holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure categories with no color do not turn the event transparent.

Browse Source
This commit is contained in:
Nathan Gray 2015-10-09 16:33:34 +00:00
parent 61db4b7559
commit 0bdbccf1b4
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/js/et2_widget_event.js
View File

@ -206,7 +206,6 @@ var et2_calendar_event = et2_valueWidget.extend([et2_IDetachedDOM],
{
this.div.addClass('cat_' + event.category);
}
this.div.css('border-color', this.div.css('background-color'));
this.div.toggleClass('calendar_calEventUnknown', event.participants[egw.user('account_id')] ? event.participants[egw.user('account_id')][0] === 'U' : false);
this.div.addClass(this._status_class());
@ -224,10 +223,17 @@ var et2_calendar_event = et2_valueWidget.extend([et2_IDetachedDOM],
}
this.div.attr('data-title', title);
this.title.text(small_height ? title : this._get_timespan(event))
this.title.text(small_height ? title : this._get_timespan(event));
// Colors - don't make them transparent if there is no color
if(jQuery.Color("rgba(0,0,0,0)").toRgbaString() != jQuery.Color(this.div,'background-color').toRgbaString())
{
this.div.css('border-color', this.div.css('background-color'));
// Set title color based on background brightness
this.title
.css('background-color', this.div.css('background-color'))
.css('color', jQuery.Color(this.div.css('background-color')).lightness() > 0.5 ? 'black':'white');
}
this.icons.appendTo(this.title)
.html(this._icons());

1
calendar/templates/default/app.css
View File

@ -356,6 +356,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
* background: depending on category (shade)
*
*/
border-color: #808080;
}
.calendar_calEvent:not([class*="cat_"]) {
/* Defaults for no category, so we don't override it */