mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-24 23:58:54 +01:00
* Api - Fix row category colors go missing after a change
- Row color css was not specific enough to override the default, and only worked because of load order - Remove uneeded category CSS requests from calendar
This commit is contained in:
parent
7805844b7c
commit
e8127f7da7
@ -41,7 +41,7 @@ foreach($categories as $cat)
|
||||
{
|
||||
// Use slightly more specific selector that just class, to allow defaults
|
||||
// if the category has no color
|
||||
$content .= ".egwGridView_scrollarea tr.cat_{$cat['id']} > td:first-child, .select-cat li.cat_{$cat['id']}, .nextmatch_header_row .et2_selectbox.select-cat.cat_{$cat['id']} a.chzn-single {border-left-color: {$cat['data']['color']};} .cat_{$cat['id']}.fullline_cat_bg, div.cat_{$cat['id']}, span.cat_{$cat['id']} { background-color: {$cat['data']['color']};} /*{$cat['name']}*/\n";
|
||||
$content .= ".egwGridView_scrollarea tr.row_category.cat_{$cat['id']} > td:first-child, .select-cat li.cat_{$cat['id']}, .nextmatch_header_row .et2_selectbox.select-cat.cat_{$cat['id']} a.chzn-single {border-left-color: {$cat['data']['color']};} .cat_{$cat['id']}.fullline_cat_bg, div.cat_{$cat['id']}, span.cat_{$cat['id']} { background-color: {$cat['data']['color']};} /*{$cat['name']}*/\n";
|
||||
}
|
||||
if (!empty($cat['data']['icon']))
|
||||
{
|
||||
|
@ -262,9 +262,6 @@ var et2_calendar_event = (function(){ "use strict"; return et2_valueWidget.exten
|
||||
getInstanceManager: function() {return im}
|
||||
}, {application:event.app||'calendar'});
|
||||
|
||||
// Get CSS too
|
||||
egw.includeCSS('/api/categories.php?app='+event.app);
|
||||
|
||||
// Need cleaning? (DnD helper removes content)
|
||||
if(!this.div.has(this.title).length)
|
||||
{
|
||||
|
@ -1877,9 +1877,6 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
|
||||
_type:'select-cat',
|
||||
getInstanceManager: function() {return im;}
|
||||
}, {application:event.data.app||'calendar'});
|
||||
|
||||
// Get CSS too
|
||||
egw.includeCSS('/api/categories.php?app='+event.data.app);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user