extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 09:05:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Nicer formatting in tooltip for multiple categories

Browse Source
This commit is contained in:
Nathan Gray 2015-11-17 20:48:29 +00:00
parent 955466d156
commit 0b13d0deac
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/js/et2_widget_event.js
View File

@ -331,7 +331,10 @@ var et2_calendar_event = et2_valueWidget.extend([et2_IDetachedDOM],
'<span class="calendar_calEventLabel">'+this.egw().lang('End') + '</span>:' + end '<span class="calendar_calEventLabel">'+this.egw().lang('End') + '</span>:' + end
var cat = et2_createWidget('select-cat',{'readonly':true},this); var cat = et2_createWidget('select-cat',{'readonly':true},this);
cat.set_value(this.options.value.category); cat.set_value(this.options.value.category);
var cat_label = cat.span.text(); var cat_label = [];
cat.span.children().each(function() {
cat_label.push($j(this).text());
});
cat.destroy(); cat.destroy();
return '<div class="calendar_calEventTooltip ' + this._status_class() + '" style="border-color: '+border+'; background: '+bg_color+';">'+ return '<div class="calendar_calEventTooltip ' + this._status_class() + '" style="border-color: '+border+'; background: '+bg_color+';">'+
@ -346,7 +349,7 @@ var et2_calendar_event = et2_valueWidget.extend([et2_IDetachedDOM],
this.options.value.description+'</p>'+ this.options.value.description+'</p>'+
'<p style="margin: 2px 0px;">'+times+'</p>'+ '<p style="margin: 2px 0px;">'+times+'</p>'+
(this.options.value.location ? '<p><span class="calendar_calEventLabel">'+this.egw().lang('Location') + '</span>:' + this.options.value.location+'</p>' : '')+ (this.options.value.location ? '<p><span class="calendar_calEventLabel">'+this.egw().lang('Location') + '</span>:' + this.options.value.location+'</p>' : '')+
(cat_label ? '<p><span class="calendar_calEventLabel">'+this.egw().lang('Category') + '</span>:' + cat_label+'</p>' : '')+ (cat_label ? '<p><span class="calendar_calEventLabel">'+this.egw().lang('Category') + '</span>:' + cat_label.join(', ')+'</p>' : '')+
'<p><span class="calendar_calEventLabel">'+this.egw().lang('Participants')+'</span>:<br />'+ '<p><span class="calendar_calEventLabel">'+this.egw().lang('Participants')+'</span>:<br />'+
(this.options.value.parts ? this.options.value.parts.replace("\n","<br />"):'')+'</p>'+ (this.options.value.parts ? this.options.value.parts.replace("\n","<br />"):'')+'</p>'+
'</div>'+ '</div>'+