R55433 - in /trunk: egroupware/api/src/ egroupware/api/templates/ egroupware/api/templates/default/ etemplate/templates/defa

[ralfbecker_sf]

Author: ralfbecker
New Revision: 55433

URL: http://svn.stylite.de/viewvc/egroupware?rev=55433&view=rev
Log:
move etemplate2.css to api

Added:
trunk/egroupware/api/templates/
trunk/egroupware/api/templates/default/
trunk/egroupware/api/templates/default/etemplate2.css
- copied unchanged from r55427, trunk/etemplate/templates/default/etemplate2.css
Removed:
trunk/etemplate/templates/default/etemplate2.css
Modified:
trunk/egroupware/api/src/Etemplate.php
trunk/phpgwapi/inc/class.egw_framework.inc.php

Modified: trunk/egroupware/api/src/Etemplate.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Etemplate.php?rev=55433&r1=55432&r2=55433&view=diff

— trunk/egroupware/api/src/Etemplate.php (original)
+++ trunk/egroupware/api/src/Etemplate.php Sat Mar 19 16:22:41 2016
@@ -224,7 +224,7 @@
$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);
  

Modified: trunk/phpgwapi/inc/class.egw_framework.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.egw_framework.inc.php?rev=55433&r1=55432&r2=55433&view=diff

— trunk/phpgwapi/inc/class.egw_framework.inc.php (original)
+++ trunk/phpgwapi/inc/class.egw_framework.inc.php Sat Mar 19 16:22:41 2016
@@ -1297,7 +1297,7 @@
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);
  

---

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231&iu=/4140

---

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs