diff --git a/Gruntfile.js b/Gruntfile.js index ac25a3db0b..ceafab4e10 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -95,98 +95,98 @@ module.exports = function (grunt) { }, et2: { files: { - "etemplate\/js\/etemplate2.min.js": [ - "etemplate\/js\/et2_core_xml.js", - "etemplate\/js\/et2_core_common.js", - "etemplate\/js\/et2_core_inheritance.js", - "etemplate\/js\/et2_core_interfaces.js", - "etemplate\/js\/et2_core_phpExpressionCompiler.js", - "etemplate\/js\/et2_core_arrayMgr.js", - "etemplate\/js\/et2_core_widget.js", - "etemplate\/js\/et2_core_DOMWidget.js", - "etemplate\/js\/et2_widget_template.js", - "etemplate\/js\/et2_widget_grid.js", - "etemplate\/js\/et2_core_baseWidget.js", - "etemplate\/js\/et2_widget_box.js", - "etemplate\/js\/et2_widget_hbox.js", - "etemplate\/js\/et2_widget_groupbox.js", + "api\/js\/etemplate\/etemplate2.min.js": [ + "api\/js\/etemplate\/et2_core_xml.js", + "api\/js\/etemplate\/et2_core_common.js", + "api\/js\/etemplate\/et2_core_inheritance.js", + "api\/js\/etemplate\/et2_core_interfaces.js", + "api\/js\/etemplate\/et2_core_phpExpressionCompiler.js", + "api\/js\/etemplate\/et2_core_arrayMgr.js", + "api\/js\/etemplate\/et2_core_widget.js", + "api\/js\/etemplate\/et2_core_DOMWidget.js", + "api\/js\/etemplate\/et2_widget_template.js", + "api\/js\/etemplate\/et2_widget_grid.js", + "api\/js\/etemplate\/et2_core_baseWidget.js", + "api\/js\/etemplate\/et2_widget_box.js", + "api\/js\/etemplate\/et2_widget_hbox.js", + "api\/js\/etemplate\/et2_widget_groupbox.js", "phpgwapi\/js\/jquery\/splitter.js", - "etemplate\/js\/et2_widget_split.js", - "etemplate\/js\/et2_widget_button.js", - "etemplate\/js\/et2_core_valueWidget.js", - "etemplate\/js\/et2_core_inputWidget.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", "phpgwapi\/js\/jquery\/jpicker\/jpicker-1.1.6.js", - "etemplate\/js\/et2_widget_color.js", + "api\/js\/etemplate\/et2_widget_color.js", "phpgwapi\/js\/jquery\/blueimp\/js\/blueimp-gallery.min.js", - "etemplate\/js\/expose.js", - "etemplate\/js\/et2_widget_description.js", - "etemplate\/js\/et2_widget_entry.js", - "etemplate\/js\/et2_widget_textbox.js", - "etemplate\/js\/et2_widget_number.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", "phpgwapi\/js\/jquery\/jquery.base64.js", - "etemplate\/js\/et2_widget_url.js", - "etemplate\/js\/et2_widget_selectbox.js", - "etemplate\/js\/et2_widget_checkbox.js", - "etemplate\/js\/et2_widget_radiobox.js", - "etemplate\/js\/lib\/date.js", - "etemplate\/js\/et2_widget_date.js", - "etemplate\/js\/et2_widget_dialog.js", - "etemplate\/js\/lib\/jsdifflib\/difflib.js", - "etemplate\/js\/lib\/jsdifflib\/diffview.js", - "etemplate\/js\/et2_widget_diff.js", - "etemplate\/js\/et2_widget_dropdown_button.js", - "etemplate\/js\/et2_widget_styles.js", - "etemplate\/js\/et2_widget_link.js", - "etemplate\/js\/et2_widget_selectAccount.js", - "etemplate\/js\/et2_extension_customfields.js", - "etemplate\/js\/et2_dataview_interfaces.js", - "etemplate\/js\/et2_dataview_view_container.js", - "etemplate\/js\/et2_dataview_view_row.js", + "api\/js\/etemplate\/et2_widget_url.js", + "api\/js\/etemplate\/et2_widget_selectbox.js", + "api\/js\/etemplate\/et2_widget_checkbox.js", + "api\/js\/etemplate\/et2_widget_radiobox.js", + "api\/js\/etemplate\/lib\/date.js", + "api\/js\/etemplate\/et2_widget_date.js", + "api\/js\/etemplate\/et2_widget_dialog.js", + "api\/js\/etemplate\/lib\/jsdifflib\/difflib.js", + "api\/js\/etemplate\/lib\/jsdifflib\/diffview.js", + "api\/js\/etemplate\/et2_widget_diff.js", + "api\/js\/etemplate\/et2_widget_dropdown_button.js", + "api\/js\/etemplate\/et2_widget_styles.js", + "api\/js\/etemplate\/et2_widget_link.js", + "api\/js\/etemplate\/et2_widget_selectAccount.js", + "api\/js\/etemplate\/et2_extension_customfields.js", + "api\/js\/etemplate\/et2_dataview_interfaces.js", + "api\/js\/etemplate\/et2_dataview_view_container.js", + "api\/js\/etemplate\/et2_dataview_view_row.js", "phpgwapi\/js\/jquery\/TouchSwipe\/jquery.touchSwipe.js", - "etemplate\/js\/et2_dataview_view_aoi.js", - "etemplate\/js\/et2_dataview_controller_selection.js", - "etemplate\/js\/et2_dataview_controller.js", - "etemplate\/js\/et2_dataview_view_tile.js", - "etemplate\/js\/et2_extension_nextmatch_actions.js", - "etemplate\/js\/et2_extension_nextmatch_controller.js", - "etemplate\/js\/et2_extension_nextmatch_rowProvider.js", - "etemplate\/js\/et2_extension_nextmatch_dynheight.js", - "etemplate\/js\/et2_dataview_model_columns.js", - "etemplate\/js\/et2_dataview_view_rowProvider.js", - "etemplate\/js\/et2_dataview_view_spacer.js", - "etemplate\/js\/et2_dataview_view_grid.js", - "etemplate\/js\/et2_dataview_view_resizeable.js", - "etemplate\/js\/et2_dataview.js", - "etemplate\/js\/et2_extension_nextmatch.js", - "etemplate\/js\/et2_widget_favorites.js", + "api\/js\/etemplate\/et2_dataview_view_aoi.js", + "api\/js\/etemplate\/et2_dataview_controller_selection.js", + "api\/js\/etemplate\/et2_dataview_controller.js", + "api\/js\/etemplate\/et2_dataview_view_tile.js", + "api\/js\/etemplate\/et2_extension_nextmatch_actions.js", + "api\/js\/etemplate\/et2_extension_nextmatch_controller.js", + "api\/js\/etemplate\/et2_extension_nextmatch_rowProvider.js", + "api\/js\/etemplate\/et2_extension_nextmatch_dynheight.js", + "api\/js\/etemplate\/et2_dataview_model_columns.js", + "api\/js\/etemplate\/et2_dataview_view_rowProvider.js", + "api\/js\/etemplate\/et2_dataview_view_spacer.js", + "api\/js\/etemplate\/et2_dataview_view_grid.js", + "api\/js\/etemplate\/et2_dataview_view_resizeable.js", + "api\/js\/etemplate\/et2_dataview.js", + "api\/js\/etemplate\/et2_extension_nextmatch.js", + "api\/js\/etemplate\/et2_widget_favorites.js", "phpgwapi\/js\/dhtmlxGantt\/codebase\/dhtmlxgantt.js", - "etemplate\/js\/et2_widget_gantt.js", - "etemplate\/js\/et2_widget_html.js", + "api\/js\/etemplate\/et2_widget_gantt.js", + "api\/js\/etemplate\/et2_widget_html.js", "phpgwapi\/js\/ckeditor\/adapters\/jquery.js", - "etemplate\/js\/et2_widget_htmlarea.js", - "etemplate\/js\/et2_widget_tabs.js", + "api\/js\/etemplate\/et2_widget_htmlarea.js", + "api\/js\/etemplate\/et2_widget_tabs.js", "phpgwapi\/js\/jquery\/magicsuggest\/magicsuggest.js", - "etemplate\/js\/et2_widget_taglist.js", - "etemplate\/js\/et2_widget_toolbar.js", - "etemplate\/js\/et2_widget_tree.js", - "etemplate\/js\/et2_widget_historylog.js", - "etemplate\/js\/et2_widget_hrule.js", - "etemplate\/js\/et2_widget_image.js", - "etemplate\/js\/et2_widget_iframe.js", + "api\/js\/etemplate\/et2_widget_taglist.js", + "api\/js\/etemplate\/et2_widget_toolbar.js", + "api\/js\/etemplate\/et2_widget_tree.js", + "api\/js\/etemplate\/et2_widget_historylog.js", + "api\/js\/etemplate\/et2_widget_hrule.js", + "api\/js\/etemplate\/et2_widget_image.js", + "api\/js\/etemplate\/et2_widget_iframe.js", "phpgwapi\/js\/Resumable\/resumable.js", - "etemplate\/js\/et2_widget_file.js", - "etemplate\/js\/et2_widget_progress.js", - "etemplate\/js\/et2_widget_portlet.js", - "etemplate\/js\/et2_widget_ajaxSelect.js", - "etemplate\/js\/et2_widget_vfs.js", - "etemplate\/js\/et2_widget_video.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", "phpgwapi\/js\/jquery\/barcode\/jquery-barcode.min.js", - "etemplate\/js\/et2_widget_barcode.js", - "etemplate\/js\/et2_extension_itempicker_actions.js", - "etemplate\/js\/et2_widget_itempicker.js", - "etemplate\/js\/et2_widget_script.js", - "etemplate\/js\/et2_core_legacyJSFunctions.js", - "etemplate\/js\/etemplate2.js" + "api\/js\/etemplate\/et2_widget_barcode.js", + "api\/js\/etemplate\/et2_extension_itempicker_actions.js", + "api\/js\/etemplate\/et2_widget_itempicker.js", + "api\/js\/etemplate\/et2_widget_script.js", + "api\/js\/etemplate\/et2_core_legacyJSFunctions.js", + "api\/js\/etemplate\/etemplate2.js" ] } }, diff --git a/etemplate/js/et2_core_DOMWidget.js b/api/js/etemplate/et2_core_DOMWidget.js similarity index 100% rename from etemplate/js/et2_core_DOMWidget.js rename to api/js/etemplate/et2_core_DOMWidget.js diff --git a/etemplate/js/et2_core_arrayMgr.js b/api/js/etemplate/et2_core_arrayMgr.js similarity index 100% rename from etemplate/js/et2_core_arrayMgr.js rename to api/js/etemplate/et2_core_arrayMgr.js diff --git a/etemplate/js/et2_core_baseWidget.js b/api/js/etemplate/et2_core_baseWidget.js similarity index 100% rename from etemplate/js/et2_core_baseWidget.js rename to api/js/etemplate/et2_core_baseWidget.js diff --git a/etemplate/js/et2_core_common.js b/api/js/etemplate/et2_core_common.js similarity index 100% rename from etemplate/js/et2_core_common.js rename to api/js/etemplate/et2_core_common.js diff --git a/etemplate/js/et2_core_inheritance.js b/api/js/etemplate/et2_core_inheritance.js similarity index 100% rename from etemplate/js/et2_core_inheritance.js rename to api/js/etemplate/et2_core_inheritance.js diff --git a/etemplate/js/et2_core_inputWidget.js b/api/js/etemplate/et2_core_inputWidget.js similarity index 100% rename from etemplate/js/et2_core_inputWidget.js rename to api/js/etemplate/et2_core_inputWidget.js diff --git a/etemplate/js/et2_core_interfaces.js b/api/js/etemplate/et2_core_interfaces.js similarity index 100% rename from etemplate/js/et2_core_interfaces.js rename to api/js/etemplate/et2_core_interfaces.js diff --git a/etemplate/js/et2_core_legacyJSFunctions.js b/api/js/etemplate/et2_core_legacyJSFunctions.js similarity index 100% rename from etemplate/js/et2_core_legacyJSFunctions.js rename to api/js/etemplate/et2_core_legacyJSFunctions.js diff --git a/etemplate/js/et2_core_phpExpressionCompiler.js b/api/js/etemplate/et2_core_phpExpressionCompiler.js similarity index 100% rename from etemplate/js/et2_core_phpExpressionCompiler.js rename to api/js/etemplate/et2_core_phpExpressionCompiler.js diff --git a/etemplate/js/et2_core_valueWidget.js b/api/js/etemplate/et2_core_valueWidget.js similarity index 100% rename from etemplate/js/et2_core_valueWidget.js rename to api/js/etemplate/et2_core_valueWidget.js diff --git a/etemplate/js/et2_core_widget.js b/api/js/etemplate/et2_core_widget.js similarity index 100% rename from etemplate/js/et2_core_widget.js rename to api/js/etemplate/et2_core_widget.js diff --git a/etemplate/js/et2_core_xml.js b/api/js/etemplate/et2_core_xml.js similarity index 100% rename from etemplate/js/et2_core_xml.js rename to api/js/etemplate/et2_core_xml.js diff --git a/etemplate/js/et2_dataview.js b/api/js/etemplate/et2_dataview.js similarity index 100% rename from etemplate/js/et2_dataview.js rename to api/js/etemplate/et2_dataview.js diff --git a/etemplate/js/et2_dataview_controller.js b/api/js/etemplate/et2_dataview_controller.js similarity index 100% rename from etemplate/js/et2_dataview_controller.js rename to api/js/etemplate/et2_dataview_controller.js diff --git a/etemplate/js/et2_dataview_controller_selection.js b/api/js/etemplate/et2_dataview_controller_selection.js similarity index 100% rename from etemplate/js/et2_dataview_controller_selection.js rename to api/js/etemplate/et2_dataview_controller_selection.js diff --git a/etemplate/js/et2_dataview_interfaces.js b/api/js/etemplate/et2_dataview_interfaces.js similarity index 100% rename from etemplate/js/et2_dataview_interfaces.js rename to api/js/etemplate/et2_dataview_interfaces.js diff --git a/etemplate/js/et2_dataview_model_columns.js b/api/js/etemplate/et2_dataview_model_columns.js similarity index 100% rename from etemplate/js/et2_dataview_model_columns.js rename to api/js/etemplate/et2_dataview_model_columns.js diff --git a/etemplate/js/et2_dataview_view_aoi.js b/api/js/etemplate/et2_dataview_view_aoi.js similarity index 100% rename from etemplate/js/et2_dataview_view_aoi.js rename to api/js/etemplate/et2_dataview_view_aoi.js diff --git a/etemplate/js/et2_dataview_view_container.js b/api/js/etemplate/et2_dataview_view_container.js similarity index 100% rename from etemplate/js/et2_dataview_view_container.js rename to api/js/etemplate/et2_dataview_view_container.js diff --git a/etemplate/js/et2_dataview_view_grid.js b/api/js/etemplate/et2_dataview_view_grid.js similarity index 100% rename from etemplate/js/et2_dataview_view_grid.js rename to api/js/etemplate/et2_dataview_view_grid.js diff --git a/etemplate/js/et2_dataview_view_resizeable.js b/api/js/etemplate/et2_dataview_view_resizeable.js similarity index 100% rename from etemplate/js/et2_dataview_view_resizeable.js rename to api/js/etemplate/et2_dataview_view_resizeable.js diff --git a/etemplate/js/et2_dataview_view_row.js b/api/js/etemplate/et2_dataview_view_row.js similarity index 100% rename from etemplate/js/et2_dataview_view_row.js rename to api/js/etemplate/et2_dataview_view_row.js diff --git a/etemplate/js/et2_dataview_view_rowProvider.js b/api/js/etemplate/et2_dataview_view_rowProvider.js similarity index 100% rename from etemplate/js/et2_dataview_view_rowProvider.js rename to api/js/etemplate/et2_dataview_view_rowProvider.js diff --git a/etemplate/js/et2_dataview_view_spacer.js b/api/js/etemplate/et2_dataview_view_spacer.js similarity index 100% rename from etemplate/js/et2_dataview_view_spacer.js rename to api/js/etemplate/et2_dataview_view_spacer.js diff --git a/etemplate/js/et2_dataview_view_tile.js b/api/js/etemplate/et2_dataview_view_tile.js similarity index 100% rename from etemplate/js/et2_dataview_view_tile.js rename to api/js/etemplate/et2_dataview_view_tile.js diff --git a/etemplate/js/et2_extension_customfields.js b/api/js/etemplate/et2_extension_customfields.js similarity index 100% rename from etemplate/js/et2_extension_customfields.js rename to api/js/etemplate/et2_extension_customfields.js diff --git a/etemplate/js/et2_extension_itempicker_actions.js b/api/js/etemplate/et2_extension_itempicker_actions.js similarity index 100% rename from etemplate/js/et2_extension_itempicker_actions.js rename to api/js/etemplate/et2_extension_itempicker_actions.js diff --git a/etemplate/js/et2_extension_nextmatch.js b/api/js/etemplate/et2_extension_nextmatch.js similarity index 100% rename from etemplate/js/et2_extension_nextmatch.js rename to api/js/etemplate/et2_extension_nextmatch.js diff --git a/etemplate/js/et2_extension_nextmatch_actions.js b/api/js/etemplate/et2_extension_nextmatch_actions.js similarity index 100% rename from etemplate/js/et2_extension_nextmatch_actions.js rename to api/js/etemplate/et2_extension_nextmatch_actions.js diff --git a/etemplate/js/et2_extension_nextmatch_controller.js b/api/js/etemplate/et2_extension_nextmatch_controller.js similarity index 100% rename from etemplate/js/et2_extension_nextmatch_controller.js rename to api/js/etemplate/et2_extension_nextmatch_controller.js diff --git a/etemplate/js/et2_extension_nextmatch_dynheight.js b/api/js/etemplate/et2_extension_nextmatch_dynheight.js similarity index 100% rename from etemplate/js/et2_extension_nextmatch_dynheight.js rename to api/js/etemplate/et2_extension_nextmatch_dynheight.js diff --git a/etemplate/js/et2_extension_nextmatch_rowProvider.js b/api/js/etemplate/et2_extension_nextmatch_rowProvider.js similarity index 100% rename from etemplate/js/et2_extension_nextmatch_rowProvider.js rename to api/js/etemplate/et2_extension_nextmatch_rowProvider.js diff --git a/etemplate/js/et2_widget_ajaxSelect.js b/api/js/etemplate/et2_widget_ajaxSelect.js similarity index 100% rename from etemplate/js/et2_widget_ajaxSelect.js rename to api/js/etemplate/et2_widget_ajaxSelect.js diff --git a/etemplate/js/et2_widget_barcode.js b/api/js/etemplate/et2_widget_barcode.js similarity index 100% rename from etemplate/js/et2_widget_barcode.js rename to api/js/etemplate/et2_widget_barcode.js diff --git a/etemplate/js/et2_widget_box.js b/api/js/etemplate/et2_widget_box.js similarity index 100% rename from etemplate/js/et2_widget_box.js rename to api/js/etemplate/et2_widget_box.js diff --git a/etemplate/js/et2_widget_button.js b/api/js/etemplate/et2_widget_button.js similarity index 100% rename from etemplate/js/et2_widget_button.js rename to api/js/etemplate/et2_widget_button.js diff --git a/etemplate/js/et2_widget_checkbox.js b/api/js/etemplate/et2_widget_checkbox.js similarity index 100% rename from etemplate/js/et2_widget_checkbox.js rename to api/js/etemplate/et2_widget_checkbox.js diff --git a/etemplate/js/et2_widget_color.js b/api/js/etemplate/et2_widget_color.js similarity index 100% rename from etemplate/js/et2_widget_color.js rename to api/js/etemplate/et2_widget_color.js diff --git a/etemplate/js/et2_widget_date.js b/api/js/etemplate/et2_widget_date.js similarity index 100% rename from etemplate/js/et2_widget_date.js rename to api/js/etemplate/et2_widget_date.js diff --git a/etemplate/js/et2_widget_description.js b/api/js/etemplate/et2_widget_description.js similarity index 99% rename from etemplate/js/et2_widget_description.js rename to api/js/etemplate/et2_widget_description.js index fb0e62879d..d23da8a83e 100644 --- a/etemplate/js/et2_widget_description.js +++ b/api/js/etemplate/et2_widget_description.js @@ -13,7 +13,7 @@ /*egw:uses jquery.jquery; et2_core_baseWidget; - /etemplate/js/expose.js; + expose; */ /** diff --git a/etemplate/js/et2_widget_dialog.js b/api/js/etemplate/et2_widget_dialog.js similarity index 100% rename from etemplate/js/et2_widget_dialog.js rename to api/js/etemplate/et2_widget_dialog.js diff --git a/etemplate/js/et2_widget_diff.js b/api/js/etemplate/et2_widget_diff.js similarity index 100% rename from etemplate/js/et2_widget_diff.js rename to api/js/etemplate/et2_widget_diff.js diff --git a/etemplate/js/et2_widget_dropdown_button.js b/api/js/etemplate/et2_widget_dropdown_button.js similarity index 100% rename from etemplate/js/et2_widget_dropdown_button.js rename to api/js/etemplate/et2_widget_dropdown_button.js diff --git a/etemplate/js/et2_widget_entry.js b/api/js/etemplate/et2_widget_entry.js similarity index 100% rename from etemplate/js/et2_widget_entry.js rename to api/js/etemplate/et2_widget_entry.js diff --git a/etemplate/js/et2_widget_favorites.js b/api/js/etemplate/et2_widget_favorites.js similarity index 100% rename from etemplate/js/et2_widget_favorites.js rename to api/js/etemplate/et2_widget_favorites.js diff --git a/etemplate/js/et2_widget_file.js b/api/js/etemplate/et2_widget_file.js similarity index 100% rename from etemplate/js/et2_widget_file.js rename to api/js/etemplate/et2_widget_file.js diff --git a/etemplate/js/et2_widget_gantt.js b/api/js/etemplate/et2_widget_gantt.js similarity index 100% rename from etemplate/js/et2_widget_gantt.js rename to api/js/etemplate/et2_widget_gantt.js diff --git a/etemplate/js/et2_widget_grid.js b/api/js/etemplate/et2_widget_grid.js similarity index 100% rename from etemplate/js/et2_widget_grid.js rename to api/js/etemplate/et2_widget_grid.js diff --git a/etemplate/js/et2_widget_groupbox.js b/api/js/etemplate/et2_widget_groupbox.js similarity index 100% rename from etemplate/js/et2_widget_groupbox.js rename to api/js/etemplate/et2_widget_groupbox.js diff --git a/etemplate/js/et2_widget_hbox.js b/api/js/etemplate/et2_widget_hbox.js similarity index 100% rename from etemplate/js/et2_widget_hbox.js rename to api/js/etemplate/et2_widget_hbox.js diff --git a/etemplate/js/et2_widget_historylog.js b/api/js/etemplate/et2_widget_historylog.js similarity index 100% rename from etemplate/js/et2_widget_historylog.js rename to api/js/etemplate/et2_widget_historylog.js diff --git a/etemplate/js/et2_widget_hrule.js b/api/js/etemplate/et2_widget_hrule.js similarity index 100% rename from etemplate/js/et2_widget_hrule.js rename to api/js/etemplate/et2_widget_hrule.js diff --git a/etemplate/js/et2_widget_html.js b/api/js/etemplate/et2_widget_html.js similarity index 100% rename from etemplate/js/et2_widget_html.js rename to api/js/etemplate/et2_widget_html.js diff --git a/etemplate/js/et2_widget_htmlarea.js b/api/js/etemplate/et2_widget_htmlarea.js similarity index 100% rename from etemplate/js/et2_widget_htmlarea.js rename to api/js/etemplate/et2_widget_htmlarea.js diff --git a/etemplate/js/et2_widget_iframe.js b/api/js/etemplate/et2_widget_iframe.js similarity index 100% rename from etemplate/js/et2_widget_iframe.js rename to api/js/etemplate/et2_widget_iframe.js diff --git a/etemplate/js/et2_widget_image.js b/api/js/etemplate/et2_widget_image.js similarity index 99% rename from etemplate/js/et2_widget_image.js rename to api/js/etemplate/et2_widget_image.js index 5218c01723..9e3722e9ee 100644 --- a/etemplate/js/et2_widget_image.js +++ b/api/js/etemplate/et2_widget_image.js @@ -14,7 +14,7 @@ jquery.jquery; et2_core_interfaces; et2_core_baseWidget; - /etemplate/js/expose.js; + expose; */ /** diff --git a/etemplate/js/et2_widget_itempicker.js b/api/js/etemplate/et2_widget_itempicker.js similarity index 100% rename from etemplate/js/et2_widget_itempicker.js rename to api/js/etemplate/et2_widget_itempicker.js diff --git a/etemplate/js/et2_widget_link.js b/api/js/etemplate/et2_widget_link.js similarity index 100% rename from etemplate/js/et2_widget_link.js rename to api/js/etemplate/et2_widget_link.js diff --git a/etemplate/js/et2_widget_number.js b/api/js/etemplate/et2_widget_number.js similarity index 100% rename from etemplate/js/et2_widget_number.js rename to api/js/etemplate/et2_widget_number.js diff --git a/etemplate/js/et2_widget_portlet.js b/api/js/etemplate/et2_widget_portlet.js similarity index 100% rename from etemplate/js/et2_widget_portlet.js rename to api/js/etemplate/et2_widget_portlet.js diff --git a/etemplate/js/et2_widget_progress.js b/api/js/etemplate/et2_widget_progress.js similarity index 100% rename from etemplate/js/et2_widget_progress.js rename to api/js/etemplate/et2_widget_progress.js diff --git a/etemplate/js/et2_widget_radiobox.js b/api/js/etemplate/et2_widget_radiobox.js similarity index 100% rename from etemplate/js/et2_widget_radiobox.js rename to api/js/etemplate/et2_widget_radiobox.js diff --git a/etemplate/js/et2_widget_script.js b/api/js/etemplate/et2_widget_script.js similarity index 100% rename from etemplate/js/et2_widget_script.js rename to api/js/etemplate/et2_widget_script.js diff --git a/etemplate/js/et2_widget_selectAccount.js b/api/js/etemplate/et2_widget_selectAccount.js similarity index 100% rename from etemplate/js/et2_widget_selectAccount.js rename to api/js/etemplate/et2_widget_selectAccount.js diff --git a/etemplate/js/et2_widget_selectbox.js b/api/js/etemplate/et2_widget_selectbox.js similarity index 100% rename from etemplate/js/et2_widget_selectbox.js rename to api/js/etemplate/et2_widget_selectbox.js diff --git a/etemplate/js/et2_widget_split.js b/api/js/etemplate/et2_widget_split.js similarity index 100% rename from etemplate/js/et2_widget_split.js rename to api/js/etemplate/et2_widget_split.js diff --git a/etemplate/js/et2_widget_styles.js b/api/js/etemplate/et2_widget_styles.js similarity index 100% rename from etemplate/js/et2_widget_styles.js rename to api/js/etemplate/et2_widget_styles.js diff --git a/etemplate/js/et2_widget_tabs.js b/api/js/etemplate/et2_widget_tabs.js similarity index 100% rename from etemplate/js/et2_widget_tabs.js rename to api/js/etemplate/et2_widget_tabs.js diff --git a/etemplate/js/et2_widget_taglist.js b/api/js/etemplate/et2_widget_taglist.js similarity index 100% rename from etemplate/js/et2_widget_taglist.js rename to api/js/etemplate/et2_widget_taglist.js diff --git a/etemplate/js/et2_widget_template.js b/api/js/etemplate/et2_widget_template.js similarity index 100% rename from etemplate/js/et2_widget_template.js rename to api/js/etemplate/et2_widget_template.js diff --git a/etemplate/js/et2_widget_textbox.js b/api/js/etemplate/et2_widget_textbox.js similarity index 100% rename from etemplate/js/et2_widget_textbox.js rename to api/js/etemplate/et2_widget_textbox.js diff --git a/etemplate/js/et2_widget_toolbar.js b/api/js/etemplate/et2_widget_toolbar.js similarity index 100% rename from etemplate/js/et2_widget_toolbar.js rename to api/js/etemplate/et2_widget_toolbar.js diff --git a/etemplate/js/et2_widget_tree.js b/api/js/etemplate/et2_widget_tree.js similarity index 100% rename from etemplate/js/et2_widget_tree.js rename to api/js/etemplate/et2_widget_tree.js diff --git a/etemplate/js/et2_widget_url.js b/api/js/etemplate/et2_widget_url.js similarity index 100% rename from etemplate/js/et2_widget_url.js rename to api/js/etemplate/et2_widget_url.js diff --git a/etemplate/js/et2_widget_vfs.js b/api/js/etemplate/et2_widget_vfs.js similarity index 99% rename from etemplate/js/et2_widget_vfs.js rename to api/js/etemplate/et2_widget_vfs.js index 8e085752d0..95e952ebb6 100644 --- a/etemplate/js/et2_widget_vfs.js +++ b/api/js/etemplate/et2_widget_vfs.js @@ -16,7 +16,7 @@ et2_core_valueWidget; et2_widget_description; et2_widget_file; - /etemplate/js/expose.js; + expose; */ /** diff --git a/etemplate/js/et2_widget_video.js b/api/js/etemplate/et2_widget_video.js similarity index 100% rename from etemplate/js/et2_widget_video.js rename to api/js/etemplate/et2_widget_video.js diff --git a/etemplate/js/etemplate2.js b/api/js/etemplate/etemplate2.js similarity index 100% rename from etemplate/js/etemplate2.js rename to api/js/etemplate/etemplate2.js diff --git a/etemplate/js/expose.js b/api/js/etemplate/expose.js similarity index 100% rename from etemplate/js/expose.js rename to api/js/etemplate/expose.js diff --git a/etemplate/js/lib/date.js b/api/js/etemplate/lib/date.js similarity index 100% rename from etemplate/js/lib/date.js rename to api/js/etemplate/lib/date.js diff --git a/etemplate/js/lib/jsdifflib/difflib.js b/api/js/etemplate/lib/jsdifflib/difflib.js similarity index 100% rename from etemplate/js/lib/jsdifflib/difflib.js rename to api/js/etemplate/lib/jsdifflib/difflib.js diff --git a/etemplate/js/lib/jsdifflib/diffview.css b/api/js/etemplate/lib/jsdifflib/diffview.css similarity index 100% rename from etemplate/js/lib/jsdifflib/diffview.css rename to api/js/etemplate/lib/jsdifflib/diffview.css diff --git a/etemplate/js/lib/jsdifflib/diffview.js b/api/js/etemplate/lib/jsdifflib/diffview.js similarity index 100% rename from etemplate/js/lib/jsdifflib/diffview.js rename to api/js/etemplate/lib/jsdifflib/diffview.js diff --git a/etemplate/js/test/et2_test_basic.json b/api/js/etemplate/test/et2_test_basic.json similarity index 100% rename from etemplate/js/test/et2_test_basic.json rename to api/js/etemplate/test/et2_test_basic.json diff --git a/etemplate/js/test/et2_test_basic_widgets.xet b/api/js/etemplate/test/et2_test_basic_widgets.xet similarity index 100% rename from etemplate/js/test/et2_test_basic_widgets.xet rename to api/js/etemplate/test/et2_test_basic_widgets.xet diff --git a/etemplate/js/test/et2_test_date.xet b/api/js/etemplate/test/et2_test_date.xet similarity index 100% rename from etemplate/js/test/et2_test_date.xet rename to api/js/etemplate/test/et2_test_date.xet diff --git a/etemplate/js/test/et2_test_dates.json b/api/js/etemplate/test/et2_test_dates.json similarity index 100% rename from etemplate/js/test/et2_test_dates.json rename to api/js/etemplate/test/et2_test_dates.json diff --git a/etemplate/js/test/et2_test_description.xet b/api/js/etemplate/test/et2_test_description.xet similarity index 100% rename from etemplate/js/test/et2_test_description.xet rename to api/js/etemplate/test/et2_test_description.xet diff --git a/etemplate/js/test/et2_test_expressions.json b/api/js/etemplate/test/et2_test_expressions.json similarity index 100% rename from etemplate/js/test/et2_test_expressions.json rename to api/js/etemplate/test/et2_test_expressions.json diff --git a/etemplate/js/test/et2_test_expressions.xet b/api/js/etemplate/test/et2_test_expressions.xet similarity index 100% rename from etemplate/js/test/et2_test_expressions.xet rename to api/js/etemplate/test/et2_test_expressions.xet diff --git a/etemplate/js/test/et2_test_file_upload.xet b/api/js/etemplate/test/et2_test_file_upload.xet similarity index 100% rename from etemplate/js/test/et2_test_file_upload.xet rename to api/js/etemplate/test/et2_test_file_upload.xet diff --git a/etemplate/js/test/et2_test_grid.xet b/api/js/etemplate/test/et2_test_grid.xet similarity index 100% rename from etemplate/js/test/et2_test_grid.xet rename to api/js/etemplate/test/et2_test_grid.xet diff --git a/etemplate/js/test/et2_test_hbox.xet b/api/js/etemplate/test/et2_test_hbox.xet similarity index 100% rename from etemplate/js/test/et2_test_hbox.xet rename to api/js/etemplate/test/et2_test_hbox.xet diff --git a/etemplate/js/test/et2_test_input_validator.json b/api/js/etemplate/test/et2_test_input_validator.json similarity index 100% rename from etemplate/js/test/et2_test_input_validator.json rename to api/js/etemplate/test/et2_test_input_validator.json diff --git a/etemplate/js/test/et2_test_input_validator.xet b/api/js/etemplate/test/et2_test_input_validator.xet similarity index 100% rename from etemplate/js/test/et2_test_input_validator.xet rename to api/js/etemplate/test/et2_test_input_validator.xet diff --git a/etemplate/js/test/et2_test_label.xet b/api/js/etemplate/test/et2_test_label.xet similarity index 100% rename from etemplate/js/test/et2_test_label.xet rename to api/js/etemplate/test/et2_test_label.xet diff --git a/etemplate/js/test/et2_test_nextmatch.xet b/api/js/etemplate/test/et2_test_nextmatch.xet similarity index 100% rename from etemplate/js/test/et2_test_nextmatch.xet rename to api/js/etemplate/test/et2_test_nextmatch.xet diff --git a/etemplate/js/test/et2_test_tabbox.json b/api/js/etemplate/test/et2_test_tabbox.json similarity index 100% rename from etemplate/js/test/et2_test_tabbox.json rename to api/js/etemplate/test/et2_test_tabbox.json diff --git a/etemplate/js/test/et2_test_tabbox.xet b/api/js/etemplate/test/et2_test_tabbox.xet similarity index 100% rename from etemplate/js/test/et2_test_tabbox.xet rename to api/js/etemplate/test/et2_test_tabbox.xet diff --git a/etemplate/js/test/et2_test_template.xet b/api/js/etemplate/test/et2_test_template.xet similarity index 100% rename from etemplate/js/test/et2_test_template.xet rename to api/js/etemplate/test/et2_test_template.xet diff --git a/etemplate/js/test/et2_test_text.json b/api/js/etemplate/test/et2_test_text.json similarity index 100% rename from etemplate/js/test/et2_test_text.json rename to api/js/etemplate/test/et2_test_text.json diff --git a/etemplate/js/test/et2_test_text.xet b/api/js/etemplate/test/et2_test_text.xet similarity index 100% rename from etemplate/js/test/et2_test_text.xet rename to api/js/etemplate/test/et2_test_text.xet diff --git a/etemplate/js/test/et2_test_textbox.xet b/api/js/etemplate/test/et2_test_textbox.xet similarity index 100% rename from etemplate/js/test/et2_test_textbox.xet rename to api/js/etemplate/test/et2_test_textbox.xet diff --git a/etemplate/js/test/et2_test_timesheet_edit.json b/api/js/etemplate/test/et2_test_timesheet_edit.json similarity index 100% rename from etemplate/js/test/et2_test_timesheet_edit.json rename to api/js/etemplate/test/et2_test_timesheet_edit.json diff --git a/etemplate/js/test/et2_test_timesheet_edit.xet b/api/js/etemplate/test/et2_test_timesheet_edit.xet similarity index 100% rename from etemplate/js/test/et2_test_timesheet_edit.xet rename to api/js/etemplate/test/et2_test_timesheet_edit.xet diff --git a/etemplate/js/test/grid.css b/api/js/etemplate/test/grid.css similarity index 100% rename from etemplate/js/test/grid.css rename to api/js/etemplate/test/grid.css diff --git a/etemplate/js/test/jquery.js b/api/js/etemplate/test/jquery.js similarity index 100% rename from etemplate/js/test/jquery.js rename to api/js/etemplate/test/jquery.js diff --git a/etemplate/js/test/test.css b/api/js/etemplate/test/test.css similarity index 100% rename from etemplate/js/test/test.css rename to api/js/etemplate/test/test.css diff --git a/etemplate/js/test/test.php b/api/js/etemplate/test/test.php similarity index 100% rename from etemplate/js/test/test.php rename to api/js/etemplate/test/test.php diff --git a/etemplate/js/test/test_dataview.html b/api/js/etemplate/test/test_dataview.html similarity index 100% rename from etemplate/js/test/test_dataview.html rename to api/js/etemplate/test/test_dataview.html diff --git a/etemplate/js/test/test_xml.html b/api/js/etemplate/test/test_xml.html similarity index 100% rename from etemplate/js/test/test_xml.html rename to api/js/etemplate/test/test_xml.html diff --git a/etemplate/js/widget_browser.js b/api/js/etemplate/widget_browser.js similarity index 100% rename from etemplate/js/widget_browser.js rename to api/js/etemplate/widget_browser.js diff --git a/api/src/Etemplate.php b/api/src/Etemplate.php index 788973f2ec..23ac105fc6 100644 --- a/api/src/Etemplate.php +++ b/api/src/Etemplate.php @@ -140,7 +140,7 @@ class Etemplate extends Etemplate\Widget\Template unset($hook_data); // Include the etemplate2 javascript code - egw_framework::validate_file('.', 'etemplate2', 'etemplate'); + egw_framework::validate_file('etemplate', 'etemplate2', 'api'); if (!$this->rel_path) throw new Exception\AssertionFailed("No (valid) template '$this->name' found!"); diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index a2d227f851..f9f5b4b556 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -1940,8 +1940,8 @@ abstract class egw_framework */ static $bundle2minurl = array( 'api' => '/phpgwapi/js/jsapi.min.js', - 'et2' => '/etemplate/js/etemplate2.min.js', - 'et21'=> '/etemplate/js/etemplate2.min.js', + 'et2' => '/api/js/etemplate/etemplate2.min.js', + 'et21'=> '/api/js/etemplate/etemplate2.min.js', 'pixelegg' => '/pixelegg/js/fw_pixelegg.min.js', 'jdots' => '/jdots/js/fw_jdots.min.js', 'mobile' => '/jdots/js/fw_mobile.min.js', @@ -1965,6 +1965,12 @@ abstract class egw_framework unset($bundles['.ts']); foreach($bundles as $name => $files) { + // to facilitate move to new et2 location, can be removed after 16.1 release + if ($name == 'et21' && !in_array('/api/js/etemplate/etemplate2.js', $files)) + { + egw_cache::unsetTree(__CLASS__, 'bundles'); + return self::bundle_js_includes($js_includes); + } // ignore bundles of not used templates, as they can contain identical files if (in_array($name, array('api', 'et2', 'et21')) || $name == (html::$ua_mobile ? 'mobile' : $GLOBALS['egw_info']['server']['template_set']) || @@ -2143,7 +2149,7 @@ abstract class egw_framework // generate et2 bundle (excluding files in api bundle) //$inc_mgr->include_js_file('/etemplate/js/lib/jsdifflib/difflib.js'); // it does not work with "use strict" therefore included in front - $inc_mgr->include_js_file('/etemplate/js/etemplate2.js'); + $inc_mgr->include_js_file('/api/js/etemplate/etemplate2.js'); $bundles['et2'] = array_diff($inc_mgr->get_included_files(), $bundles['api']); self::bundle_urls($bundles['et2'], $max_mod['et2']);