Author: ralfbecker
New Revision: 55668
URL: http://svn.stylite.de/viewvc/egroupware?rev=55668&view=rev
Log:
moving all - non ancient 
- js files to api/js
Added:
trunk/egroupware/api/js/Resumable/
- copied from r55666, trunk/phpgwapi/js/Resumable/
trunk/egroupware/api/js/dhtmlxMenu/
- copied from r55666, trunk/phpgwapi/js/dhtmlxMenu/
trunk/egroupware/api/js/dhtmlxtree/
- copied from r55666, trunk/phpgwapi/js/dhtmlxtree/
trunk/egroupware/api/js/egw_action/
- copied from r55666, trunk/phpgwapi/js/egw_action/
trunk/egroupware/api/js/egw_json.js
- copied unchanged from r55666, trunk/phpgwapi/js/egw_json.js
trunk/egroupware/api/js/es6-promise.min.js
- copied unchanged from r55666, trunk/phpgwapi/js/es6-promise.min.js
trunk/egroupware/api/js/framework/
- copied from r55667, trunk/phpgwapi/js/framework/
trunk/egroupware/api/js/jquery/
- copied from r55666, trunk/phpgwapi/js/jquery/
trunk/egroupware/api/js/jsapi/
- copied from r55666, trunk/phpgwapi/js/jsapi/
trunk/egroupware/api/js/labjs/
- copied from r55666, trunk/phpgwapi/js/labjs/
trunk/egroupware/api/js/login.js
- copied unchanged from r55666, trunk/phpgwapi/js/login.js
Removed:
trunk/phpgwapi/js/Resumable/
trunk/phpgwapi/js/dhtmlxMenu/
trunk/phpgwapi/js/dhtmlxtree/
trunk/phpgwapi/js/egw_action/
trunk/phpgwapi/js/egw_json.js
trunk/phpgwapi/js/es6-promise.min.js
trunk/phpgwapi/js/framework/
trunk/phpgwapi/js/jquery/
trunk/phpgwapi/js/jsapi/
trunk/phpgwapi/js/labjs/
trunk/phpgwapi/js/login.js
Modified:
trunk/egroupware/Gruntfile.js
trunk/egroupware/api/js/ (props changed)
trunk/egroupware/api/js/egw_action/egw_action_popup.js
trunk/egroupware/api/js/egw_action/egw_menu_dhtmlx.js
trunk/egroupware/api/js/etemplate/et2_core_DOMWidget.js
trunk/egroupware/api/js/etemplate/et2_dataview_view_aoi.js
trunk/egroupware/api/js/etemplate/et2_widget_barcode.js
trunk/egroupware/api/js/etemplate/et2_widget_color.js
trunk/egroupware/api/js/etemplate/et2_widget_htmlarea.js
trunk/egroupware/api/js/etemplate/et2_widget_selectbox.js
trunk/egroupware/api/js/etemplate/et2_widget_taglist.js
trunk/egroupware/api/js/etemplate/et2_widget_tree.js
trunk/egroupware/api/js/etemplate/expose.js
trunk/egroupware/api/js/etemplate/test/test_dataview.html
trunk/egroupware/api/js/etemplate/test/test_xml.html
trunk/egroupware/api/js/framework/fw_ui.js
trunk/egroupware/api/js/jsapi/app_base.js
trunk/egroupware/api/js/jsapi/egw_jquery.js
trunk/egroupware/api/src/Etemplate.php
trunk/egroupware/api/src/Etemplate/Widget/Nextmatch.php
trunk/egroupware/api/src/Etemplate/Widget/Tree.php
trunk/egroupware/api/src/Etemplate/WidgetBrowser.php
trunk/egroupware/api/src/Html.php
trunk/egroupware/api/src/Html/CkEditorConfig.php
trunk/egroupware/api/templates/default/etemplate2.css
trunk/egroupware/home/inc/class.home_ui.inc.php
trunk/egroupware/home/js/app.js
trunk/egroupware/updateGruntfile.php
trunk/etemplate/gantt_print.php
trunk/etemplate/inc/class.nextmatch_widget.inc.php
trunk/jdots/js/fw_mobile.js
trunk/phpgwapi/inc/class.egw_framework.inc.php
trunk/phpgwapi/inc/class.egw_include_mgr.inc.php
trunk/phpgwapi/js/ (props changed)
trunk/phpgwapi/templates/default/login.tpl
trunk/pixelegg/login.tpl
trunk/pixelegg/login_mobile.tpl
— trunk/egroupware/Gruntfile.js (original)
+++ trunk/egroupware/Gruntfile.js Thu Apr 7 12:38:05 2016
@@ -44,52 +44,52 @@
},
api: {
files: {
-
"phpgwapi\/js\/jsapi.min.js": [
-
"phpgwapi\/js\/jquery\/jquery.js",
-
"phpgwapi\/js\/jquery\/jquery-ui.js",
-
"phpgwapi\/js\/jsapi\/jsapi.js",
-
"phpgwapi\/js\/egw_json.js",
-
"phpgwapi\/js\/jsapi\/egw_core.js",
-
"phpgwapi\/js\/jsapi\/egw_debug.js",
-
"phpgwapi\/js\/jsapi\/egw_preferences.js",
-
"phpgwapi\/js\/jsapi\/egw_utils.js",
-
"phpgwapi\/js\/jsapi\/egw_ready.js",
-
"phpgwapi\/js\/jsapi\/egw_files.js",
-
"phpgwapi\/js\/jsapi\/egw_lang.js",
-
"phpgwapi\/js\/jsapi\/egw_links.js",
-
"phpgwapi\/js\/jsapi\/egw_open.js",
-
"phpgwapi\/js\/jsapi\/egw_user.js",
-
"phpgwapi\/js\/jsapi\/egw_config.js",
-
"phpgwapi\/js\/jsapi\/egw_images.js",
-
"phpgwapi\/js\/jsapi\/egw_jsonq.js",
-
"phpgwapi\/js\/jsapi\/egw_json.js",
-
"phpgwapi\/js\/jsapi\/egw_store.js",
-
"phpgwapi\/js\/jsapi\/egw_tooltip.js",
-
"phpgwapi\/js\/jsapi\/egw_css.js",
-
"phpgwapi\/js\/jquery\/jquery-ui-timepicker-addon.js",
-
"phpgwapi\/js\/jsapi\/egw_calendar.js",
-
"phpgwapi\/js\/jsapi\/egw_data.js",
-
"phpgwapi\/js\/jsapi\/egw_tail.js",
-
"phpgwapi\/js\/jsapi\/egw_inheritance.js",
-
"phpgwapi\/js\/jsapi\/egw_message.js",
-
"phpgwapi\/js\/es6-promise.min.js",
-
"phpgwapi\/js\/jsapi\/app_base.js",
-
"phpgwapi\/js\/dhtmlxtree\/codebase\/dhtmlxcommon.js",
-
"phpgwapi\/js\/dhtmlxtree\/sources\/dhtmlxtree.js",
-
"phpgwapi\/js\/dhtmlxtree\/sources\/ext\/dhtmlxtree_json.js",
-
"phpgwapi\/js\/egw_action\/egw_action_common.js",
-
"phpgwapi\/js\/egw_action\/egw_action.js",
-
"phpgwapi\/js\/egw_action\/egw_keymanager.js",
-
"phpgwapi\/js\/egw_action\/egw_menu.js",
-
"phpgwapi\/js\/jquery\/jquery-tap-and-hold\/jquery.tapandhold.js",
-
"phpgwapi\/js\/egw_action\/egw_action_popup.js",
-
"phpgwapi\/js\/egw_action\/egw_action_dragdrop.js",
-
"phpgwapi\/js\/egw_action\/egw_dragdrop_dhtmlx_tree.js",
-
"phpgwapi\/js\/dhtmlxMenu\/sources\/dhtmlxmenu.js",
-
"phpgwapi\/js\/dhtmlxMenu\/sources\/ext\/dhtmlxmenu_ext.js",
-
"phpgwapi\/js\/egw_action\/egw_menu_dhtmlx.js",
-
"phpgwapi\/js\/jquery\/chosen\/chosen.jquery.js",
-
"phpgwapi\/js\/ckeditor\/config.js"
-
"api\/js\/jsapi.min.js": [
-
"api\/js\/jquery\/jquery.js",
-
"api\/js\/jquery\/jquery-ui.js",
-
"api\/js\/jsapi\/jsapi.js",
-
"api\/js\/egw_json.js",
-
"api\/js\/jsapi\/egw_core.js",
-
"api\/js\/jsapi\/egw_debug.js",
-
"api\/js\/jsapi\/egw_preferences.js",
-
"api\/js\/jsapi\/egw_utils.js",
-
"api\/js\/jsapi\/egw_ready.js",
-
"api\/js\/jsapi\/egw_files.js",
-
"api\/js\/jsapi\/egw_lang.js",
-
"api\/js\/jsapi\/egw_links.js",
-
"api\/js\/jsapi\/egw_open.js",
-
"api\/js\/jsapi\/egw_user.js",
-
"api\/js\/jsapi\/egw_config.js",
-
"api\/js\/jsapi\/egw_images.js",
-
"api\/js\/jsapi\/egw_jsonq.js",
-
"api\/js\/jsapi\/egw_json.js",
-
"api\/js\/jsapi\/egw_store.js",
-
"api\/js\/jsapi\/egw_tooltip.js",
-
"api\/js\/jsapi\/egw_css.js",
-
"api\/js\/jquery\/jquery-ui-timepicker-addon.js",
-
"api\/js\/jsapi\/egw_calendar.js",
-
"api\/js\/jsapi\/egw_data.js",
-
"api\/js\/jsapi\/egw_tail.js",
-
"api\/js\/jsapi\/egw_inheritance.js",
-
"api\/js\/jsapi\/egw_message.js",
-
"api\/js\/es6-promise.min.js",
-
"api\/js\/jsapi\/app_base.js",
-
"api\/js\/dhtmlxtree\/codebase\/dhtmlxcommon.js",
-
"api\/js\/dhtmlxtree\/sources\/dhtmlxtree.js",
-
"api\/js\/dhtmlxtree\/sources\/ext\/dhtmlxtree_json.js",
-
"api\/js\/egw_action\/egw_action_common.js",
-
"api\/js\/egw_action\/egw_action.js",
-
"api\/js\/egw_action\/egw_keymanager.js",
-
"api\/js\/egw_action\/egw_menu.js",
-
"api\/js\/jquery\/jquery-tap-and-hold\/jquery.tapandhold.js",
-
"api\/js\/egw_action\/egw_action_popup.js",
-
"api\/js\/egw_action\/egw_action_dragdrop.js",
-
"api\/js\/egw_action\/egw_dragdrop_dhtmlx_tree.js",
-
"api\/js\/dhtmlxMenu\/sources\/dhtmlxmenu.js",
-
"api\/js\/dhtmlxMenu\/sources\/ext\/dhtmlxmenu_ext.js",
-
"api\/js\/egw_action\/egw_menu_dhtmlx.js",
-
"api\/js\/jquery\/chosen\/chosen.jquery.js",
-
"api\/js\/ckeditor\/config.js"
]
}
},
@@ -110,20 +110,20 @@
“api/js/etemplate/et2_widget_box.js”,
“api/js/etemplate/et2_widget_hbox.js”,
“api/js/etemplate/et2_widget_groupbox.js”,
-
"api\/js\/jquery\/splitter.js",
"api\/js\/etemplate\/et2_widget_split.js",
"api\/js\/etemplate\/et2_widget_button.js",
"api\/js\/etemplate\/et2_core_valueWidget.js",
"api\/js\/etemplate\/et2_core_inputWidget.js",
-
"api\/js\/jquery\/blueimp\/js\/blueimp-gallery.min.js",
"api\/js\/etemplate\/expose.js",
"api\/js\/etemplate\/et2_widget_description.js",
"api\/js\/etemplate\/et2_widget_entry.js",
"api\/js\/etemplate\/et2_widget_textbox.js",
"api\/js\/etemplate\/et2_widget_number.js",
-
"api\/js\/jquery\/jquery.base64.js",
"api\/js\/etemplate\/et2_widget_url.js",
"api\/js\/etemplate\/et2_widget_selectbox.js",
"api\/js\/etemplate\/et2_widget_checkbox.js",
@@ -142,7 +142,7 @@
“api/js/etemplate/et2_dataview_interfaces.js”,
“api/js/etemplate/et2_dataview_view_container.js”,
“api/js/etemplate/et2_dataview_view_row.js”,
-
"api\/js\/jquery\/TouchSwipe\/jquery.touchSwipe.js",
"api\/js\/etemplate\/et2_dataview_view_aoi.js",
"api\/js\/etemplate\/et2_dataview_controller_selection.js",
"api\/js\/etemplate\/et2_dataview_controller.js",
@@ -160,10 +160,10 @@
“api/js/etemplate/et2_extension_nextmatch.js”,
“api/js/etemplate/et2_widget_favorites.js”,
“api/js/etemplate/et2_widget_html.js”,
-
"api\/js\/ckeditor\/adapters\/jquery.js",
"api\/js\/etemplate\/et2_widget_htmlarea.js",
"api\/js\/etemplate\/et2_widget_tabs.js",
-
"api\/js\/jquery\/magicsuggest\/magicsuggest.js",
"api\/js\/etemplate\/et2_widget_taglist.js",
"api\/js\/etemplate\/et2_widget_toolbar.js",
"api\/js\/etemplate\/et2_widget_tree.js",
@@ -171,14 +171,14 @@
“api/js/etemplate/et2_widget_hrule.js”,
“api/js/etemplate/et2_widget_image.js”,
“api/js/etemplate/et2_widget_iframe.js”,
-
"api\/js\/Resumable\/resumable.js",
"api\/js\/etemplate\/et2_widget_file.js",
"api\/js\/etemplate\/et2_widget_progress.js",
"api\/js\/etemplate\/et2_widget_portlet.js",
"api\/js\/etemplate\/et2_widget_ajaxSelect.js",
"api\/js\/etemplate\/et2_widget_vfs.js",
"api\/js\/etemplate\/et2_widget_video.js",
-
"api\/js\/jquery\/barcode\/jquery-barcode.min.js",
"api\/js\/etemplate\/et2_widget_barcode.js",
"api\/js\/etemplate\/et2_extension_itempicker_actions.js",
"api\/js\/etemplate\/et2_widget_itempicker.js",
@@ -212,12 +212,12 @@
jdots: {
files: {
“jdots/js/fw_jdots.min.js”: [
-
"phpgwapi\/js\/framework\/fw_base.js",
-
"phpgwapi\/js\/framework\/fw_browser.js",
-
"phpgwapi\/js\/jquery\/mousewheel\/mousewheel.js",
-
"phpgwapi\/js\/framework\/fw_ui.js",
-
"phpgwapi\/js\/framework\/fw_classes.js",
-
"phpgwapi\/js\/framework\/fw_desktop.js",
-
"api\/js\/framework\/fw_base.js",
-
"api\/js\/framework\/fw_browser.js",
-
"api\/js\/jquery\/mousewheel\/mousewheel.js",
-
"api\/js\/framework\/fw_ui.js",
-
"api\/js\/framework\/fw_classes.js",
-
"api\/js\/framework\/fw_desktop.js",
"jdots\/js\/fw_jdots.js"
]
}
@@ -225,12 +225,12 @@
mobile: {
files: {
“jdots/js/fw_mobile.min.js”: [
-
"phpgwapi\/js\/jquery\/fastclick\/lib\/fastclick.js",
-
"phpgwapi\/js\/framework\/fw_base.js",
-
"phpgwapi\/js\/framework\/fw_browser.js",
-
"phpgwapi\/js\/jquery\/mousewheel\/mousewheel.js",
-
"phpgwapi\/js\/framework\/fw_ui.js",
-
"phpgwapi\/js\/framework\/fw_classes.js",
-
"api\/js\/jquery\/fastclick\/lib\/fastclick.js",
-
"api\/js\/framework\/fw_base.js",
-
"api\/js\/framework\/fw_browser.js",
-
"api\/js\/jquery\/mousewheel\/mousewheel.js",
-
"api\/js\/framework\/fw_ui.js",
-
"api\/js\/framework\/fw_classes.js",
"jdots\/js\/fw_mobile.js"
]
}
@@ -238,12 +238,12 @@
pixelegg: {
files: {
“pixelegg/js/fw_pixelegg.min.js”: [
-
"phpgwapi\/js\/framework\/fw_base.js",
-
"phpgwapi\/js\/framework\/fw_browser.js",
-
"phpgwapi\/js\/jquery\/mousewheel\/mousewheel.js",
-
"phpgwapi\/js\/framework\/fw_ui.js",
-
"phpgwapi\/js\/framework\/fw_classes.js",
-
"phpgwapi\/js\/framework\/fw_desktop.js",
-
"api\/js\/framework\/fw_base.js",
-
"api\/js\/framework\/fw_browser.js",
-
"api\/js\/jquery\/mousewheel\/mousewheel.js",
-
"api\/js\/framework\/fw_ui.js",
-
"api\/js\/framework\/fw_classes.js",
-
"api\/js\/framework\/fw_desktop.js",
"pixelegg\/js\/slider.js",
"pixelegg\/js\/fw_pixelegg.js"
]
Propchange: trunk/egroupware/api/js/
— svn:externals (added)
+++ svn:externals Thu Apr 7 12:38:05 2016
@@ -1,0 +1,4 @@
+#
+# svn externals for api/js
+#
+ckeditor https://github.com/EGroupware/ckeditor-dev/branches/trunk/dev/builder/release/ckeditor
— trunk/egroupware/api/js/egw_action/egw_action_popup.js (original)
+++ trunk/egroupware/api/js/egw_action/egw_action_popup.js Thu Apr 7 12:38:05 2016
@@ -12,7 +12,7 @@
/*egw:uses
jquery.jquery;
egw_menu;
- /phpgwapi/js/jquery/jquery-tap-and-hold/jquery.tapandhold.js;
- /api/js/jquery/jquery-tap-and-hold/jquery.tapandhold.js;
*/
if (typeof window._egwActionClasses == “undefined”)
— trunk/egroupware/api/js/egw_action/egw_menu_dhtmlx.js (original)
+++ trunk/egroupware/api/js/egw_action/egw_menu_dhtmlx.js Thu Apr 7 12:38:05 2016
@@ -11,13 +11,13 @@
/*egw:uses
egw_menu;
- /phpgwapi/js/dhtmlxtree/codebase/dhtmlxcommon.js;
- /phpgwapi/js/dhtmlxMenu/sources/dhtmlxmenu.js;
- /phpgwapi/js/dhtmlxMenu/sources/ext/dhtmlxmenu_ext.js;
- /api/js/dhtmlxtree/codebase/dhtmlxcommon.js;
- /api/js/dhtmlxMenu/sources/dhtmlxmenu.js;
- /api/js/dhtmlxMenu/sources/ext/dhtmlxmenu_ext.js;
*/
// Need CSS, or it doesn’t really work
-if(typeof egw == ‘function’) egw(window).includeCSS(egw.webserverUrl + “/phpgwapi/js/egw_action/test/skins/dhtmlxmenu_egw.css”);
+if(typeof egw == ‘function’) egw(window).includeCSS(egw.webserverUrl + “/api/js/egw_action/test/skins/dhtmlxmenu_egw.css”);
function egwMenuImpl(_structure)
{
//Create a new dhtmlxmenu object
— trunk/egroupware/api/js/etemplate/et2_core_DOMWidget.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_core_DOMWidget.js Thu Apr 7 12:38:05 2016
@@ -13,7 +13,7 @@
/*egw:uses
et2_core_interfaces;
et2_core_widget;
- /phpgwapi/js/egw_action/egw_action.js;
- /api/js/egw_action/egw_action.js;
*/
/**
— trunk/egroupware/api/js/etemplate/et2_dataview_view_aoi.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_dataview_view_aoi.js Thu Apr 7 12:38:05 2016
@@ -13,7 +13,7 @@
/*egw:uses
egw_action.egw_action_common;
egw_action.egw_action;
- /phpgwapi/js/jquery/TouchSwipe/jquery.touchSwipe.js;
- /api/js/jquery/TouchSwipe/jquery.touchSwipe.js;
*/
/**
— trunk/egroupware/api/js/etemplate/et2_widget_barcode.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_widget_barcode.js Thu Apr 7 12:38:05 2016
@@ -12,7 +12,7 @@
/*egw:uses
jquery.jquery;
- /phpgwapi/js/jquery/barcode/jquery-barcode.min.js;
- /api/js/jquery/barcode/jquery-barcode.min.js;
et2_core_interfaces;
et2_core_baseWidget;
*/
— trunk/egroupware/api/js/etemplate/et2_widget_color.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_widget_color.js Thu Apr 7 12:38:05 2016
@@ -14,7 +14,7 @@
jquery.jquery;
et2_core_inputWidget;
et2_core_valueWidget;
- /phpgwapi/js/jquery/jpicker/jpicker-1.1.6.js;
- /api/js/jquery/jpicker/jpicker-1.1.6.js;
*/
/**
@@ -41,7 +41,7 @@
position: { “x”: “screenCenter”, “y”: “screenCenter”}
},
“images”: {
— trunk/egroupware/api/js/etemplate/et2_widget_htmlarea.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_widget_htmlarea.js Thu Apr 7 12:38:05 2016
@@ -13,9 +13,9 @@
/*egw:uses
jsapi.jsapi; // Needed for egw_seperateJavaScript
jquery.jquery;
- /phpgwapi/js/ckeditor/ckeditor.js;
- /phpgwapi/js/ckeditor/config.js;
- /phpgwapi/js/ckeditor/adapters/jquery.js;
- ckeditor.ckeditor;
- ckeditor.config;
- ckeditor.adapters/jquery;
et2_core_baseWidget;
*/
— trunk/egroupware/api/js/etemplate/et2_widget_selectbox.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_widget_selectbox.js Thu Apr 7 12:38:05 2016
@@ -13,7 +13,7 @@
/*egw:uses
jquery.jquery;
- /phpgwapi/js/jquery/chosen/chosen.jquery.js;
- /api/js/jquery/chosen/chosen.jquery.js;
et2_core_xml;
et2_core_DOMWidget;
et2_core_inputWidget;
— trunk/egroupware/api/js/etemplate/et2_widget_taglist.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_widget_taglist.js Thu Apr 7 12:38:05 2016
@@ -12,7 +12,7 @@
/*egw:uses
et2_core_inputWidget;
- /phpgwapi/js/jquery/magicsuggest/magicsuggest.js;
- /api/js/jquery/magicsuggest/magicsuggest.js;
*/
/**
@@ -1246,4 +1246,4 @@
// Require css
// TODO: merge into etemplate2.css with all other widgets when done
-if(typeof egw == ‘function’) egw(window).includeCSS(egw.webserverUrl + “/phpgwapi/js/jquery/magicsuggest/magicsuggest.css”);
+if(typeof egw == ‘function’) egw(window).includeCSS(egw.webserverUrl + “/api/js/jquery/magicsuggest/magicsuggest.css”);
— trunk/egroupware/api/js/etemplate/et2_widget_tree.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_widget_tree.js Thu Apr 7 12:38:05 2016
@@ -1,7 +1,7 @@
/**
- EGroupware eTemplate2 - JS Tree object
-
/*egw:uses
-
et2_core_inputWidget;
- /phpgwapi/js/egw_action/egw_dragdrop_dhtmlx_tree.js;
- /phpgwapi/js/dhtmlxtree/codebase/dhtmlxcommon.js;
-// using debugable and fixed source of dhtmltree instead: /phpgwapi/js/dhtmlxtree/js/dhtmlXTree.js;
- /phpgwapi/js/dhtmlxtree/sources/dhtmlxtree.js;
- /phpgwapi/js/dhtmlxtree/sources/ext/dhtmlxtree_json.js;
-// /phpgwapi/js/dhtmlxtree/sources/ext/dhtmlxtree_start.js;
- et2_core_inputWidget;
- /api/js/egw_action/egw_dragdrop_dhtmlx_tree.js;
- /api/js/dhtmlxtree/codebase/dhtmlxcommon.js;
+// using debugable and fixed source of dhtmltree instead: /api/js/dhtmlxtree/js/dhtmlXTree.js;
- /api/js/dhtmlxtree/sources/dhtmlxtree.js;
- /api/js/dhtmlxtree/sources/ext/dhtmlxtree_json.js;
+// /api/js/dhtmlxtree/sources/ext/dhtmlxtree_start.js;
*/
/**
— trunk/egroupware/api/js/etemplate/expose.js (original)
+++ trunk/egroupware/api/js/etemplate/expose.js Thu Apr 7 12:38:05 2016
@@ -12,7 +12,7 @@
/*egw:uses
jquery.jquery;
- /phpgwapi/js/jquery/blueimp/js/blueimp-gallery.min.js;
- /api/js/jquery/blueimp/js/blueimp-gallery.min.js;
*/
/**
— trunk/egroupware/api/js/etemplate/test/test_dataview.html (original)
+++ trunk/egroupware/api/js/etemplate/test/test_dataview.html Thu Apr 7 12:38:05 2016
@@ -3,13 +3,13 @@
ET2 - Test
<script src="jquery.js"></script>
-
<script src="../../../phpgwapi/js/jsapi/jsapi.js"></script>
-
<script src="../../../phpgwapi/js/egw_json.js"></script>
-
<script src="../../../phpgwapi/js/jquery/jquery.tools.min.js"></script>
-
<script src="../../../phpgwapi/js/jquery/jquery-ui.js"></script>
-
-
<script src="../../../phpgwapi/js/egw_action/egw_action.js"></script>
-
<script src="../../../phpgwapi/js/egw_action/egw_action_common.js"></script>
-
<script src="../../jsapi/jsapi.js"></script>
-
<script src="../../egw_json.js"></script>
-
<script src="../../jquery/jquery.tools.min.js"></script>
-
<script src="../../jquery/jquery-ui.js"></script>
-
-
<script src="../../egw_action/egw_action.js"></script>
-
<script src="../../egw_action/egw_action_common.js"></script>
<script>
// Create the egw object template
@@ -17,12 +17,12 @@
‘prefsOnly’: true
};
-
<script src="../../../phpgwapi/js/jsapi/egw_core.js"></script>
-
<script src="../../../phpgwapi/js/jsapi/egw_utils.js"></script>
-
<script src="../../../phpgwapi/js/jsapi/egw_css.js"></script>
-
<script src="../../../phpgwapi/js/jsapi/egw_debug.js"></script>
-
-
<script src="../../../phpgwapi/js/jsapi/egw_inheritance.js"></script>
-
<script src="../../jsapi/egw_core.js"></script>
-
<script src="../../jsapi/egw_utils.js"></script>
-
<script src="../../jsapi/egw_css.js"></script>
-
<script src="../../jsapi/egw_debug.js"></script>
-
-
<script src="../../jsapi/egw_inheritance.js"></script>
<script src="../et2_core_inheritance.js"></script>
<script src="../et2_core_interfaces.js"></script>
<script src="../et2_core_common.js"></script>
— trunk/egroupware/api/js/etemplate/test/test_xml.html (original)
+++ trunk/egroupware/api/js/etemplate/test/test_xml.html Thu Apr 7 12:38:05 2016
@@ -3,37 +3,37 @@
ET2 - Test
<script src="jquery.js"></script>
-
<script src="../../../phpgwapi/js/jsapi/jsapi.js"></script>
-
<script src="../../../phpgwapi/js/egw_json.js"></script>
-
<script src="../../../phpgwapi/js/jsapi/egw.js"></script>
-
<script src="../../../phpgwapi/js/jquery/jquery.tools.min.js"></script>
-
<script src="../../../phpgwapi/js/jquery/jquery-ui.js"></script>
-
<script src="../../jsapi/jsapi.js"></script>
-
<script src="../../egw_json.js"></script>
-
<script src="../../jsapi/egw.js"></script>
-
<script src="../../jquery/jquery.tools.min.js"></script>
-
<script src="../../jquery/jquery-ui.js"></script>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
<script src="../etemplate2.js"></script>
<script src="../et2_core_xml.js"></script>
@@ -101,7 +101,7 @@
— trunk/egroupware/api/js/framework/fw_ui.js (original)
+++ trunk/egroupware/api/js/framework/fw_ui.js Thu Apr 7 12:38:05 2016
@@ -9,7 +9,7 @@
/*egw:uses
jquery.jquery;
- /phpgwapi/js/jquery/mousewheel/mousewheel.js;
- /api/js/jquery/mousewheel/mousewheel.js;
egw_inheritance.js;
*/
— trunk/egroupware/api/js/jsapi/app_base.js (original)
+++ trunk/egroupware/api/js/jsapi/app_base.js Thu Apr 7 12:38:05 2016
@@ -13,7 +13,7 @@
/*egw:uses
egw_inheritance;
- /phpgwapi/js/es6-promise.min.js;
- /api/js/es6-promise.min.js;
*/
/**
— trunk/egroupware/api/js/jsapi/egw_jquery.js (original)
+++ trunk/egroupware/api/js/jsapi/egw_jquery.js Thu Apr 7 12:38:05 2016
@@ -32,9 +32,9 @@
// Include the jQuery and jQuery UI library.
var token = ready.readyWaitFor();
files.includeJS([
-
this.webserverUrl + '/phpgwapi/js/jquery/jquery.js',
-
this.webserverUrl + '/phpgwapi/js/jquery/jquery-ui.js',
-
this.webserverUrl + '/phpgwapi/js/jquery/jquery.html5_upload.js'
-
this.webserverUrl + '/api/js/jquery/jquery.js',
-
this.webserverUrl + '/api/js/jquery/jquery-ui.js',
-
this.webserverUrl + '/api/js/jquery/jquery.html5_upload.js'
], function () {
this.constant(‘jquery’, ‘$j’, _wnd.$j, _wnd);
ready.readyDone(token);
— trunk/egroupware/api/src/Etemplate.php (original)
+++ trunk/egroupware/api/src/Etemplate.php Thu Apr 7 12:38:05 2016
@@ -220,7 +220,7 @@
// Include the jQuery-UI CSS - many more complex widgets use it
$theme = 'redmond';
— trunk/egroupware/api/src/Etemplate/Widget/Nextmatch.php (original)
+++ trunk/egroupware/api/src/Etemplate/Widget/Nextmatch.php Thu Apr 7 12:38:05 2016
@@ -95,7 +95,7 @@
parent::__construct($xml);
// TODO: probably a better way to do this
— trunk/egroupware/api/src/Etemplate/Widget/Tree.php (original)
+++ trunk/egroupware/api/src/Etemplate/Widget/Tree.php Thu Apr 7 12:38:05 2016
@@ -19,7 +19,7 @@
// explicitly import old not yet ported classes
use egw_framework;
-egw_framework::includeCSS(’/phpgwapi/js/dhtmlxtree/codebase/dhtmlXTree.css’);
+egw_framework::includeCSS(’/api/js/dhtmlxtree/codebase/dhtmlXTree.css’);
/**
— trunk/egroupware/api/src/Etemplate/WidgetBrowser.php (original)
+++ trunk/egroupware/api/src/Etemplate/WidgetBrowser.php Thu Apr 7 12:38:05 2016
@@ -45,7 +45,7 @@
// Include the jQuery-UI CSS - many more complex widgets use it
$theme = 'redmond';
— trunk/egroupware/api/src/Html.php (original)
+++ trunk/egroupware/api/src/Html.php Thu Apr 7 12:38:05 2016
@@ -197,8 +197,8 @@
$out .= “\n”;
if($enhanced) {
-
egw_framework::validate_file('/phpgwapi/js/jquery/chosen/chosen.jquery.js');
-
egw_framework::includeCSS('/phpgwapi/js/jquery/chosen/chosen.css',null,false);
-
egw_framework::validate_file('/api/js/jquery/chosen/chosen.jquery.js');
-
egw_framework::includeCSS('/api/js/jquery/chosen/chosen.css',null,false);
$out .= "<script>var lab = egw_LAB || \$LAB; lab.wait(function() {\$j(function() {if(\$j().chosen) \$j('select[name=\"$name\"]').chosen({width: '100%'});});})</script>\n";
}
return $out;
@@ -459,7 +459,7 @@
return self::textarea($_name,$_content,‘id="’.htmlspecialchars($_name).’"’,true). // true = double encoding
’
-window.CKEDITOR_BASEPATH="'.$GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/ckeditor/";
+window.CKEDITOR_BASEPATH="'.$GLOBALS['egw_info']['server']['webserver_url'].'/api/js/ckeditor/";
egw_LAB.wait(function() {
CKEDITOR.replace("'.$_name.'", '.Html\CkEditorConfig::get_ckeditor_config($_mode,
$pxheight, $expanded, $_start_path).');
@@ -1121,10 +1121,10 @@
static $tree_initialised=false;
if (!$tree_initialised)
{
- egw_framework::includeCSS('/phpgwapi/js/dhtmlxtree/codebase/dhtmlxtree.css');
- egw_framework::validate_file('/phpgwapi/js/dhtmlxtree/codebase/dhtmlxcommon.js');
- egw_framework::validate_file('/phpgwapi/js/dhtmlxtree/sources/dhtmlxtree.js');
- if ($autoLoading && $dataMode != 'XML') egw_framework::validate_file('/phpgwapi/js/dhtmlxtree/sources/ext/dhtmlxtree_json.js');
+ egw_framework::includeCSS('/api/js/dhtmlxtree/codebase/dhtmlxtree.css');
+ egw_framework::validate_file('/api/js/dhtmlxtree/codebase/dhtmlxcommon.js');
+ egw_framework::validate_file('/api/js/dhtmlxtree/sources/dhtmlxtree.js');
+ if ($autoLoading && $dataMode != 'XML') egw_framework::validate_file('/api/js/dhtmlxtree/sources/ext/dhtmlxtree_json.js');
$tree_initialised = true;
if (!$_folders && !$autoLoading) return null;
}
Modified: trunk/egroupware/api/src/Html/CkEditorConfig.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Html/CkEditorConfig.php?rev=55668&r1=55667&r2=55668&view=diff
==============================================================================
--- trunk/egroupware/api/src/Html/CkEditorConfig.php (original)
+++ trunk/egroupware/api/src/Html/CkEditorConfig.php Thu Apr 7 12:38:05 2016
@@ -83,7 +83,7 @@
);
$skins = array();
- foreach(scandir(EGW_SERVER_ROOT.'/phpgwapi/js/ckeditor/skins') as $skin)
+ foreach(scandir(EGW_SERVER_ROOT.'/api/js/ckeditor/skins') as $skin)
{
if ($skin[0] == '.') continue;
@@ -169,7 +169,7 @@
private static function get_base_path()
{
//Get the ckeditor base url
- return $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/ckeditor/';
+ return $GLOBALS['egw_info']['server']['webserver_url'].'/api/js/ckeditor/';
}
/**
@@ -247,7 +247,7 @@
}
//Check whether the skin actually exists, if not, switch to a default
- if (!file_exists(EGW_SERVER_ROOT.'/phpgwapi/js/ckeditor/skins/'.$skin))
+ if (!file_exists(EGW_SERVER_ROOT.'/api/js/ckeditor/skins/'.$skin))
{
$skin = "moono"; //this is the basic skin for ckeditor
}
Modified: trunk/egroupware/api/templates/default/etemplate2.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/templates/default/etemplate2.css?rev=55668&r1=55667&r2=55668&view=diff
==============================================================================
--- trunk/egroupware/api/templates/default/etemplate2.css (original)
+++ trunk/egroupware/api/templates/default/etemplate2.css Thu Apr 7 12:38:05 2016
@@ -7,8 +7,8 @@
* Magic suggest / tag list widget
*/
/* These imports processed by framework */
-/*@import url("../../../phpgwapi/js/jquery/magicsuggest/magicsuggest.css");*/
-/*@import url("../../../phpgwapi/js/jquery/blueimp/css/blueimp-gallery.min.css");*/
+/*@import url("../../js/jquery/magicsuggest/magicsuggest.css");*/
+/*@import url("../../js/jquery/blueimp/css/blueimp-gallery.min.css");*/
/**
Modified: trunk/egroupware/home/inc/class.home_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/home/inc/class.home_ui.inc.php?rev=55668&r1=55667&r2=55668&view=diff
==============================================================================
--- trunk/egroupware/home/inc/class.home_ui.inc.php (original)
+++ trunk/egroupware/home/inc/class.home_ui.inc.php Thu Apr 7 12:38:05 2016
@@ -37,7 +37,7 @@
self::setup_default_home();
// CSS for Gridster grid layout
- egw_framework::includeCSS('/phpgwapi/js/jquery/gridster/jquery.gridster.css');
+ egw_framework::includeCSS('/api/js/jquery/gridster/jquery.gridster.css');
$template = new etemplate_new('home.index');
Modified: trunk/egroupware/home/js/app.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/home/js/app.js?rev=55668&r1=55667&r2=55668&view=diff
==============================================================================
--- trunk/egroupware/home/js/app.js (original)
+++ trunk/egroupware/home/js/app.js Thu Apr 7 12:38:05 2016
@@ -10,9 +10,9 @@
*/
/*egw:uses
- jquery.jquery;
- jquery.jquery-ui;
- /phpgwapi/js/jquery/gridster/jquery.gridster.js;
+ jquery.jquery;
+ jquery.jquery-ui;
+ /api/js/jquery/gridster/jquery.gridster.js;
*/
/**
Modified: trunk/egroupware/updateGruntfile.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/updateGruntfile.php?rev=55668&r1=55667&r2=55668&view=diff
==============================================================================
--- trunk/egroupware/updateGruntfile.php (original)
+++ trunk/egroupware/updateGruntfile.php Thu Apr 7 12:38:05 2016
@@ -45,13 +45,13 @@
if ($path[0] == '/') $path = substr($path, 1);
});
- // phpgwapi/js/jsapi/egw.js loaded via own tag, and we must not load it twice!
- if ($name == 'api' && ($key = array_search('phpgwapi/js/jsapi/egw.js', $files)))
+ // api/js/jsapi/egw.js loaded via own tag, and we must not load it twice!
+ if ($name == 'api' && ($key = array_search('api/js/jsapi/egw.js', $files)))
{
unset($files[$key]);
}
// ckeditor is loaded separate before the bundle
- if ($name == 'api' && ($key = array_search('phpgwapi/js/ckeditor/ckeditor.js', $files)))
+ if ($name == 'api' && ($key = array_search('api/js/ckeditor/ckeditor.js', $files)))
{
unset($files[$key]);
}
Modified: trunk/etemplate/gantt_print.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/gantt_print.php?rev=55668&r1=55667&r2=55668&view=diff
==============================================================================
--- trunk/etemplate/gantt_print.php (original)
+++ trunk/etemplate/gantt_print.php Thu Apr 7 12:38:05 2016
@@ -21,10 +21,10 @@
egw_framework::csp_script_src_attrs(array('https://export.dhtmlx.com/gantt/api.js'));
egw_framework::csp_connect_src_attrs('http://export.dhtmlx.com');
-egw_framework::validate_file('/phpgwapi/js/dhtmlxtree/codebase/dhtmlxcommon.js');
-egw_framework::validate_file('/phpgwapi/js/dhtmlxGantt/codebase/dhtmlxgantt.js');
+egw_framework::validate_file('/api/js/dhtmlxtree/codebase/dhtmlxcommon.js');
+egw_framework::validate_file('/api/js/dhtmlxGantt/codebase/dhtmlxgantt.js');
-egw_framework::includeCSS('/phpgwapi/js/dhtmlxGantt/codebase/dhtmlxgantt.css');
+egw_framework::includeCSS('/api/js/dhtmlxGantt/codebase/dhtmlxgantt.css');
echo $GLOBALS['egw']->framework->header();
?>
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=55668&r1=55667&r2=55668&view=diff
==============================================================================
--- trunk/etemplate/inc/class.nextmatch_widget.inc.php (original)
+++ trunk/etemplate/inc/class.nextmatch_widget.inc.php Thu Apr 7 12:38:05 2016
@@ -883,7 +883,7 @@
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('/phpgwapi/js/egw_action/test/skins/dhtmlxmenu_egw.css');
+ 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');
Modified: trunk/jdots/js/fw_mobile.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/jdots/js/fw_mobile.js?rev=55668&r1=55667&r2=55668&view=diff
==============================================================================
--- trunk/jdots/js/fw_mobile.js (original)
+++ trunk/jdots/js/fw_mobile.js Thu Apr 7 12:38:05 2016
@@ -9,8 +9,8 @@
/*egw:uses
jquery.jquery;
- /phpgwapi/js/jquery/TouchSwipe/jquery.touchSwipe.js;
- /phpgwapi/js/jquery/fastclick/lib/fastclick.js;
+ /api/js/jquery/TouchSwipe/jquery.touchSwipe.js;
+ /api/js/jquery/fastclick/lib/fastclick.js;
framework.fw_base;
framework.fw_browser;
framework.fw_ui;
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=55668&r1=55667&r2=55668&view=diff
==============================================================================
--- trunk/phpgwapi/inc/class.egw_framework.inc.php (original)
+++ trunk/phpgwapi/inc/class.egw_framework.inc.php Thu Apr 7 12:38:05 2016
@@ -205,13 +205,13 @@
{
self::$js_include_mgr = new egw_include_mgr(array(
// We need LABjs, but putting it through egw_include_mgr causes it to re-load itself
- //'/phpgwapi/js/labjs/LAB.src.js',
-
-
