extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

move etemplate2.css to api

Browse Source
This commit is contained in:
Ralf Becker 2016-03-19 15:22:41 +00:00
parent 9b446f7c17
commit d8514e47b9
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Etemplate.php
View File

@ -224,7 +224,7 @@ class Etemplate extends Etemplate\Widget\Template
$theme = 'redmond';
egw_framework::includeCSS("/phpgwapi/js/jquery/jquery-ui/$theme/jquery-ui-1.10.3.custom.css");
// Load our CSS after jQuery-UI, so we can override it
egw_framework::includeCSS('/etemplate/templates/default/etemplate2.css');
egw_framework::includeCSS('/api/templates/default/etemplate2.css');
// check if application of template has a app.js file --> load it
list($app) = explode('.',$this->name);

0
etemplate/templates/default/etemplate2.css → api/templates/default/etemplate2.css
View File

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

@ -1297,7 +1297,7 @@ abstract class egw_framework
self::includeCSS("/phpgwapi/js/jquery/jquery-ui/redmond/jquery-ui.css");
// eTemplate2 - load in top so sidebox has styles too
self::includeCSS('/etemplate/templates/default/etemplate2.css');
self::includeCSS('/api/templates/default/etemplate2.css');
// Category styles
categories::css(categories::GLOBAL_APPNAME);