wip: component reorg, gathering js, css, images, ...

lib/Alchemy/Phrasea/Controller/Prod/RootController.php

@@ -45,7 +45,7 @@ class RootController extends Controller
             return $this->app->redirectPath('logout');
         }
 
-        $cssPath = $this->app['root.path'] . '/www/skins/prod/';
+        $cssPath = $this->app['root.path'] . '/www/assets/prod/';
 
         $css = [];
 

lib/Alchemy/Phrasea/Core/PhraseaExceptionHandler.php

@@ -110,25 +110,25 @@ class PhraseaExceptionHandler extends SymfonyExceptionHandler
 
         switch ($exception->getStatusCode()) {
             case 403:
-                $errorImg = '/skins/error-pages/403.png';
+                $errorImg = '/assets/common/images/error-pages/403.png';
                 break;
             case 404:
-                $errorImg = '/skins/error-pages/404.png';
+                $errorImg = '/assets/common/images/error-pages/404.png';
                 break;
             case 500:
-                $errorImg = '/skins/error-pages/500.png';
+                $errorImg = '/assets/common/images/error-pages/500.png';
                 break;
             case 503:
-                $errorImg = '/skins/error-pages/503.png';
+                $errorImg = '/assets/common/images/error-pages/503.png';
                 break;
             default:
-                $errorImg = '/skins/error-pages/error.png';
+                $errorImg = '/assets/common/images/error-pages/error.png';
                 break;
         }
 
         return <<<EOF
             html {
-                background-image:url("/skins/error-pages/background.png");
+                background-image:url("/assets/common/images/error-pages/background.png");
                 background-repeat:repeat;
                 padding-top:0px;
             }

resources/gulp/components/admin.js

@@ -17,11 +17,7 @@ gulp.task('build-admin', ['copy-admin-images', 'build-admin-css'], function(){
         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.src +  'admin/js/template-dialogs.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'

resources/gulp/components/common.js

@@ -38,7 +38,7 @@ gulp.task('build-common', ['copy-common-images', 'build-common-css'], function()
         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.src + 'common/js/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)
     ];

resources/gulp/components/lightbox.js

@@ -13,6 +13,13 @@ gulp.task('build-lightbox-mobile-css', function(){
     ], 'lightbox-mobile', 'lightbox/css/');
 });
 
+gulp.task('build-lightbox-mobile-js', function(){
+
+    return utils.buildJsGroup([
+        config.paths.src + 'lightbox/js/jquery.validator.mobile.js'
+    ], 'lightbox-mobile', 'lightbox/js');
+});
+
 gulp.task('build-lightbox-ie6-css', function(){
     return utils.buildCssGroup([
         config.paths.src + 'lightbox/styles/main-ie6.scss'
@@ -25,13 +32,13 @@ gulp.task('build-lightbox-css', ['build-lightbox-mobile-css', 'build-lightbox-ie
     ], 'lightbox', 'lightbox/css/')
 });
 
-gulp.task('build-lightbox', ['copy-lightbox-images', 'build-lightbox-css'], function(){
+gulp.task('build-lightbox', ['copy-lightbox-images', 'build-lightbox-css', 'build-lightbox-mobile-js'], function(){
     var lightboxGroup = [
-        config.paths.dist + 'skins/lightbox/jquery.lightbox.js'
+        config.paths.src + 'lightbox/js/jquery.lightbox.js'
     ];
 
     var lightboxIE6Group = [
-        config.paths.dist + 'skins/lightbox/jquery.lightbox.ie6.js'
+        config.paths.src + 'lightbox/js/jquery.lightbox.ie6.js'
     ];
     utils.buildJsGroup(lightboxIE6Group, 'lightboxIe6', 'lightbox/js');
     return utils.buildJsGroup(lightboxGroup, 'lightbox', 'lightbox/js');

resources/gulp/components/prod.js

@@ -4,7 +4,7 @@ var utils = require('../utils.js');
 
 gulp.task('copy-prod-images', function(){
     // @TODO
-    return gulp.src([config.paths.src + 'prod/images/***'])
+    return gulp.src([config.paths.src + 'prod/images/**/*'])
         .pipe(gulp.dest( config.paths.build + 'prod/images'));
 });
 
@@ -40,19 +40,19 @@ gulp.task('build-prod', ['copy-prod-images', 'build-prod-css'], function(){
         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.src + 'prod/js/jquery.Prod.js',
+        config.paths.src + 'prod/js/jquery.Feedback.js',
+        config.paths.src + 'prod/js/jquery.Results.js',
+        config.paths.src + 'prod/js/jquery.main-prod.js',
+        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 + 'skins/prod/ThumbExtractor.js',
-        config.paths.dist + 'skins/prod/publicator.js',
+        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.dist + 'skins/prod/jquery.edit.js',
+        config.paths.src + 'prod/js/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',

resources/gulp/components/vendors/bootstrap.js

@@ -36,6 +36,7 @@ gulp.task('bootstrap-assets', function () {
 
 });
 gulp.task('build-bootstrap', ['bootstrap-assets', 'bootstrap-js'], function () {
+    // build standalone version (not used, see: Common Component)
     gulp.src(config.paths.vendors + 'bootstrap-sass/vendor/assets/stylesheets/bootstrap.scss')
         .pipe(sass().on('error', sass.logError))
         .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/css/'))

resources/www/account/styles/_variables.scss

@@ -14,8 +14,8 @@
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, $colorButton), color-stop(100%, hsl(hue($colorButton), saturation($colorButton), $colorHsl)));  /*Safari 4+, Chrome 2+*/
     background: -webkit-linear-gradient($colorButton, hsl(hue($colorButton), saturation($colorButton), $colorHsl)); /* Safari 5.1+, Chrome 10+ */
     background: -o-linear-gradient($colorButton, hsl(hue($colorButton), saturation($colorButton), $colorHsl)); /* Opera 11.10 */
-/*    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#ffffff');  IE6 & IE7
-    -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#ffffff')";  IE8+ */
+    /*    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#ffffff');  IE6 & IE7
+        -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#ffffff')";  IE8+ */
     background: linear-gradient($colorButton, hsl(hue($colorButton), saturation($colorButton), $colorHsl)); /* the standard */
 }
 
@@ -132,7 +132,7 @@ $btnBackgroundHighlight:            darken($white, 10%);
 $btnBorder:                         #bbb;
 
 $btnPrimaryBackground:              $linkColor;
-$btnPrimaryBackgroundHighlight:     spin($btnPrimaryBackground, 20%);
+$btnPrimaryBackgroundHighlight:     darken($btnPrimaryBackground, 20%);
 
 $btnInfoBackground:                 #3d8fa8;
 $btnInfoBackgroundHighlight:        #0d4461;
@@ -194,8 +194,8 @@ $zindexModal:             1050;
 
 // Sprite icons path
 // -------------------------
-$iconSpritePath:          "/skins/build/bootstrap/img/glyphicons-halflings.png";
-$iconWhiteSpritePath:     "/skins/build/bootstrap/img/glyphicons-halflings-white.png";
+$iconSpritePath:          "/assets/vendors/bootstrap/img/glyphicons-halflings.png";
+$iconWhiteSpritePath:     "/assets/vendors/bootstrap/img/glyphicons-halflings-white.png";
 
 
 // Input placeholder text color

resources/www/account/styles/main.scss

@@ -1,9 +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';
+@import '../../vendors/bootstrap/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';

resources/www/common/styles/main.scss

@@ -1,8 +1,8 @@
 /**
  * Common stylesheet, builded into assets/common/styles/common.css
  */
-@import '../../shared/styles/bootstrap.scss';
-@import '../../shared/styles/bootstrap-responsive.scss';
+@import '../../vendors/bootstrap/bootstrap';
+@import '../../vendors/bootstrap/responsive';
 $fontAwesomePath:   "../font"; // dist path
 $iconsPath: '../../../skins/icons/';
 @import '../../../../www/bower_components/font-awesome/sass/font-awesome.scss';

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

@@ -1,5 +1,5 @@
 $iconsPath: '../../../skins/icons/';
-$lightboxPath: '../../../skins/lightbox/';
+$lightboxPath: '../images/';
 @import '../../shared/styles/jquery.contextmenu';
 
 body {

resources/www/lightbox/styles/main.scss

@@ -1,5 +1,5 @@
 $iconsPath: '../../../skins/icons/';
-$lightboxPath: '../../../skins/lightbox/';
+$lightboxPath: '../images/';
 @import '../../shared/styles/jquery.contextmenu';
 
 body {