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

Update CSS order so apps can customize theme:

Browse Source 
Libs < etemplate2 < framework/theme < app < print
This commit is contained in:
Nathan Gray 2014-03-18 15:29:03 +00:00
parent a744177316
commit 764d7f99a5
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -1028,7 +1028,7 @@ if ($app == 'home') continue;
{ {
// Load these first // Load these first
// Cascade should go: // Cascade should go:
// Libs < etemplate2 < framework/theme < app < print (?) // Libs < etemplate2 < framework/theme < app < print
// Enhanced selectboxes (et1) // Enhanced selectboxes (et1)
self::includeCSS('/phpgwapi/js/jquery/chosen/chosen.css'); self::includeCSS('/phpgwapi/js/jquery/chosen/chosen.css');
@ -1038,22 +1038,23 @@ if ($app == 'home') continue;
// eTemplate2 - load in top so sidebox has styles too // eTemplate2 - load in top so sidebox has styles too
self::includeCSS('/etemplate/templates/default/etemplate2.css'); self::includeCSS('/etemplate/templates/default/etemplate2.css');
// Theme likes to override eTemplate2
$theme_css = $this->template_dir.'/css/'.$GLOBALS['egw_info']['user']['preferences']['common']['theme'].'.css'; $theme_css = $this->template_dir.'/css/'.$GLOBALS['egw_info']['user']['preferences']['common']['theme'].'.css';
if(!file_exists(EGW_SERVER_ROOT.$theme_css)) if(!file_exists(EGW_SERVER_ROOT.$theme_css))
{ {
$theme_css = $this->template_dir.'/css/'.$this->template.'.css'; $theme_css = $this->template_dir.'/css/'.$this->template.'.css';
} }
self::includeCSS($theme_css);
// search for app specific css file, so it can customize the theme
self::includeCSS($GLOBALS['egw_info']['flags']['currentapp'], 'app');
// sending print css last, so it can overwrite anything
$print_css = $this->template_dir.'/print.css'; $print_css = $this->template_dir.'/print.css';
if(!file_exists(EGW_SERVER_ROOT.$print_css)) if(!file_exists(EGW_SERVER_ROOT.$print_css))
{ {
$print_css = '/phpgwapi/templates/idots/print.css'; $print_css = '/phpgwapi/templates/idots/print.css';
} }
// search for app specific css file
self::includeCSS($GLOBALS['egw_info']['flags']['currentapp'], 'app');
// sending template/theme and print css last, so they can overwrite anything
self::includeCSS($theme_css);
self::includeCSS($print_css); self::includeCSS($print_css);
} }
// add all css files from self::includeCSS // add all css files from self::includeCSS