From 1167f8f4857e9ce0e382f508998a0a7c20c89411 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Tue, 26 Mar 2013 12:45:02 +0100 Subject: [PATCH] Reorder & cleanup directory structure --- .../Phrasea/Command/Setup/LessCompile.php | 4 +- lib/conf.d/minifyGroupsConfig.php | 18 +- templates/web/account/account.html.twig | 4 +- templates/web/prod/index.html.twig | 6 +- tests/js/login/config/testacular.conf.js | 2 +- www/skins/account/account.less | 60 +++ www/skins/account/{less => }/responsive.less | 0 www/skins/account/{less => }/skin.less | 0 www/skins/account/{less => }/variables.less | 0 www/skins/{account/css => build}/.placeholder | 0 www/skins/build/css/.placeholder | 0 .../{account/css => geonames}/geonames.css | 0 .../{account/js => geonames}/geonames.js | 0 www/skins/icons/home.jpg | Bin 93699 -> 0 bytes www/skins/login/css/.placeholder | 0 www/skins/login/home.css | 426 ------------------ www/skins/login/js/{angular/app => }/app.js | 0 .../less/style.less => login/less/login.less} | 0 www/skins/login/less/style.less | 60 --- 19 files changed, 77 insertions(+), 503 deletions(-) create mode 100644 www/skins/account/account.less rename www/skins/account/{less => }/responsive.less (100%) rename www/skins/account/{less => }/skin.less (100%) rename www/skins/account/{less => }/variables.less (100%) rename www/skins/{account/css => build}/.placeholder (100%) delete mode 100644 www/skins/build/css/.placeholder rename www/skins/{account/css => geonames}/geonames.css (100%) rename www/skins/{account/js => geonames}/geonames.js (100%) delete mode 100644 www/skins/icons/home.jpg delete mode 100644 www/skins/login/css/.placeholder delete mode 100644 www/skins/login/home.css rename www/skins/login/js/{angular/app => }/app.js (100%) rename www/skins/{account/less/style.less => login/less/login.less} (100%) delete mode 100644 www/skins/login/less/style.less diff --git a/lib/Alchemy/Phrasea/Command/Setup/LessCompile.php b/lib/Alchemy/Phrasea/Command/Setup/LessCompile.php index 3194bf5dbc..6267a25c10 100644 --- a/lib/Alchemy/Phrasea/Command/Setup/LessCompile.php +++ b/lib/Alchemy/Phrasea/Command/Setup/LessCompile.php @@ -34,8 +34,8 @@ class LessCompile extends Command protected function doExecute(InputInterface $input, OutputInterface $output) { $files = array( - __DIR__ . '/../../../../../www/skins/build/css/login.css' => realpath(__DIR__ . '/../../../../../www/skins/login/less/style.less'), - __DIR__ . '/../../../../../www/skins/build/css/account.css' => realpath(__DIR__ . '/../../../../../www/skins/account/less/style.less'), + __DIR__ . '/../../../../../www/skins/build/login.css' => realpath(__DIR__ . '/../../../../../www/skins/login/less/login.less'), + __DIR__ . '/../../../../../www/skins/build/account.css' => realpath(__DIR__ . '/../../../../../www/skins/account/account.less'), ); $output->writeln('Building Assets...'); diff --git a/lib/conf.d/minifyGroupsConfig.php b/lib/conf.d/minifyGroupsConfig.php index a1e2c5facf..b7db49f126 100644 --- a/lib/conf.d/minifyGroupsConfig.php +++ b/lib/conf.d/minifyGroupsConfig.php @@ -12,7 +12,7 @@ $groups = array( 'authentication_css' => array( '//assets/normalize-css/normalize.css', '//assets/bootstrap-switch/static/stylesheets/bootstrapSwitch.css', - '//skins/build/css/login.css', + '//skins/build/login.css', '//assets/font-awesome/css/font-awesome.css', ), 'authentication' => array( @@ -36,12 +36,12 @@ $groups = array( '//assets/bootstrap-switch/static/js/bootstrapSwitch.js', '//assets/underscore/underscore.js', '//skins/login/js/main.js', - '//skins/login/js/angular/app/app.js', + '//skins/login/js/app.js', ), 'client' => array( '//include/jslibs/swfobject/swfobject.js' , '//include/jslibs/jquery-ui-1.8.17/jquery-ui-i18n.js' - , '//include/account/geonames.js' + , '//skins/geonames/geonames.js' , '//include/jslibs/jquery.cookie.js' , '//include/jquery.common.js' , '//include/jslibs/json2.js' @@ -65,7 +65,7 @@ $groups = array( , '//skins/admin/users.js' , '//skins/admin/editusers.js' , '//include/jquery.common.js' - , '//include/account/geonames.js' + , '//skins/geonames/geonames.js' , '//include/jquery.tooltip.js' , '//include/jslibs/jquery.contextmenu_scroll.js' , '//assets/blueimp-load-image/load-image.js' @@ -97,13 +97,13 @@ $groups = array( , '//include/jslibs/jquery-ui-1.8.17/jquery-ui-i18n.js' , '//include/jslibs/jquery.cookie.js' , '//include/jquery.common.js' - , '//include/vendor/humane-js/humane.js' - , '//include/vendor/mustache-js/mustache.js' + , '//assets/humane-js/humane.js' + , '//assets/mustache/mustache.js' , '//assets/blueimp-load-image/load-image.js' , '//assets/jquery-file-upload/js/vendor/jquery.ui.widget.js' , '//assets/jquery-file-upload/js/jquery.iframe-transport.js' , '//assets/jquery-file-upload/js/jquery.fileupload.js' - , '//include/account/geonames.js' + , '//skins/geonames/geonames.js' , '//include/jslibs/jquery.form.2.49.js' , '//include/jslibs/jquery.vertical.buttonset.js' , '//include/js/jquery.Selection.js' @@ -144,7 +144,7 @@ $groups = array( '//include/jslibs/jquery.mousewheel.js' , '//include/jquery.tooltip.js' , '//include/jslibs/swfobject/swfobject.js' - , '//include/account/geonames.js' + , '//skins/geonames/geonames.js' , '//include/jslibs/jquery-ui-1.8.17/jquery-ui-i18n.js' , '//include/jslibs/jquery.cookie.js' , '//include/jslibs/jquery.contextmenu_scroll.js' @@ -156,7 +156,7 @@ $groups = array( '//include/jslibs/jquery.mousewheel.js' , '//include/jquery.tooltip.js' , '//include/jslibs/swfobject/swfobject.js' - , '//include/account/geonames.js' + , '//skins/geonames/geonames.js' , '//include/jslibs/jquery-ui-1.8.17/jquery-ui-i18n.js' , '//include/jslibs/jquery.cookie.js' , '//include/jslibs/jquery.contextmenu_scroll.js' diff --git a/templates/web/account/account.html.twig b/templates/web/account/account.html.twig index 4d18124b0f..9674022c40 100644 --- a/templates/web/account/account.html.twig +++ b/templates/web/account/account.html.twig @@ -5,8 +5,8 @@ {% set selected = "informations" %} {% block head %} - - + +