extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 05:41:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Backported commit 38270 from trunk, concatenated dhtmlxmenu and dhtmlxmenu_ext

Browse Source
This commit is contained in:
Andreas Stöckel 2012-03-07 10:39:23 +00:00
parent aa3ac75278
commit 36f9cc2f6a
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -886,7 +886,7 @@ 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'); //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();

2
felamimail/inc/class.uifelamimail.inc.php
View File

@ -675,7 +675,7 @@ class uifelamimail
egw_framework::validate_file('egw_action','egw_stylesheet'); egw_framework::validate_file('egw_action','egw_stylesheet');
// The ext stuff has to be loaded at the end // The ext stuff has to be loaded at the end
egw_framework::validate_file('dhtmlxtree','dhtmlxMenu/codebase/ext/dhtmlxmenu_ext'); // egw_framework::validate_file('dhtmlxtree','dhtmlxMenu/codebase/ext/dhtmlxmenu_ext');
egw_framework::validate_file('jscode','viewMainScreen','felamimail'); egw_framework::validate_file('jscode','viewMainScreen','felamimail');
egw_framework::includeCSS('/phpgwapi/js/egw_action/test/skins/dhtmlxmenu_egw.css'); egw_framework::includeCSS('/phpgwapi/js/egw_action/test/skins/dhtmlxmenu_egw.css');

18
phpgwapi/js/dhtmlxtree/dhtmlxMenu/codebase/dhtmlxmenu.js
View File

File diff suppressed because one or more lines are too long