[Backend] Message de nouvelle version du logiciel #1126

backend/views/layouts/left.php

@@ -37,6 +37,7 @@
  */
 
 use common\helpers\GlobalParam;
+use common\helpers\Opendistrib;
 use yii\helpers\Html;
 
 $producerManager = $this->getProducerManager();
@@ -51,7 +52,7 @@ $producer = GlobalParam::getCurrentProducer();
         <?php
             $newVersionOpendistribTemplate = '';
             if($producer && !$producerManager->isUpToDateWithOpendistribVersion($producer)) {
-                $newVersionOpendistribTemplate = '<span class="pull-right-container"><small class="label pull-right bg-orange">&nbsp;</small></span>';
+                $newVersionOpendistribTemplate = '<span class="pull-right-container"><small class="label pull-right bg-yellow">'.GlobalParam::getOpendistribVersion().'</small></span>';
             }
         ?>
 

backend/views/producer/update.php

@@ -75,13 +75,6 @@ $this->addBreadcrumb($this->getTitle());
         <div>
             <div v-show="currentSection == 'general'" class="panel panel-default">
                 <div class="panel-body">
-                    <h4>Logiciel</h4>
-                    <?= $form->field($model, 'option_display_message_new_opendistrib_version')
-                        ->dropDownList([
-                            1 => 'Oui',
-                            0 => 'Non'
-                        ], []); ?>
-
                     <h4>Accès</h4>
                     <?= $form->field($model, 'active')
                         ->dropDownList([
@@ -127,6 +120,13 @@ $this->addBreadcrumb($this->getTitle());
                             Producer::BEHAVIOR_HOME_POINT_SALE_DAY_LIST_INCOMING_DISTRIBUTIONS => 'Distributions à venir',
                         ]); ?>
                     <?= $form->field($model, 'option_point_sale_wording') ?>
+
+                    <h4>Logiciel</h4>
+                    <?= $form->field($model, 'option_display_message_new_opendistrib_version')
+                        ->dropDownList([
+                            1 => 'Oui',
+                            0 => 'Non'
+                        ], []); ?>
                 </div>
             </div>
 

backend/web/css/screen.css

@@ -130,21 +130,21 @@ h1, h2, h3, h4, h5, h6 {
 
 /* line 54, ../sass/screen.scss */
 a {
-  color: #FF7F00;
+  color: #F39C12;
 }
 /* line 57, ../sass/screen.scss */
 a:hover, a:focus, a:active {
-  color: #cc6600;
+  color: #c87f0a;
 }
 
 /* line 62, ../sass/screen.scss */
 #block-demo {
   padding: 10px 0px;
   background-color: white;
-  color: #FF7F00;
+  color: #F39C12;
   text-align: left;
   margin-bottom: 20px;
-  border: solid 1px #ff9933;
+  border: solid 1px #f5b043;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
   border-radius: 5px;
@@ -170,13 +170,13 @@ a:hover, a:focus, a:active {
 /* line 89, ../sass/screen.scss */
 .wrap .btn-primary {
   background: none;
-  background-color: #FF7F00;
-  border: solid 1px #FF7F00;
+  background-color: #F39C12;
+  border: solid 1px #F39C12;
 }
 /* line 94, ../sass/screen.scss */
 .wrap .btn-primary:hover, .wrap .btn-primary:focus, .wrap .btn-primary:active {
-  background-color: #cc6600;
-  border: solid 1px #cc6600;
+  background-color: #c87f0a;
+  border: solid 1px #c87f0a;
 }
 
 /* line 102, ../sass/screen.scss */
@@ -201,7 +201,7 @@ a:hover, a:focus, a:active {
 /* line 121, ../sass/screen.scss */
 .navbar-inverse {
   background: none;
-  background-color: #FF7F00;
+  background-color: #F39C12;
   border-bottom: 0px none;
 }
 /* line 126, ../sass/screen.scss */
@@ -228,7 +228,7 @@ a:hover, a:focus, a:active {
   text-shadow: none;
   margin-left: 3px;
   background-color: white;
-  color: #FF7F00;
+  color: #F39C12;
   padding: 3px 11px;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
@@ -239,7 +239,7 @@ a:hover, a:focus, a:active {
 .navbar-inverse .navbar-nav > .open a:hover,
 .navbar-inverse .navbar-nav > .open a:focus {
   background-color: white;
-  color: #FF7F00;
+  color: #F39C12;
 }
 /* line 162, ../sass/screen.scss */
 .navbar-inverse .navbar-nav > .open a.dropdown-toggle {
@@ -264,7 +264,7 @@ a:hover, a:focus, a:active {
 }
 /* line 175, ../sass/screen.scss */
 .navbar-inverse .navbar-nav > .open ul.dropdown-menu li a:hover {
-  color: #cc6600;
+  color: #c87f0a;
 }
 
 /* line 191, ../sass/screen.scss */
@@ -282,7 +282,7 @@ a:hover, a:focus, a:active {
 
 /* line 201, ../sass/screen.scss */
 .select2-container--default .select2-results__option--highlighted[aria-selected] {
-  background-color: #FF7F00 !important;
+  background-color: #F39C12 !important;
 }
 
 /* line 205, ../sass/screen.scss */
@@ -311,7 +311,7 @@ a:hover, a:focus, a:active {
   width: 100%;
   background-color: #515151;
   background-color: white;
-  color: #b35900;
+  color: #b06f09;
   z-index: 100;
   font-size: 20px;
   padding: 8px 15px;
@@ -384,7 +384,7 @@ a.btn .glyphicon-triangle-bottom, button.btn .glyphicon-triangle-bottom {
   left: 50%;
   margin-left: -10px;
   font-size: 20px;
-  color: #FF7F00;
+  color: #F39C12;
 }
 /* line 308, ../sass/screen.scss */
 a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-triangle-bottom {
@@ -518,7 +518,7 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
 }
 /* line 436, ../sass/screen.scss */
 .site-index #last-orders tr.order-update .update, .site-index #history-orders tr.order-update .update, .user-commandes #last-orders tr.order-update .update, .user-commandes #history-orders tr.order-update .update {
-  color: #FF7F00;
+  color: #F39C12;
 }
 /* line 442, ../sass/screen.scss */
 .site-index #last-orders tr.order-delete td, .site-index #history-orders tr.order-delete td, .user-commandes #last-orders tr.order-delete td, .user-commandes #history-orders tr.order-delete td {
@@ -591,7 +591,7 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
 .site-index #billing .amount span {
   font-size: 22px;
   color: white;
-  background-color: #FF7F00;
+  background-color: #F39C12;
   padding: 7px 10px 3px;
   font-family: "myriadpro-regular";
   -moz-border-radius: 5px;
@@ -802,8 +802,8 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
 /* line 755, ../sass/screen.scss */
 #page-order #commandes-points-vente .recap-pv .recettes {
   float: right;
-  color: #FF7F00;
-  border: solid 1px #FF7F00;
+  color: #F39C12;
+  border: solid 1px #F39C12;
   padding: 4px 10px;
   -moz-border-radius: 10px;
   -webkit-border-radius: 10px;
@@ -850,7 +850,7 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
 /* line 796, ../sass/screen.scss */
 #page-order #commandes-points-vente ul.liste-commandes li a .montant {
   float: right;
-  color: #FF7F00;
+  color: #F39C12;
   font-weight: bold;
 }
 /* line 801, ../sass/screen.scss */
@@ -860,7 +860,7 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
 }
 /* line 807, ../sass/screen.scss */
 #page-order #commandes-points-vente ul.liste-commandes li a .glyphicon-comment {
-  color: #FF7F00;
+  color: #F39C12;
 }
 /* line 811, ../sass/screen.scss */
 #page-order #commandes-points-vente ul.liste-commandes li a:hover, #page-order #commandes-points-vente ul.liste-commandes li a:active, #page-order #commandes-points-vente ul.liste-commandes li a.active {
@@ -955,7 +955,7 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
 /* line 903, ../sass/screen.scss */
 #page-order #commandes-points-vente .td-total span {
   padding: 2px 10px;
-  background-color: #FF7F00;
+  background-color: #F39C12;
   color: white;
   font-weight: bold;
   -moz-border-radius: 8px;
@@ -991,7 +991,7 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
 /* line 947, ../sass/screen.scss */
 #page-order .form-commandes-point-vente .title-point-sale {
   background-color: #fff8e2;
-  border-left: solid 3px #FF7F00;
+  border-left: solid 3px #F39C12;
   font-weight: bold;
   text-align: left;
   padding: 10px;
@@ -1214,7 +1214,7 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
 /* line 1177, ../sass/screen.scss */
 .communicate-instructions h3 {
   font-size: 18px;
-  color: #FF7F00;
+  color: #F39C12;
   margin-top: 0px;
   margin-bottom: 0px;
   line-height: 20px;
@@ -1399,7 +1399,7 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
 .user-credit .the-credit {
   float: right;
   font-weight: bold;
-  background-color: #FF7F00;
+  background-color: #F39C12;
   color: white;
   -moz-border-radius: 8px;
   -webkit-border-radius: 8px;
@@ -1424,7 +1424,7 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
 #free-price .amount span {
   font-size: 25px;
   color: white;
-  background-color: #FF7F00;
+  background-color: #F39C12;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
   border-radius: 5px;
@@ -1462,7 +1462,7 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
 /* line 1440, ../sass/screen.scss */
 .development-index ul#tabs-status-developments {
   margin-bottom: 30px;
-  border-bottom: solid 3px #FF7F00;
+  border-bottom: solid 3px #F39C12;
 }
 /* line 1444, ../sass/screen.scss */
 .development-index ul#tabs-status-developments a {
@@ -1475,7 +1475,7 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
 }
 /* line 1450, ../sass/screen.scss */
 .development-index ul#tabs-status-developments .active a {
-  background-color: #FF7F00;
+  background-color: #F39C12;
   color: white;
 }
 /* line 1458, ../sass/screen.scss */
@@ -1601,7 +1601,7 @@ body.skin-black .main-header .navbar .navbar-right > li > a {
 body.skin-black .main-header .navbar .nav > li > a:hover, body.skin-black .main-header .navbar .nav > li > a:active, body.skin-black .main-header .navbar .nav > li > a:focus,
 body.skin-black .main-header .navbar .nav .open > a, body.skin-black .main-header .navbar .nav .open > a:hover, body.skin-black .main-header .navbar .nav .open > a:focus,
 body.skin-black .main-header .navbar .nav > .active > a {
-  color: #FF7F00;
+  color: #F39C12;
 }
 /* line 85, ../sass/_adminlte.scss */
 body.skin-black .main-header .navbar .dropdown-menu {
@@ -1646,7 +1646,7 @@ body.skin-black .main-header .navbar .nav li.producer-menu .label {
 }
 /* line 130, ../sass/_adminlte.scss */
 body.skin-black .main-header .navbar .nav li.producer-menu #link-display-producers-offline {
-  color: #FF7F00;
+  color: #F39C12;
 }
 /* line 134, ../sass/_adminlte.scss */
 body.skin-black .main-header .navbar .nav li.producer-menu .offline {
@@ -1654,7 +1654,7 @@ body.skin-black .main-header .navbar .nav li.producer-menu .offline {
 }
 /* line 140, ../sass/_adminlte.scss */
 body.skin-black .sidebar-menu > li.active > a {
-  border-color: #FF7F00;
+  border-color: #F39C12;
 }
 /* line 145, ../sass/_adminlte.scss */
 body.skin-black section.sidebar .user-panel {
@@ -1694,7 +1694,7 @@ body.skin-black .content-wrapper .content-header h1 {
 }
 /* line 180, ../sass/_adminlte.scss */
 body.skin-black .content-wrapper a {
-  color: #FF7F00;
+  color: #F39C12;
 }
 /* line 184, ../sass/_adminlte.scss */
 body.skin-black .content-wrapper .btn {
@@ -1707,9 +1707,9 @@ body.skin-black .content-wrapper .btn-default {
 }
 /* line 193, ../sass/_adminlte.scss */
 body.skin-black .content-wrapper .btn-primary {
-  background-color: #FF7F00;
+  background-color: #F39C12;
   color: white;
-  border-color: #FF7F00;
+  border-color: #F39C12;
 }
 /* line 200, ../sass/_adminlte.scss */
 body.skin-black .content-wrapper .alert a {
@@ -1761,17 +1761,17 @@ body.skin-black .content-wrapper .table td.text-small, body.skin-black .content-
 }
 /* line 248, ../sass/_adminlte.scss */
 body.skin-black .content-wrapper .pagination > .active > a, body.skin-black .content-wrapper .pagination > .active > span, body.skin-black .content-wrapper .pagination > .active > a:hover, body.skin-black .content-wrapper .pagination > .active > span:hover, body.skin-black .content-wrapper .pagination > .active > a:focus, body.skin-black .content-wrapper .pagination > .active > span:focus {
-  background-color: #FF7F00;
-  border: solid 1px #FF7F00;
+  background-color: #F39C12;
+  border: solid 1px #F39C12;
   color: white;
 }
 /* line 253, ../sass/_adminlte.scss */
 body.skin-black .content-wrapper .pagination > li > a, body.skin-black .content-wrapper .pagination > li > span {
-  color: #FF7F00;
+  color: #F39C12;
 }
 /* line 255, ../sass/_adminlte.scss */
 body.skin-black .content-wrapper .pagination > li > a:hover, body.skin-black .content-wrapper .pagination > li > span:hover {
-  color: #cc6600;
+  color: #c87f0a;
 }
 /* line 260, ../sass/_adminlte.scss */
 body.skin-black .content-wrapper .submenu {
@@ -1779,7 +1779,7 @@ body.skin-black .content-wrapper .submenu {
 }
 /* line 266, ../sass/_adminlte.scss */
 body.skin-black .main-footer a {
-  color: #FF7F00;
+  color: #F39C12;
 }
 
 /* line 272, ../sass/_adminlte.scss */
@@ -1798,22 +1798,22 @@ body.login-page .login-box .login-logo img {
 }
 /* line 284, ../sass/_adminlte.scss */
 body.login-page .login-box .login-box-body .btn-primary {
-  background-color: #FF7F00;
-  border-color: #FF7F00;
+  background-color: #F39C12;
+  border-color: #F39C12;
   padding: 5px 10px;
 }
 /* line 289, ../sass/_adminlte.scss */
 body.login-page .login-box .login-box-body .btn-primary:active {
-  background-color: #ff8c1a;
-  border-color: #FF7F00;
+  background-color: #f4a62a;
+  border-color: #F39C12;
 }
 /* line 295, ../sass/_adminlte.scss */
 body.login-page .login-box .login-box-body a {
-  color: #FF7F00;
+  color: #F39C12;
 }
 /* line 297, ../sass/_adminlte.scss */
 body.login-page .login-box .login-box-body a:hover {
-  color: #ff8c1a;
+  color: #f4a62a;
 }
 
 /* line 2, ../sass/_alerts.scss */

backend/web/sass/_adminlte.scss

@@ -79,7 +79,7 @@ body.skin-black {
             .nav > li > a:hover, .nav > li > a:active, .nav > li > a:focus, 
             .nav .open > a, .nav .open > a:hover, .nav .open > a:focus, 
             .nav > .active > a {
-                color: #FF7F00 ;
+                color: $color1 ;
             }
             
             .dropdown-menu {

backend/web/sass/screen.scss

@@ -39,8 +39,8 @@ termes.
 $dir-fonts: '../fonts/' ;
 @import "_fonts.scss" ;
 
-$color1: #FF7F00 ;
-//$color1: #F39C12;
+//$color1: #FF7F00 ;
+$color1: #F39C12;
 $color2: white ;
 
 .clr {
@@ -301,7 +301,7 @@ a.btn, button.btn {
         left: 50%;
         margin-left: -10px;
         font-size: 20px;
-        color: #FF7F00;
+        color: $color1;
     }
 
     &.btn-primary {

console/migrations/m230726_105750_producer_alter_option_display_message_new_opendistrib_version.php

@@ -0,0 +1,28 @@
+<?php
+
+use common\logic\Producer\Producer\Model\Producer;
+use yii\db\Migration;
+use yii\db\Schema;
+
+/**
+ * Class m230726_105750_producer_alter_option_display_message_new_opendistrib_version
+ */
+class m230726_105750_producer_alter_option_display_message_new_opendistrib_version extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->alterColumn('producer', 'option_display_message_new_opendistrib_version', Schema::TYPE_BOOLEAN.' DEFAULT 0');
+        Producer::updateAll(['option_display_message_new_opendistrib_version' => 0]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->alterColumn('producer', 'option_display_message_new_opendistrib_version', Schema::TYPE_BOOLEAN.' DEFAULT 1');
+    }
+}

producer/web/css/screen.css

@@ -134,7 +134,7 @@ Le fait que vous puissiez accéder à cet en-tête signifie que vous avez
 pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
-/* line 45, ../sass/_layout.scss */
+/* line 46, ../sass/_layout.scss */
 body {
   font-family: "Arial";
   background-color: #FFF8DC;
@@ -143,84 +143,84 @@ body {
   font-size: 14px;
 }
 
-/* line 53, ../sass/_layout.scss */
+/* line 54, ../sass/_layout.scss */
 .clr {
   clear: both;
 }
 
-/* line 63, ../sass/_layout.scss */
+/* line 64, ../sass/_layout.scss */
 .modal-backdrop.in {
   z-index: 10;
 }
 
-/* line 68, ../sass/_layout.scss */
+/* line 69, ../sass/_layout.scss */
 #section-user-top .navbar-default {
   background-color: white;
 }
 
-/* line 73, ../sass/_layout.scss */
+/* line 74, ../sass/_layout.scss */
 #main {
   position: relative;
 }
-/* line 75, ../sass/_layout.scss */
+/* line 76, ../sass/_layout.scss */
 #main .btn-primary {
-  background-color: #FF7F00;
-  border: solid 1px #FF7F00;
+  background-color: #F39C12;
+  border: solid 1px #F39C12;
   color: white;
 }
-/* line 80, ../sass/_layout.scss */
+/* line 81, ../sass/_layout.scss */
 #main .btn-primary:hover, #main .btn-primary:active, #main .btn-primary:focus {
-  background-color: #e67200;
-  border: solid 1px #FF7F00;
+  background-color: #e08e0b;
+  border: solid 1px #F39C12;
   color: white;
 }
 
-/* line 89, ../sass/_layout.scss */
+/* line 90, ../sass/_layout.scss */
 .btn {
   background-image: none;
 }
 
-/* line 93, ../sass/_layout.scss */
+/* line 94, ../sass/_layout.scss */
 #main .alert {
   background-image: none;
   background-color: white;
   border-bottom-width: 3px;
 }
 
-/* line 101, ../sass/_layout.scss */
+/* line 102, ../sass/_layout.scss */
 .alert.alert-warning a {
   color: #8a6d3b;
   text-decoration: underline;
 }
-/* line 108, ../sass/_layout.scss */
+/* line 109, ../sass/_layout.scss */
 .alert.alert-danger a {
   color: #a94442;
   text-decoration: underline;
 }
 
-/* line 118, ../sass/_layout.scss */
+/* line 119, ../sass/_layout.scss */
 ul.pagination li.active a {
-  background-color: #FF7F00;
-  border: solid 1px #FF7F00;
+  background-color: #F39C12;
+  border: solid 1px #F39C12;
 }
-/* line 122, ../sass/_layout.scss */
+/* line 123, ../sass/_layout.scss */
 ul.pagination li.active a:hover {
   background-color: white;
   border: solid 1px white;
-  color: #FF7F00;
+  color: #F39C12;
 }
-/* line 129, ../sass/_layout.scss */
+/* line 130, ../sass/_layout.scss */
 ul.pagination li a {
-  color: #FF7F00;
+  color: #F39C12;
 }
-/* line 132, ../sass/_layout.scss */
+/* line 133, ../sass/_layout.scss */
 ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
   background-color: white;
   border: solid 1px white;
-  color: #FF7F00;
+  color: #F39C12;
 }
 
-/* line 141, ../sass/_layout.scss */
+/* line 142, ../sass/_layout.scss */
 #header-bap {
   position: absolute;
   right: 0px;
@@ -232,63 +232,63 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
   text-align: center;
   z-index: 1000;
 }
-/* line 152, ../sass/_layout.scss */
+/* line 153, ../sass/_layout.scss */
 #header-bap .container {
   padding-left: 0px;
   padding-right: 0px;
 }
-/* line 157, ../sass/_layout.scss */
+/* line 158, ../sass/_layout.scss */
 #header-bap a#logo {
   color: black;
   text-decoration: none;
   position: relative;
   top: 3px;
 }
-/* line 163, ../sass/_layout.scss */
+/* line 164, ../sass/_layout.scss */
 #header-bap a#logo img {
   width: 45px;
 }
-/* line 168, ../sass/_layout.scss */
+/* line 169, ../sass/_layout.scss */
 #header-bap ul#nav-bap {
   float: right;
 }
-/* line 172, ../sass/_layout.scss */
+/* line 173, ../sass/_layout.scss */
 #header-bap ul#nav-bap li a {
   color: black;
   font-size: 15px;
-  color: #FF7F00;
+  color: #F39C12;
 }
-/* line 177, ../sass/_layout.scss */
+/* line 178, ../sass/_layout.scss */
 #header-bap ul#nav-bap li a:hover, #header-bap ul#nav-bap li a:focus {
   color: #333;
-  color: #FF7F00;
+  color: #F39C12;
   background: none;
 }
-/* line 184, ../sass/_layout.scss */
+/* line 185, ../sass/_layout.scss */
 #header-bap ul#nav-bap li ul {
   background-color: white;
-  border-top: solid 2px #FF7F00;
+  border-top: solid 2px #F39C12;
   left: -141px;
   top: 50px;
   width: 200px;
 }
-/* line 192, ../sass/_layout.scss */
+/* line 193, ../sass/_layout.scss */
 #header-bap ul#nav-bap li ul li a {
   text-transform: uppercase;
   font-size: 13px;
 }
-/* line 196, ../sass/_layout.scss */
+/* line 197, ../sass/_layout.scss */
 #header-bap ul#nav-bap li ul li a:hover {
-  color: #ff9933;
+  color: #f5b043;
 }
-/* line 200, ../sass/_layout.scss */
+/* line 201, ../sass/_layout.scss */
 #header-bap ul#nav-bap li ul li a small {
   font-size: 10px;
   line-height: 13px;
   margin-left: 18px;
 }
 
-/* line 212, ../sass/_layout.scss */
+/* line 213, ../sass/_layout.scss */
 #left {
   background-color: #FFF8DC;
   text-align: center;
@@ -296,12 +296,12 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
   padding: 0px;
   position: relative;
 }
-/* line 219, ../sass/_layout.scss */
+/* line 220, ../sass/_layout.scss */
 #left .fixed {
   position: fixed;
   display: none;
 }
-/* line 225, ../sass/_layout.scss */
+/* line 226, ../sass/_layout.scss */
 #left #logo {
   position: relative;
   background-color: white;
@@ -316,7 +316,7 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
   text-align: center;
   overflow: hidden;
 }
-/* line 237, ../sass/_layout.scss */
+/* line 238, ../sass/_layout.scss */
 #left #logo img {
   position: absolute;
   top: 50%;
@@ -325,11 +325,11 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
   max-width: 90px;
   max-height: 90px;
 }
-/* line 247, ../sass/_layout.scss */
+/* line 248, ../sass/_layout.scss */
 #left h1, #left h2, #left #infos, #left #infos a {
   color: #323232;
 }
-/* line 251, ../sass/_layout.scss */
+/* line 252, ../sass/_layout.scss */
 #left h1 {
   text-transform: uppercase;
   font-family: "highvoltageregular";
@@ -340,37 +340,37 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
   text-align: center;
   font-weight: normal;
 }
-/* line 262, ../sass/_layout.scss */
+/* line 263, ../sass/_layout.scss */
 #left h2 {
   font-family: "capsuularegular";
   font-size: 15px;
   font-weight: normal;
   text-align: center;
 }
-/* line 268, ../sass/_layout.scss */
+/* line 269, ../sass/_layout.scss */
 #left h2 .favorite {
   padding-left: 0px;
 }
-/* line 271, ../sass/_layout.scss */
+/* line 272, ../sass/_layout.scss */
 #left h2 .favorite .glyphicon {
   font-size: 14px;
 }
-/* line 276, ../sass/_layout.scss */
+/* line 277, ../sass/_layout.scss */
 #left h2 a {
   color: #323232;
 }
-/* line 282, ../sass/_layout.scss */
+/* line 283, ../sass/_layout.scss */
 #left nav#main-nav {
   background-color: white;
   border: solid 1px #e0e0e0;
   border-bottom: 0px none;
   margin-top: 20px;
 }
-/* line 289, ../sass/_layout.scss */
+/* line 290, ../sass/_layout.scss */
 #left nav#main-nav ul li {
   display: block;
 }
-/* line 292, ../sass/_layout.scss */
+/* line 293, ../sass/_layout.scss */
 #left nav#main-nav ul li a {
   color: #323232;
   color: black;
@@ -380,46 +380,46 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
   display: block;
   text-align: left;
 }
-/* line 301, ../sass/_layout.scss */
+/* line 302, ../sass/_layout.scss */
 #left nav#main-nav ul li a .glyphicon {
   font-size: 15px;
   margin-right: 3px;
 }
-/* line 306, ../sass/_layout.scss */
+/* line 307, ../sass/_layout.scss */
 #left nav#main-nav ul li a span.label {
   padding-bottom: 3px;
   font-family: "Arial";
   float: right;
 }
-/* line 314, ../sass/_layout.scss */
+/* line 315, ../sass/_layout.scss */
 #left nav#main-nav ul li.active span.label, #left nav#main-nav ul li a:hover span.label {
-  background-color: #e67200;
+  background-color: #e08e0b;
   color: white;
 }
-/* line 320, ../sass/_layout.scss */
+/* line 321, ../sass/_layout.scss */
 #left nav#main-nav ul li a:hover, #left nav#main-nav ul li.active a {
-  background: #FF7F00;
+  background: #F39C12;
   color: white;
   -moz-border-radius: 0px;
   -webkit-border-radius: 0px;
   border-radius: 0px;
 }
-/* line 329, ../sass/_layout.scss */
+/* line 330, ../sass/_layout.scss */
 #left nav#main-nav ul li#btn-administration a {
-  color: #FF7F00;
+  color: #F39C12;
 }
-/* line 332, ../sass/_layout.scss */
+/* line 333, ../sass/_layout.scss */
 #left nav#main-nav ul li#btn-administration a:hover {
   color: white;
 }
-/* line 340, ../sass/_layout.scss */
+/* line 341, ../sass/_layout.scss */
 #left nav#main-nav #user {
-  color: #FF7F00;
+  color: #F39C12;
   float: right;
   padding: 10px;
 }
 
-/* line 348, ../sass/_layout.scss */
+/* line 349, ../sass/_layout.scss */
 #main {
   background-color: #FFF8DC;
   border: solid 1px #e0e0e0;
@@ -427,13 +427,13 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
   padding: 0px;
   background-color: white;
 }
-/* line 355, ../sass/_layout.scss */
+/* line 356, ../sass/_layout.scss */
 #main #img-big {
   height: 130px;
   overflow: hidden;
   position: relative;
 }
-/* line 360, ../sass/_layout.scss */
+/* line 361, ../sass/_layout.scss */
 #main #img-big img.img-photo {
   width: 100%;
   position: absolute;
@@ -441,7 +441,7 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
   left: 50%;
   transform: translate(-50%, -50%);
 }
-/* line 370, ../sass/_layout.scss */
+/* line 371, ../sass/_layout.scss */
 #main #infos-producer {
   padding: 5px 10px;
   margin-bottom: 0px;
@@ -451,20 +451,20 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
   border-bottom: solid 1px #e0e0e0;
   color: gray;
 }
-/* line 379, ../sass/_layout.scss */
+/* line 380, ../sass/_layout.scss */
 #main #infos-producer strong {
   font-weight: bold;
 }
-/* line 383, ../sass/_layout.scss */
+/* line 384, ../sass/_layout.scss */
 #main #infos-producer .favorite {
   float: right;
   color: gray;
 }
-/* line 386, ../sass/_layout.scss */
+/* line 387, ../sass/_layout.scss */
 #main #infos-producer .favorite a {
   color: black;
 }
-/* line 392, ../sass/_layout.scss */
+/* line 393, ../sass/_layout.scss */
 #main h2#page-title {
   padding-left: 15px;
   padding-right: 15px;
@@ -479,36 +479,36 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
   top: -10px;
   text-align: left;
 }
-/* line 406, ../sass/_layout.scss */
+/* line 407, ../sass/_layout.scss */
 #main h2#page-title #buttons {
   margin-bottom: 15px;
   font-family: "Arial";
 }
-/* line 413, ../sass/_layout.scss */
+/* line 414, ../sass/_layout.scss */
 #main #content {
   padding: 0px 20px 20px 20px;
   padding-bottom: 40px;
   min-height: 300px;
 }
-/* line 418, ../sass/_layout.scss */
+/* line 419, ../sass/_layout.scss */
 #main #content h1, #main #content h2, #main #content h3, #main #content h4, #main #content h5, #main #content h6 {
   font-family: "highvoltageregular";
   margin-top: 30px;
   margin-bottom: 20px;
 }
-/* line 423, ../sass/_layout.scss */
+/* line 424, ../sass/_layout.scss */
 #main #content h1.first, #main #content h2.first, #main #content h3.first, #main #content h4.first, #main #content h5.first, #main #content h6.first {
   margin-top: 0px;
 }
-/* line 428, ../sass/_layout.scss */
+/* line 429, ../sass/_layout.scss */
 #main #content h1 {
   font-size: 30px;
 }
-/* line 432, ../sass/_layout.scss */
+/* line 433, ../sass/_layout.scss */
 #main #content h2 {
   font-size: 25px;
 }
-/* line 437, ../sass/_layout.scss */
+/* line 438, ../sass/_layout.scss */
 #main #content h3 {
   font-family: "capsuularegular";
   text-transform: uppercase;
@@ -517,29 +517,29 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
   margin-bottom: 30px;
   margin-top: 45px;
 }
-/* line 445, ../sass/_layout.scss */
+/* line 446, ../sass/_layout.scss */
 #main #content h3 span {
   padding-top: 14px;
   color: #323232;
 }
-/* line 451, ../sass/_layout.scss */
+/* line 452, ../sass/_layout.scss */
 #main #content h4 {
   font-size: 20px;
 }
-/* line 455, ../sass/_layout.scss */
+/* line 456, ../sass/_layout.scss */
 #main #content h5 {
   font-size: 18px;
 }
-/* line 459, ../sass/_layout.scss */
+/* line 460, ../sass/_layout.scss */
 #main #content h6 {
   font-size: 16px;
 }
-/* line 465, ../sass/_layout.scss */
+/* line 466, ../sass/_layout.scss */
 #main #content form .form-group .hint-block {
   color: gray;
 }
 
-/* line 473, ../sass/_layout.scss */
+/* line 474, ../sass/_layout.scss */
 #footer-producer {
   text-align: center;
   position: absolute;
@@ -547,28 +547,28 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
   left: 0px;
   width: 100%;
 }
-/* line 480, ../sass/_layout.scss */
+/* line 481, ../sass/_layout.scss */
 #footer-producer a {
-  color: #FF7F00;
+  color: #F39C12;
 }
-/* line 482, ../sass/_layout.scss */
+/* line 483, ../sass/_layout.scss */
 #footer-producer a:active {
   text-decoration: underline;
 }
 
-/* line 488, ../sass/_layout.scss */
+/* line 489, ../sass/_layout.scss */
 #footer {
   background-color: #FFF8DC;
   height: 100px;
   float: right;
   text-align: center;
 }
-/* line 494, ../sass/_layout.scss */
+/* line 495, ../sass/_layout.scss */
 #footer .content {
   padding-top: 20px;
   color: black;
 }
-/* line 498, ../sass/_layout.scss */
+/* line 499, ../sass/_layout.scss */
 #footer .content a {
   color: black;
   font-family: "capsuularegular";
@@ -576,11 +576,11 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
   padding-left: 10px;
   padding-right: 10px;
 }
-/* line 505, ../sass/_layout.scss */
+/* line 506, ../sass/_layout.scss */
 #footer .content a:hover {
   text-decoration: underline;
 }
-/* line 512, ../sass/_layout.scss */
+/* line 513, ../sass/_layout.scss */
 #footer #code-source img {
   height: 20px;
 }
@@ -678,7 +678,7 @@ termes.
 
 /* line 4, ../sass/site/_credit_history.scss */
 .site-credit-history #credit-user {
-  color: #FF7F00;
+  color: #F39C12;
   font-size: 29px;
   font-weight: bold;
 }
@@ -749,7 +749,7 @@ termes.
 /* line 61, ../sass/order/_form.scss */
 .order-create #main #content .order-form #datepicker-distribution .ui-datepicker-header,
 .order-update #main #content .order-form #datepicker-distribution .ui-datepicker-header {
-  background-color: #FF7F00;
+  background-color: #F39C12;
 }
 /* line 65, ../sass/order/_form.scss */
 .order-create #main #content .order-form #datepicker-distribution .ui-datepicker-title,
@@ -779,7 +779,7 @@ termes.
 .order-create #main #content .order-form #datepicker-distribution .ui-datepicker-calendar a.ui-state-hover, .order-create #main #content .order-form #datepicker-distribution .ui-datepicker-calendar a.ui-state-active,
 .order-update #main #content .order-form #datepicker-distribution .ui-datepicker-calendar a.ui-state-hover,
 .order-update #main #content .order-form #datepicker-distribution .ui-datepicker-calendar a.ui-state-active {
-  background-color: #FF7F00;
+  background-color: #F39C12;
   color: white;
   border-color: #cdc3b7;
 }
@@ -791,7 +791,7 @@ termes.
 /* line 96, ../sass/order/_form.scss */
 .order-create #main #content .order-form .date-order span,
 .order-update #main #content .order-form .date-order span {
-  background-color: #FF7F00;
+  background-color: #F39C12;
   color: white;
   -moz-border-radius: 10px;
   -webkit-border-radius: 10px;
@@ -882,7 +882,7 @@ termes.
 /* line 171, ../sass/order/_form.scss */
 .order-create #main #content .order-form .blocks .block.selected,
 .order-update #main #content .order-form .blocks .block.selected {
-  border-left: solid 5px #FF7F00;
+  border-left: solid 5px #F39C12;
 }
 /* line 173, ../sass/order/_form.scss */
 .order-create #main #content .order-form .blocks .block.selected .contenu,
@@ -910,7 +910,7 @@ termes.
 /* line 189, ../sass/order/_form.scss */
 .order-create #main #content .order-form .blocks .block .comment span,
 .order-update #main #content .order-form .blocks .block .comment span {
-  background-color: #FF7F00;
+  background-color: #F39C12;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
   border-radius: 5px;
@@ -1180,7 +1180,7 @@ termes.
 /* line 404, ../sass/order/_form.scss */
 .order-create #main #content .order-form #bar-fixed #checkbox-credit .the-credit,
 .order-update #main #content .order-form #bar-fixed #checkbox-credit .the-credit {
-  background-color: #FF7F00;
+  background-color: #F39C12;
   color: white;
   padding: 2px 8px;
   -moz-border-radius: 5px;
@@ -1190,7 +1190,7 @@ termes.
 /* line 411, ../sass/order/_form.scss */
 .order-create #main #content .order-form #bar-fixed #checkbox-credit .amount-paid,
 .order-update #main #content .order-form #bar-fixed #checkbox-credit .amount-paid {
-  color: #FF7F00;
+  color: #F39C12;
 }
 /* line 415, ../sass/order/_form.scss */
 .order-create #main #content .order-form #bar-fixed #checkbox-credit #info-credit-empty,
@@ -1294,7 +1294,7 @@ termes.
 }
 /* line 48, ../sass/order/_history.scss */
 .order-history #tabs-orders-history li a {
-  color: #FF7F00;
+  color: #F39C12;
 }
 /* line 52, ../sass/order/_history.scss */
 .order-history #tabs-orders-history li.active a {
@@ -1356,7 +1356,7 @@ termes.
   left: 0px;
   width: 100%;
   text-transform: normal;
-  color: #FF7F00;
+  color: #F39C12;
   font-family: "capsuularegular";
   font-size: 17px;
   font-weight: bold;
@@ -1401,7 +1401,7 @@ termes.
 }
 /* line 90, ../sass/order/_order.scss */
 .order-order #main #app-order-order #steps ul li .btn.btn-primary {
-  background-color: #FF7F00;
+  background-color: #F39C12;
 }
 /* line 94, ../sass/order/_order.scss */
 .order-order #main #app-order-order #steps ul li .btn::after, .order-order #main #app-order-order #steps ul li .btn::before {
@@ -1425,7 +1425,7 @@ termes.
 }
 /* line 114, ../sass/order/_order.scss */
 .order-order #main #app-order-order #steps ul li .btn.btn-primary::after {
-  border-left: 17px solid #FF7F00;
+  border-left: 17px solid #F39C12;
 }
 /* line 128, ../sass/order/_order.scss */
 .order-order #main #app-order-order #steps ul li .btn-primary {
@@ -1440,7 +1440,7 @@ termes.
 }
 /* line 143, ../sass/order/_order.scss */
 .order-order #main #app-order-order #legend #order-date-color {
-  background-color: #FF7F00;
+  background-color: #F39C12;
 }
 /* line 146, ../sass/order/_order.scss */
 .order-order #main #app-order-order #legend #distribution-date-color {
@@ -1460,7 +1460,7 @@ termes.
 }
 /* line 161, ../sass/order/_order.scss */
 .order-order #main #app-order-order #calendar .c-day:hover .c-day-background {
-  background-color: #FF7F00 !important;
+  background-color: #F39C12 !important;
   color: white !important;
 }
 /* line 167, ../sass/order/_order.scss */
@@ -1540,7 +1540,7 @@ termes.
 /* line 261, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.category-name:hover {
   cursor: pointer;
-  background-color: #FF7F00;
+  background-color: #F39C12;
   color: white;
 }
 /* line 269, ../sass/order/_order.scss */
@@ -2012,12 +2012,12 @@ termes.
   /* line 79, ../sass/_responsive.scss */
   #main nav#main-nav ul li.active a {
     border-bottom: solid 1px white;
-    background-color: #FF7F00;
+    background-color: #F39C12;
     color: white;
   }
   /* line 84, ../sass/_responsive.scss */
   #main nav#main-nav ul li.active a:hover {
-    background-color: #FF7F00;
+    background-color: #F39C12;
     color: white;
   }
   /* line 90, ../sass/_responsive.scss */
@@ -2028,7 +2028,7 @@ termes.
   /* line 94, ../sass/_responsive.scss */
   #main nav#main-nav ul li a:hover {
     background-color: white;
-    color: #FF7F00;
+    color: #F39C12;
   }
   /* line 101, ../sass/_responsive.scss */
   #main nav#main-nav ul li#btn-administration {
@@ -2037,7 +2037,7 @@ termes.
   /* line 103, ../sass/_responsive.scss */
   #main nav#main-nav ul li#btn-administration a:hover {
     background-color: white;
-    color: #FF7F00;
+    color: #F39C12;
   }
   /* line 111, ../sass/_responsive.scss */
   #main h2#page-title {

producer/web/sass/_layout.scss

@@ -35,7 +35,8 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
-$color1: #FF7F00 ;
+//$color1: #FF7F00 ;
+$color1: #F39C12;
 $color2: white ;
 $courant: #323232 ;
 $color-back: #E9EBEE ;