Merge branch 'master' of github.com:thelia/thelia

core/lib/Thelia/Config/Resources/routing/admin.xml

@@ -487,6 +487,15 @@
 
     <!-- end feature and feature routes  management -->
 
+    <!-- Modules rule management -->
+
+    <route id="admin.module" path="/admin/modules">
+        <default key="_controller">Thelia\Controller\Admin\ModuleController::indexAction</default>
+    </route>
+
+    <!-- end Modules rule management -->
+
+
 	<!-- The default route, to display a template -->
 
     <route id="admin.processTemplate" path="/admin/{template}">

core/lib/Thelia/Controller/Admin/ModuleController.php

@@ -0,0 +1,46 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Controller\Admin;
+
+/**
+ * Class ModuleController
+ * @package Thelia\Controller\Admin
+ * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ */
+class ModuleController extends BaseAdminController
+{
+    public function indexAction()
+    {
+        if (null !== $response = $this->checkAuth("admin.module.view")) return $response;
+        return $this->render("modules", array("display_module" => 20));
+    }
+    
+    public function updateAction($module_id)
+    {
+
+    	return $this->render("module-edit", array(
+    		"module_id" => $module_id
+    	));
+    }
+}

templates/admin/default/assets/less/thelia/bootstrap-select.less

@@ -48,20 +48,17 @@
 }
 
 .bootstrap-select:not([class*="span"]) {
-    width: 220px;
+    width: 100%;
 }
 
 .bootstrap-select {
     /*width: 220px\9; IE8 and below*/
-    width: 220px\0; /*IE9 and below*/
+    width: 100%\0; /*IE9 and below*/
 }
 
 .bootstrap-select > .btn {
     width: 100%;
-}
+    .form-control-focus();
-
-.error .bootstrap-select .btn {
-    border: 1px solid #b94a48;
 }
 
 
@@ -79,6 +76,7 @@
     left: 12px;
     right: 25px;
     text-align: left;
+    color: @input-color;
 }
 
 .bootstrap-select.btn-group .btn .caret {
@@ -132,6 +130,14 @@
     overflow: hidden;
 }
 
+.bootstrap-select.btn-group .dropdown-menu li a{
+    color: @input-color;
+
+    &:hover{
+        color: #FFF;
+    }
+}
+
 .bootstrap-select.btn-group .dropdown-menu li {
     position: relative;
 

templates/admin/default/assets/less/thelia/forms.less

@@ -167,6 +167,36 @@ form .info {
     }
 }
 
+// Form validation states
+//
+// Used in forms.less to generate the form validation CSS for warnings, errors,
+// and successes.
+
+.form-control-validation(@text-color: #555; @border-color: #ccc; @background-color: #f5f5f5) {
+  // Color the label and help text
+  .help-block,
+  .control-label {
+    color: @text-color;
+  }
+  // Set the border and box shadow on specific inputs to match
+  .form-control, .bootstrap-select .btn {
+    border-color: @border-color;
+    .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
+    &:focus {
+      border-color: darken(@border-color, 10%);
+      @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%);
+      .box-shadow(@shadow);
+    }
+  }
+  // Set validation states also for addons
+  .input-group-addon {
+    color: @text-color;
+    border-color: @border-color;
+    background-color: @background-color;
+  }
+}
+
+
 // -- Sign in --
 .form-signin{
     // .form-control {