From cd392db0785fcc8dfc95af99bee934a231ba9016 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 28 Jan 2018 16:17:36 -0500 Subject: [PATCH] Move js/ folder under view/ - Move library/cropper to view/js/cropper - Move library/jquery-textcomplete to view/js/jquery-textcomplete --- util/minifyjs.sh | 8 ++++---- {js => view/js}/acl.js | 0 {js => view/js}/ajaxupload.js | 0 {js => view/js}/autocomplete.js | 0 {js => view/js}/country.js | 0 {library => view/js}/cropper/cropper.css | 0 {library => view/js}/cropper/cropper.html | 0 {library => view/js}/cropper/cropper.js | 0 .../js}/cropper/cropper.uncompressed.js | 0 {library => view/js}/cropper/lib/builder.js | 0 {library => view/js}/cropper/lib/controls.js | 0 {library => view/js}/cropper/lib/dragdrop.js | 0 {library => view/js}/cropper/lib/effects.js | 0 {library => view/js}/cropper/lib/prototype.js | 0 {library => view/js}/cropper/lib/scriptaculous.js | 0 {library => view/js}/cropper/lib/slider.js | 0 {library => view/js}/cropper/lib/unittest.js | 0 {library => view/js}/cropper/licence.txt | 0 {library => view/js}/cropper/marqueeHoriz.gif | Bin {library => view/js}/cropper/marqueeVert.gif | Bin {library => view/js}/cropper/tests/castle.jpg | Bin {library => view/js}/cropper/tests/castleMed.jpg | Bin .../js}/cropper/tests/example-Basic.htm | 0 .../js}/cropper/tests/example-CSS-Absolute.htm | 0 .../js}/cropper/tests/example-CSS-Float.htm | 0 .../js}/cropper/tests/example-CSS-Relative.htm | 0 .../js}/cropper/tests/example-CoordsOnLoad.htm | 0 .../cropper/tests/example-CoordsOnLoadWithRatio.htm | 0 .../js}/cropper/tests/example-Dimensions.htm | 0 .../js}/cropper/tests/example-DynamicImage.htm | 0 .../js}/cropper/tests/example-FixedRatio.htm | 0 .../js}/cropper/tests/example-MinimumDimensions.htm | 0 .../js}/cropper/tests/example-MinimumWidth.htm | 0 .../js}/cropper/tests/example-Preview.htm | 0 {library => view/js}/cropper/tests/poppy.jpg | Bin .../js}/cropper/tests/staticHTMLStructure.htm | 0 {js => view/js}/filebrowser.js | 0 .../js}/jquery-textcomplete/CHANGELOG.md | 0 {library => view/js}/jquery-textcomplete/LICENSE | 0 {library => view/js}/jquery-textcomplete/README.md | 0 .../js}/jquery-textcomplete/jquery.textcomplete.css | 0 .../js}/jquery-textcomplete/jquery.textcomplete.js | 0 .../jquery-textcomplete/jquery.textcomplete.min.js | 0 .../jquery-textcomplete/jquery.textcomplete.min.map | 0 {js => view/js}/jquery.textinputs.js | 0 {js => view/js}/main.js | 0 {js => view/js}/modernizr.js | 0 view/templates/crophead.tpl | 8 ++++---- view/templates/filebrowser.tpl | 4 ++-- view/templates/head.tpl | 12 ++++++------ view/templates/jot-header.tpl | 2 +- view/templates/msg-header.tpl | 2 +- view/templates/profed_head.tpl | 2 +- view/theme/frio/templates/filebrowser.tpl | 2 +- view/theme/frio/templates/head.tpl | 12 ++++++------ view/theme/frio/templates/jot-header.tpl | 2 +- view/theme/frio/templates/theme_settings.tpl | 2 +- view/theme/frost-mobile/templates/cropend.tpl | 6 +++--- view/theme/frost-mobile/templates/crophead.tpl | 2 +- view/theme/frost-mobile/templates/end.tpl | 6 +++--- view/theme/frost-mobile/templates/jot-end.tpl | 2 +- view/theme/frost-mobile/templates/msg-end.tpl | 2 +- view/theme/frost-mobile/templates/profed_end.tpl | 2 +- view/theme/frost-mobile/templates/wallmsg-end.tpl | 2 +- view/theme/frost/templates/cropend.tpl | 6 +++--- view/theme/frost/templates/crophead.tpl | 2 +- view/theme/frost/templates/end.tpl | 6 +++--- view/theme/frost/templates/jot-end.tpl | 2 +- view/theme/frost/templates/msg-end.tpl | 2 +- view/theme/frost/templates/profed_end.tpl | 2 +- view/theme/frost/templates/wallmsg-end.tpl | 2 +- view/theme/smoothly/templates/jot-header.tpl | 2 +- 72 files changed, 51 insertions(+), 51 deletions(-) rename {js => view/js}/acl.js (100%) rename {js => view/js}/ajaxupload.js (100%) rename {js => view/js}/autocomplete.js (100%) rename {js => view/js}/country.js (100%) rename {library => view/js}/cropper/cropper.css (100%) rename {library => view/js}/cropper/cropper.html (100%) rename {library => view/js}/cropper/cropper.js (100%) rename {library => view/js}/cropper/cropper.uncompressed.js (100%) rename {library => view/js}/cropper/lib/builder.js (100%) rename {library => view/js}/cropper/lib/controls.js (100%) rename {library => view/js}/cropper/lib/dragdrop.js (100%) rename {library => view/js}/cropper/lib/effects.js (100%) rename {library => view/js}/cropper/lib/prototype.js (100%) rename {library => view/js}/cropper/lib/scriptaculous.js (100%) rename {library => view/js}/cropper/lib/slider.js (100%) rename {library => view/js}/cropper/lib/unittest.js (100%) rename {library => view/js}/cropper/licence.txt (100%) rename {library => view/js}/cropper/marqueeHoriz.gif (100%) rename {library => view/js}/cropper/marqueeVert.gif (100%) rename {library => view/js}/cropper/tests/castle.jpg (100%) rename {library => view/js}/cropper/tests/castleMed.jpg (100%) rename {library => view/js}/cropper/tests/example-Basic.htm (100%) rename {library => view/js}/cropper/tests/example-CSS-Absolute.htm (100%) rename {library => view/js}/cropper/tests/example-CSS-Float.htm (100%) rename {library => view/js}/cropper/tests/example-CSS-Relative.htm (100%) rename {library => view/js}/cropper/tests/example-CoordsOnLoad.htm (100%) rename {library => view/js}/cropper/tests/example-CoordsOnLoadWithRatio.htm (100%) rename {library => view/js}/cropper/tests/example-Dimensions.htm (100%) rename {library => view/js}/cropper/tests/example-DynamicImage.htm (100%) rename {library => view/js}/cropper/tests/example-FixedRatio.htm (100%) rename {library => view/js}/cropper/tests/example-MinimumDimensions.htm (100%) rename {library => view/js}/cropper/tests/example-MinimumWidth.htm (100%) rename {library => view/js}/cropper/tests/example-Preview.htm (100%) rename {library => view/js}/cropper/tests/poppy.jpg (100%) rename {library => view/js}/cropper/tests/staticHTMLStructure.htm (100%) rename {js => view/js}/filebrowser.js (100%) rename {library => view/js}/jquery-textcomplete/CHANGELOG.md (100%) rename {library => view/js}/jquery-textcomplete/LICENSE (100%) rename {library => view/js}/jquery-textcomplete/README.md (100%) rename {library => view/js}/jquery-textcomplete/jquery.textcomplete.css (100%) rename {library => view/js}/jquery-textcomplete/jquery.textcomplete.js (100%) rename {library => view/js}/jquery-textcomplete/jquery.textcomplete.min.js (100%) rename {library => view/js}/jquery-textcomplete/jquery.textcomplete.min.map (100%) rename {js => view/js}/jquery.textinputs.js (100%) rename {js => view/js}/main.js (100%) rename {js => view/js}/modernizr.js (100%) diff --git a/util/minifyjs.sh b/util/minifyjs.sh index 6341860b13..50a56a45ca 100755 --- a/util/minifyjs.sh +++ b/util/minifyjs.sh @@ -5,10 +5,10 @@ command -v uglifyjs >/dev/null 2>&1 || { echo >&2 "I require UglifyJS but it's n MINIFY_CMD=uglifyjs JSFILES=( - "js/acl.js" - "js/ajaxupload.js" - "js/country.js" - "js/main.js" + "view/js/acl.js" + "view/js/ajaxupload.js" + "view/js/country.js" + "view/js/main.js" "vendor/asset/base64/base64.min.js" "view/theme/frost/js/acl.js" "view/theme/frost/js/jquery.divgrow-1.3.1.f1.js" diff --git a/js/acl.js b/view/js/acl.js similarity index 100% rename from js/acl.js rename to view/js/acl.js diff --git a/js/ajaxupload.js b/view/js/ajaxupload.js similarity index 100% rename from js/ajaxupload.js rename to view/js/ajaxupload.js diff --git a/js/autocomplete.js b/view/js/autocomplete.js similarity index 100% rename from js/autocomplete.js rename to view/js/autocomplete.js diff --git a/js/country.js b/view/js/country.js similarity index 100% rename from js/country.js rename to view/js/country.js diff --git a/library/cropper/cropper.css b/view/js/cropper/cropper.css similarity index 100% rename from library/cropper/cropper.css rename to view/js/cropper/cropper.css diff --git a/library/cropper/cropper.html b/view/js/cropper/cropper.html similarity index 100% rename from library/cropper/cropper.html rename to view/js/cropper/cropper.html diff --git a/library/cropper/cropper.js b/view/js/cropper/cropper.js similarity index 100% rename from library/cropper/cropper.js rename to view/js/cropper/cropper.js diff --git a/library/cropper/cropper.uncompressed.js b/view/js/cropper/cropper.uncompressed.js similarity index 100% rename from library/cropper/cropper.uncompressed.js rename to view/js/cropper/cropper.uncompressed.js diff --git a/library/cropper/lib/builder.js b/view/js/cropper/lib/builder.js similarity index 100% rename from library/cropper/lib/builder.js rename to view/js/cropper/lib/builder.js diff --git a/library/cropper/lib/controls.js b/view/js/cropper/lib/controls.js similarity index 100% rename from library/cropper/lib/controls.js rename to view/js/cropper/lib/controls.js diff --git a/library/cropper/lib/dragdrop.js b/view/js/cropper/lib/dragdrop.js similarity index 100% rename from library/cropper/lib/dragdrop.js rename to view/js/cropper/lib/dragdrop.js diff --git a/library/cropper/lib/effects.js b/view/js/cropper/lib/effects.js similarity index 100% rename from library/cropper/lib/effects.js rename to view/js/cropper/lib/effects.js diff --git a/library/cropper/lib/prototype.js b/view/js/cropper/lib/prototype.js similarity index 100% rename from library/cropper/lib/prototype.js rename to view/js/cropper/lib/prototype.js diff --git a/library/cropper/lib/scriptaculous.js b/view/js/cropper/lib/scriptaculous.js similarity index 100% rename from library/cropper/lib/scriptaculous.js rename to view/js/cropper/lib/scriptaculous.js diff --git a/library/cropper/lib/slider.js b/view/js/cropper/lib/slider.js similarity index 100% rename from library/cropper/lib/slider.js rename to view/js/cropper/lib/slider.js diff --git a/library/cropper/lib/unittest.js b/view/js/cropper/lib/unittest.js similarity index 100% rename from library/cropper/lib/unittest.js rename to view/js/cropper/lib/unittest.js diff --git a/library/cropper/licence.txt b/view/js/cropper/licence.txt similarity index 100% rename from library/cropper/licence.txt rename to view/js/cropper/licence.txt diff --git a/library/cropper/marqueeHoriz.gif b/view/js/cropper/marqueeHoriz.gif similarity index 100% rename from library/cropper/marqueeHoriz.gif rename to view/js/cropper/marqueeHoriz.gif diff --git a/library/cropper/marqueeVert.gif b/view/js/cropper/marqueeVert.gif similarity index 100% rename from library/cropper/marqueeVert.gif rename to view/js/cropper/marqueeVert.gif diff --git a/library/cropper/tests/castle.jpg b/view/js/cropper/tests/castle.jpg similarity index 100% rename from library/cropper/tests/castle.jpg rename to view/js/cropper/tests/castle.jpg diff --git a/library/cropper/tests/castleMed.jpg b/view/js/cropper/tests/castleMed.jpg similarity index 100% rename from library/cropper/tests/castleMed.jpg rename to view/js/cropper/tests/castleMed.jpg diff --git a/library/cropper/tests/example-Basic.htm b/view/js/cropper/tests/example-Basic.htm similarity index 100% rename from library/cropper/tests/example-Basic.htm rename to view/js/cropper/tests/example-Basic.htm diff --git a/library/cropper/tests/example-CSS-Absolute.htm b/view/js/cropper/tests/example-CSS-Absolute.htm similarity index 100% rename from library/cropper/tests/example-CSS-Absolute.htm rename to view/js/cropper/tests/example-CSS-Absolute.htm diff --git a/library/cropper/tests/example-CSS-Float.htm b/view/js/cropper/tests/example-CSS-Float.htm similarity index 100% rename from library/cropper/tests/example-CSS-Float.htm rename to view/js/cropper/tests/example-CSS-Float.htm diff --git a/library/cropper/tests/example-CSS-Relative.htm b/view/js/cropper/tests/example-CSS-Relative.htm similarity index 100% rename from library/cropper/tests/example-CSS-Relative.htm rename to view/js/cropper/tests/example-CSS-Relative.htm diff --git a/library/cropper/tests/example-CoordsOnLoad.htm b/view/js/cropper/tests/example-CoordsOnLoad.htm similarity index 100% rename from library/cropper/tests/example-CoordsOnLoad.htm rename to view/js/cropper/tests/example-CoordsOnLoad.htm diff --git a/library/cropper/tests/example-CoordsOnLoadWithRatio.htm b/view/js/cropper/tests/example-CoordsOnLoadWithRatio.htm similarity index 100% rename from library/cropper/tests/example-CoordsOnLoadWithRatio.htm rename to view/js/cropper/tests/example-CoordsOnLoadWithRatio.htm diff --git a/library/cropper/tests/example-Dimensions.htm b/view/js/cropper/tests/example-Dimensions.htm similarity index 100% rename from library/cropper/tests/example-Dimensions.htm rename to view/js/cropper/tests/example-Dimensions.htm diff --git a/library/cropper/tests/example-DynamicImage.htm b/view/js/cropper/tests/example-DynamicImage.htm similarity index 100% rename from library/cropper/tests/example-DynamicImage.htm rename to view/js/cropper/tests/example-DynamicImage.htm diff --git a/library/cropper/tests/example-FixedRatio.htm b/view/js/cropper/tests/example-FixedRatio.htm similarity index 100% rename from library/cropper/tests/example-FixedRatio.htm rename to view/js/cropper/tests/example-FixedRatio.htm diff --git a/library/cropper/tests/example-MinimumDimensions.htm b/view/js/cropper/tests/example-MinimumDimensions.htm similarity index 100% rename from library/cropper/tests/example-MinimumDimensions.htm rename to view/js/cropper/tests/example-MinimumDimensions.htm diff --git a/library/cropper/tests/example-MinimumWidth.htm b/view/js/cropper/tests/example-MinimumWidth.htm similarity index 100% rename from library/cropper/tests/example-MinimumWidth.htm rename to view/js/cropper/tests/example-MinimumWidth.htm diff --git a/library/cropper/tests/example-Preview.htm b/view/js/cropper/tests/example-Preview.htm similarity index 100% rename from library/cropper/tests/example-Preview.htm rename to view/js/cropper/tests/example-Preview.htm diff --git a/library/cropper/tests/poppy.jpg b/view/js/cropper/tests/poppy.jpg similarity index 100% rename from library/cropper/tests/poppy.jpg rename to view/js/cropper/tests/poppy.jpg diff --git a/library/cropper/tests/staticHTMLStructure.htm b/view/js/cropper/tests/staticHTMLStructure.htm similarity index 100% rename from library/cropper/tests/staticHTMLStructure.htm rename to view/js/cropper/tests/staticHTMLStructure.htm diff --git a/js/filebrowser.js b/view/js/filebrowser.js similarity index 100% rename from js/filebrowser.js rename to view/js/filebrowser.js diff --git a/library/jquery-textcomplete/CHANGELOG.md b/view/js/jquery-textcomplete/CHANGELOG.md similarity index 100% rename from library/jquery-textcomplete/CHANGELOG.md rename to view/js/jquery-textcomplete/CHANGELOG.md diff --git a/library/jquery-textcomplete/LICENSE b/view/js/jquery-textcomplete/LICENSE similarity index 100% rename from library/jquery-textcomplete/LICENSE rename to view/js/jquery-textcomplete/LICENSE diff --git a/library/jquery-textcomplete/README.md b/view/js/jquery-textcomplete/README.md similarity index 100% rename from library/jquery-textcomplete/README.md rename to view/js/jquery-textcomplete/README.md diff --git a/library/jquery-textcomplete/jquery.textcomplete.css b/view/js/jquery-textcomplete/jquery.textcomplete.css similarity index 100% rename from library/jquery-textcomplete/jquery.textcomplete.css rename to view/js/jquery-textcomplete/jquery.textcomplete.css diff --git a/library/jquery-textcomplete/jquery.textcomplete.js b/view/js/jquery-textcomplete/jquery.textcomplete.js similarity index 100% rename from library/jquery-textcomplete/jquery.textcomplete.js rename to view/js/jquery-textcomplete/jquery.textcomplete.js diff --git a/library/jquery-textcomplete/jquery.textcomplete.min.js b/view/js/jquery-textcomplete/jquery.textcomplete.min.js similarity index 100% rename from library/jquery-textcomplete/jquery.textcomplete.min.js rename to view/js/jquery-textcomplete/jquery.textcomplete.min.js diff --git a/library/jquery-textcomplete/jquery.textcomplete.min.map b/view/js/jquery-textcomplete/jquery.textcomplete.min.map similarity index 100% rename from library/jquery-textcomplete/jquery.textcomplete.min.map rename to view/js/jquery-textcomplete/jquery.textcomplete.min.map diff --git a/js/jquery.textinputs.js b/view/js/jquery.textinputs.js similarity index 100% rename from js/jquery.textinputs.js rename to view/js/jquery.textinputs.js diff --git a/js/main.js b/view/js/main.js similarity index 100% rename from js/main.js rename to view/js/main.js diff --git a/js/modernizr.js b/view/js/modernizr.js similarity index 100% rename from js/modernizr.js rename to view/js/modernizr.js diff --git a/view/templates/crophead.tpl b/view/templates/crophead.tpl index 48f3754265..033f2e4101 100644 --- a/view/templates/crophead.tpl +++ b/view/templates/crophead.tpl @@ -1,4 +1,4 @@ - - - - + + + + diff --git a/view/templates/filebrowser.tpl b/view/templates/filebrowser.tpl index 105e0c7c47..27a73d0398 100644 --- a/view/templates/filebrowser.tpl +++ b/view/templates/filebrowser.tpl @@ -4,8 +4,8 @@ - - + + + - - - + + + - + - + - + - + \ No newline at end of file + \ No newline at end of file diff --git a/view/theme/frio/templates/filebrowser.tpl b/view/theme/frio/templates/filebrowser.tpl index 3fde6a5202..dc3c47a66a 100644 --- a/view/theme/frio/templates/filebrowser.tpl +++ b/view/theme/frio/templates/filebrowser.tpl @@ -4,7 +4,7 @@ -{{**}} +{{**}} {{**}}
diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl index e599a5151b..fb91af0863 100644 --- a/view/theme/frio/templates/head.tpl +++ b/view/theme/frio/templates/head.tpl @@ -57,18 +57,18 @@ - + - - - + + + - + - + diff --git a/view/theme/frio/templates/jot-header.tpl b/view/theme/frio/templates/jot-header.tpl index d52f4b98de..81921598ab 100644 --- a/view/theme/frio/templates/jot-header.tpl +++ b/view/theme/frio/templates/jot-header.tpl @@ -1,5 +1,5 @@ - + - + {{include file="field_select.tpl" field=$schema}} diff --git a/view/theme/frost-mobile/templates/cropend.tpl b/view/theme/frost-mobile/templates/cropend.tpl index a56c71d92e..a26100e0d4 100644 --- a/view/theme/frost-mobile/templates/cropend.tpl +++ b/view/theme/frost-mobile/templates/cropend.tpl @@ -1,4 +1,4 @@ - - - + + + diff --git a/view/theme/frost-mobile/templates/crophead.tpl b/view/theme/frost-mobile/templates/crophead.tpl index 56e941e3ab..cbfce8d83f 100644 --- a/view/theme/frost-mobile/templates/crophead.tpl +++ b/view/theme/frost-mobile/templates/crophead.tpl @@ -1 +1 @@ - + diff --git a/view/theme/frost-mobile/templates/end.tpl b/view/theme/frost-mobile/templates/end.tpl index 1f47aecee8..4af3b41c0b 100644 --- a/view/theme/frost-mobile/templates/end.tpl +++ b/view/theme/frost-mobile/templates/end.tpl @@ -3,12 +3,12 @@ - + - - + + diff --git a/view/theme/frost-mobile/templates/jot-end.tpl b/view/theme/frost-mobile/templates/jot-end.tpl index 5a38b51ac6..7455d355a2 100644 --- a/view/theme/frost-mobile/templates/jot-end.tpl +++ b/view/theme/frost-mobile/templates/jot-end.tpl @@ -1,4 +1,4 @@ - + diff --git a/view/theme/frost-mobile/templates/msg-end.tpl b/view/theme/frost-mobile/templates/msg-end.tpl index fe59efd880..18aec4e6a6 100644 --- a/view/theme/frost-mobile/templates/msg-end.tpl +++ b/view/theme/frost-mobile/templates/msg-end.tpl @@ -1,3 +1,3 @@ - + diff --git a/view/theme/frost-mobile/templates/profed_end.tpl b/view/theme/frost-mobile/templates/profed_end.tpl index 07ec0f7385..a54fe60ddc 100644 --- a/view/theme/frost-mobile/templates/profed_end.tpl +++ b/view/theme/frost-mobile/templates/profed_end.tpl @@ -1,6 +1,6 @@ - + + diff --git a/view/theme/frost/templates/cropend.tpl b/view/theme/frost/templates/cropend.tpl index a56c71d92e..a26100e0d4 100644 --- a/view/theme/frost/templates/cropend.tpl +++ b/view/theme/frost/templates/cropend.tpl @@ -1,4 +1,4 @@ - - - + + + diff --git a/view/theme/frost/templates/crophead.tpl b/view/theme/frost/templates/crophead.tpl index 56e941e3ab..cbfce8d83f 100644 --- a/view/theme/frost/templates/crophead.tpl +++ b/view/theme/frost/templates/crophead.tpl @@ -1 +1 @@ - + diff --git a/view/theme/frost/templates/end.tpl b/view/theme/frost/templates/end.tpl index ac931261bf..b49fc3cd4c 100644 --- a/view/theme/frost/templates/end.tpl +++ b/view/theme/frost/templates/end.tpl @@ -5,15 +5,15 @@ - + - - + + diff --git a/view/theme/frost/templates/jot-end.tpl b/view/theme/frost/templates/jot-end.tpl index e448157086..9c04ad631a 100644 --- a/view/theme/frost/templates/jot-end.tpl +++ b/view/theme/frost/templates/jot-end.tpl @@ -1,4 +1,4 @@ - + diff --git a/view/theme/frost/templates/msg-end.tpl b/view/theme/frost/templates/msg-end.tpl index 90ff83e28a..628dec2ba4 100644 --- a/view/theme/frost/templates/msg-end.tpl +++ b/view/theme/frost/templates/msg-end.tpl @@ -1,4 +1,4 @@ - + diff --git a/view/theme/frost/templates/profed_end.tpl b/view/theme/frost/templates/profed_end.tpl index e8aafd1ef1..cac9de97ab 100644 --- a/view/theme/frost/templates/profed_end.tpl +++ b/view/theme/frost/templates/profed_end.tpl @@ -1,5 +1,5 @@ - + + diff --git a/view/theme/smoothly/templates/jot-header.tpl b/view/theme/smoothly/templates/jot-header.tpl index eb8c13f217..5eae0ce4bb 100644 --- a/view/theme/smoothly/templates/jot-header.tpl +++ b/view/theme/smoothly/templates/jot-header.tpl @@ -48,7 +48,7 @@ function enableOnUser(){ -