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

Reorder CSS inclusion so theme can override jQuery-UI

Browse Source 
eTemplate2 does it right automatically, but it also needs to be done in framework, because framework included etemplate2.css
This commit is contained in:
Nathan Gray 2013-12-12 18:03:23 +00:00
parent 447e3ed5f0
commit 0d3a7b73cf
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -984,6 +984,19 @@ abstract class egw_framework
public function _get_css() public function _get_css()
{ {
$app_css = ''; $app_css = '';
// Load these first
// Cascade should go:
// Libs < etemplate2 < framework/theme < app < print (?)
// Enhanced selectboxes (et1)
self::includeCSS('/phpgwapi/js/jquery/chosen/chosen.css');
// eTemplate2 uses jQueryUI, so load it first so et2 can override if needed
egw_framework::includeCSS("/phpgwapi/js/jquery/jquery-ui/redmond/jquery-ui-1.10.3.custom.css");
// eTemplate2 - load in top so sidebox has styles too
self::includeCSS('/etemplate/templates/default/etemplate2.css');
if(isset($_GET['menuaction'])) if(isset($_GET['menuaction']))
{ {
list($app,$class,$method) = explode('.',$_GET['menuaction']); list($app,$class,$method) = explode('.',$_GET['menuaction']);
@ -1009,11 +1022,6 @@ abstract class egw_framework
$print_css = '/phpgwapi/templates/idots/print.css'; $print_css = '/phpgwapi/templates/idots/print.css';
} }
// Enhanced selectboxes (et1)
self::includeCSS('/phpgwapi/js/jquery/chosen/chosen.css');
// eTemplate2 - load in top so sidebox has styles too
self::includeCSS('/etemplate/templates/default/etemplate2.css');
// search for app specific css file // search for app specific css file
self::includeCSS($GLOBALS['egw_info']['flags']['currentapp'], 'app'); self::includeCSS($GLOBALS['egw_info']['flags']['currentapp'], 'app');