diff --git a/bower.json b/bower.json index 939fce01d8..4dbdfd786a 100644 --- a/bower.json +++ b/bower.json @@ -24,9 +24,10 @@ "tinymce": "~4.0", "jquery-galleria": "1.2.9", "jquery.cookie": "~1.4", - "jquery.treeview": "1.4.1", "fancytree": "~2.7", - "bootstrap-sass": "v2.3.2.2" + "bootstrap-sass": "v2.3.2.2", + "jquery.lazyload": "~1.9.7", + "jquery-treeview": "~1.4.2" }, "devDependencies": { "mocha": "latest", diff --git a/resources/gulp/build.js b/resources/gulp/build.js index 8b12843281..3bf068543a 100644 --- a/resources/gulp/build.js +++ b/resources/gulp/build.js @@ -59,5 +59,6 @@ gulp.task('build-vendors', [ 'build-geonames-server-jquery-plugin', 'build-jquery-cookie', 'build-requirejs', - 'build-jquery-treeview' + 'build-jquery-treeview', + 'build-jquery-lazyload' ], function() {}); \ No newline at end of file diff --git a/resources/gulp/components/common.js b/resources/gulp/components/common.js index 46b83a432c..9186210e7c 100644 --- a/resources/gulp/components/common.js +++ b/resources/gulp/components/common.js @@ -14,7 +14,7 @@ gulp.task('copy-common-fonts',function(){ gulp.task('build-common-font-css', ['copy-common-fonts'],function(){ return gulp.src([config.paths.vendors + 'font-awesome/css/font-awesome-ie7.min.css']) - .pipe(gulp.dest( config.paths.distVendors + 'common/css')); + .pipe(gulp.dest( config.paths.build + 'common/css')); }); gulp.task('build-common-css', ['build-common-font-css'],function(){ diff --git a/resources/gulp/components/prod.js b/resources/gulp/components/prod.js index e505c24951..ba2b8058b4 100644 --- a/resources/gulp/components/prod.js +++ b/resources/gulp/components/prod.js @@ -30,12 +30,13 @@ gulp.task('build-prod', ['copy-prod-images', 'build-prod-css'], function(){ var prodGroup = [ config.paths.vendors + 'underscore-amd/underscore.js', config.paths.dist + 'include/jslibs/colorpicker/js/colorpicker.js', - config.paths.dist + 'include/jslibs/jquery.lazyload/jquery.lazyload.1.8.1.js', + config.paths.vendors + 'jquery.lazyload/jquery.lazyload.js', + // config.paths.dist + 'include/jslibs/jquery.lazyload/jquery.lazyload.1.8.1.js', config.paths.vendors + 'humane-js/humane.js', // @TODO > extra files config.paths.vendors + 'blueimp-load-image/js/load-image.js', // @TODO > extra files config.paths.vendors + 'jquery-file-upload/js/jquery.iframe-transport.js', config.paths.vendors + 'jquery-file-upload/js/jquery.fileupload.js', - config.paths.dist + 'include/jslibs/jquery.form.2.49.js', + config.paths.src + 'prod/js/jquery.form.2.49.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', @@ -51,10 +52,10 @@ gulp.task('build-prod', ['copy-prod-images', 'build-prod-css'], function(){ config.paths.dist + 'include/jslibs/jquery.sprintf.1.0.3.js', config.paths.dist + 'include/jquery.p4.preview.js', config.paths.src + 'prod/js/record.editor.js', - config.paths.dist + 'include/jslibs/jquery.color.animation.js', + config.paths.src + 'prod/js/jquery.color.animation.js', config.paths.dist + 'include/jquery.image_enhancer.js', - config.paths.vendors + 'jquery.treeview/jquery.treeview.js', - config.paths.vendors + 'jquery.treeview/jquery.treeview.async.js', + config.paths.vendors + 'jquery-treeview/jquery.treeview.js', + config.paths.vendors + 'jquery-treeview/jquery.treeview.async.js', config.paths.vendors + 'fancytree/dist/jquery.fancytree-all.min.js' ]; return utils.buildJsGroup(prodGroup, 'prod', 'prod/js'); diff --git a/resources/gulp/components/vendors/jquery-lazyload.js b/resources/gulp/components/vendors/jquery-lazyload.js new file mode 100644 index 0000000000..0faa60f9dc --- /dev/null +++ b/resources/gulp/components/vendors/jquery-lazyload.js @@ -0,0 +1,9 @@ +var gulp = require('gulp'); +var config = require('../../config.js'); +var utils = require('../../utils.js'); + +gulp.task('build-jquery-lazyload', function(){ + return utils.buildJsGroup([ + config.paths.vendors + 'jquery.lazyload/jquery.lazyload.js' + ], 'jquery.lazyload', 'vendors/jquery.lazyload'); +}); \ No newline at end of file diff --git a/resources/gulp/components/vendors/jquery-treeview.js b/resources/gulp/components/vendors/jquery-treeview.js index 5cbe704b4f..fbcf4ca997 100644 --- a/resources/gulp/components/vendors/jquery-treeview.js +++ b/resources/gulp/components/vendors/jquery-treeview.js @@ -2,8 +2,16 @@ var gulp = require('gulp'); var config = require('../../config.js'); var utils = require('../../utils.js'); -gulp.task('build-jquery-treeview', function(){ +gulp.task('copy-jquery-treeview-images', function(){ + return gulp.src([config.paths.vendors + 'jquery-treeview/images/**/*']) + .pipe(gulp.dest( config.paths.build + 'vendors/jquery-treeview/images')); +}); +gulp.task('build-jquery-treeview', ['copy-jquery-treeview-images'], function(){ + // no standalone version used + /*utils.buildJsGroup([ + config.paths.vendors + 'jquery-treeview/jquery.treeview.async.js' + ], 'jquery.treeview.async', 'vendors/jquery-treeview');*/ return utils.buildJsGroup([ - config.paths.vendors + 'jquery.treeview/jquery.treeview.js' - ], 'jquery.treeview', 'vendors/jquery.treeview'); + config.paths.vendors + 'jquery-treeview/jquery.treeview.js' + ], 'jquery.treeview', 'vendors/jquery-treeview'); }); \ No newline at end of file diff --git a/resources/gulp/config.js b/resources/gulp/config.js index c42fa4579d..592157f8de 100644 --- a/resources/gulp/config.js +++ b/resources/gulp/config.js @@ -1,8 +1,7 @@ var gutil = require("gulp-util"); var configPaths = { src: 'resources/www/', - vendors: 'tmp-assets/', - distVendors: 'www/assets/', //@deprecated + vendors: 'www/bower_components/', build: 'www/assets/', dist: 'www/' }; diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index 68ac6863e2..4e0894221b 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -1,7 +1,7 @@ $skinsPath: '../../../skins/'; $iconsPath: '../../../assets/common/images/icons/'; -@import '../../vendors/jquery.treeview/jquery.treeview'; // to inline import css file, don't put extension +@import '../../vendors/jquery-treeview/jquery.treeview'; // to inline import css file, don't put extension @import '../../../../www/bower_components/jquery-file-upload/css/jquery.fileupload-ui'; // to inline import css file, don't put extension @import '../../shared/styles/jquery.contextmenu'; @import '../../shared/styles/skin/main'; diff --git a/www/include/jslibs/jquery.color.animation.js b/resources/www/prod/js/jquery.color.animation.js similarity index 100% rename from www/include/jslibs/jquery.color.animation.js rename to resources/www/prod/js/jquery.color.animation.js diff --git a/www/include/jslibs/jquery.form.2.49.js b/resources/www/prod/js/jquery.form.2.49.js similarity index 100% rename from www/include/jslibs/jquery.form.2.49.js rename to resources/www/prod/js/jquery.form.2.49.js diff --git a/resources/www/prod/styles/main.scss b/resources/www/prod/styles/main.scss index dc1065cace..3ee585aaca 100644 --- a/resources/www/prod/styles/main.scss +++ b/resources/www/prod/styles/main.scss @@ -1,6 +1,6 @@ $iconsPath: '../../../assets/common/images/icons/'; @import '../../../../www/bower_components/fancytree/dist/skin-win8/ui.fancytree'; // to inline import css file, don't put extension -@import '../../vendors/jquery.treeview/jquery.treeview'; // to inline import css file, don't put extension +@import '../../vendors/jquery-treeview/jquery.treeview'; // to inline import css file, don't put extension @import '../../../../www/bower_components/humane-js/themes/libnotify'; @import '../../shared/styles/jquery.contextmenu'; @import '../../shared/styles/jquery.image_enhancer'; diff --git a/resources/www/prod/styles/skin-000000.scss b/resources/www/prod/styles/skin-000000.scss index 54cdc5c952..635b904a83 100644 --- a/resources/www/prod/styles/skin-000000.scss +++ b/resources/www/prod/styles/skin-000000.scss @@ -369,7 +369,7 @@ span.ww_winTitle { vertical-align: middle; padding: 0; border-radius: 0; - background: $col1 url('#{$skinsPath}icons/icon_magnify.png') 50% no-repeat; + background: $col1 url('#{$iconsPath}icon_magnify.png') 50% no-repeat; border: none; margin: 0; outline:none; @@ -390,7 +390,7 @@ span.ww_winTitle { line-height: 50px; padding: 0; border-radius: 0; - background: url('#{$skinsPath}icons/icon_clear_search.png') 50% no-repeat; + background: url('#{$iconsPath}icon_clear_search.png') 50% no-repeat; border: none; outline: none; box-shadow: none; @@ -414,7 +414,7 @@ span.ww_winTitle { .treeview>li.expandable>.hitarea { height: 51px; - background: url('#{$skinsPath}icons/sprite_tree_first.png') 99% 22px no-repeat; + background: url('#{$iconsPath}sprite_tree_first.png') 99% 22px no-repeat; border-left: 5px $col1 solid; } @@ -436,7 +436,7 @@ span.ww_winTitle { } .treeview ul li .hitarea { - background: url('#{$skinsPath}icons/icon_tree.png') 0 0 no-repeat; + background: url('#{$iconsPath}/icon_tree.png') 0 0 no-repeat; position: relative; height: 9px; width: 9px; @@ -650,7 +650,7 @@ span.ww_winTitle { } .ui-accordion .ui-accordion-content.loading { - background-image: url('#{$skinsPath}icons/loader000.gif'); + background-image: url('#{$iconsPath}loader000.gif'); background-position: center center; background-repeat: no-repeat; } @@ -1019,7 +1019,7 @@ div.diapo { } #idFrameT #selectCase { - background: url('#{$skinsPath}icons/ccoch0.gif') no-repeat center center; + background: url('#{$iconsPath}ccoch0.gif') no-repeat center center; padding-left: 16px; } @@ -1581,30 +1581,30 @@ form.phrasea_query input.query { } .history-collection { - background-image: url('#{$skinsPath}icons/chgcoll_history.png'); + background-image: url('#{$iconsPath}chgcoll_history.png'); } .history-status { - background-image: url('#{$skinsPath}icons/chgstatus_history.png'); + background-image: url('#{$iconsPath}chgstatus_history.png'); } .history-print { - background-image: url('#{$skinsPath}icons/print_history.png'); + background-image: url('#{$iconsPath}print_history.png'); } .history-substit, .history-publish { - background-image: url('#{$skinsPath}icons/imgtools_history.png'); + background-image: url('#{$iconsPath}imgtools_history.png'); } .history-download, .history-mail, .history-ftp { - background-image: url('#{$skinsPath}icons/disktt_history.png'); + background-image: url('#{$iconsPath}disktt_history.png'); } .history-edit { - background-image: url('#{$skinsPath}icons/ppen_history.png'); + background-image: url('#{$iconsPath}ppen_history.png'); } .history-validate, .history-push { - background-image: url('#{$skinsPath}icons/push16.png'); + background-image: url('#{$iconsPath}push16.png'); } .history-collection, .history-status, .history-print, .history-substit, .history-publish, .history-download, .history-mail, .history-ftp, .history-edit, .history-validate, .history-push { @@ -1854,7 +1854,7 @@ input.input-button.hover { input.search { padding-left: 25px; - background-image: url('#{$skinsPath}icons/search.png'); + background-image: url('#{$iconsPath}search.png'); background-repeat: no-repeat; background-position: 3px center; } @@ -2947,7 +2947,7 @@ DIV.thesaurus U.w { #idFrameE .ui-datepicker-inline { background-color: #111111; - background-image: url('#{$skinsPath}prod/000000/images/ui-bg_gloss-wave_20_111111_500x100.png'); + background-image: url('../images/000000/images/ui-bg_gloss-wave_20_111111_500x100.png'); background-repeat: repeat-x; background-position: 50% top; } @@ -3266,7 +3266,7 @@ DIV.thesaurus U.w { } #mainMenu .PNB.right li.user { - background: url('#{$skinsPath}icons/icon_user.png') 15px 7px no-repeat; + background: url('#{$iconsPath}icon_user.png') 15px 7px no-repeat; padding-left: 41px; } @@ -4101,7 +4101,7 @@ dans l'onglet thesaurus : arbres, menus contextuels } #dialog_publicator .ui-tabs .ui-tabs-panel.loading { - background-image: url('#{$skinsPath}icons/loader000.gif'); + background-image: url('#{$iconsPath}loader000.gif'); background-position: center center; background-repeat: no-repeat; } @@ -4196,7 +4196,7 @@ dans l'onglet thesaurus : arbres, menus contextuels #dialog_publicator .api_infos { top: auto; height: 25px; - background-image: url('#{$skinsPath}icons/api_info.png'); + background-image: url('#{$iconsPath}api_info.png'); background-repeat: repeat-x; background-position: 0 0; color: #999999; @@ -4222,15 +4222,15 @@ dans l'onglet thesaurus : arbres, menus contextuels } #ul_main_pub_tabs li.bridge_Youtube { - background-image: url('#{$skinsPath}icons/youtube-small.gif'); + background-image: url('#{$iconsPath}youtube-small.gif'); } #ul_main_pub_tabs li.bridge_Dailymotion { - background-image: url('#{$skinsPath}icons/dailymotion-small.gif'); + background-image: url('#{$iconsPath}dailymotion-small.gif'); } #ul_main_pub_tabs li.bridge_Flickr { - background-image: url('#{$skinsPath}icons/flickr-small.gif'); + background-image: url('#{$iconsPath}flickr-small.gif'); } #dialog_publicator .diapo .thumb_wrapper { diff --git a/resources/www/prod/styles/skin-959595.scss b/resources/www/prod/styles/skin-959595.scss index 5c9412542d..d8d6f854ce 100644 --- a/resources/www/prod/styles/skin-959595.scss +++ b/resources/www/prod/styles/skin-959595.scss @@ -2809,7 +2809,7 @@ DIV.thesaurus U.w { #idFrameE .ui-datepicker-inline { background-color: #111111; - background-image: url('/skins/prod/000000/images/ui-bg_gloss-wave_20_111111_500x100.png'); + background-image: url('../images/000000/images/ui-bg_gloss-wave_20_111111_500x100.png'); background-repeat: repeat-x; background-position: 50% top; } diff --git a/resources/www/vendors/jquery.treeview/jquery.treeview.scss b/resources/www/vendors/jquery-treeview/jquery.treeview.scss similarity index 95% rename from resources/www/vendors/jquery.treeview/jquery.treeview.scss rename to resources/www/vendors/jquery-treeview/jquery.treeview.scss index f3f55d8b42..127aaee1c0 100644 --- a/resources/www/vendors/jquery.treeview/jquery.treeview.scss +++ b/resources/www/vendors/jquery-treeview/jquery.treeview.scss @@ -1,4 +1,5 @@ -$imagesPath: '../../../../include/jslibs/jquery-treeview/images/'; +//$imagesPath: '../../../../include/jslibs/jquery-treeview/images/'; +$imagesPath: '/assets/vendors/jquery-treeview/images'; .treeview, .treeview ul { padding: 0; margin: 0; diff --git a/www/include/jslibs/jquery-treeview/changelog.txt b/www/include/jslibs/jquery-treeview/changelog.txt deleted file mode 100644 index 44a94e82b0..0000000000 --- a/www/include/jslibs/jquery-treeview/changelog.txt +++ /dev/null @@ -1,29 +0,0 @@ -1.4 ---- - -* Added changelog (this file) -* Fixed tree control to search only for anchors, allowing images or other elements inside the controls, while keeping the control usable with the keyboard -* Restructured folder layout: root contains plugin resources, lib contains script dependencies, demo contains demos and related files -* Added prerendered option: If set to true, assumes all hitarea divs and classes already rendered, speeding up initialization for big trees, but more obtrusive -* Added jquery.treeview.async.js for ajax-lazy-loading trees, see async.html demo -* Exposed $.fn.treeview.classes for custom classes if necessary -* Show treecontrol only when JavaScript is enabled -* Completely reworked themeing via CSS sprites, resulting in only two files per theme - * updated dotted, black, gray and red theme - * added famfamfam theme (no lines) -* Improved cookie persistence to allow multiple persisted trees per page via cookieId option -* Improved location persistence by making it case-insensitive -* Improved swapClass and replaceClass plugin implementations -* Added folder-closed.gif to filetree example - -1.3 ---- - -* Fixes for all outstanding bugs -* Added persistence features - * location based: click on a link in the treeview and reopen that link after the page loaded - * cookie based: save the state of the tree in a cookie on each click and load that on reload -* smoothed animations, fixing flickering in both IE and Opera -* Tested in Firefox 2, IE 6 & 7, Opera 9, Safari 3 -* Moved documentation to jQuery wiki -* Requires jQuery 1.2+ diff --git a/www/include/jslibs/jquery-treeview/images/file.gif b/www/include/jslibs/jquery-treeview/images/file.gif deleted file mode 100644 index 7e6216798f..0000000000 Binary files a/www/include/jslibs/jquery-treeview/images/file.gif and /dev/null differ diff --git a/www/include/jslibs/jquery-treeview/images/folder-closed.gif b/www/include/jslibs/jquery-treeview/images/folder-closed.gif deleted file mode 100644 index 541107888e..0000000000 Binary files a/www/include/jslibs/jquery-treeview/images/folder-closed.gif and /dev/null differ diff --git a/www/include/jslibs/jquery-treeview/images/folder.gif b/www/include/jslibs/jquery-treeview/images/folder.gif deleted file mode 100644 index 2b31631ca2..0000000000 Binary files a/www/include/jslibs/jquery-treeview/images/folder.gif and /dev/null differ diff --git a/www/include/jslibs/jquery-treeview/images/minus.gif b/www/include/jslibs/jquery-treeview/images/minus.gif deleted file mode 100644 index 47fb7b767c..0000000000 Binary files a/www/include/jslibs/jquery-treeview/images/minus.gif and /dev/null differ diff --git a/www/include/jslibs/jquery-treeview/images/plus.gif b/www/include/jslibs/jquery-treeview/images/plus.gif deleted file mode 100644 index 6906621627..0000000000 Binary files a/www/include/jslibs/jquery-treeview/images/plus.gif and /dev/null differ diff --git a/www/include/jslibs/jquery-treeview/images/treeview-black-line.gif b/www/include/jslibs/jquery-treeview/images/treeview-black-line.gif deleted file mode 100644 index e5496877a0..0000000000 Binary files a/www/include/jslibs/jquery-treeview/images/treeview-black-line.gif and /dev/null differ diff --git a/www/include/jslibs/jquery-treeview/images/treeview-black.gif b/www/include/jslibs/jquery-treeview/images/treeview-black.gif deleted file mode 100644 index d549b9fc56..0000000000 Binary files a/www/include/jslibs/jquery-treeview/images/treeview-black.gif and /dev/null differ diff --git a/www/include/jslibs/jquery-treeview/images/treeview-default-line.gif b/www/include/jslibs/jquery-treeview/images/treeview-default-line.gif deleted file mode 100644 index 37114d3068..0000000000 Binary files a/www/include/jslibs/jquery-treeview/images/treeview-default-line.gif and /dev/null differ diff --git a/www/include/jslibs/jquery-treeview/images/treeview-default-line.png b/www/include/jslibs/jquery-treeview/images/treeview-default-line.png deleted file mode 100644 index 01c1aa9826..0000000000 Binary files a/www/include/jslibs/jquery-treeview/images/treeview-default-line.png and /dev/null differ diff --git a/www/include/jslibs/jquery-treeview/images/treeview-default.gif b/www/include/jslibs/jquery-treeview/images/treeview-default.gif deleted file mode 100644 index a12ac52ffe..0000000000 Binary files a/www/include/jslibs/jquery-treeview/images/treeview-default.gif and /dev/null differ diff --git a/www/include/jslibs/jquery-treeview/images/treeview-famfamfam-line.gif b/www/include/jslibs/jquery-treeview/images/treeview-famfamfam-line.gif deleted file mode 100644 index 6e289cecc5..0000000000 Binary files a/www/include/jslibs/jquery-treeview/images/treeview-famfamfam-line.gif and /dev/null differ diff --git a/www/include/jslibs/jquery-treeview/images/treeview-famfamfam.gif b/www/include/jslibs/jquery-treeview/images/treeview-famfamfam.gif deleted file mode 100644 index 0cb178e899..0000000000 Binary files a/www/include/jslibs/jquery-treeview/images/treeview-famfamfam.gif and /dev/null differ diff --git a/www/include/jslibs/jquery-treeview/images/treeview-gray-line.gif b/www/include/jslibs/jquery-treeview/images/treeview-gray-line.gif deleted file mode 100644 index 37600447dc..0000000000 Binary files a/www/include/jslibs/jquery-treeview/images/treeview-gray-line.gif and /dev/null differ diff --git a/www/include/jslibs/jquery-treeview/images/treeview-gray.gif b/www/include/jslibs/jquery-treeview/images/treeview-gray.gif deleted file mode 100644 index cfb8a2f096..0000000000 Binary files a/www/include/jslibs/jquery-treeview/images/treeview-gray.gif and /dev/null differ diff --git a/www/include/jslibs/jquery-treeview/images/treeview-red-line.gif b/www/include/jslibs/jquery-treeview/images/treeview-red-line.gif deleted file mode 100644 index df9e749a8f..0000000000 Binary files a/www/include/jslibs/jquery-treeview/images/treeview-red-line.gif and /dev/null differ diff --git a/www/include/jslibs/jquery-treeview/images/treeview-red.gif b/www/include/jslibs/jquery-treeview/images/treeview-red.gif deleted file mode 100644 index 3bbb3a157f..0000000000 Binary files a/www/include/jslibs/jquery-treeview/images/treeview-red.gif and /dev/null differ diff --git a/www/include/jslibs/jquery-treeview/jquery.treeview.async.js b/www/include/jslibs/jquery-treeview/jquery.treeview.async.js deleted file mode 100644 index f0e55e8d4b..0000000000 --- a/www/include/jslibs/jquery-treeview/jquery.treeview.async.js +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Async Treeview 0.1 - Lazy-loading extension for Treeview - * - * http://bassistance.de/jquery-plugins/jquery-plugin-treeview/ - * - * Copyright (c) 2007 Jörn Zaefferer - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * - * Revision: $Id$ - * - */ - -;(function($) { - -function load(settings, root, child, container) { - $.getJSON(settings.url, {root: root}, function(response) { - function createNode(parent) { - var current = $("
  • ").attr("id", this.id || "").html("" + this.text + "").appendTo(parent); - if (this.classes) { - current.children("span").addClass(this.classes); - } - if (this.expanded) { - current.addClass("open"); - } - if (this.hasChildren || this.children && this.children.length) { - var branch = $("