refactor build as components, wip: gathering js, css, images, ...

resources/gulp/build.js

@@ -5,72 +5,8 @@ var debug = require('gulp-debug');
 var fs = require('fs');
 var utils = require('./utils.js');
 
-gulp.task('build-common',  function(){
-    var commonGroup = [
-        // config.paths.dist + 'assets/bootstrap/js/bootstrap.js', // should append no conflict
-        config.paths.dist + 'include/jslibs/jquery.mousewheel.js',
-        // jquery ui date picker langs
-        config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-ar.js',
-        config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-de.js',
-        config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-es.js',
-        config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-fr.js',
-        config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-nl.js',
-        config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-en-GB.js',
-        config.paths.vendors + 'jquery.cookie/jquery.cookie.js',
-        config.paths.dist + 'include/jslibs/jquery.contextmenu_scroll.js',
-        config.paths.dist + 'include/jquery.common.js',
-        config.paths.dist + 'include/jquery.tooltip.js',
-        config.paths.dist + 'skins/prod/jquery.Dialog.js',
-        config.paths.vendors + 'swfobject/swfobject/swfobject.js', // @TODO: should be moved away (embed-bundle)
-        config.paths.dist + 'include/jslibs/flowplayer/flowplayer-3.2.13.min.js' // @TODO: should be moved away (embed-bundle)
-    ];
-    return utils.buildJsGroup(commonGroup, 'common', 'common/js');
-});
 
-gulp.task('build-prod',  function(){
+//@TODO > submodule of prod
-    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 + '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.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.dist + 'skins/prod/jquery.Prod.js',
-        config.paths.dist + 'skins/prod/jquery.Feedback.js',
-        config.paths.dist + 'skins/prod/jquery.Results.js',
-        config.paths.dist + 'skins/prod/jquery.main-prod.js',
-        config.paths.dist + 'skins/prod/jquery.WorkZone.js',
-        config.paths.dist + 'skins/prod/jquery.Alerts.js',
-        config.paths.dist + 'skins/prod/jquery.Upload.js',
-        config.paths.dist + 'include/jslibs/pixastic.custom.js',
-        config.paths.dist + 'skins/prod/ThumbExtractor.js',
-        config.paths.dist + 'skins/prod/publicator.js',
-        config.paths.dist + 'include/jslibs/jquery.sprintf.1.0.3.js',
-        config.paths.dist + 'include/jquery.p4.preview.js',
-        config.paths.dist + 'skins/prod/jquery.edit.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',
-        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');
-});
-gulp.task('build-thesaurus',  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'
-    ];
-    return utils.buildJsGroup(thesaurusGroup, 'thesaurus', 'thesaurus/js');
-});
 gulp.task('build-uploadFlash',  function(){
     var uploadFlashGroup = [
         config.paths.dist + 'include/jslibs/SWFUpload/swfupload.js',
@@ -78,53 +14,8 @@ gulp.task('build-uploadFlash',  function(){
     ];
     return utils.buildJsGroup(uploadFlashGroup, 'uploadFlash', 'upload/js');
 });
-gulp.task('build-lightbox',  function(){
-    var lightboxGroup = [
-        config.paths.dist + 'skins/lightbox/jquery.lightbox.js'
-    ];
-
-    var lightboxIE6Group = [
-        config.paths.dist + 'skins/lightbox/jquery.lightbox.ie6.js'
-    ];
-    utils.buildJsGroup(lightboxIE6Group, 'lightboxIe6', 'lightbox/js');
-    return utils.buildJsGroup(lightboxGroup, 'lightbox', 'lightbox/js');
-});
-
-gulp.task('build-admin',  function(){
-    var adminGroup = [
-        config.paths.vendors + 'underscore-amd/underscore.js',
-        config.paths.vendors + 'jquery.treeview/jquery.treeview.js',
-        config.paths.dist +  'include/jquery.kb-event.js',
-        config.paths.dist +  'skins/admin/template-dialogs.js',
-        // loaded via requirejs
-        // config.paths.vendors + 'blueimp-load-image/js/load-image.js',
-        // config.paths.vendors + 'jquery-file-upload/js/jquery.iframe-transport.js',
-        // config.paths.vendors + 'jquery-file-upload/js/jquery.fileupload.js',
-        config.paths.vendors + 'requirejs/require.js',
-        config.paths.dist +  'scripts/apps/admin/require.config.js',
-        config.paths.dist +  'scripts/apps/admin/main/main.js'
-    ];
-    utils.buildJsGroup(adminGroup, 'admin', 'admin/js');
-});
-
-gulp.task('build-report',  function(){
-    var reportGroup = [
-        config.paths.dist + 'include/jslibs/jquery.print.js',
-        config.paths.dist + 'include/jslibs/jquery.cluetip.js',
-        config.paths.dist + 'include/jquery.nicoslider.js',
-        config.paths.dist + 'skins/report/report.js'
-    ];
-    return utils.buildJsGroup(reportGroup, 'report', 'report/js');
-});
-
-gulp.task('build-account',  function(){
-    var accountGroup = [
-        config.paths.vendors + 'requirejs/require.js',
-        config.paths.dist + 'skins/account/account.js'
-    ];
-    return utils.buildJsGroup(accountGroup, 'account', 'account/js');
-});
 
+//@TODO > submodule of prod
 gulp.task('build-permaview',  function(){
     var permaviewGroup =  [
         config.paths.dist + 'include/jslibs/jquery.mousewheel.js',
@@ -135,24 +26,6 @@ gulp.task('build-permaview',  function(){
     return utils.buildJsGroup(permaviewGroup, 'permaview', 'permaview/js');
 });
 
-gulp.task('build-setup',  function(){
-    var setupGroup = [
-        config.paths.vendors + 'jquery.cookie/jquery.cookie.js',
-        config.paths.dist + 'include/jslibs/jquery-validation/jquery.validate.js',
-        config.paths.dist + 'include/jslibs/jquery-validate.password/jquery.validate.password.js',
-        config.paths.dist + 'include/path_files_tests.jquery.js'
-    ];
-    return utils.buildJsGroup(setupGroup, 'setup', 'setup/js');
-});
-gulp.task('build-authentication',  function(){
-    var authenticationGroup = [
-        config.paths.vendors + 'requirejs/require.js',
-        config.paths.dist + 'scripts/apps/login/home/config.js'
-    ];
-    return utils.buildJsGroup(authenticationGroup, 'authentication', 'authentication/js');
-});
-
-
 gulp.task('build', ['build-vendors'], function(){
     gulp.start('build-common');
     gulp.start('build-prod');

resources/gulp/components/account.js

@@ -0,0 +1,21 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('copy-account-images', function(){
+    return gulp.src([config.paths.src + 'account/images/**/*'])
+        .pipe(gulp.dest( config.paths.build + 'account/images'));
+});
+gulp.task('build-account-css', function(){
+    return utils.buildCssGroup([
+        config.paths.src + 'account/styles/main.scss'
+    ], 'account', 'account/css/');
+});
+
+gulp.task('build-account', ['copy-account-images', 'build-account-css'], function(){
+    var accountGroup = [
+        config.paths.vendors + 'requirejs/require.js',
+        config.paths.src + 'account/js/account.js'
+    ];
+    return utils.buildJsGroup(accountGroup, 'account', 'account/js');
+});

resources/gulp/components/admin.js

@@ -0,0 +1,30 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('copy-admin-images', function(){
+    return gulp.src([config.paths.src + 'admin/images/**/*'])
+        .pipe(gulp.dest( config.paths.build + 'admin/images'));
+});
+gulp.task('build-admin-css', function(){
+    return utils.buildCssGroup([
+        config.paths.src + 'admin/styles/main.scss'
+    ], 'admin', 'admin/css/');
+});
+
+gulp.task('build-admin', ['copy-admin-images', 'build-admin-css'], function(){
+    var adminGroup = [
+        config.paths.vendors + 'underscore-amd/underscore.js',
+        config.paths.vendors + 'jquery.treeview/jquery.treeview.js',
+        config.paths.dist +  'include/jquery.kb-event.js',
+        config.paths.dist +  'skins/admin/template-dialogs.js',
+        // loaded via requirejs
+        // config.paths.vendors + 'blueimp-load-image/js/load-image.js',
+        // config.paths.vendors + 'jquery-file-upload/js/jquery.iframe-transport.js',
+        // config.paths.vendors + 'jquery-file-upload/js/jquery.fileupload.js',
+        config.paths.vendors + 'requirejs/require.js',
+        config.paths.dist +  'scripts/apps/admin/require.config.js',
+        config.paths.dist +  'scripts/apps/admin/main/main.js'
+    ];
+    utils.buildJsGroup(adminGroup, 'admin', 'admin/js');
+});

resources/gulp/components/authentication.js

@@ -0,0 +1,21 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('copy-authentication-images', function(){
+    return gulp.src([config.paths.src + 'authentication/images/**/*'])
+        .pipe(gulp.dest( config.paths.build + 'authentication/images'));
+});
+gulp.task('build-authentication-css', function(){
+    return utils.buildCssGroup([
+        config.paths.src + 'authentication/styles/main.scss'
+    ], 'authentication', 'authentication/css/');
+});
+
+gulp.task('build-authentication', ['copy-authentication-images', 'build-authentication-css'], function(){
+    var authenticationGroup = [
+        config.paths.vendors + 'requirejs/require.js',
+        config.paths.dist + 'scripts/apps/login/home/config.js'
+    ];
+    return utils.buildJsGroup(authenticationGroup, 'authentication', 'authentication/js');
+});

resources/gulp/components/common.js

@@ -0,0 +1,46 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('copy-common-images', function(){
+    return gulp.src([config.paths.src + 'common/images/**/*'])
+        .pipe(gulp.dest( config.paths.build + 'common/images'));
+});
+
+gulp.task('copy-common-fonts',function(){
+    return gulp.src([config.paths.vendors + 'font-awesome/font/*'])
+        .pipe(gulp.dest( config.paths.build + 'common/font'));
+});
+
+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'));
+});
+
+gulp.task('build-common-css', ['build-common-font-css'],function(){
+    return utils.buildCssGroup([
+        config.paths.src + 'common/styles/main.scss'
+    ], 'common', 'common/css/')
+});
+
+gulp.task('build-common', ['copy-common-images', 'build-common-css'], function(){
+    var commonGroup = [
+        // config.paths.dist + 'assets/bootstrap/js/bootstrap.js', // should append no conflict
+        config.paths.dist + 'include/jslibs/jquery.mousewheel.js',
+        // jquery ui date picker langs
+        config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-ar.js',
+        config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-de.js',
+        config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-es.js',
+        config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-fr.js',
+        config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-nl.js',
+        config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-en-GB.js',
+        config.paths.vendors + 'jquery.cookie/jquery.cookie.js',
+        config.paths.dist + 'include/jslibs/jquery.contextmenu_scroll.js',
+        config.paths.dist + 'include/jquery.common.js',
+        config.paths.dist + 'include/jquery.tooltip.js',
+        config.paths.dist + 'skins/prod/jquery.Dialog.js',
+        config.paths.vendors + 'swfobject/swfobject/swfobject.js', // @TODO: should be moved away (embed-bundle)
+        config.paths.dist + 'include/jslibs/flowplayer/flowplayer-3.2.13.min.js' // @TODO: should be moved away (embed-bundle)
+    ];
+    return utils.buildJsGroup(commonGroup, 'common', 'common/js');
+});

resources/gulp/components/lightbox.js

@@ -0,0 +1,38 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('copy-lightbox-images', function(){
+    return gulp.src([config.paths.src + 'lightbox/images/**/*'])
+        .pipe(gulp.dest( config.paths.build + 'lightbox/images'));
+});
+
+gulp.task('build-lightbox-mobile-css', function(){
+    return utils.buildCssGroup([
+        config.paths.src + 'lightbox/styles/main-mobile.scss'
+    ], 'lightbox-mobile', 'lightbox/css/');
+});
+
+gulp.task('build-lightbox-ie6-css', function(){
+    return utils.buildCssGroup([
+        config.paths.src + 'lightbox/styles/main-ie6.scss'
+    ], 'lightbox-ie6', 'lightbox/css/')
+});
+
+gulp.task('build-lightbox-css', ['build-lightbox-mobile-css', 'build-lightbox-ie6-css'], function(){
+    return utils.buildCssGroup([
+        config.paths.src + 'lightbox/styles/main.scss'
+    ], 'lightbox', 'lightbox/css/')
+});
+
+gulp.task('build-lightbox', ['copy-lightbox-images', 'build-lightbox-css'], function(){
+    var lightboxGroup = [
+        config.paths.dist + 'skins/lightbox/jquery.lightbox.js'
+    ];
+
+    var lightboxIE6Group = [
+        config.paths.dist + 'skins/lightbox/jquery.lightbox.ie6.js'
+    ];
+    utils.buildJsGroup(lightboxIE6Group, 'lightboxIe6', 'lightbox/js');
+    return utils.buildJsGroup(lightboxGroup, 'lightbox', 'lightbox/js');
+});

resources/gulp/components/prod.js

@@ -0,0 +1,63 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('copy-prod-images', function(){
+    // @TODO
+    return gulp.src([config.paths.src + 'prod/images/***'])
+        .pipe(gulp.dest( config.paths.build + 'prod/images'));
+});
+
+gulp.task('build-prod-skin-black', function(){
+    return utils.buildCssGroup([
+        config.paths.src + 'prod/styles/skin-000000.scss'
+    ], 'skin-000000', 'prod/css/');
+});
+
+gulp.task('build-prod-skin-grey', function(){
+    return utils.buildCssGroup([
+        config.paths.src + 'prod/styles/skin-959595.scss'
+    ], 'skin-959595', 'prod/css/');
+});
+
+gulp.task('build-prod-css', ['build-prod-skin-black', 'build-prod-skin-grey'], function(){
+    return utils.buildCssGroup([
+        config.paths.src + 'prod/styles/main.scss'
+    ], 'prod', 'prod/css/');
+});
+
+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 + '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.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.dist + 'skins/prod/jquery.Prod.js',
+        config.paths.dist + 'skins/prod/jquery.Feedback.js',
+        config.paths.dist + 'skins/prod/jquery.Results.js',
+        config.paths.dist + 'skins/prod/jquery.main-prod.js',
+        config.paths.dist + 'skins/prod/jquery.WorkZone.js',
+        config.paths.dist + 'skins/prod/jquery.Alerts.js',
+        config.paths.dist + 'skins/prod/jquery.Upload.js',
+        config.paths.dist + 'include/jslibs/pixastic.custom.js',
+        config.paths.dist + 'skins/prod/ThumbExtractor.js',
+        config.paths.dist + 'skins/prod/publicator.js',
+        config.paths.dist + 'include/jslibs/jquery.sprintf.1.0.3.js',
+        config.paths.dist + 'include/jquery.p4.preview.js',
+        config.paths.dist + 'skins/prod/jquery.edit.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',
+        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');
+});

resources/gulp/components/report.js

@@ -0,0 +1,30 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('copy-report-images', function(){
+    return gulp.src([config.paths.src + 'report/images/**/*'])
+        .pipe(gulp.dest( config.paths.build + 'report/images'));
+});
+
+gulp.task('build-report-print-css', function(){
+    return utils.buildCssGroup([
+        config.paths.src + 'report/styles/main-print.scss'
+    ], 'print', 'report/css/');
+});
+
+gulp.task('build-report-css', ['build-report-print-css'], function(){
+    return utils.buildCssGroup([
+        config.paths.src + 'report/styles/main.scss'
+    ], 'report', 'report/css/');
+});
+
+gulp.task('build-report', ['copy-report-images', 'build-report-css'], function(){
+    var reportGroup = [
+        config.paths.dist + 'include/jslibs/jquery.print.js',
+        config.paths.dist + 'include/jslibs/jquery.cluetip.js',
+        config.paths.dist + 'include/jquery.nicoslider.js',
+        config.paths.src + 'report/js/report.js'
+    ];
+    return utils.buildJsGroup(reportGroup, 'report', 'report/js');
+});

resources/gulp/components/setup.js

@@ -0,0 +1,23 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('copy-setup-images', function(){
+    return gulp.src([config.paths.src + 'setup/images/**/*'])
+        .pipe(gulp.dest( config.paths.build + 'setup/images'));
+});
+gulp.task('build-setup-css', function(){
+    utils.buildCssGroup([
+        config.paths.src + 'setup/styles/main.scss'
+    ], 'setup', 'setup/css/');
+});
+
+gulp.task('build-setup', ['copy-setup-images', 'build-setup-css'], function(){
+    var setupGroup = [
+        config.paths.vendors + 'jquery.cookie/jquery.cookie.js',
+        config.paths.dist + 'include/jslibs/jquery-validation/jquery.validate.js',
+        config.paths.dist + 'include/jslibs/jquery-validate.password/jquery.validate.password.js',
+        config.paths.dist + 'include/path_files_tests.jquery.js'
+    ];
+    return utils.buildJsGroup(setupGroup, 'setup', 'setup/js');
+});

resources/gulp/components/thesaurus.js

@@ -0,0 +1,23 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('copy-thesaurus-images', function(){
+    return gulp.src([config.paths.src + 'thesaurus/images/**/*'])
+        .pipe(gulp.dest( config.paths.build + 'thesaurus/images'));
+});
+gulp.task('build-thesaurus-css', function(){
+    return utils.buildCssGroup([
+        config.paths.src + 'thesaurus/styles/main.scss'
+    ], 'thesaurus', 'thesaurus/css/');
+});
+
+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'
+    ];
+    return utils.buildJsGroup(thesaurusGroup, 'thesaurus', 'thesaurus/js');
+});

resources/gulp/components/vendors/backbone.js

@@ -1,6 +1,6 @@
 var gulp = require('gulp');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 
 

resources/gulp/components/vendors/blueimp-load-image.js

@@ -1,6 +1,6 @@
 var gulp = require('gulp');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 gulp.task('build-blueimp-load-image', function(){
     return utils.buildJsGroup([

resources/gulp/components/vendors/bootstrap-multiselect.js

@@ -1,6 +1,6 @@
 var gulp = require('gulp');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 gulp.task('build-bootstrap-multiselect', function(){
     return utils.buildJsGroup([

resources/gulp/components/vendors/bootstrap.js

@@ -4,8 +4,8 @@ var uglify = require('gulp-uglify');
 var cssmin = require('gulp-cssmin');
 var concat = require('gulp-concat');
 var rename = require('gulp-rename');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 gulp.task('bootstrap-js', function () {
     var btSource = [

resources/gulp/components/vendors/geonames-server-jquery-plugin.js

@@ -1,6 +1,6 @@
 var gulp = require('gulp');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 gulp.task('build-geonames-server-jquery-plugin', function(){
     return utils.buildJsGroup([

resources/gulp/components/vendors/i18next.js

@@ -1,6 +1,6 @@
 var gulp = require('gulp');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 gulp.task('build-i18next', function(){
     return utils.buildJsGroup([

resources/gulp/components/vendors/jquery-cookie.js

@@ -1,6 +1,6 @@
 var gulp = require('gulp');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 gulp.task('build-jquery-cookie', function(){
     return utils.buildJsGroup([

resources/gulp/components/vendors/jquery-file-upload.js

@@ -1,6 +1,6 @@
 var gulp = require('gulp');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 
 

resources/gulp/components/vendors/jquery-galleria.js

@@ -1,6 +1,6 @@
 var gulp = require('gulp');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 gulp.task('build-galleria-css', function(){
     return utils.buildCssGroup([

resources/gulp/components/vendors/jquery-mobile.js

@@ -1,6 +1,6 @@
 var gulp = require('gulp');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 gulp.task('build-jquery-mobile-css', function(){
     return utils.buildCssGroup([

resources/gulp/components/vendors/jquery-treeview.js

@@ -1,6 +1,6 @@
 var gulp = require('gulp');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 gulp.task('build-jquery-treeview', function(){
     return utils.buildJsGroup([

resources/gulp/components/vendors/jquery-ui.js

@@ -1,6 +1,6 @@
 var gulp = require('gulp');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 gulp.task('build-jquery-ui', [], function(){
     // copy jquery ui assets

resources/gulp/components/vendors/jquery.js

@@ -1,6 +1,6 @@
 var gulp = require('gulp');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 gulp.task('build-jquery', function(){
     return utils.buildJsGroup([

resources/gulp/components/vendors/json2.js

@@ -1,6 +1,6 @@
 var gulp = require('gulp');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 gulp.task('build-json2', [], function(){
     return utils.buildJsGroup([

resources/gulp/components/vendors/modernizr.js

@@ -1,6 +1,6 @@
 var gulp = require('gulp');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 gulp.task('build-modernizr', [], function(){
     return utils.buildJsGroup([

resources/gulp/components/vendors/requirejs.js

@@ -1,6 +1,6 @@
 var gulp = require('gulp');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 gulp.task('build-requirejs', function(){
     return utils.buildJsGroup([

resources/gulp/components/vendors/tinymce.js

@@ -1,6 +1,6 @@
 var gulp = require('gulp');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 gulp.task('build-tinymce', [], function(){
     return gulp.src([config.paths.vendors + 'tinymce/**'])

resources/gulp/components/vendors/zxcvbn.js

@@ -1,6 +1,6 @@
 var gulp = require('gulp');
-var config = require('../config.js');
+var config = require('../../config.js');
-var utils = require('../utils.js');
+var utils = require('../../utils.js');
 
 gulp.task('build-zxcvbn', [], function(){
     return utils.buildJsGroup([

resources/gulp/styles.js

@@ -5,32 +5,7 @@ var utils = require('./utils.js');
 
 
 gulp.task('build-css', function () {
-
-    // copy fontawesome fonts and alt stylesheet:
-    gulp.src([config.paths.vendors + 'font-awesome/font/*'])
-        .pipe(gulp.dest( config.paths.build + 'common/font'));
-
-    gulp.src([config.paths.vendors + 'font-awesome/css/font-awesome-ie7.min.css'])
-        .pipe(gulp.dest( config.paths.distVendors + 'common/css'));
-
-    utils.buildCssGroup([config.paths.src + 'common/main.scss'], 'common', 'common/css/');
-    utils.buildCssGroup([config.paths.src + 'admin/main.scss'], 'admin', 'admin/css/');
-    utils.buildCssGroup([config.paths.src + 'thesaurus/main.scss'], 'thesaurus', 'thesaurus/css/');
-    utils.buildCssGroup([config.paths.src + 'prod/main.scss'], 'prod', 'prod/css/');
-    utils.buildCssGroup([config.paths.src + 'prod/skin-000000.scss'], 'skin-000000', 'prod/css/');
-    utils.buildCssGroup([config.paths.src + 'prod/skin-959595.scss'], 'skin-959595', 'prod/css/');
-    utils.buildCssGroup([config.paths.src + 'setup/main.scss'], 'setup', 'setup/css/');
-    utils.buildCssGroup([config.paths.src + 'authentication/main.scss'], 'authentication', 'authentication/css/');
-    utils.buildCssGroup([config.paths.src + 'account/main.scss'], 'account', 'account/css/');
     utils.buildCssGroup([config.paths.src + 'oauth/main.scss'], 'oauth', 'oauth/css/');
-
-    utils.buildCssGroup([config.paths.src + 'report/main.scss'], 'report', 'report/css/');
-    utils.buildCssGroup([config.paths.src + 'report/main-print.scss'], 'print', 'report/css/');
-
-    utils.buildCssGroup([config.paths.src + 'lightbox/main.scss'], 'lightbox', 'lightbox/css/');
-    utils.buildCssGroup([config.paths.src + 'lightbox/main-ie6.scss'], 'lightbox-ie6', 'lightbox/css/');
-    utils.buildCssGroup([config.paths.src + 'lightbox/main-mobile.scss'], 'lightbox-mobile', 'lightbox/css/');
-
     utils.buildCssGroup([config.paths.src + 'vendors/jquery-ui/dark-hive.scss'], 'dark-hive', 'vendors/jquery-ui/css/');
     utils.buildCssGroup([config.paths.src + 'vendors/jquery-ui/ui-lightness.scss'], 'ui-lightness', 'vendors/jquery-ui/css/');
 });

resources/www/account/main.scss

@@ -1,9 +0,0 @@
-$fontAwesomePath:   "../../common/font"; // dist path
-@import '../../../www/bower_components/normalize-css/normalize'; // not extension for inline import
-@import '../shared/bootstrap';
-// @TODO enable importation of: @import "../../../../plugins/login.less";
-@import 'variables';
-@import 'skin';
-@import '../shared/skin/geonames';
-@import '../../../www/bower_components/font-awesome/sass/font-awesome.scss';
-@import '../../../www/bower_components/jquery-ui/themes/base/jquery.ui.autocomplete'; // not extension for inline import

resources/www/account/styles/main.scss

@@ -0,0 +1,10 @@
+$fontAwesomePath:   "../../common/font"; // dist path
+$iconsPath: '../../../skins/icons/';
+@import '../../../../www/bower_components/normalize-css/normalize'; // not extension for inline import
+@import '../../shared/styles/bootstrap';
+// @TODO enable importation of: @import "../../../../plugins/login.less";
+@import 'variables';
+@import 'skin';
+@import '../../shared/styles/skin/geonames';
+@import '../../../../www/bower_components/font-awesome/sass/font-awesome.scss';
+@import '../../../../www/bower_components/jquery-ui/themes/base/jquery.ui.autocomplete'; // not extension for inline import

resources/www/admin/styles/main.scss

@@ -1,11 +1,11 @@
 $skinsPath: '../../../skins/';
 $iconsPath: '../../../skins/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 '../../../../www/bower_components/jquery-file-upload/css/jquery.fileupload-ui'; // to inline import css file, don't put extension
-@import '../shared/jquery.contextmenu';
+@import '../../shared/styles/jquery.contextmenu';
-@import '../shared/skin/main';
+@import '../../shared/styles/skin/main';
-@import '../shared/skin/geonames';
+@import '../../shared/styles/skin/geonames';
 
 /******* GLOBAL CSS for ADMIN *************************************************/
 body {

resources/www/authentication/main.scss

@@ -1 +0,0 @@
-@import '../account/main';

resources/www/authentication/styles/main.scss

@@ -0,0 +1 @@
+@import '../../account/styles/main';

resources/www/common/main.scss

@@ -1,13 +0,0 @@
-/**
- * Common stylesheet, builded into assets/common/css/common.css
- */
-@import '../shared/bootstrap.scss';
-@import '../shared/bootstrap-responsive.scss';
-$fontAwesomePath:   "../font"; // dist path
-@import '../../../www/bower_components/font-awesome/sass/font-awesome.scss';
-
-// to inline import css file, don't put extension
-// assets/fancytree/dist/skin-win8/ui.fancytree.min.css
-
-@import '../shared/skin/main';
-@import '../shared/skin/geonames';

resources/www/common/styles/main.scss

@@ -0,0 +1,14 @@
+/**
+ * Common stylesheet, builded into assets/common/styles/common.css
+ */
+@import '../../shared/styles/bootstrap.scss';
+@import '../../shared/styles/bootstrap-responsive.scss';
+$fontAwesomePath:   "../font"; // dist path
+$iconsPath: '../../../skins/icons/';
+@import '../../../../www/bower_components/font-awesome/sass/font-awesome.scss';
+
+// to inline import css file, don't put extension
+// assets/fancytree/dist/skin-win8/ui.fancytree.min.css
+
+@import '../../shared/styles/skin/main';
+@import '../../shared/styles/skin/geonames';

resources/www/lightbox/styles/main-ie6.scss

@@ -1,6 +1,6 @@
 $iconsPath: '../../../skins/icons/';
 $lightboxPath: '../../../skins/lightbox/';
-@import '../shared/jquery.contextmenu';
+@import '../../shared/styles/jquery.contextmenu';
 
 body {
   width: 100%;

resources/www/lightbox/styles/main.scss

@@ -1,6 +1,6 @@
 $iconsPath: '../../../skins/icons/';
 $lightboxPath: '../../../skins/lightbox/';
-@import '../shared/jquery.contextmenu';
+@import '../../shared/styles/jquery.contextmenu';
 
 body {
   background-color: #BFBFBF;

resources/www/prod/styles/main.scss

@@ -1,16 +1,14 @@
-
+$iconsPath: '../../../skins/icons/';
-@import '../../../www/bower_components/fancytree/dist/skin-win8/ui.fancytree'; // to inline import css file, don't put extension
+@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 '../../../../www/bower_components/humane-js/themes/libnotify';
-@import '../shared/jquery.contextmenu';
+@import '../../shared/styles/jquery.contextmenu';
-@import '../shared/jquery.image_enhancer';
+@import '../../shared/styles/jquery.image_enhancer';
-@import '../shared/colorpicker';
+@import '../../shared/styles/colorpicker';
-@import '../shared/skin/main';
+@import '../../shared/styles/skin/main';
-@import '../shared/skin/geonames';
+@import '../../shared/styles/skin/geonames';
-@import '../shared/skin/basket';
+@import '../../shared/styles/skin/basket';
-@import '../shared/skin/push';
+@import '../../shared/styles/skin/push';
-//include/jslibs/colorpicker/css/colorpicker.css,
-
 
 #idFrameC {
   top: 10px;

resources/www/prod/styles/skin-000000.scss

@@ -641,7 +641,7 @@ span.ww_winTitle {
 }
 
 .ui-state-active .ui-icon {
-  background-image: url('/include/jslibs/jquery-ui-1.10.3/css/dark-hive/images/ui-icons_cccccc_256x240.png');
+  background-image: url('/include/jslibs/jquery-ui-1.10.3/styles/dark-hive/images/ui-icons_cccccc_256x240.png');
 }
 
 #baskets .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited {

resources/www/prod/styles/skin-959595.scss

@@ -636,7 +636,7 @@ span.ww_winTitle {
 }
 
 .ui-state-active .ui-icon {
-  background-image: url('/include/jslibs/jquery-ui-1.10.3/css/ui-lightness/images/ui-icons_ffffff_256x240.png');
+  background-image: url('/include/jslibs/jquery-ui-1.10.3/styles/ui-lightness/images/ui-icons_ffffff_256x240.png');
 }
 
 #baskets .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited {