From d8514e47b9193d1b6b375fbd835eed95f06a8657 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 19 Mar 2016 15:22:41 +0000 Subject: [PATCH] move etemplate2.css to api --- api/src/Etemplate.php | 2 +- {etemplate => api}/templates/default/etemplate2.css | 0 phpgwapi/inc/class.egw_framework.inc.php | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename {etemplate => api}/templates/default/etemplate2.css (100%) diff --git a/api/src/Etemplate.php b/api/src/Etemplate.php index 23ac105fc6..7db2a093cd 100644 --- a/api/src/Etemplate.php +++ b/api/src/Etemplate.php @@ -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); diff --git a/etemplate/templates/default/etemplate2.css b/api/templates/default/etemplate2.css similarity index 100% rename from etemplate/templates/default/etemplate2.css rename to api/templates/default/etemplate2.css diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index f9f5b4b556..0a25b09663 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -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);