Agencer la page d'accueil, mise en place d'un logo

composer.json

@@ -18,8 +18,9 @@
         "yiisoft/yii2": "*",
         "yiisoft/yii2-bootstrap": "*",
         "yiisoft/yii2-swiftmailer": "*",
-        "fxp/composer-asset-plugin": "~1.1.1",
-        "2amigos/yii2-chartjs-widget": "~2.0.0"
+        "fxp/composer-asset-plugin": "dev-master",
+        "2amigos/yii2-chartjs-widget": "~2.0.0",
+        "2amigos/yii2-leaflet-extension" : "*"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",

frontend/controllers/SiteController.php

@@ -14,6 +14,12 @@ use yii\web\Controller;
 use yii\filters\VerbFilter;
 use yii\filters\AccessControl;
 
+use dosamigos\leaflet\types\LatLng;
+use dosamigos\leaflet\layers\Marker;
+use dosamigos\leaflet\layers\TileLayer;
+use dosamigos\leaflet\LeafLet;
+use dosamigos\leaflet\widgets\Map;
+
 
 /**
  * Site controller
@@ -84,10 +90,30 @@ class SiteController extends Controller
     		return $this->refresh();
     	} 
     	
+        // map
+        /*$center = new dosamigos\leaflet\types\LatLng(['lat' => $resource->address->lat, 'lng' => $resource->address->lon]);
+        $tileLayer = new TileLayer([
+                        'map' => 'test',
+                        'urlTemplate' => 'http://{s}.tile.osm.org/{z}/{x}/{y}.png',
+                        'clientOptions' => [
+                        'attribution' => 'Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> ' .
+                        '<img src="http://developer.mapquest.com/content/osm/mq_logo.png">, ' .
+                        'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
+                        ]
+                        ]);
+        $map = new LeafLet([
+                        'tileLayer' => $tileLayer,
+                        'center' => $center,
+                        ]);
+        $point = new LatLng(['lat' => $resource->address->lat, 'lng' => $resource->address->lon]);
+        $marker = new Marker(['latLng' => $point, 'popupContent' => Html::encode($resource->name)]);
+        $map->addLayer($marker);*/
+        
         return $this->render('index',[
         		'page_principale'=>true,
         		'produits' => $produits,
         		'model' => $model,
+                        //('map' => $map
         ]);
     }
     

frontend/views/layouts/main.php

@@ -37,15 +37,18 @@ AppAsset::register($this);
 		<div id="back"></div>
 		<header id="header">
                     <div class="container">
-                        <a id="link-home" href="<?= Yii::$app->urlManager->createUrl('site/index') ; ?>"><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/fournisseurs.png" alt="" /></a>
-                        <nav>
+                        <a id="link-home" href="<?= Yii::$app->urlManager->createUrl('site/index') ; ?>">
+                            <img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/laboulange.png" alt="" /><br />
+                            La boulange
+                        </a>
+                        <nav class="">
                             <ul class="nav nav-pills">
                         <?php if(!Yii::$app->user->isGuest): ?>
                             <li><a <?php if(Yii::$app->controller->id == 'commande' && Yii::$app->controller->action->id == 'create'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('commande/create') ; ?>"><span class="glyphicon glyphicon-plus"></span> Commander</a></li>
                             <li><a <?php if(Yii::$app->controller->id == 'commande' && Yii::$app->controller->action->id == 'index'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('commande/index') ; ?>"><span class="glyphicon glyphicon-th-list"></span> Historique</a></li>
                             <li><a <?php if(Yii::$app->controller->id == 'user' && Yii::$app->controller->action->id == 'update'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('user/update') ; ?>"><span class="glyphicon glyphicon-user"></span> Profil</a></li>
-                            <li><a id="link-logout" href="<?php echo Yii::$app->urlManager->createUrl('site/logout') ; ?>"><span class="glyphicon glyphicon-off"></span> Déconnexion <span class="nom">(<?php echo Html::encode(Yii::$app->user->identity->prenom .' '.  substr(strtoupper(Yii::$app->user->identity->nom), 0, 1).'.') ; ?>)</span></a></li>
-                            <?php if(Yii::$app->user->identity->isBoulanger()): ?><li><a class="btn btn-default" id="link-espace-boulanger" href="../../backend/web/"><span class="glyphicon glyphicon-grain"></span> Espace boulanger</a></li><?php endif; ?>
+                            <li><a id="link-logout" href="<?php echo Yii::$app->urlManager->createUrl('site/logout') ; ?>"><span class="glyphicon glyphicon-off"></span> Déconnexion<!-- <span class="nom">(<?php echo Html::encode(Yii::$app->user->identity->prenom .' '.  substr(strtoupper(Yii::$app->user->identity->nom), 0, 1).'.') ; ?>)</span>--></a></li>
+                            <?php if(Yii::$app->user->identity->isBoulanger()): ?><li><a class="" id="link-espace-boulanger" href="../../backend/web/"><span class="glyphicon glyphicon-grain"></span> Espace boulanger</a></li><?php endif; ?>
                         <?php else: ?>
                             <li><a <?php if(Yii::$app->controller->id == 'site' && Yii::$app->controller->action->id == 'login'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('site/login') ; ?>"><span class="glyphicon glyphicon-log-in"></span> Connexion</a></li>
                             <li><a <?php if(Yii::$app->controller->id == 'site' && Yii::$app->controller->action->id == 'signup'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('site/signup') ; ?>"><span class="glyphicon glyphicon-user"></span> Inscription</a></li>

frontend/views/site/index.php

@@ -4,21 +4,67 @@ use yii\helpers\Html;
 use yii\bootstrap\ActiveForm;
 use yii\captcha\Captcha;
 
+use dosamigos\leaflet\types\LatLng;
+use dosamigos\leaflet\layers\Marker;
+use dosamigos\leaflet\layers\TileLayer;
+use dosamigos\leaflet\LeafLet;
+use dosamigos\leaflet\widgets\Map;
+
 /* @var $this yii\web\View */
 $this->title = 'Système de réservation de pain';
 ?>
 
 <?php
 
-
 ?>
 			
 <div class="item" id="presentation">
-	<div class="container">
-		<h2>Réservation de pain</h2>
-                <p> Suspendisse suscipit ligula ac eleifend ornare. Nunc luctus ipsum et elit condimentum feugiat. Aenean sed ligula ac urna cursus mattis. Sed vestibulum euismod ligula, quis varius velit ultricies vel. Curabitur pretium ornare justo, tempor vehicula purus sodales et. Maecenas et ante laoreet, aliquet nunc sit amet, iaculis arcu. Maecenas ut sem sit amet eros interdum accumsan in quis tellus. Quisque ac molestie ex. Ut rutrum ex in fringilla varius. Nam porta mi at condimentum fermentum. </p>
-		<div class="clr"></div>
+    <div class="container">
+	<div class="row" id="row-presentation">
+            <div class="col-md-12">
+                <h1>Service de réservation de pain</h1>
+                <p>Réservez votre pain en ligne et récupérez votre commande<br />
+                dans votre boulangerie ou dans un dépôt près de chez vous.</p>
+		<!--<img src="./img/four.jpg" alt="Baguettes" id="main-img" />-->
+                <div class="clr"></div>
+            </div>
 	</div>
+        
+        <div class="row" id="row-clients-boulanger">
+            <div class="col-md-6" id="clients">
+                <h2><img src="./img/clients.png" id="img-clients" /><br />
+                    Clients
+                    </h2>
+                <ul>
+                    <li>Garantie d'avoir du pain</li>
+                    <li>Possibilité de choisir un dépôt proche de chez soi</li>
+                    <li><strong>Gratuit</strong></li>
+                </ul>
+            </div>
+            <div class="col-md-6">
+                <h2><img src="./img/boulanger1.png" id="img-boulanger" /><br />
+                    Boulanger
+                   </h2>
+                <ul>
+                    <li>Service supplémentaire pour les clients</li>
+                    <li>Optimisation de la production</li>
+                    <li><strong>20 € / mois</strong></li>
+                </ul>
+            </div>
+        </div>
+        <div class="row" id="row-signup">
+            <a class="btn btn-primary btn-lg" href="<?= Yii::$app->urlManager->createUrl('site/login'); ?>">Inscription</a>
+        </div>
+        
+        <div class="row">
+            <!--<h2>Boulangeries partenaires</h2>-->
+            
+            <?php 
+                //echo Map::widget(['leafLet' => $map,]); 
+            ?>
+            
+        </div>
+    </div>
 </div>
 
 <div class="item back1" id="contact">

frontend/views/site/login.php

@@ -10,7 +10,9 @@ $this->title = 'Connexion';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="site-login">
-    <h1><?= Html::encode($this->title) ?></h1>
+    
+    <h1 class="title-systeme-commande"><span class="glyphicon glyphicon-log-in"></span> &nbsp;&nbsp;<?= Html::encode($this->title) ?></h1>
+
 
     <p>Pas encore de compte ? <a class="" href="<?php echo Yii::$app->urlManager->createUrl('site/signup') ; ?>">Je m'inscris</a></p>
     

frontend/views/site/mentions.php

@@ -45,6 +45,12 @@
 		<h3>Lien hypertextes</h3>		
 		<p>La mise en place d’un lien hypertexte vers le site http://www.lechatdesnoisettes.com nécessite une autorisation préalable écrite de Le Chat des Noisettes. Si vous souhaitez mettre en place un lien hypertexte vers ce site, vous devez en conséquence prendre contact avec le responsable du site. Le Chat des Noisettes ne peut en aucun cas être tenu pour responsable de la mise à disposition des sites qui font l’objet d’un lien hypertexte à partir du site http://www.lechatdesnoisettes.com et ne peut supporter aucune responsabilité sur le contenu, les produits, les services, etc. disponibles sur ces sites ou à partir de ces sites.</p>
 
+                <h3>Icones</h3>
+                <p>users by DTE MEDIA from the Noun Project</p>
+                <p>chef by Sergey Demushkin from the Noun Project</p>
+                <p>chef by Andrey Vasiliev from the Noun Project</p>
+                <p>Bread by Cédric Villain from the Noun Project</p>
+                
 	</div>
 
 </div>

frontend/views/site/signup.php

@@ -10,7 +10,7 @@ $this->title = 'Inscription';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="site-signup">
-    <h1><?= Html::encode($this->title) ?></h1>
+    <h1 class="title-systeme-commande"><span class="glyphicon glyphicon-user"></span>&nbsp;&nbsp;<?= Html::encode($this->title) ?></h1>
 
     <p>Veuillez remplir les champs suivants afin de créer votre compte.<br />
     Tous les champs sont obligatoires.</p>

frontend/web/css/screen.css

@@ -136,46 +136,55 @@ ul li {
   z-index: 100;
   border-bottom: solid 1px #e0e0e0;
   background-color: white;
-  height: 75px;
-  -moz-box-shadow: 0px 0px 5px #ededed;
-  -webkit-box-shadow: 0px 0px 5px #ededed;
-  box-shadow: 0px 0px 5px #ededed;
-  -moz-box-shadow: 0px 0px 5px #dcdcdc;
-  -webkit-box-shadow: 0px 0px 5px #dcdcdc;
-  box-shadow: 0px 0px 5px #dcdcdc;
-}
-/* line 112, ../sass/screen.scss */
+  -moz-box-shadow: 0px 0px 3px gray;
+  -webkit-box-shadow: 0px 0px 3px gray;
+  box-shadow: 0px 0px 3px gray;
+}
+/* line 114, ../sass/screen.scss */
 #header .container {
-  padding-left: 0px;
   position: relative;
 }
-/* line 117, ../sass/screen.scss */
+/* line 119, ../sass/screen.scss */
 #header #link-home {
-  position: relative;
-  top: 15px;
+  position: fixed;
+  z-index: 1000;
+  text-align: center;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  padding: 10px;
+  text-decoration: none;
+  background-color: white;
+  -moz-box-shadow: 0px 0px 5px black;
+  -webkit-box-shadow: 0px 0px 5px black;
+  box-shadow: 0px 0px 5px black;
+  -moz-border-radius: 0px 0px 8px 8px;
+  -webkit-border-radius: 0px;
+  border-radius: 0px 0px 8px 8px;
+  font-size: 18px;
 }
-/* line 120, ../sass/screen.scss */
+/* line 133, ../sass/screen.scss */
 #header #link-home img {
-  width: 37px;
+  width: 90px;
+  margin-bottom: 5px;
 }
-/* line 126, ../sass/screen.scss */
-#header nav {
-  position: relative;
-  bottom: 25px;
+/* line 139, ../sass/screen.scss */
+#header #link-espace-boulanger {
+  border-left: solid 1px #e0e0e0;
 }
-/* line 129, ../sass/screen.scss */
+/* line 144, ../sass/screen.scss */
 #header nav ul {
   float: right;
 }
-/* line 132, ../sass/screen.scss */
+/* line 147, ../sass/screen.scss */
 #header nav ul li a {
   text-decoration: none;
 }
-/* line 135, ../sass/screen.scss */
+/* line 150, ../sass/screen.scss */
 #header nav ul li a.active {
   background-color: #eee;
 }
-/* line 144, ../sass/screen.scss */
+/* line 159, ../sass/screen.scss */
 #header #link-logout .nom {
   font-size: 10px;
   /*position: relative ;
@@ -183,34 +192,79 @@ ul li {
   top: -3px ;*/
 }
 
-/* line 153, ../sass/screen.scss */
+/* line 168, ../sass/screen.scss */
 #main {
   padding: 0px;
 }
 
-/* line 163, ../sass/screen.scss */
+/* line 178, ../sass/screen.scss */
 #content {
   position: relative;
   padding: 20px 0px;
   padding-bottom: 0px;
-  padding-top: 15px;
+  padding-top: 35px;
   min-height: 500px;
 }
-/* line 171, ../sass/screen.scss */
+/* line 186, ../sass/screen.scss */
 #content #description img {
   width: 100%;
 }
-/* line 176, ../sass/screen.scss */
+/* line 191, ../sass/screen.scss */
+#content #main-img {
+  max-width: 100%;
+  border: solid 1px #e0e0e0;
+  padding: 5px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+}
+/* line 198, ../sass/screen.scss */
+#content #row-presentation {
+  text-align: center;
+}
+/* line 202, ../sass/screen.scss */
+#content #row-signup {
+  text-align: center;
+  margin-top: 20px;
+}
+/* line 207, ../sass/screen.scss */
+#content #row-clients-boulanger {
+  margin-bottom: 50px;
+}
+/* line 209, ../sass/screen.scss */
+#content #row-clients-boulanger h2 {
+  text-align: center;
+  margin-bottom: 15px;
+  padding-bottom: 0px;
+}
+/* line 213, ../sass/screen.scss */
+#content #row-clients-boulanger h2 img {
+  height: 70px;
+  margin-bottom: 60px;
+}
+/* line 219, ../sass/screen.scss */
+#content #row-clients-boulanger ul {
+  text-align: center;
+}
+/* line 221, ../sass/screen.scss */
+#content #row-clients-boulanger ul li {
+  list-style-type: none;
+}
+/* line 226, ../sass/screen.scss */
+#content #row-clients-boulanger #clients {
+  border-right: dotted 1px gray;
+}
+/* line 231, ../sass/screen.scss */
 #content .item {
   position: relative;
   min-height: 250px;
 }
-/* line 180, ../sass/screen.scss */
+/* line 235, ../sass/screen.scss */
 #content .item .container {
   padding: 20px;
   position: relative;
 }
-/* line 185, ../sass/screen.scss */
+/* line 240, ../sass/screen.scss */
 #content .item .separateur {
   width: 600px;
   border-top: 1px solid #e0e0e0;
@@ -218,61 +272,64 @@ ul li {
   padding-top: 20px;
   margin-top: 20px;
 }
-/* line 193, ../sass/screen.scss */
+/* line 248, ../sass/screen.scss */
 #content .item h2 {
   color: black;
-  padding-bottom: 50px;
+  padding-bottom: 30px;
   font-size: 25px;
   line-height: 35px;
   font-family: "myriadpro-regular";
   text-transform: uppercase;
-  text-align: center;
   position: relative;
   margin-top: 30px;
 }
-/* line 205, ../sass/screen.scss */
+/* line 260, ../sass/screen.scss */
 #content .item h3 {
   color: black;
   font-family: "comfortaalight";
   font-size: 20px;
   padding-bottom: 12px;
 }
-/* line 212, ../sass/screen.scss */
+/* line 267, ../sass/screen.scss */
 #content .item .icon {
   position: absolute;
 }
 
-/* line 223, ../sass/screen.scss */
+/* line 276, ../sass/screen.scss */
+#content #contact {
+  display: none;
+}
+/* line 280, ../sass/screen.scss */
 #content #contact .icon {
   width: 55px;
   top: -15px;
   margin-left: -70px;
 }
-/* line 232, ../sass/screen.scss */
+/* line 289, ../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 237, ../sass/screen.scss */
+/* line 294, ../sass/screen.scss */
 #content #contact .form-group {
   text-align: center;
 }
-/* line 241, ../sass/screen.scss */
+/* line 298, ../sass/screen.scss */
 #content #contact .img-right {
   float: right;
 }
-/* line 244, ../sass/screen.scss */
+/* line 301, ../sass/screen.scss */
 #content #contact .img-right img {
   width: 300px;
 }
 
-/* line 251, ../sass/screen.scss */
+/* line 308, ../sass/screen.scss */
 .form-control:focus {
   /*@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px $jaune) ;
   border-color: $jaune ;*/
 }
 
-/* line 256, ../sass/screen.scss */
+/* line 313, ../sass/screen.scss */
 #footer {
   height: 50px;
   background-color: white;
@@ -282,31 +339,31 @@ ul li {
   padding-bottom: 60px;
   position: relative;
 }
-/* line 268, ../sass/screen.scss */
+/* line 325, ../sass/screen.scss */
 #footer a {
   color: #7e7e7e;
   text-transform: uppercase;
   text-decoration: none;
 }
-/* line 273, ../sass/screen.scss */
+/* line 330, ../sass/screen.scss */
 #footer a:hover {
   color: black;
 }
 
-/* line 279, ../sass/screen.scss */
+/* line 336, ../sass/screen.scss */
 #content #mentions {
   padding-top: 20px;
 }
-/* line 282, ../sass/screen.scss */
+/* line 339, ../sass/screen.scss */
 #content #mentions div.content {
   width: 60%;
   font-size: 90%;
 }
-/* line 287, ../sass/screen.scss */
+/* line 344, ../sass/screen.scss */
 #content #mentions p {
   padding-bottom: 15px;
 }
-/* line 291, ../sass/screen.scss */
+/* line 348, ../sass/screen.scss */
 #content #mentions h2 {
   color: black;
   padding-bottom: 40px;
@@ -314,7 +371,7 @@ ul li {
   line-height: 35px;
   font-family: "myriadpro-regular";
 }
-/* line 299, ../sass/screen.scss */
+/* line 356, ../sass/screen.scss */
 #content #mentions h3 {
   font-family: "comfortaaregular";
   font-size: 18px;
@@ -323,40 +380,40 @@ ul li {
   color: black;
 }
 
-/* line 310, ../sass/screen.scss */
+/* line 367, ../sass/screen.scss */
 .mentions #main, .mentions body {
   background-color: white;
 }
 
-/* line 315, ../sass/screen.scss */
+/* line 372, ../sass/screen.scss */
 .vegas-loading {
   display: none;
 }
 
-/* line 322, ../sass/screen.scss */
+/* line 379, ../sass/screen.scss */
 #profil-user .form-group.field-user-no_mail label {
   font-weight: normal;
 }
-/* line 326, ../sass/screen.scss */
+/* line 383, ../sass/screen.scss */
 #profil-user .form-group label {
   cursor: pointer;
 }
-/* line 331, ../sass/screen.scss */
+/* line 388, ../sass/screen.scss */
 #profil-user #mails-jours-prod .form-group {
   float: left;
   margin-right: 15px;
 }
-/* line 334, ../sass/screen.scss */
+/* line 391, ../sass/screen.scss */
 #profil-user #mails-jours-prod .form-group label {
   font-weight: normal;
 }
-/* line 340, ../sass/screen.scss */
+/* line 397, ../sass/screen.scss */
 #profil-user p.strong {
   font-weight: bold;
 }
 
 /* signup */
-/* line 349, ../sass/screen.scss */
+/* line 406, ../sass/screen.scss */
 #form-signup #champs-boulanger {
   display: none;
 }

frontend/web/sass/screen.scss

@@ -101,37 +101,52 @@ ul {
 	//border-top: solid 4px $jaune ;
 	border-bottom: solid 1px $gris1 ;	
 	background-color: white ;
-	height: 75px ;
-	@include box-shadow(0px 0px 5px #ededed) ;
-	@include box-shadow(0px 0px 5px #dcdcdc) ;
+        //border-top: 4px solid #2b669a ;
+        @include box-shadow(0px 0px 3px gray) ;
+	
+	//@include box-shadow(0px 0px 5px #ededed) ;
+	//@include box-shadow(0px 0px 5px #dcdcdc) ;
 	//@include box-shadow(0px 0px 5px black) ;
 	
 	//position: fixed ;
 	//width: 100% ;
 
 	.container {
-		padding-left: 0px ;
+		//padding-left: 0px ;
 		position: relative ;
 	}
 
         #link-home {
-            position: relative ;
-            top: 15px ;
+            position: fixed ;
+            z-index: 1000 ;
+            text-align: center ;
+            position: absolute ;
+            top: 0px ;
+            left: 0px ;
+            padding: 10px ;
+            text-decoration: none ;
+            background-color: white ;
+            @include box-shadow(0px 0px 5px black) ;
+            @include border-radius(0px 0px 8px 8px) ; 
+            font-size: 18px ;
+            
             img {
-                width: 37px ;
-                
+                width: 90px ;
+                margin-bottom: 5px ;
             }
         }
         
+        #link-espace-boulanger {
+            border-left: solid 1px #e0e0e0 ;
+        }
+        
         nav {
-            position: relative ;
-            bottom: 25px ;
             ul {
                 float: right ;
                 li {
                     a {
                         text-decoration: none ;
-                        
+                        //color: #9d9d9d ;
                         &.active {
                             background-color: #eee ;
                         }
@@ -164,7 +179,7 @@ ul {
         position: relative ;
 	padding: 20px 0px ;
 	padding-bottom: 0px ;
-	padding-top: 15px ;
+	padding-top: 35px ;
 	min-height: 500px ;
 	
 	#description {
@@ -172,7 +187,47 @@ ul {
 			width: 100% ;
 		}
 	}
+        
+        #main-img {
+            max-width: 100% ;
+            border: solid 1px #e0e0e0 ;
+            padding: 5px ;
+            @include border-radius(5px) ;
+        }
+        
+        #row-presentation {
+            text-align: center ;
+        }
+        
+        #row-signup {
+            text-align: center ;
+            margin-top: 20px ;
+        }
 
+        #row-clients-boulanger {
+            margin-bottom: 50px ;
+            h2 {
+                text-align: center ;
+                margin-bottom: 15px ;
+                padding-bottom: 0px ;
+                img {
+                    height: 70px ;
+                    margin-bottom: 60px ;
+                }
+            }
+            
+            ul {
+                text-align: center ;
+                li {
+                    list-style-type: none ;
+                }
+            }
+            
+            #clients {
+                border-right: dotted 1px gray ;
+            }
+        }
+        
 	.item {
 		position: relative ;
 		min-height: 250px ;
@@ -192,12 +247,12 @@ ul {
 
 		h2 {
 			color: black ;
-			padding-bottom: 50px ;
+			padding-bottom: 30px ;
 			font-size: 25px ;
 			line-height: 35px ;
 			font-family: 'myriadpro-regular' ;	
 			text-transform: uppercase ;
-			text-align: center ;
+			//text-align: center ;
 			position: relative ;
 			margin-top: 30px ;
 		}
@@ -214,12 +269,14 @@ ul {
 		}
 
 	}
-
+      
 }
 
 
 #content #contact {
 	
+        display: none ;
+    
 	.icon {
 		width: 55px ;
 		top: -15px ;

vendor/composer/ClassLoader.php

@@ -147,7 +147,7 @@ class ClassLoader
      * appending or prepending to the ones previously set for this namespace.
      *
      * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-0 base directories
+     * @param array|string $paths   The PSR-4 base directories
      * @param bool         $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException

vendor/composer/LICENSE

@@ -1,21 +1,433 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Composer
+Upstream-Contact: Jordi Boggiano <j.boggiano@seld.be>
+Source: https://github.com/composer/composer
 
-Copyright (c) 2015 Nils Adermann, Jordi Boggiano
+Files: *
+Copyright: 2016, Nils Adermann <naderman@naderman.de>
+           2016, Jordi Boggiano <j.boggiano@seld.be>
+License: Expat
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
+Files: res/cacert.pem
+Copyright: 2015, Mozilla Foundation
+License: MPL-2.0
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+Files: src/Composer/Util/RemoteFilesystem.php
+       src/Composer/Util/TlsHelper.php
+Copyright: 2016, Nils Adermann <naderman@naderman.de>
+           2016, Jordi Boggiano <j.boggiano@seld.be>
+           2013, Evan Coury <me@evancoury.com>
+License: Expat and BSD-2-Clause
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+License: BSD-2-Clause
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ .
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+ .
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is furnished
+ to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+License: MPL-2.0
+ 1. Definitions
+ --------------
+ .
+ 1.1. "Contributor"
+     means each individual or legal entity that creates, contributes to
+     the creation of, or owns Covered Software.
+ .
+ 1.2. "Contributor Version"
+     means the combination of the Contributions of others (if any) used
+     by a Contributor and that particular Contributor's Contribution.
+ .
+ 1.3. "Contribution"
+     means Covered Software of a particular Contributor.
+ .
+ 1.4. "Covered Software"
+     means Source Code Form to which the initial Contributor has attached
+     the notice in Exhibit A, the Executable Form of such Source Code
+     Form, and Modifications of such Source Code Form, in each case
+     including portions thereof.
+ .
+ 1.5. "Incompatible With Secondary Licenses"
+     means
+ .
+     (a) that the initial Contributor has attached the notice described
+         in Exhibit B to the Covered Software; or
+ .
+     (b) that the Covered Software was made available under the terms of
+         version 1.1 or earlier of the License, but not also under the
+         terms of a Secondary License.
+ .
+ 1.6. "Executable Form"
+     means any form of the work other than Source Code Form.
+ .
+ 1.7. "Larger Work"
+     means a work that combines Covered Software with other material, in
+     a separate file or files, that is not Covered Software.
+ .
+ 1.8. "License"
+     means this document.
+ .
+ 1.9. "Licensable"
+     means having the right to grant, to the maximum extent possible,
+     whether at the time of the initial grant or subsequently, any and
+     all of the rights conveyed by this License.
+ .
+ 1.10. "Modifications"
+     means any of the following:
+ .
+     (a) any file in Source Code Form that results from an addition to,
+         deletion from, or modification of the contents of Covered
+         Software; or
+ .
+     (b) any new file in Source Code Form that contains any Covered
+         Software.
+ .
+ 1.11. "Patent Claims" of a Contributor
+     means any patent claim(s), including without limitation, method,
+     process, and apparatus claims, in any patent Licensable by such
+     Contributor that would be infringed, but for the grant of the
+     License, by the making, using, selling, offering for sale, having
+     made, import, or transfer of either its Contributions or its
+     Contributor Version.
+ .
+ 1.12. "Secondary License"
+     means either the GNU General Public License, Version 2.0, the GNU
+     Lesser General Public License, Version 2.1, the GNU Affero General
+     Public License, Version 3.0, or any later versions of those
+     licenses.
+ .
+ 1.13. "Source Code Form"
+     means the form of the work preferred for making modifications.
+ .
+ 1.14. "You" (or "Your")
+     means an individual or a legal entity exercising rights under this
+     License. For legal entities, "You" includes any entity that
+     controls, is controlled by, or is under common control with You. For
+     purposes of this definition, "control" means (a) the power, direct
+     or indirect, to cause the direction or management of such entity,
+     whether by contract or otherwise, or (b) ownership of more than
+     fifty percent (50%) of the outstanding shares or beneficial
+     ownership of such entity.
+ .
+ 2. License Grants and Conditions
+ --------------------------------
+ .
+ 2.1. Grants
+ .
+ Each Contributor hereby grants You a world-wide, royalty-free,
+ non-exclusive license:
+ .
+ (a) under intellectual property rights (other than patent or trademark)
+     Licensable by such Contributor to use, reproduce, make available,
+     modify, display, perform, distribute, and otherwise exploit its
+     Contributions, either on an unmodified basis, with Modifications, or
+     as part of a Larger Work; and
+ .
+ (b) under Patent Claims of such Contributor to make, use, sell, offer
+     for sale, have made, import, and otherwise transfer either its
+     Contributions or its Contributor Version.
+ .
+ 2.2. Effective Date
+ .
+ The licenses granted in Section 2.1 with respect to any Contribution
+ become effective for each Contribution on the date the Contributor first
+ distributes such Contribution.
+ .
+ 2.3. Limitations on Grant Scope
+ .
+ The licenses granted in this Section 2 are the only rights granted under
+ this License. No additional rights or licenses will be implied from the
+ distribution or licensing of Covered Software under this License.
+ Notwithstanding Section 2.1(b) above, no patent license is granted by a
+ Contributor:
+ .
+ (a) for any code that a Contributor has removed from Covered Software;
+     or
+ .
+ (b) for infringements caused by: (i) Your and any other third party's
+     modifications of Covered Software, or (ii) the combination of its
+     Contributions with other software (except as part of its Contributor
+     Version); or
+ .
+ (c) under Patent Claims infringed by Covered Software in the absence of
+     its Contributions.
+ .
+ This License does not grant any rights in the trademarks, service marks,
+ or logos of any Contributor (except as may be necessary to comply with
+ the notice requirements in Section 3.4).
+ .
+ 2.4. Subsequent Licenses
+ .
+ No Contributor makes additional grants as a result of Your choice to
+ distribute the Covered Software under a subsequent version of this
+ License (see Section 10.2) or under the terms of a Secondary License (if
+ permitted under the terms of Section 3.3).
+ .
+ 2.5. Representation
+ .
+ Each Contributor represents that the Contributor believes its
+ Contributions are its original creation(s) or it has sufficient rights
+ to grant the rights to its Contributions conveyed by this License.
+ .
+ 2.6. Fair Use
+ .
+ This License is not intended to limit any rights You have under
+ applicable copyright doctrines of fair use, fair dealing, or other
+ equivalents.
+ .
+ 2.7. Conditions
+ .
+ Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+ in Section 2.1.
+ .
+ 3. Responsibilities
+ -------------------
+ .
+ 3.1. Distribution of Source Form
+ .
+ All distribution of Covered Software in Source Code Form, including any
+ Modifications that You create or to which You contribute, must be under
+ the terms of this License. You must inform recipients that the Source
+ Code Form of the Covered Software is governed by the terms of this
+ License, and how they can obtain a copy of this License. You may not
+ attempt to alter or restrict the recipients' rights in the Source Code
+ Form.
+ .
+ 3.2. Distribution of Executable Form
+ .
+ If You distribute Covered Software in Executable Form then:
+ .
+ (a) such Covered Software must also be made available in Source Code
+     Form, as described in Section 3.1, and You must inform recipients of
+     the Executable Form how they can obtain a copy of such Source Code
+     Form by reasonable means in a timely manner, at a charge no more
+     than the cost of distribution to the recipient; and
+ .
+ (b) You may distribute such Executable Form under the terms of this
+     License, or sublicense it under different terms, provided that the
+     license for the Executable Form does not attempt to limit or alter
+     the recipients' rights in the Source Code Form under this License.
+ .
+ 3.3. Distribution of a Larger Work
+ .
+ You may create and distribute a Larger Work under terms of Your choice,
+ provided that You also comply with the requirements of this License for
+ the Covered Software. If the Larger Work is a combination of Covered
+ Software with a work governed by one or more Secondary Licenses, and the
+ Covered Software is not Incompatible With Secondary Licenses, this
+ License permits You to additionally distribute such Covered Software
+ under the terms of such Secondary License(s), so that the recipient of
+ the Larger Work may, at their option, further distribute the Covered
+ Software under the terms of either this License or such Secondary
+ License(s).
+ .
+ 3.4. Notices
+ .
+ You may not remove or alter the substance of any license notices
+ (including copyright notices, patent notices, disclaimers of warranty,
+ or limitations of liability) contained within the Source Code Form of
+ the Covered Software, except that You may alter any license notices to
+ the extent required to remedy known factual inaccuracies.
+ .
+ 3.5. Application of Additional Terms
+ .
+ You may choose to offer, and to charge a fee for, warranty, support,
+ indemnity or liability obligations to one or more recipients of Covered
+ Software. However, You may do so only on Your own behalf, and not on
+ behalf of any Contributor. You must make it absolutely clear that any
+ such warranty, support, indemnity, or liability obligation is offered by
+ You alone, and You hereby agree to indemnify every Contributor for any
+ liability incurred by such Contributor as a result of warranty, support,
+ indemnity or liability terms You offer. You may include additional
+ disclaimers of warranty and limitations of liability specific to any
+ jurisdiction.
+ .
+ 4. Inability to Comply Due to Statute or Regulation
+ ---------------------------------------------------
+ .
+ If it is impossible for You to comply with any of the terms of this
+ License with respect to some or all of the Covered Software due to
+ statute, judicial order, or regulation then You must: (a) comply with
+ the terms of this License to the maximum extent possible; and (b)
+ describe the limitations and the code they affect. Such description must
+ be placed in a text file included with all distributions of the Covered
+ Software under this License. Except to the extent prohibited by statute
+ or regulation, such description must be sufficiently detailed for a
+ recipient of ordinary skill to be able to understand it.
+ .
+ 5. Termination
+ --------------
+ .
+ 5.1. The rights granted under this License will terminate automatically
+ if You fail to comply with any of its terms. However, if You become
+ compliant, then the rights granted under this License from a particular
+ Contributor are reinstated (a) provisionally, unless and until such
+ Contributor explicitly and finally terminates Your grants, and (b) on an
+ ongoing basis, if such Contributor fails to notify You of the
+ non-compliance by some reasonable means prior to 60 days after You have
+ come back into compliance. Moreover, Your grants from a particular
+ Contributor are reinstated on an ongoing basis if such Contributor
+ notifies You of the non-compliance by some reasonable means, this is the
+ first time You have received notice of non-compliance with this License
+ from such Contributor, and You become compliant prior to 30 days after
+ Your receipt of the notice.
+ .
+ 5.2. If You initiate litigation against any entity by asserting a patent
+ infringement claim (excluding declaratory judgment actions,
+ counter-claims, and cross-claims) alleging that a Contributor Version
+ directly or indirectly infringes any patent, then the rights granted to
+ You by any and all Contributors for the Covered Software under Section
+ 2.1 of this License shall terminate.
+ .
+ 5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+ end user license agreements (excluding distributors and resellers) which
+ have been validly granted by You or Your distributors under this License
+ prior to termination shall survive termination.
+ .
+  ************************************************************************
+  *                                                                      *
+  *  6. Disclaimer of Warranty                                           *
+  *  -------------------------                                           *
+  *                                                                      *
+  *  Covered Software is provided under this License on an "as is"       *
+  *  basis, without warranty of any kind, either expressed, implied, or  *
+  *  statutory, including, without limitation, warranties that the       *
+  *  Covered Software is free of defects, merchantable, fit for a        *
+  *  particular purpose or non-infringing. The entire risk as to the     *
+  *  quality and performance of the Covered Software is with You.        *
+  *  Should any Covered Software prove defective in any respect, You     *
+  *  (not any Contributor) assume the cost of any necessary servicing,   *
+  *  repair, or correction. This disclaimer of warranty constitutes an   *
+  *  essential part of this License. No use of any Covered Software is   *
+  *  authorized under this License except under this disclaimer.         *
+  *                                                                      *
+  ************************************************************************
+ .
+  ************************************************************************
+  *                                                                      *
+  *  7. Limitation of Liability                                          *
+  *  --------------------------                                          *
+  *                                                                      *
+  *  Under no circumstances and under no legal theory, whether tort      *
+  *  (including negligence), contract, or otherwise, shall any           *
+  *  Contributor, or anyone who distributes Covered Software as          *
+  *  permitted above, be liable to You for any direct, indirect,         *
+  *  special, incidental, or consequential damages of any character      *
+  *  including, without limitation, damages for lost profits, loss of    *
+  *  goodwill, work stoppage, computer failure or malfunction, or any    *
+  *  and all other commercial damages or losses, even if such party      *
+  *  shall have been informed of the possibility of such damages. This   *
+  *  limitation of liability shall not apply to liability for death or   *
+  *  personal injury resulting from such party's negligence to the       *
+  *  extent applicable law prohibits such limitation. Some               *
+  *  jurisdictions do not allow the exclusion or limitation of           *
+  *  incidental or consequential damages, so this exclusion and          *
+  *  limitation may not apply to You.                                    *
+  *                                                                      *
+  ************************************************************************
+ .
+ 8. Litigation
+ -------------
+ .
+ Any litigation relating to this License may be brought only in the
+ courts of a jurisdiction where the defendant maintains its principal
+ place of business and such litigation shall be governed by laws of that
+ jurisdiction, without reference to its conflict-of-law provisions.
+ Nothing in this Section shall prevent a party's ability to bring
+ cross-claims or counter-claims.
+ .
+ 9. Miscellaneous
+ ----------------
+ .
+ This License represents the complete agreement concerning the subject
+ matter hereof. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the extent
+ necessary to make it enforceable. Any law or regulation which provides
+ that the language of a contract shall be construed against the drafter
+ shall not be used to construe this License against a Contributor.
+ .
+ 10. Versions of the License
+ ---------------------------
+ .
+ 10.1. New Versions
+ .
+ Mozilla Foundation is the license steward. Except as provided in Section
+ 10.3, no one other than the license steward has the right to modify or
+ publish new versions of this License. Each version will be given a
+ distinguishing version number.
+ .
+ 10.2. Effect of New Versions
+ .
+ You may distribute the Covered Software under the terms of the version
+ of the License under which You originally received the Covered Software,
+ or under the terms of any subsequent version published by the license
+ steward.
+ .
+ 10.3. Modified Versions
+ .
+ If you create software not governed by this License, and you want to
+ create a new license for such software, you may create and use a
+ modified version of this License if you rename the license and remove
+ any references to the name of the license steward (except to note that
+ such modified license differs from this License).
+ .
+ 10.4. Distributing Source Code Form that is Incompatible With Secondary
+ Licenses
+ .
+ If You choose to distribute Source Code Form that is Incompatible With
+ Secondary Licenses under the terms of this version of the License, the
+ notice described in Exhibit B of this License must be attached.
+ .
+ Exhibit A - Source Code Form License Notice
+ -------------------------------------------
+ .
+   This Source Code Form is subject to the terms of the Mozilla Public
+   License, v. 2.0. If a copy of the MPL was not distributed with this
+   file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ .
+ If it is not possible or desirable to put the notice in a particular
+ file, then You may include the notice in a location (such as a LICENSE
+ file in a relevant directory) where a recipient would be likely to look
+ for such a notice.
+ .
+ You may add additional accurate notices of copyright ownership.
+ .
+ Exhibit B - "Incompatible With Secondary Licenses" Notice
+ ---------------------------------------------------------
+ .
+   This Source Code Form is "Incompatible With Secondary Licenses", as
+   defined by the Mozilla Public License, v. 2.0.

vendor/composer/autoload_psr4.php

@@ -14,6 +14,7 @@ return array(
     'yii\\codeception\\' => array($vendorDir . '/yiisoft/yii2-codeception'),
     'yii\\bootstrap\\' => array($vendorDir . '/yiisoft/yii2-bootstrap'),
     'yii\\' => array($vendorDir . '/yiisoft/yii2'),
+    'dosamigos\\leaflet\\' => array($baseDir . '/src'),
     'dosamigos\\chartjs\\' => array($vendorDir . '/2amigos/yii2-chartjs-widget/src'),
     'cebe\\markdown\\' => array($vendorDir . '/cebe/markdown'),
     'Fxp\\Composer\\AssetPlugin\\' => array($vendorDir . '/fxp/composer-asset-plugin'),