From 22fa4e70bc44194df47b58e610e9e434ddf52ac5 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 29 Apr 2016 13:43:50 +0000
Subject: [PATCH] moving to stray css includes into etemplate2.css, so they
 also get minified and loaded in one go

---
 api/src/Etemplate/Widget/Nextmatch.php       | 3 ---
 api/src/Etemplate/Widget/Tree.php            | 2 --
 api/templates/default/etemplate2.css         | 4 +++-
 etemplate/inc/class.nextmatch_widget.inc.php | 5 -----
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/api/src/Etemplate/Widget/Nextmatch.php b/api/src/Etemplate/Widget/Nextmatch.php
index f3d43928bb..5eef7eedaf 100644
--- a/api/src/Etemplate/Widget/Nextmatch.php
+++ b/api/src/Etemplate/Widget/Nextmatch.php
@@ -89,9 +89,6 @@ class Nextmatch extends Etemplate\Widget
 	{
 		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');
 		}
 	}
 
diff --git a/api/src/Etemplate/Widget/Tree.php b/api/src/Etemplate/Widget/Tree.php
index 28de2a14a9..8c2dd67b02 100644
--- a/api/src/Etemplate/Widget/Tree.php
+++ b/api/src/Etemplate/Widget/Tree.php
@@ -16,8 +16,6 @@ namespace EGroupware\Api\Etemplate\Widget;
 use EGroupware\Api\Etemplate;
 use EGroupware\Api;
 
-Api\Framework::includeCSS('/api/js/dhtmlxtree/codebase/dhtmlXTree.css');
-
 /**
  * eTemplate tree widget
  *
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index e470dada4a..2cc3344616 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -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 @@ div .et2_taglist_single div.ms-sel-ctn div.ms-sel-item {
 	border: none;
 	background: inherit;
 	margin-bottom: 0px;
-	
+
 	white-space: nowrap;
 	overflow: hidden;
 }
diff --git a/etemplate/inc/class.nextmatch_widget.inc.php b/etemplate/inc/class.nextmatch_widget.inc.php
index c54d36f3c8..a805e885be 100644
--- a/etemplate/inc/class.nextmatch_widget.inc.php
+++ b/etemplate/inc/class.nextmatch_widget.inc.php
@@ -882,9 +882,6 @@ class nextmatch_widget
 	 */
 	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');
@@ -895,8 +892,6 @@ class nextmatch_widget
 		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();
 
 		$app = $GLOBALS['egw_info']['flags']['currentapp'];