mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-23 07:09:20 +01:00
Load jquery-ui css before ours, so we can override it
This commit is contained in:
parent
4239b83bd0
commit
0ae58e39de
@ -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
|
// 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::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
|
// Include the jQuery-UI CSS - many more complex widgets use it
|
||||||
$theme = 'redmond';
|
$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");
|
||||||
|
|
||||||
|
// 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
|
// check if application of template has a app.js file --> load it
|
||||||
list($app) = explode('.',$this->name);
|
list($app) = explode('.',$this->name);
|
||||||
if (file_exists(EGW_SERVER_ROOT.'/'.$app.'/js/app.js'))
|
if (file_exists(EGW_SERVER_ROOT.'/'.$app.'/js/app.js'))
|
||||||
|
@ -37,11 +37,11 @@ class etemplate_et2_widgets
|
|||||||
// Include the etemplate2 javascript code
|
// Include the etemplate2 javascript code
|
||||||
egw_framework::validate_file('.', 'etemplate2', 'etemplate');
|
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
|
// Include the jQuery-UI CSS - many more complex widgets use it
|
||||||
$theme = 'redmond';
|
$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);
|
egw_framework::includeCSS('etemplate','widget_browser',false);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user