extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-24 11:51:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

moving to stray css includes into etemplate2.css, so they also get minified and loaded in one go

Browse Source
This commit is contained in:
Ralf Becker 2016-04-29 13:43:50 +00:00
parent 2a03cc7ca9
commit 22fa4e70bc
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/Etemplate/Widget/Nextmatch.php
View File

@ -89,9 +89,6 @@ class Nextmatch extends Etemplate\Widget
{ {
if($xml) { if($xml) {
parent::__construct($xml); parent::__construct($xml);
// TODO: probably a better way to do this
Api\Framework::includeCSS('/api/js/egw_action/test/skins/dhtmlxmenu_egw.css');
} }
} }

2
api/src/Etemplate/Widget/Tree.php
View File

@ -16,8 +16,6 @@ namespace EGroupware\Api\Etemplate\Widget;
use EGroupware\Api\Etemplate; use EGroupware\Api\Etemplate;
use EGroupware\Api; use EGroupware\Api;
Api\Framework::includeCSS('/api/js/dhtmlxtree/codebase/dhtmlXTree.css');
/** /**
* eTemplate tree widget * eTemplate tree widget
* *

4
api/templates/default/etemplate2.css
View File

@ -11,6 +11,8 @@
/*@import url("../../js/jquery/jpicker/css/jPicker-1.1.6.min.css");*/ /*@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/jquery-ui-timepicker-addon.css");*/
/*@import url("../../js/jquery/blueimp/css/blueimp-gallery.min.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; border: none;
background: inherit; background: inherit;
margin-bottom: 0px; margin-bottom: 0px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
} }

5
etemplate/inc/class.nextmatch_widget.inc.php
View File

@ -882,9 +882,6 @@ class nextmatch_widget
*/ */
public static function init_egw_actions(array $actions=null, $action_links=null, $template_name='', $prefix='egw_') 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/dhtmlxcommon');
egw_framework::validate_file('dhtmlxtree','dhtmlxMenu/codebase/dhtmlxmenu'); egw_framework::validate_file('dhtmlxtree','dhtmlxMenu/codebase/dhtmlxmenu');
egw_framework::validate_file('egw_action','egw_action'); 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('egw_action','egw_keymanager');
egw_framework::validate_file('.', 'nextmatch_action', 'etemplate'); 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(); if (!is_array($action_links)) $action_links = array();
$app = $GLOBALS['egw_info']['flags']['currentapp']; $app = $GLOBALS['egw_info']['flags']['currentapp'];