Merge branch 'dev'

common/components/MyView.php

@@ -85,4 +85,11 @@ class MyView extends \yii\web\View
         $this->buttons[] = $button ;
     }
     
+    public function setMeta($name, $content) 
+    {
+        Yii::$app->view->registerMetaTag([
+            'name'      => $name,
+            'content'   => $content
+        ]); 
+    }
 }

frontend/views/site/cgv.php

@@ -35,7 +35,8 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
-$this->title = 'Conditions générales de service';
+$this->setTitle('Conditions générales de service') ;
+$this->setMeta('description', 'Nous vous présentons ici les conditions selon lesquelles nous vous proposons nos offres de service.') ;
 
 ?>
 

frontend/views/site/contact.php

@@ -43,7 +43,9 @@ use yii\captcha\Captcha;
 /* @var $this yii\web\View */
 /* @var $form yii\bootstrap\ActiveForm */
 
-$this->title = 'Me contacter';
+$this->setTitle('Me contacter');
+$this->setMeta('description', 'Pour toute remarque ou demande d\'information, nous vous proposons d\'utiliser ce formulaire de contact.') ;
+
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="site-contact">

frontend/views/site/credit.php

@@ -36,7 +36,9 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
-$this->title = 'Crédit';
+$this->setTitle('Crédit') ;
+$this->setMeta('Présentation de la fonctionnalité "Crédit" de la plateforme.') ;
+
 ?>
 
 <div class="container content-text">

frontend/views/site/error-404-producer.php

@@ -37,6 +37,7 @@ termes.
 */
 
 $this->setTitle('Producteur introuvable') ;
+$this->setMeta('Le producteur que vous recherchez est introuvable.') ;
 
 ?>
 

frontend/views/site/error.php

@@ -43,7 +43,9 @@ use yii\helpers\Html;
 /* @var $message string */
 /* @var $exception Exception */
 
-$this->title = $exception->getName();
+$this->setTitle($exception->getName());
+$this->setMeta('description', 'Oups ! Une erreur est survenue.') ;
+
 ?>
 <div class="site-error">
 

frontend/views/site/index.php

@@ -48,16 +48,17 @@ use dosamigos\leaflet\widgets\Map;
 
 use common\helpers\Url ;
 
-/* @var $this yii\web\View */
-$this->setTitle('Logiciel libre de distribution alimentaire') ;
+$this->setTitle('Logiciel libre de distribution alimentaire en circuit court') ;
+$this->setMeta('description', 'Simplifiez la distribution de vos produits en circuit court grâce à des outils web adaptés.') ;
 
 ?>
 
 <div id="presentation">
     <div id="presentation-distrib">
-        <h2><span>Logiciel libre<br />
-            de distribution alimentaire</span></h2>
-        <h3>simple, ouvert et participatif</h3>
+        <h1><span>Logiciel libre<br />
+                de distribution alimentaire<br />
+            en circuit court</span></h1>
+        <p>simple, ouvert et participatif</p>
     </div>
     <div id="row-users-producers">
         <div class="col-md-6 producer">

frontend/views/site/login.php

@@ -43,7 +43,9 @@ use yii\bootstrap\ActiveForm;
 /* @var $form yii\bootstrap\ActiveForm */
 /* @var $model \common\models\LoginForm */
 
-$this->title = 'Connexion';
+$this->setTitle('Connexion') ;
+$this->setMeta('description', 'Connectez-vous afin d\'accéder à votre compte.') ;
+
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="site-login">

frontend/views/site/mentions.php

@@ -36,7 +36,10 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
 termes.
 */
 
-$this->title = 'Mentions légales';
+$this->setTitle('Mentions légales');
+$this->setMeta('description', 'Prenez connaissance de nos mentions légales.') ;
+
+
 ?>
 
 <div class="container content-text">

frontend/views/site/producer.php

@@ -39,7 +39,8 @@ termes.
 use yii\helpers\Html ;
 use yii\bootstrap\ActiveForm;
 
-$this->title = 'Producteur '.Html::encode($producer->name) ;
+$this->setTitle('Producteur '.Html::encode($producer->name)) ;
+$this->setMeta('description', 'Veuillez vous connecter pour réserver les produits de ce producteur.') ;
 
 ?>
 

frontend/views/site/producer_code.php

@@ -38,7 +38,9 @@ termes.
 
 use yii\bootstrap\ActiveForm;
 
-$this->title = 'Producteur '.Html::encode($producer->name) ;
+$this->setTitle('Producteur '.Html::encode($producer->name)) ;
+$this->setMeta('Ce producteur est protègé par un code d\'accès.') ;
+
 
 ?>
 <div id="page-producer-code">

frontend/views/site/producer_offline.php

@@ -39,7 +39,8 @@ termes.
 use yii\helpers\Html ;
 use yii\bootstrap\ActiveForm;
 
-$this->title = 'Espace producteur '.Html::encode($producer->name).' désactivé' ;
+$this->setTitle('Espace producteur '.Html::encode($producer->name).' désactivé') ;
+$this->setMeta('description','L\'espace de ce producteur est désactivé.') ;
 
 ?>
 

frontend/views/site/producers.php

@@ -37,6 +37,7 @@ termes.
 */
 
 $this->setTitle('Producteurs') ;
+$this->setMeta('description', 'Retrouvez les producteurs présents sur Opendistrib.') ;
 
 ?>
 

frontend/views/site/requestPasswordResetToken.php

@@ -43,7 +43,9 @@ use yii\bootstrap\ActiveForm;
 /* @var $form yii\bootstrap\ActiveForm */
 /* @var $model \frontend\models\PasswordResetRequestForm */
 
-$this->title = 'Mot de passe oublié';
+$this->setTitle('Mot de passe oublié') ;
+$this->setMeta('description', 'Vous avez oublié votre mot de passe ?');
+
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="site-request-password-reset">

frontend/views/site/resetPassword.php

@@ -43,7 +43,9 @@ use yii\bootstrap\ActiveForm;
 /* @var $form yii\bootstrap\ActiveForm */
 /* @var $model \frontend\models\ResetPasswordForm */
 
-$this->title = 'Nouveau mot de passe';
+$this->setTitle('Nouveau mot de passe') ;
+$this->setMeta('description', 'Indiquez ici votre nouveau mot de passe');
+
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="site-reset-password">

frontend/views/site/signup.php

@@ -43,7 +43,9 @@ use yii\bootstrap\ActiveForm;
 /* @var $form yii\bootstrap\ActiveForm */
 /* @var $model \frontend\models\SignupForm */
 
-$this->title = 'Inscription';
+$this->setTitle('Inscription') ;
+$this->setMeta('description', 'Inscrivez-vous afin de profiter des fonctionnalités de la plateforme.');
+
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="site-signup">

frontend/web/css/screen.css

@@ -416,7 +416,7 @@ ul li {
   text-align: center;
 }
 /* line 410, ../sass/screen.scss */
-#content #presentation-distrib h2 {
+#content #presentation-distrib h1 {
   font-family: "capsuularegular";
   text-align: center;
   margin-top: 15px;
@@ -428,17 +428,18 @@ ul li {
   padding-bottom: 0px;
 }
 /* line 422, ../sass/screen.scss */
-#content #presentation-distrib h3 {
+#content #presentation-distrib p {
   color: white;
   font-family: "capsuularegular";
   font-size: 20px;
+  margin-top: 20px;
 }
-/* line 429, ../sass/screen.scss */
+/* line 430, ../sass/screen.scss */
 #content .panel {
   background-color: white;
   border: solid 1px #e0e0e0;
 }
-/* line 433, ../sass/screen.scss */
+/* line 434, ../sass/screen.scss */
 #content .panel .panel-heading {
   background-color: #FFF8DC;
   border-bottom: 0px;
@@ -446,24 +447,24 @@ ul li {
   padding-bottom: 8px;
   border-bottom: solid 1px #e0e0e0;
 }
-/* line 440, ../sass/screen.scss */
+/* line 441, ../sass/screen.scss */
 #content .panel .panel-heading h2.panel-title {
   margin: 0px;
   padding: 0px;
   padding-top: 0px;
   text-align: center;
 }
-/* line 446, ../sass/screen.scss */
+/* line 447, ../sass/screen.scss */
 #content .panel .panel-heading h2.panel-title .img {
   height: 20px;
   display: none;
 }
-/* line 450, ../sass/screen.scss */
+/* line 451, ../sass/screen.scss */
 #content .panel .panel-heading h2.panel-title .glyphicon {
   font-size: 20px;
   display: none;
 }
-/* line 454, ../sass/screen.scss */
+/* line 455, ../sass/screen.scss */
 #content .panel .panel-heading h2.panel-title span.the-title {
   margin-left: 10px;
   font-size: 26px;
@@ -471,14 +472,14 @@ ul li {
   top: 0px;
   text-transform: uppercase;
 }
-/* line 463, ../sass/screen.scss */
+/* line 464, ../sass/screen.scss */
 #content .panel .panel-body {
   background-color: white;
   -moz-border-radius: 0px 0px 5px 5px;
   -webkit-border-radius: 0px;
   border-radius: 0px 0px 5px 5px;
 }
-/* line 469, ../sass/screen.scss */
+/* line 470, ../sass/screen.scss */
 #content #row-users-producers {
   text-align: center;
   display: table;
@@ -487,12 +488,12 @@ ul li {
   -webkit-border-radius: 5px;
   border-radius: 5px;
 }
-/* line 475, ../sass/screen.scss */
+/* line 476, ../sass/screen.scss */
 #content #row-users-producers .col-md-6 {
   display: table-cell;
   width: 50%;
 }
-/* line 478, ../sass/screen.scss */
+/* line 479, ../sass/screen.scss */
 #content #row-users-producers .col-md-6 .panel {
   height: 100%;
   margin-bottom: 20px;
@@ -501,20 +502,20 @@ ul li {
   -webkit-box-shadow: none;
   box-shadow: none;
 }
-/* line 485, ../sass/screen.scss */
+/* line 486, ../sass/screen.scss */
 #content #row-users-producers .col-md-6.producer {
   padding-left: 0px;
 }
-/* line 488, ../sass/screen.scss */
+/* line 489, ../sass/screen.scss */
 #content #row-users-producers .col-md-6.users {
   padding-right: 0px;
 }
-/* line 501, ../sass/screen.scss */
+/* line 502, ../sass/screen.scss */
 #content #row-users-producers div.producer .btn-primary,
 #content #row-functionalities-rates div.producer .btn-primary {
   margin-bottom: 5px;
 }
-/* line 506, ../sass/screen.scss */
+/* line 507, ../sass/screen.scss */
 #content #row-users-producers p.presentation,
 #content #row-functionalities-rates p.presentation {
   font-family: "capsuularegular";
@@ -522,84 +523,84 @@ ul li {
   font-size: 20px;
   line-height: 26px;
 }
-/* line 513, ../sass/screen.scss */
+/* line 514, ../sass/screen.scss */
 #content #row-users-producers p,
 #content #row-functionalities-rates p {
   padding-bottom: 4px;
 }
-/* line 519, ../sass/screen.scss */
+/* line 520, ../sass/screen.scss */
 #content #row-functionalities-rates .block {
   margin-bottom: 10px;
 }
-/* line 521, ../sass/screen.scss */
+/* line 522, ../sass/screen.scss */
 #content #row-functionalities-rates .block p {
   font-family: "capsuularegular";
   font-size: 18px;
   margin-left: 70px;
 }
-/* line 526, ../sass/screen.scss */
+/* line 527, ../sass/screen.scss */
 #content #row-functionalities-rates .block img {
   float: left;
   width: 50px;
   height: auto;
 }
-/* line 531, ../sass/screen.scss */
+/* line 532, ../sass/screen.scss */
 #content #row-functionalities-rates .block a {
   text-decoration: none;
   color: black;
 }
-/* line 534, ../sass/screen.scss */
+/* line 535, ../sass/screen.scss */
 #content #row-functionalities-rates .block a:hover {
   color: #FF7F00;
 }
-/* line 541, ../sass/screen.scss */
+/* line 542, ../sass/screen.scss */
 #content #row-functionalities-rates .block-points-sale-products img {
   width: 40px;
 }
-/* line 549, ../sass/screen.scss */
+/* line 550, ../sass/screen.scss */
 #content #block-rates table th {
   font-family: "capsuularegular";
   font-weight: normal;
   font-size: 23px;
 }
-/* line 554, ../sass/screen.scss */
+/* line 555, ../sass/screen.scss */
 #content #block-rates table th, #content #block-rates table td {
   text-align: center;
 }
-/* line 561, ../sass/screen.scss */
+/* line 562, ../sass/screen.scss */
 #content #btn-demo:hover, #content #btn-demo:focus, #content #btn-demo:active {
   color: black;
 }
 
-/* line 571, ../sass/screen.scss */
+/* line 572, ../sass/screen.scss */
 #content #contact {
   display: none;
 }
-/* line 575, ../sass/screen.scss */
+/* line 576, ../sass/screen.scss */
 #content #contact .icon {
   width: 55px;
   top: -15px;
   margin-left: -70px;
 }
-/* line 581, ../sass/screen.scss */
+/* line 582, ../sass/screen.scss */
 #content #contact .form-control:focus {
   /*@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px $jaune) ;
   border-color: $jaune ;*/
 }
-/* line 586, ../sass/screen.scss */
+/* line 587, ../sass/screen.scss */
 #content #contact .form-group {
   text-align: center;
 }
-/* line 590, ../sass/screen.scss */
+/* line 591, ../sass/screen.scss */
 #content #contact .img-right {
   float: right;
 }
-/* line 593, ../sass/screen.scss */
+/* line 594, ../sass/screen.scss */
 #content #contact .img-right img {
   width: 300px;
 }
 
-/* line 599, ../sass/screen.scss */
+/* line 600, ../sass/screen.scss */
 #bookmarked-producers {
   padding: 0px;
   padding-top: 15px;
@@ -608,7 +609,7 @@ ul li {
   border-bottom: solid 1px #e0e0e0;
   background-color: white;
 }
-/* line 607, ../sass/screen.scss */
+/* line 608, ../sass/screen.scss */
 #bookmarked-producers h2 {
   float: left;
   font-family: "highvoltageregular";
@@ -619,30 +620,30 @@ ul li {
   padding: 0px;
   color: #323232;
 }
-/* line 618, ../sass/screen.scss */
+/* line 619, ../sass/screen.scss */
 #bookmarked-producers #producers {
   position: relative;
   top: -5px;
   left: 5px;
 }
-/* line 624, ../sass/screen.scss */
+/* line 625, ../sass/screen.scss */
 #bookmarked-producers #discover {
   padding-bottom: 20px;
   text-align: center;
 }
-/* line 628, ../sass/screen.scss */
+/* line 629, ../sass/screen.scss */
 #bookmarked-producers #discover p {
   padding-bottom: 0px;
   color: white;
 }
-/* line 633, ../sass/screen.scss */
+/* line 634, ../sass/screen.scss */
 #bookmarked-producers #discover .btn {
   background-color: white;
   color: #FF7F00;
   border: solid 1px white;
 }
 
-/* line 642, ../sass/screen.scss */
+/* line 643, ../sass/screen.scss */
 #footer {
   position: absolute;
   bottom: 0px;
@@ -653,7 +654,7 @@ ul li {
   background-color: white;
   border-top: solid 1px #e0e0e0;
 }
-/* line 652, ../sass/screen.scss */
+/* line 653, ../sass/screen.scss */
 #footer a {
   color: black;
   font-family: "capsuularegular";
@@ -663,11 +664,11 @@ ul li {
   padding-right: 10px;
   border-right: solid 1px white;
 }
-/* line 661, ../sass/screen.scss */
+/* line 662, ../sass/screen.scss */
 #footer a:hover {
   text-decoration: underline;
 }
-/* line 665, ../sass/screen.scss */
+/* line 666, ../sass/screen.scss */
 #footer a:last-child {
   border: 0px none;
 }

frontend/web/sass/screen.scss

@@ -407,7 +407,7 @@ ul {
             margin-bottom: 50px ;
             text-align: center ;
             
-            h2 {
+            h1 {
                 font-family: 'capsuularegular' ;
                 text-align: center ;
                 margin-top: 15px ;
@@ -419,10 +419,11 @@ ul {
                 padding-bottom: 0px ;
             }
             
-            h3 {
+            p {
                 color: white ;
                 font-family: 'capsuularegular' ;
                 font-size: 20px ;
+                margin-top: 20px ;
             }
         }