[eGroupWare-svn] r55944 - in /trunk: egroupware/api/src/Etemplate/Widget/ egroupware/api/templates/default/ etemplate/inc/

Author: ralfbecker
Date: Fri Apr 29 15:43:50 2016
New Revision: 55944

URL: http://svn.stylite.de/viewvc/egroupware?rev=55944&view=rev
Log:
moving to stray css includes into etemplate2.css, so they also get minified and loaded in one go

Modified:
    trunk/egroupware/api/src/Etemplate/Widget/Nextmatch.php
    trunk/egroupware/api/src/Etemplate/Widget/Tree.php
    trunk/egroupware/api/templates/default/etemplate2.css
    trunk/etemplate/inc/class.nextmatch_widget.inc.php

Modified: trunk/egroupware/api/src/Etemplate/Widget/Nextmatch.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Etemplate/Widget/Nextmatch.php?rev=55944&r1=55943&r2=55944&view=diff
==============================================================================
--- trunk/egroupware/api/src/Etemplate/Widget/Nextmatch.php (original)
+++ trunk/egroupware/api/src/Etemplate/Widget/Nextmatch.php Fri Apr 29 15:43:50 2016
@@ -89,9 +89,6 @@
 	{
 		if($xml) {
 			parent::__construct($xml);
-
-			// TODO: probably a better way to do this
-			Api\Framework::includeCSS('/api/js/egw_action/test/skins/dhtmlxmenu_egw.css');
 		}
 	}
 

Modified: trunk/egroupware/api/src/Etemplate/Widget/Tree.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Etemplate/Widget/Tree.php?rev=55944&r1=55943&r2=55944&view=diff
==============================================================================
--- trunk/egroupware/api/src/Etemplate/Widget/Tree.php (original)
+++ trunk/egroupware/api/src/Etemplate/Widget/Tree.php Fri Apr 29 15:43:50 2016
@@ -15,8 +15,6 @@
 
 use EGroupware\Api\Etemplate;
 use EGroupware\Api;
-
-Api\Framework::includeCSS('/api/js/dhtmlxtree/codebase/dhtmlXTree.css');
 
 /**
  * eTemplate tree widget

Modified: trunk/egroupware/api/templates/default/etemplate2.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/templates/default/etemplate2.css?rev=55944&r1=55943&r2=55944&view=diff
==============================================================================
--- trunk/egroupware/api/templates/default/etemplate2.css (original)
+++ trunk/egroupware/api/templates/default/etemplate2.css Fri Apr 29 15:43:50 2016
@@ -11,6 +11,8 @@
 /*@import url("../../js/jquery/jpicker/css/jPicker-1.1.6.min.css");*/
 /*@import url("../../js/jquery/jquery-ui-timepicker-addon.css");*/
 /*@import url("../../js/jquery/blueimp/css/blueimp-gallery.min.css");*/
+/*@import url("../../js/dhtmlxtree/codebase/dhtmlXTree.css");*/
+/*@import url("../../js/egw_action/test/skins/dhtmlxmenu_egw.css");*/
 
 
 /**
@@ -1100,7 +1102,7 @@
 	border: none;
 	background: inherit;
 	margin-bottom: 0px;
-	
+
 	white-space: nowrap;
 	overflow: hidden;
 }

Modified: trunk/etemplate/inc/class.nextmatch_widget.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/inc/class.nextmatch_widget.inc.php?rev=55944&r1=55943&r2=55944&view=diff
==============================================================================
--- trunk/etemplate/inc/class.nextmatch_widget.inc.php (original)
+++ trunk/etemplate/inc/class.nextmatch_widget.inc.php Fri Apr 29 15:43:50 2016
@@ -882,9 +882,6 @@
 	 */
 	public static function init_egw_actions(array $actions=null, $action_links=null, $template_name='', $prefix='egw_')
 	{
-		// Load some JS files needed for the egw_action framework
-		egw_framework::includeCSS('/api/js/egw_action/test/skins/dhtmlxmenu_egw.css');
-
 		egw_framework::validate_file('dhtmlxtree','dhtmlxMenu/codebase/dhtmlxcommon');
 		egw_framework::validate_file('dhtmlxtree','dhtmlxMenu/codebase/dhtmlxmenu');
 		egw_framework::validate_file('egw_action','egw_action');
@@ -894,8 +891,6 @@
 		egw_framework::validate_file('egw_action','egw_menu_dhtmlx');
 		egw_framework::validate_file('egw_action','egw_keymanager');
 		egw_framework::validate_file('.', 'nextmatch_action', 'etemplate');
-
-		//egw_framework::validate_file('dhtmlxtree','dhtmlxMenu/codebase/ext/dhtmlxmenu_ext');
 
 		if (!is_array($action_links)) $action_links = array();
 


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z