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

Load jquery-ui css before ours, so we can override it

Browse Source
This commit is contained in:
Nathan Gray 2013-04-16 18:46:23 +00:00
parent 4239b83bd0
commit 0ae58e39de
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etemplate/inc/class.etemplate.inc.php
View File

@ -146,12 +146,13 @@ class etemplate_new extends etemplate_widget_template
// missing dependency, thought egw:uses jquery.jquery.tools does NOT work, maybe we should rename it to jquery-tools
// egw_framework::validate_file('jquery','jquery.tools.min');
egw_framework::includeCSS('/etemplate/templates/default/etemplate2.css');
// Include the jQuery-UI CSS - many more complex widgets use it
$theme = 'redmond';
egw_framework::includeCSS("/phpgwapi/js/jquery/jquery-ui/$theme/jquery-ui-1.8.21.custom.css");
// Load our CSS after jQuery-UI, so we can override it
egw_framework::includeCSS('/etemplate/templates/default/etemplate2.css');
// check if application of template has a app.js file --> load it
list($app) = explode('.',$this->name);
if (file_exists(EGW_SERVER_ROOT.'/'.$app.'/js/app.js'))

6
etemplate/inc/class.etemplate_et2_widgets.inc.php
View File

@ -37,11 +37,11 @@ class etemplate_et2_widgets
// Include the etemplate2 javascript code
egw_framework::validate_file('.', 'etemplate2', 'etemplate');
egw_framework::includeCSS('/etemplate/templates/default/etemplate2.css');
// Include the jQuery-UI CSS - many more complex widgets use it
$theme = 'redmond';
egw_framework::includeCSS("/phpgwapi/js/jquery/jquery-ui/$theme/jquery-ui-1.8.21.custom.css");
egw_framework::includeCSS("/phpgwapi/js/jquery/jquery-ui/$theme/jquery-ui-1.8.21.custom.css");
egw_framework::includeCSS('/etemplate/templates/default/etemplate2.css');
egw_framework::includeCSS('etemplate','widget_browser',false);