Reorder & cleanup directory structure

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...');

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'

templates/web/account/account.html.twig

@@ -5,8 +5,8 @@
 {% set selected = "informations" %}
 
 {% block head %}
-    <link rel="stylesheet" type="text/css" href="/include/minify/f=/skins/account/css/geonames.css">
-    <script type="text/javascript" src="/include/minify/f=/skins/account/js/geonames.js"></script>
+    <link rel="stylesheet" type="text/css" href="/include/minify/f=/skins/geonames/geonames.css">
+    <script type="text/javascript" src="/include/minify/f=/skins/geonames/geonames.js"></script>
 
     <script type="text/javascript">
         initialize_geoname_field($('#form_geonameid'));

templates/web/prod/index.html.twig

@@ -97,9 +97,9 @@
         }
     </style>
 
-    <link type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/?f=include/jslibs/jquery.contextmenu.css,include/jslibs/colorpicker/css/colorpicker.css,include/jslibs/jquery-treeview/jquery.treeview.css,skins/common/main.css,skins/account/geonames.css,include/jquery.image_enhancer.css,include/jslibs/jquery-ui-1.8.17/css/dark-hive/jquery-ui-1.8.17.custom.css" >
-    <link id="skinCss" type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/?f=skins/prod/{{cssfile}}/prodcolor.css" >
-    <link type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/?f=include/vendor/humane-js/themes/libnotify.css,skins/prod/Prod.css,skins/prod/Basket.css,skins/prod/Push.css" >
+    <link type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/f=include/jslibs/jquery.contextmenu.css,include/jslibs/colorpicker/css/colorpicker.css,include/jslibs/jquery-treeview/jquery.treeview.css,skins/common/main.css,skins/geonames/geonames.css,include/jquery.image_enhancer.css,include/jslibs/jquery-ui-1.8.17/css/dark-hive/jquery-ui-1.8.17.custom.css" >
+    <link id="skinCss" type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/f=skins/prod/{{cssfile}}/prodcolor.css" >
+    <link type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/f=assets/humane-js/themes/libnotify.css,skins/prod/Prod.css,skins/prod/Basket.css,skins/prod/Push.css" >
 
     <!--[if IE 7]>
             <link type="text/css" rel="stylesheet" href="/include/minify/?f=skins/prod/ie7.css" >

tests/js/login/config/testacular.conf.js

@@ -7,7 +7,7 @@ files = [
     'www/assets/angular-ui/build/angular-ui.js',
     'www/assets/underscore/underscore.js',
     'www/assets/angular-mocks/angular-mocks.js',
-    'www/skins/login/js/angular/app/*.js',
+    'www/skins/login/js/app.js',
     'tests/js/login/tests/unit/*.js'
 ];
 

www/skins/account/account.less

@@ -0,0 +1,60 @@
+// CSS Reset
+@import "../../assets/bootstrap/less/reset.less";
+
+// Core variables and mixins
+@import "../../assets/bootstrap/less/variables.less";
+@import "variables.less";
+@import "../../assets/bootstrap/less/mixins.less";
+
+// Grid system and page structure
+@import "../../assets/bootstrap/less/scaffolding.less";
+@import "../../assets/bootstrap/less/grid.less";
+@import "../../assets/bootstrap/less/layouts.less";
+
+// Base CSS
+@import "../../assets/bootstrap/less/type.less";
+@import "../../assets/bootstrap/less/code.less";
+@import "../../assets/bootstrap/less/forms.less";
+@import "../../assets/bootstrap/less/tables.less";
+
+// Components: common
+@import "../../assets/bootstrap/less/sprites.less";
+@import "../../assets/bootstrap/less/dropdowns.less";
+@import "../../assets/bootstrap/less/wells.less";
+@import "../../assets/bootstrap/less/component-animations.less";
+@import "../../assets/bootstrap/less/close.less";
+
+// Components: Buttons & Alerts
+@import "../../assets/bootstrap/less/buttons.less";
+@import "../../assets/bootstrap/less/button-groups.less";
+@import "../../assets/bootstrap/less/alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
+
+// Components: Nav
+@import "../../assets/bootstrap/less/navs.less";
+@import "../../assets/bootstrap/less/navbar.less";
+@import "../../assets/bootstrap/less/breadcrumbs.less";
+@import "../../assets/bootstrap/less/pagination.less";
+@import "../../assets/bootstrap/less/pager.less";
+
+// Components: Popovers
+@import "../../assets/bootstrap/less/modals.less";
+@import "../../assets/bootstrap/less/tooltip.less";
+@import "../../assets/bootstrap/less/popovers.less";
+
+// Components: Misc
+@import "../../assets/bootstrap/less/thumbnails.less";
+@import "../../assets/bootstrap/less/media.less";
+@import "../../assets/bootstrap/less/labels-badges.less";
+@import "../../assets/bootstrap/less/progress-bars.less";
+@import "../../assets/bootstrap/less/accordion.less";
+@import "../../assets/bootstrap/less/carousel.less";
+@import "../../assets/bootstrap/less/hero-unit.less";
+
+// Utility classes
+@import "../../assets/bootstrap/less/utilities.less"; // Has to be last to override when necessary
+
+// Responsive
+@import "../../assets/bootstrap/less/responsive.less";
+@import "responsive.less";
+
+@import "skin.less";

www/skins/login/home.css

@@ -1,426 +0,0 @@
-
-body{
-    font-family:Helvetica,Verdana,Arial,sans-serif;
-    font-size:11px;
-    color:white;
-    position:absolute;
-    top:0;
-    left:0;
-    width:99%;
-    height:99%;
-    background-color:#000000;
-}
-input,select,textarea{
-    border:none;
-    background:white;
-}
-input.checkbox{
-    background:transparent;
-    border:none;
-}
-.link{
-    text-decoration:underline;
-    font-weight:bold;
-    color: #A9A9A9;
-}
-.pointer{
-    cursor:pointer;
-}
-.tab-content{
-    height:490px;margin:0 10px;position:relative;top:10px;background-color:#000000;display:none;
-}
-.tab-pane{
-    background-color:#525252;
-}
-.tab{
-    -moz-border-radius-topleft:3px;
-    -moz-border-radius-topright:3px;
-    -webkit-border-top-left-radius:3px;
-    -webkit-border-top-right-radius:3px;
-    xborder-color:#b2b2b2;
-    xborder-width:1px;
-    padding:6px 15px;
-    margin:0 2px;
-    xborder-style:solid;
-    float:right;
-    xborder-bottom:none;
-    background:url('img/tab-default.gif');
-    background-repeat: repeat-x;
-    background-position: 0 0;
-    color:#b2b2b2;
-    cursor:pointer;
-    text-decoration:none;
-    font-size:11px;
-}
-.tab.active{
-    background:url('img/tab-hover.gif');
-    background-repeat: repeat-x;
-    color:#b2b2b2;
-}
-.tab.click{
-    background:url('img/tab-actif.gif');
-    background-repeat: repeat-x;
-    color:#b2b2b2;
-}
-#forgotPWD{
-    color:#b2b2b2;
-    text-decoration:underline;
-}
-.apps{
-    width:135px;
-    height:135px;
-    cursor:pointer;
-}
-.apps_hover{
-    background-color:#353535;
-}
-
-.app_title, .app_name, .app_name a{
-    margin:0 0 0 10px;
-    font-size:13px;
-    text-decoration:none;
-    color:white;
-}
-.app_title{
-    font-size:14px;
-}
-.apps_separator{
-    width:0px;
-    border:none;
-    border-left:1px solid #999999;
-    border-right:1px solid #1a1a1a;
-}
-.activeApp{
-    background-color:#353535;
-}
-.activeApp .app_name a,.activeApp .app_name{
-    color:#0077BC;
-    font-weight:bold;
-    text-decoration:none;
-}
-.validation{
-    text-align:center;
-}
-.requiredField{
-    color:red;
-}
-#lng-select{
-    border:1px solid #444;
-    font-size:10px;
-}
-.title-desc{
-    font-size:12px;
-    font-weight:bold;
-    margin-left:20px;
-}
-.title-name{
-    font-size:28px;
-    color:#b1b1b1;
-}
-
-/*register && account*/
-#form_register_table tr{
-    height:22px;
-}
-table{
-    font-size:11px;
-}
-.form_alert{
-    color:red;
-}
-.input_element{
-    width:200px;
-}
-.form_label{
-    text-align:right;
-    width:150px;
-}
-.form_label label{
-    margin-right:10px;
-}
-.form_input{
-    text-align:left;
-    width:220px;
-}
-.form_alert{
-    text-align:left;
-    width:200px;
-}
-
-.notice{
-    background:#00a8FF;
-}
-
-
-
-.password-meter {
-    position:relative;
-    width: 180px;
-}
-.password-meter-message {
-    text-align: right;
-    font-weight: bold;
-    color: #676767;
-}
-.password-meter-bg, .password-meter-bar {
-    height: 4px;
-}
-.password-meter-bg {
-    top: 8px;
-    background: #e0e0e0;
-}
-
-.password-meter-message-very-weak {
-    color: #aa0033;
-}
-.password-meter-message-weak {
-    color: #f5ac00;
-}
-.password-meter-message-good {
-    color: #6699cc;
-}
-.password-meter-message-strong {
-    color: #008000;
-}
-
-.password-meter-bg .password-meter-very-weak {
-    background: #aa0033;
-    width: 30px;
-}
-.password-meter-bg .password-meter-weak {
-    background: #f5ac00;
-    width: 60px;
-}
-.password-meter-bg .password-meter-good {
-    background: #6699cc;
-    width: 135px;
-}
-.password-meter-bg .password-meter-strong {
-    background: #008000;
-    width: 180px;
-}
-
-ul.app-list {
-    border-top: 1px solid #EEEEEE;
-    margin: 10px 0 20px;
-    list-style: none outside none;
-    padding:0;
-}
-
-ul.app-list li {
-    border-bottom: 1px solid #EEEEEE;
-    font-size: 14px;
-    line-height: 19px;
-    min-height: 48px;
-    padding: 14px 0 15px;
-    margin:0;
-    clear:both;
-    display:block;
-}
-
-ul.app-list li span.app-row {
-    padding:0;
-    margin:0;
-    display:block;
-    text-align: left;
-    padding-left:30px;
-}
-
-ul.app-list li span.app-row a{
-    color: #2D76B9;
-    text-decoration:none;
-}
-
-ul.app-list li .app-btn{
-    border-color: #DDDDDD #DDDDDD #CCCCCC;
-    border-radius: 4px 4px 4px 4px;
-    border-style: solid;
-    border-width: 1px;
-    color: #333333;
-    margin: 0;
-    overflow: visible;
-    padding: 4px 8px 5px;
-    text-shadow: 1px 1px 0 #FFFFFF;
-    width: auto;
-    float:right;
-    cursor:pointer;
-}
-
-#tab-account-cat .ui-tabs-nav li a{
-    font-size: 0.95em;
-    color: #FFF;
-    font-weight:600;
-}
-#tab-account-cat .ui-tabs-nav li.ui-tabs-selected a{
-    color: #2D76B9;
-}
-
-#content-apps{
-    text-align:left;
-}
-
-div.side-section {
-
-}
-
-table.app-placement{
-    table-layout: fixed;
-    width:100%;
-}
-
-#app_dev_create{
-}
-
-.link_button{
-    text-decoration:none;
-    background-color: #00A0D1;
-    border: 1px solid #095B7E;
-    border-radius: 4px 4px 4px 4px;
-    color: #BFE4EF;
-    margin-top: 10px;
-    padding: 6px 12px;
-    width: auto;
-}
-a.no_underline{
-    text-decoration: none;
-}
-
-#app-oauth-setting{
-    border-top: 1px solid #EEEEEE;
-    margin: 0 0 3em;
-    width: 100%;
-}
-
-#app-oauth-setting td:first-child {
-    width: 25%;
-}
-
-
-#app-oauth-setting td{
-    padding: 8px 0;
-    vertical-align: top;
-    text-align: left;
-}
-
-#generate_access{
-    background-color: #00A0D1;
-    border: 1px solid #095B7E;
-    color: #BFE4EF;
-    width: 120px
-}
-
-#app-access-token-setting td{
-    padding: 8px 0;
-    vertical-align: top;
-    text-align: left;
-}
-
-#app-access-token-setting {
-    width:100%;
-    border-top:1px solid whitesmoke;
-}
-
-
-#tab-account-cat .ui-tabs-nav{
-    height:30px;
-    border-bottom:1px solid white;
-}
-#app-dev-create {
-    table-layout: fixed;
-    width:100%;
-}
-
-#app-dev-create td input[type=text], #app-dev-create td textarea, #app-dev-create td select{
-    display:inline-block;
-    width:95%;
-    border: 1px solid #CCCCCC;
-    border-radius: 4px 4px 4px 4px;
-    box-shadow: 0 1px 1px #EEEEEE;
-    margin: 0;
-    padding: 6px;
-}
-
-#app-dev-create td input[name=callback], #app-dev-create td input[name=website]{
-    width:85%;
-}
-
-#app-dev-create .url-td select{
-    width:12%;
-}
-
-#app-dev-create td{
-    text-align:left;
-}
-
-#app-dev-create tr td:first-child{
-    padding-right:10px;
-    text-align:right;
-    font-weight: 700;
-}
-
-#app-dev-create td:first-child{
-    width:25%;
-}
-
-.app_submit{
-    background-color: #00A0D1;
-    border: 1px solid #095B7E;
-    color: #BFE4EF;
-    width: 120px
-}
-
-#updatingDemand input[type=submit]{
-    margin:0 auto;
-}
-
-.delete_app{
-    text-decoration:none;
-    background-color: #BCB5B5;
-    border: 1px solid #1A1A1A;
-    border-radius: 4px 4px 4px 4px;
-    color: #000;
-    margin-top: 10px;
-    padding: 6px 12px;
-    width: auto;
-    float:right;
-    display: none;
-}
-
-.ui-dialog{
-    color:black;
-    background-color: white;
-    font-size:16px;
-    padding: 10px;
-    border: 1px solid #1A1A1A;
-    border-radius: 4px 4px 4px 4px;
-}
-
-.ui-dialog button{
-    background-color: #BCB5B5;
-    border: 1px solid #1A1A1A;
-    border-radius: 4px 4px 4px 4px;
-    color: #000;
-    padding: 2px 6px;
-    margin-left:10px;
-}
-
-.ui-dialog-buttonset{
-    text-align: right;
-}
-
-.ui-dialog a{
-    color:black;
-    float:right;
-}
-
-/* Tabs
-----------------------------------*/
-.ui-tabs { padding: .2em; zoom: 1; }
-.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: .2em .2em 0; }
-.ui-tabs .ui-tabs-nav li { position: relative; float: left; border-bottom-width: 0 !important; margin: 0 .2em -1px 0; padding: 0; }
-.ui-tabs .ui-tabs-nav li a { float: left; text-decoration: none; padding: .5em 1em; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: .1em; border-bottom-width: 0; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border-width: 0; background: none; }
-.ui-tabs .ui-tabs-hide { display: none !important; }

www/skins/login/less/style.less

@@ -1,60 +0,0 @@
-// CSS Reset
-@import "../../../assets/bootstrap/less/reset.less";
-
-// Core variables and mixins
-@import "../../../assets/bootstrap/less/variables.less";
-@import "variables.less";
-@import "../../../assets/bootstrap/less/mixins.less";
-
-// Grid system and page structure
-@import "../../../assets/bootstrap/less/scaffolding.less";
-@import "../../../assets/bootstrap/less/grid.less";
-@import "../../../assets/bootstrap/less/layouts.less";
-
-// Base CSS
-@import "../../../assets/bootstrap/less/type.less";
-@import "../../../assets/bootstrap/less/code.less";
-@import "../../../assets/bootstrap/less/forms.less";
-@import "../../../assets/bootstrap/less/tables.less";
-
-// Components: common
-@import "../../../assets/bootstrap/less/sprites.less";
-@import "../../../assets/bootstrap/less/dropdowns.less";
-@import "../../../assets/bootstrap/less/wells.less";
-@import "../../../assets/bootstrap/less/component-animations.less";
-@import "../../../assets/bootstrap/less/close.less";
-
-// Components: Buttons & Alerts
-@import "../../../assets/bootstrap/less/buttons.less";
-@import "../../../assets/bootstrap/less/button-groups.less";
-@import "../../../assets/bootstrap/less/alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
-
-// Components: Nav
-@import "../../../assets/bootstrap/less/navs.less";
-@import "../../../assets/bootstrap/less/navbar.less";
-@import "../../../assets/bootstrap/less/breadcrumbs.less";
-@import "../../../assets/bootstrap/less/pagination.less";
-@import "../../../assets/bootstrap/less/pager.less";
-
-// Components: Popovers
-@import "../../../assets/bootstrap/less/modals.less";
-@import "../../../assets/bootstrap/less/tooltip.less";
-@import "../../../assets/bootstrap/less/popovers.less";
-
-// Components: Misc
-@import "../../../assets/bootstrap/less/thumbnails.less";
-@import "../../../assets/bootstrap/less/media.less";
-@import "../../../assets/bootstrap/less/labels-badges.less";
-@import "../../../assets/bootstrap/less/progress-bars.less";
-@import "../../../assets/bootstrap/less/accordion.less";
-@import "../../../assets/bootstrap/less/carousel.less";
-@import "../../../assets/bootstrap/less/hero-unit.less";
-
-// Utility classes
-@import "../../../assets/bootstrap/less/utilities.less"; // Has to be last to override when necessary
-
-// Responsive
-@import "../../../assets/bootstrap/less/responsive.less";
-@import "responsive.less";
-
-@import "skin.less";