diff --git a/resources/gulp/components/prod.js b/resources/gulp/components/prod.js index ed1e1fb81f..b646d6a002 100644 --- a/resources/gulp/components/prod.js +++ b/resources/gulp/components/prod.js @@ -37,9 +37,9 @@ gulp.task('build-prod', ['copy-prod-images', 'build-prod-css'], function(){ config.paths.vendors + 'jquery-file-upload/js/jquery.fileupload.js', config.paths.dist + 'include/jslibs/jquery.form.2.49.js', config.paths.dist + 'include/jslibs/jquery.vertical.buttonset.js', - config.paths.dist + 'include/js/jquery.Selection.js', - config.paths.dist + 'include/js/jquery.Edit.js', - config.paths.dist + 'include/js/jquery.lists.js', + config.paths.src + 'prod/js/jquery.Selection.js', + config.paths.src + 'prod/js/jquery.Edit.js', + config.paths.src + 'prod/js/jquery.lists.js', config.paths.src + 'prod/js/jquery.Prod.js', config.paths.src + 'prod/js/jquery.Feedback.js', config.paths.src + 'prod/js/jquery.Results.js', @@ -47,12 +47,12 @@ gulp.task('build-prod', ['copy-prod-images', 'build-prod-css'], function(){ config.paths.src + 'prod/js/jquery.WorkZone.js', config.paths.src + 'prod/js/jquery.Alerts.js', config.paths.src + 'prod/js/jquery.Upload.js', - config.paths.dist + 'include/jslibs/pixastic.custom.js', + // config.paths.dist + 'include/jslibs/pixastic.custom.js', //@TODO double check usage config.paths.src + 'prod/js/ThumbExtractor.js', config.paths.src + 'prod/js/publicator.js', config.paths.dist + 'include/jslibs/jquery.sprintf.1.0.3.js', config.paths.dist + 'include/jquery.p4.preview.js', - config.paths.src + 'prod/js/jquery.edit.js', + config.paths.src + 'prod/js/record.editor.js', config.paths.dist + 'include/jslibs/jquery.color.animation.js', config.paths.dist + 'include/jquery.image_enhancer.js', config.paths.vendors + 'jquery.treeview/jquery.treeview.js', diff --git a/resources/gulp/components/thesaurus.js b/resources/gulp/components/thesaurus.js index a6f9010cf9..909c18a7c8 100644 --- a/resources/gulp/components/thesaurus.js +++ b/resources/gulp/components/thesaurus.js @@ -14,10 +14,10 @@ gulp.task('build-thesaurus-css', function(){ gulp.task('build-thesaurus', ['copy-thesaurus-images', 'build-thesaurus-css'], function(){ var thesaurusGroup = [ - config.paths.dist + 'skins/thesaurus/win.js', - config.paths.dist + 'skins/thesaurus/xmlhttp.js', - config.paths.dist + 'skins/thesaurus/thesaurus.js', - config.paths.dist + 'skins/thesaurus/sprintf.js' + config.paths.src + 'thesaurus/js/win.js', + config.paths.src + 'thesaurus/js/xmlhttp.js', + config.paths.src + 'thesaurus/js/thesaurus.js', + config.paths.src + 'thesaurus/js/sprintf.js' ]; return utils.buildJsGroup(thesaurusGroup, 'thesaurus', 'thesaurus/js'); }); \ No newline at end of file diff --git a/www/include/js/jquery.Edit.js b/resources/www/prod/js/jquery.Edit.js similarity index 100% rename from www/include/js/jquery.Edit.js rename to resources/www/prod/js/jquery.Edit.js diff --git a/www/include/js/jquery.Selection.js b/resources/www/prod/js/jquery.Selection.js similarity index 100% rename from www/include/js/jquery.Selection.js rename to resources/www/prod/js/jquery.Selection.js diff --git a/www/include/js/jquery.lists.js b/resources/www/prod/js/jquery.lists.js similarity index 100% rename from www/include/js/jquery.lists.js rename to resources/www/prod/js/jquery.lists.js diff --git a/resources/www/prod/js/jquery.edit.js b/resources/www/prod/js/record.editor.js similarity index 100% rename from resources/www/prod/js/jquery.edit.js rename to resources/www/prod/js/record.editor.js diff --git a/www/include/js/tests/jquery.Edit.js.html b/resources/www/prod/js/tests/jquery.Edit.js.html similarity index 100% rename from www/include/js/tests/jquery.Edit.js.html rename to resources/www/prod/js/tests/jquery.Edit.js.html diff --git a/www/include/js/tests/jquery.Selection.js.html b/resources/www/prod/js/tests/jquery.Selection.js.html similarity index 100% rename from www/include/js/tests/jquery.Selection.js.html rename to resources/www/prod/js/tests/jquery.Selection.js.html diff --git a/www/include/js/tests/jquery.Upload.js.html b/resources/www/prod/js/tests/jquery.Upload.js.html similarity index 100% rename from www/include/js/tests/jquery.Upload.js.html rename to resources/www/prod/js/tests/jquery.Upload.js.html diff --git a/www/skins/thesaurus/sprintf.js b/resources/www/thesaurus/js/sprintf.js similarity index 100% rename from www/skins/thesaurus/sprintf.js rename to resources/www/thesaurus/js/sprintf.js diff --git a/www/skins/thesaurus/thesaurus.js b/resources/www/thesaurus/js/thesaurus.js similarity index 100% rename from www/skins/thesaurus/thesaurus.js rename to resources/www/thesaurus/js/thesaurus.js diff --git a/www/skins/thesaurus/win.js b/resources/www/thesaurus/js/win.js similarity index 100% rename from www/skins/thesaurus/win.js rename to resources/www/thesaurus/js/win.js diff --git a/www/skins/thesaurus/xmlhttp.js b/resources/www/thesaurus/js/xmlhttp.js similarity index 100% rename from www/skins/thesaurus/xmlhttp.js rename to resources/www/thesaurus/js/xmlhttp.js diff --git a/templates/web/thesaurus/accept.html.twig b/templates/web/thesaurus/accept.html.twig index 1b09850c11..3f25e80e35 100644 --- a/templates/web/thesaurus/accept.html.twig +++ b/templates/web/thesaurus/accept.html.twig @@ -19,7 +19,8 @@ font-weight:900; } - + + {##} + + {##} {% if dlg is not none %} diff --git a/templates/web/thesaurus/properties.html.twig b/templates/web/thesaurus/properties.html.twig index 486f21e2f4..931f20c3c8 100644 --- a/templates/web/thesaurus/properties.html.twig +++ b/templates/web/thesaurus/properties.html.twig @@ -25,10 +25,11 @@ } - - + + {# + #} - + {##}