Mettre en place l'interface de base sur le frontend

common/models/Commande.php

@@ -35,11 +35,12 @@ class Commande extends \yii\db\ActiveRecord
     	if(isset($this->commandeProduits)) {
     		foreach($this->commandeProduits as $p) {
     			
-    			if($p->produit->vrac) {
+    			if(isset($p->produit) && $p->produit->vrac) {
     				$this->montant_vrac += $p->prix * $p->quantite/1000 ;
     				$this->poids_vrac += $p->quantite/1000 ;
     			}
     			else {
+                            
     				$this->montant_pain += $p->prix * $p->quantite ;
     				$this->poids_pain += $p->quantite * $p->produit->poids/1000 ;
     			}

common/models/User.php

@@ -226,4 +226,9 @@ class User extends ActiveRecord implements IdentityInterface
     	];
     }
     
+    public function isBoulanger() 
+    {
+        return $this->is_boulanger ;
+    }
+    
 }

frontend/views/layouts/main.php

@@ -36,46 +36,27 @@ AppAsset::register($this);
 	<?php $this->beginBody() ?>
 		<div id="back"></div>
 		<header id="header">
-			<div class="container">
-				<nav class="">
-					<ul>
-						<? //if($is_home): ?>					
-							<li class="contact"><a href="<?php if(!$is_home): echo Yii::$app->urlManager->createUrl(['site/index']); endif; ?>#contact" data-toggle="tooltip" data-placement="bottom" title="Contact"><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/icon_53324.png" alt="" /><span>Contact</span></a></li>
-							<li class="fournisseurs"><a href="<?php if(!$is_home): echo Yii::$app->urlManager->createUrl(['site/index']); endif; ?>#fournisseurs" data-toggle="tooltip" data-placement="bottom" title="Fournisseurs"><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/fournisseurs.png" alt="" /><span>Fournisseurs</span></a></li>
-							<li class="methode"><a href="<?php if(!$is_home): echo Yii::$app->urlManager->createUrl(['site/index']); endif; ?>#methode" data-toggle="tooltip" data-placement="bottom" title="Méthode"><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/methode.png" alt="" /><span>Méthode</span></a></li>
-							<li class="vrac"><a href="<?php if(!$is_home): echo Yii::$app->urlManager->createUrl(['site/index']); endif; ?>#vrac" data-toggle="tooltip" data-placement="bottom" title="Vrac"><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/vrac.png" alt="" /><span>Vrac</span></a></li>
-							<li class="gamme"><a href="<?php if(!$is_home): echo Yii::$app->urlManager->createUrl(['site/index']); endif; ?>#gamme" data-toggle="tooltip" data-placement="bottom" title="Pains"><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/icon_67951.png" alt="" /><span>Gamme</span></a></li>
-							<li class="points-vente"><a href="<?php if(!$is_home): echo Yii::$app->urlManager->createUrl(['site/index']); endif; ?>#points-vente" data-toggle="tooltip" data-placement="bottom" title="Points de vente"><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/icon_9667.png" alt="" /><span>Points de vente</span></a></li>
-							<li class="first horaires"><a href="<?php if(!$is_home): echo Yii::$app->urlManager->createUrl(['site/index']); endif; ?>#horaires" data-toggle="tooltip" data-placement="bottom" title="Horaires"><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/icon_3020.png" alt="" /><span>Horaires</span></a></li>
-						<? //endif; ?>		
-						<li class="presentation" id="logo"><a href="<?php if(!$is_home): echo Yii::$app->urlManager->createUrl('site/index') ; else: echo '#presentation'; endif;?>"></a></li>
-						<!--  <li class="first"><a href="#presentation">Présentation</a></li> -->
-					</ul>
-				</nav>
-				<a href="<?php echo Yii::$app->urlManager->createUrl('commande/index'); ?>" id="link-commander" data-toggle="tooltip" data-placement="bottom" title="Commander">
-					<img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/order.png" alt="" />
-					<!--<span class="glyphicon glyphicon-user"></span>-->
-				</a>
-				
-			</div>
-			
+                    <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>
+                            <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; ?>
+                        <?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>
+                        <?php endif;?>
+                            </ul>
+                        </nav>
+                    </div>
 		</header>
 		<div id="main">
 		
-                        <?php if(!Yii::$app->user->isGuest): ?>
-                            
-                            <div id="menu-user">
-                                <div class="container">
-                                <ul class="nav nav-pills">
-                                    <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 des commandes</a></li>
-                                    <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> Passer une commande</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> Modifier mon profil</a></li>
-                                    <!--<li><a <?php if(Yii::$app->controller->id == 'user' && Yii::$app->controller->action->id == 'credit'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('user/credit') ; ?>"><span class="glyphicon glyphicon-euro"></span> Créditer mon compte</a></li>-->
-                                    <li><a href="<?php echo Yii::$app->urlManager->createUrl('site/logout') ; ?>"><span class="glyphicon glyphicon-off"></span> Déconnexion (<?php echo Html::encode(Yii::$app->user->identity->prenom .' '.Yii::$app->user->identity->nom) ; ?>)</a></li>
-                                </ul>
-                                </div>
-                            </div>
-                        <?php endif;?>
+                        
                     
                     
 			<section class="<?php if(!$is_home): ?>container<?php endif;?>" id="content">

frontend/views/site/index.php

@@ -5,506 +5,27 @@ use yii\bootstrap\ActiveForm;
 use yii\captcha\Captcha;
 
 /* @var $this yii\web\View */
-$this->title = 'Du pain à Déservillers';
+$this->title = 'Système de réservation de pain';
 ?>
 
 <?php
 
-$date_printemps = date('y').'-03-20' ;
-$date_printemps_next = (date('y')+1).'-03-20' ;
-$date_ete = date('y').'-06-20' ;
-$date_automne = date('y').'-09-21' ;
-$date_hiver = date('y').'-12-21' ;
-$date_hiver_prev = (date('y')-1).'-12-21' ;
-$date = date('y-m-d') ;
-$is_printemps = false ;
-$is_ete = false ;
-$is_automne = false ;
-$is_hiver = false ;
-
-if($date >= $date_printemps && $date < $date_ete) 
-	$is_printemps = true ;
-if($date >= $date_ete && $date < $date_automne) 
-	$is_ete = true ;
-if($date >= $date_automne && $date < $date_hiver) 
-	$is_automne = true ;
-if($date >= $date_hiver && $date < $date_printemps_next) 
-	$is_hiver = true ;
-if($date >= $date_hiver_prev && $date < $date_printemps) 
-	$is_hiver = true ;
 
 ?>
 			
 <div class="item" id="presentation">
 	<div class="container">
-		
-		<input type="hidden" id="base_url" value="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>"  />
-		
-		<ul class="bjqs"></ul>
-
-		<h1>Le Chat des Noisettes</h1>
-
-		<!-- <div id="fournil">
-			<h2>Fournil</h2>
-			<p>Pains sur levain, à la farine de meule et au sel de Salins,<br /> cuits au feu de bois.</p>
-		</div>
-
-		<div id="epicerie">
-			<h2>Petite épicerie</h2>
-			<p>Quelques produits en vrac (pâtes, riz, farine, sucre...)</p>
-		</div> -->
-                
-                <!--<div id="message-fermeture">
-                    <div class="line1"><span>Le Chat des Noisettes</span> est actuellement <strong class="ferme">fermé</strong> pour cause de travaux.</div>
-                    <div class="line2">La réouverture aura lieu dès que possible ! Plus de renseignements au <strong>06 37 02 72 20</strong></div>
-                </div>-->
-
-		<div class="col-md-6" id="">
-			<h2>Fournil</h2>
-			<p>Pains sur levain, à la farine de meule<br /> et au sel de Salins, cuits au feu de bois.</p>
-			<a href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/fournil-gf.jpg" data-lightbox="four" data-title="Le four à gueulard"><img class="img-rounded img-thumbnail" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/fournil.jpg" alt="Fournil" /></a>
-		</div>
-		
-		<div class="col-md-6" id="">
-			<h2>Vrac</h2>
-			<p>Produits secs vendus sans emballages jetables.</p>
-			<br />
-			<a href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/epicerie-gf.jpg" data-lightbox="vrac" data-title="Le vrac"><img class="img-rounded img-thumbnail" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/epicerie.jpg" alt="Fournil" /></a>
-		</div>
+		<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>
 </div>
-<div class="item back2" id="horaires">
-	<div class="container">
-		
-		<div class="separateur"></div>
-		<h2><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/icon_3020.png" alt="" /> Horaires</h2>
-		
-		<p>Horaires d'ouverture du <strong>Chat des Noisettes</strong>, à Déservillers.</p>
-		    
-		    <table class="table table-bordered">
-		      <thead>
-		        <tr>
-		          <th></th>
-		          <th>Horaire</th>
-		        </tr>
-		      </thead>
-		      <tbody>
-		        <tr>
-		          <td class="jour">Lundi</td>
-		          <td class="horaire">X</td>
-		        </tr>
-		        <tr>
-		          <td class="jour">Mardi</td>
-		          <td class="horaire">X</td>
-		        </tr>
-		        <tr>
-		          <td class="jour">Mercredi</td>
-		          <td class="horaire">7h à 12h30</td>
-		        </tr>
-		        <tr>
-		          <td class="jour">Jeudi</td>
-		          <td class="horaire">7h à 12h30</td>
-		        </tr>
-		        <tr>
-		          <td class="jour">Vendredi</td>
-		          <td class="horaire">7h à 12h30</td>
-		        </tr>
-		        <tr>
-		          <td class="jour">Samedi</td>
-		          <td class="horaire">7h à 12h30</td>
-		        </tr>
-		        <tr>
-		          <td class="jour">Dimanche</td>
-		          <td class="horaire">7h à 12h30</td>
-		        </tr>
-		      </tbody>
-		    </table>
-
-	</div>
-</div>
-<div class="item back1" id="points-vente">
-	<div class="container">
-		
-		<div class="separateur"></div>
-		<h2><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/icon_9667.png" alt="" /> Points de vente</h2>
-		
-		<div class="col-md-6">
-			<iframe src="http://umap.openstreetmap.fr/en/map/le-chat-des-noisettes_26119?scaleControl=false&amp;miniMap=false&amp;scrollWheelZoom=false&amp;zoomControl=true&amp;allowEdit=false&amp;moreControl=true&amp;datalayersControl=true&amp;onLoadPanel=undefined"></iframe><p><a href="http://umap.openstreetmap.fr/en/map/le-chat-des-noisettes_26119">Voir en plein écran</a></p>
-		</div>
-
-		<div class="col-md-6">
-			<div class="content">	
-
-				<div class="bloc">
-					<h3 class="top">Vente directe</h3>
-					<address>
-						<strong><span>&bull;</span> Le Chat des Noisettes</strong><br />
-						8bis rue de l'École<br />
-						25330 DÉSERVILLERS
-					</address>
-					
-					<h3>Dépôts</h3>
-					<address>
-						<strong><span>&bull;</span> Laiterie du Lizon</strong><br />
-						9 Grande Rue<br />
-						25330 NANS-SOUS-SAINTE-ANNE
-					</address>
-					<address>
-						<strong><span>&bull;</span> La petite Épicerie</strong><br />
-						15 Grande Rue<br />
-						25270 VILLERS-SOUS-CHALAMONT
-					</address>
-				</div>
-				
-				<!-- <div class="bloc">
-					<h3>Dépôts</h3>
-					<address>
-						<strong><span>&bull;</span> Laiterie du Lison</strong><br />
-						9 Grande Rue<br /> 
-						25330 Nans-sous-Sainte-Anne
-					</address>
-					<address>
-						<strong><span>&bull;</span> La petite épicerie</strong><br />
-						15 Grande Rue<br />
-						25270 Villers-sous-Chalamont
-					</address>		
-				</div>	
-
-				<div class="bloc">
-					<h3>AMAP</h3>
-					<address>
-						<strong><span>&bull;</span> Visage du Lison</strong><br />
-						25330 Sans-sous-Sainte-Anne
-					</address>		
-				</div> -->							
-			</div>
-		</div>
-
-	</div>
-</div>
-<div class="item back2" id="gamme">
-	<div class="container">
-		
-		<div class="separateur"></div>
-		<h2><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/icon_67951.png" alt="" /> Pain</h2>
-		
-		<a class="img-right" href="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/baguettes-gf.jpg" data-lightbox="baguettes"><img class="img-rounded img-thumbnail" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/baguettes.jpg" alt="Baguettes" /></a>
-		
-		<!-- <div class="bloc-right">
-			<ul>
-				<li><a data-toggle="modal" href="#fournisseurs">Fournisseurs</a></li>
-				<li><a data-toggle="modal" href="#panification">Panification</a></li>
-			</ul>
-		</div> -->
-		
-		<div class="annee">
-				
-				
-<?php function produit($nom, $produits, $vrac = false) {
-	
-	$produit = null ;
-	
-	foreach($produits as $p) {
-		if($p->nom == $nom)
-			$produit = $p ; 
-	}
-	
-	if(is_null($produit))
-		return;
-	
-	$id = strtolower($nom) ;
-	$id = str_replace(' ','-',$id) ;
-	$id = str_replace(' ','-',$id) ;
-	$id = str_replace('\'','-',$id) ;
-	$id = str_replace('(','',$id) ;
-	$id = str_replace(')','',$id) ;
-	
-	$nom = htmlspecialchars($nom) ;
-	
-	$illustration = '' ;
-	$illustration_modal = '<em>Pas encore d\'illustration pour ce produit.</em>' ;
-	if(strlen($produit->illustration)) {
-		$illustration = '<a class="illu" data-toggle="modal" href="#'.$id.'"><img src="'.Yii::$app->urlManager->getBaseUrl().'/uploads/'.$produit->illustration.'" alt="Illustration '.$nom.'" /></a>' ;
-		$illustration_modal = '<img class="illustration" src="'.Yii::$app->urlManager->getBaseUrl().'/uploads/'.$produit->illustration.'" alt="Illustration '.$nom.'" />' ;
-	}
-	if(strlen($produit->photo)) {
-		$illustration_modal = '<img class="photo img-rounded" src="'.Yii::$app->urlManager->getBaseUrl().'/uploads/'.$produit->photo.'" alt="Photo '.$nom.'" />' ;
-	}
-	
-	$jours = '' ;
-	if($produit->lundi) $jours .= 'lundi / ' ;
-	if($produit->mardi) $jours .= 'mardi / ' ;
-	if($produit->mercredi) $jours .= 'mercredi / ' ;
-	if($produit->jeudi) $jours .= 'jeudi / ' ;
-	if($produit->vendredi) $jours .= 'vendredi / ' ;
-	if($produit->samedi) $jours .= 'samedi / ' ;
-	if($produit->dimanche) $jours .= 'dimanche   ' ;
-	
-	if(strlen($jours))
-		$jours = substr($jours, 0, strlen($jours)-3) ;
-	
-	// description
-	if($vrac) {
-		$description = Html::encode($produit->description) ;
-	}
-	else {
-		$description = $produit->getDescription() ;
-	}
-	
-	if(!$vrac)
-		echo '<td>' ;
-	
-echo '
-	'.$illustration.'
-	<div class="contenu '.(($vrac) ? 'vrac' : '').'">
-		<p class="nom"><a data-toggle="modal" href="#'.$id.'">'.$nom.'</a><br /><span class="prix">'.number_format($produit->prix, 2).' €</span></p>
-		<p class="description"><a data-toggle="modal" href="#'.$id.'">'.Html::encode($produit->description).'</a></p>
-		<!--<p class="jours">'.$jours.'</p>-->
-	</div>
-	
-	<div class="modal fade" id="'.$id.'" tabindex="-1" role="dialog" aria-hidden="true">
-	  <div class="modal-dialog">
-	    <div class="modal-content">
-	      <div class="modal-header">
-	        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	        <h4 class="modal-title"><span class="nom">'.$nom.'</span> ' ;
-
-		if($vrac) {
-			echo '<p class="recette">'.htmlentities(nl2br($produit->description)).'</p>' ;	
-		}
-		else {
-			echo '<span class="description"> &bull; '.$produit->getDescription().'</span>' ;
-			echo '<p class="recette">'.htmlentities(nl2br($produit->recette)).'</p>' ;
-			echo '<p class="jours">'.$jours.'</p>' ;
-		}
-
-		echo '
-	      </div>
-	      <div class="modal-body">
-	        '.$illustration_modal.'
-	      </div>
-	      <div class="modal-footer">
-	        <button type="button" class="btn btn-default" data-dismiss="modal">Fermer</button>
-	      </div>
-	    </div>
-	  </div>
-	</div>
-' ;
-
-	if(!$vrac)
-		echo '</td>' ;
-
-} ?>
-                    
-			<h3>Les baguettes</h3>
-			<table class="table">
-				<tbody>
-					<tr>
-						<?php produit('Rameau',$produits) ; ?>
-						<?php produit('Ramille',$produits) ; ?>
-						<?php produit('Ramier',$produits) ; ?>
-					</tr>
-				</tbody>
-			</table>
-			
-			<h3>Les pains</h3>
-			<table class="table">
-				<tbody>
-					<tr>
-						<?php produit('Foyard',$produits) ; ?>
-                                                <?php produit('Bouleau',$produits) ; ?>
-						<?php produit('Charmille',$produits) ; ?>
-						<?php produit('Sorbier des oiseleurs',$produits) ; ?>
-						<?php produit('Coudrier',$produits) ; ?>
-                                                <?php produit('Noyer',$produits) ; ?>
-					</tr>
-				</tbody>
-			</table>
-			
-			<h3>Les spéciaux</h3>
-			<table class="table">
-				<tbody>
-					<tr>
-						<?php produit('Érable',$produits) ; ?>
-					</tr>
-				</tbody>
-			</table>
-			
-			<h3>Les viennoiseries</h3>
-			<table class="table">
-				<tbody>
-					<tr>
-						<?php produit('Moineau',$produits) ; ?>
-						<?php produit('Sittelle',$produits) ; ?>
-						<?php produit('Mésange',$produits) ; ?>
-					</tr>
-				</tbody>
-			</table>
-                        
-                        <h3>Les brioches & les pains briochés</h3>
-			<table class="table">
-				<tbody>
-					<tr>
-                                            <?php produit('Bouton d\'or',$produits) ; ?>
-                                            <?php produit('Perce-neige',$produits) ; ?>
-                                            <?php produit('Pâquerette',$produits) ; ?>
-                                            <?php produit('Myosotis',$produits) ; ?>
-                                        </tr>
-                                </tbody>
-			</table>      
-                        
-                        
-	</div>
-
-	</div>
-</div>
-
-<div class="item back2" id="vrac">
-	<div class="container">
-		<div class="separateur"></div>
-		<h2><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/vrac.png" alt="" /> Vrac</h2>
-		
-		<div class="produits">
-			<?php 
-			
-			foreach($produits as $p) {
-				if($p->vrac && $p->actif)
-					echo produit($p->nom, $produits, true) ;
-			}
-			
-			?>
-			
-			<div class="clr"></div>
-		</div>
-	</div>
-</div>
-		
-
-<div class="item" id="methode">
-	<div class="container">
-	
-		<div class="separateur"></div>
-		<h2><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/methode.png" alt="Icone méthode" /> Méthode de panification</h2>
-		<div class="col-md-8">
-                    
-                    <p>L'ensemble de ma gamme est réalisée exclusivement sur levain. La pâte est pétrie mécaniquement à l'aide d'un pétrin à bras coudé puis laissée en fermentation longue à basse température. Façonnés à la main, mes produits sont ensuite cuits dans un four à bois.
-                        Tous mes produits sont certifiés <a href="http://www.natureetprogres.org/">Nature et Progrès</a>.
-                    </p>
-			<!--<p>L'ensemble de ma gamme est réalisée exclusivement sur levain.</p>
-			<p>La pâte est pétrie mécaniquement à l'aide d'un pétrin à bras coudé puis laissée en fermentation longue (36h) à basse température.</p>
-			<p>Façonnés à la main, mes produits sont ensuite cuits dans un four à bois dit "à gueulard" situé à Amancey.</p>
-			<p>Tous mes produits sont certifiés <a href="http://www.natureetprogres.org/">Nature et Progrès</a></p>
-			<p><a href="http://www.natureetprogres.org/"><img class="logo-np" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/logo_natureetprogres.jpg" alt="Logo Nature & Progrès" /></a></p>
-                        -->
-                </div>
-		<div class="col-md-4">
-			<a class="img" href="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/four-gf.jpg" data-lightbox="four-gueulard" data-title="Le four à gueulard"><img width="200" height="301" class="img-rounded img-thumbnail" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/four2.jpg" alt="Four à gueulard" /></a>
-		</div>
-		
-		<div class="clr"></div>
-	</div>
-</div>
-
-<div class="item" id="fournisseurs">
-	<div class="container">
-	
-		<div class="separateur"></div>
-		<h2><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/fournisseurs.png" alt="Icone fournisseurs" /> Fournisseurs</h2>
-		<div class="col-md-6">
-			<iframe src="http://umap.openstreetmap.fr/fr/map/fournisseurs-le-chat-des-noisettes_41178?scaleControl=false&miniMap=false&scrollWheelZoom=false&zoomControl=true&allowEdit=false&moreControl=true&datalayersControl=true&onLoadPanel=undefined&captionBar=false"></iframe><p><a href="http://umap.openstreetmap.fr/fr/map/fournisseurs-le-chat-des-noisettes_41178">Voir en plein écran</a></p>
-		</div>
-		<div class="col-md-3">
-			<h3 class="top">Farine</h3>
-			<address>
-				<strong><span>&bull;</span> La Grange Melot</strong> <img class="logo-ab" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/logo_ab.jpg" alt="Logo AB" /><br />
-				Mamirolle
-			</address>
-			<address>
-				<strong><span>&bull;</span> Moulin du Val d'Amour</strong> <img class="logo-ab" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/logo_ab.jpg" alt="Logo AB" /><br />
-				Vaudrey
-			</address>
-			<address>
-				<strong><span>&bull;</span> Moulin Taron</strong> <img class="logo-ab" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/logo_ab.jpg" alt="Logo AB" /><br />
-				Chaussin
-			</address>
-			
-			<h3>Sel</h3>
-			<address>
-				<strong><span>&bull;</span> Salins-les-Bains</strong>
-			</address>
-			
-			
-		</div>
-		<div class="col-md-3">
-		
-			<h3 class="top">Lait</h3>
-			<address>
-				<strong><span>&bull;</span> Freddy Chatelain</strong> <img class="logo-ab" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/logo_ab.jpg" alt="Logo AB" /><br />
-				Déservillers
-			</address>
-			
-			<h3>Oeufs</h3>
-			<address>
-				<strong><span>&bull;</span> La Ferme des Intondables</strong> <img class="logo-ab" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/logo_ab.jpg" alt="Logo AB" /><br />
-				Paroy
-			</address>
-			
-			<h3>Beurre</h3>
-			<address>
-				<strong><span>&bull;</span> Fromagerie du Val de Loue</strong> <img class="logo-ab" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/logo_ab.jpg" alt="Logo AB" /><br />
-				Grange-de-Vaivre
-			</address>
-		
-			<h3>Oléagineux</h3>
-			<address>
-				<strong><span>&bull;</span> La goutte d'or du Plateau</strong> <img class="logo-ab" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/logo_ab.jpg" alt="Logo AB" /><br />
-				Le Fied
-			</address>
-			
-			<h3>Miel</h3>
-			<address>
-				<strong><span>&bull;</span> Le Chat des Noisettes</strong> <img class="logo-np" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/logo_natureetprogres.jpg" alt="Logo AB" /><br />
-				Déservillers
-			</address>
-			
-			
-		</div>
-		
-		<div class="clr"></div>
-		
-		<h3>Et tout le reste ...</h3>
-		<p><strong>Raiponce</strong> (France, <img class="logo-ab" width="21px" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/logo_ab.jpg" alt="Logo AB" />) me fournit les autres matières premières (sucre, graines ...) ainsi que les produits proposés à la vente en vrac (riz, pâtes ...).</p>
-	</div>
-</div>
 
 <div class="item back1" id="contact">
 	<div class="container">
 	
 		<div class="separateur"></div>
-		<h2><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/icon_53324.png" alt="" /> Contact</h2>
-
-		<a class="img-right" href="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/charbonnette-gf.jpg" data-lightbox="charbonnette" data-title="Charbonnette"><img class="img-rounded img-thumbnail" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/charbonnette.jpg" alt="Charbonnette" /></a>
-		
-		<div id="par-telephone">
-			<h3>Par téléphone</h3>
-			<p>Matthieu au <strong>06 37 02 72 20</strong></p>
-		</div>
-		
-		<div id="par-courrier">
-			<h3>Par courrier</h3>
-			<address id="adresse-chat-noisettes">
-				<strong>Le Chat des Noisettes</strong><br />
-				8bis rue de l'École<br />
-				25330 DÉSERVILLERS
-			</address>	
-		</div>
-
-		<h3>Par email</h3>
-		
-		<div class="alert alert-warning">
-			Pour passer une commande, merci de ne pas utiliser ce formulaire de contact mais de <a href="<?php echo Yii::$app->urlManager->createurl(['commande/index']) ; ?>">cliquer ici</a>.
-		</div>
+		<h2><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/icon_53324.png" alt="" /> Contact</h2>		
 		
 		<?php if(Yii::$app->session->getFlash('success')): ?>
 			<div class="alert alert-success"><div class="icon"></div><?= Yii::$app->session->getFlash('success'); ?></div>

frontend/views/site/login.php

@@ -14,10 +14,6 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <p>Pas encore de compte ? <a class="" href="<?php echo Yii::$app->urlManager->createUrl('site/signup') ; ?>">Je m'inscris</a></p>
     
-    <div class="alert alert-info">
-        Un compte sur <em>Le Chat des Noisettes</em> vous permet de <strong>commander votre pain</strong> et de recevoir des <strong>emails d'information</strong>.
-    </div>
-    
     <div class="row">
         <div class="col-lg-5">
             <?php $form = ActiveForm::begin(['id' => 'login-form']); ?>

frontend/web/css/screen.css

@@ -70,7 +70,7 @@ a {
 }
 /* line 37, ../sass/screen.scss */
 a:focus, a:active {
-  outline-color: #fdd44b;
+  outline-color: gray;
   color: black;
 }
 /* line 42, ../sass/screen.scss */
@@ -121,257 +121,96 @@ ul li {
   color: #8a6d3b;
 }
 
-/* line 90, ../sass/screen.scss */
-#back {
-  display: none;
-  position: fixed;
-  top: 100px;
-  left: 0px;
-  width: 100%;
-  height: 100%;
-  background: transparent top center no-repeat url("../img/fournil.jpg");
-}
-
-/* line 101, ../sass/screen.scss */
-.modal.contenu-annexe .modal-title {
-  font-family: "comfortaabold";
-  font-size: 24px;
-  text-transform: uppercase;
-}
-
-/* line 110, ../sass/screen.scss */
+/* line 91, ../sass/screen.scss */
 #main {
   position: relative;
 }
-/* line 112, ../sass/screen.scss */
+/* line 93, ../sass/screen.scss */
 #main .inner {
   width: 960px;
   margin: 0px auto;
 }
 
-/* line 118, ../sass/screen.scss */
+/* line 99, ../sass/screen.scss */
 #header {
   z-index: 100;
-  border-top: solid 4px #fdd44b;
   border-bottom: solid 1px #e0e0e0;
   background-color: white;
-  height: 100px;
+  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;
-  -moz-box-shadow: 0px 0px 5px black;
-  -webkit-box-shadow: 0px 0px 5px black;
-  box-shadow: 0px 0px 5px black;
-  position: fixed;
-  width: 100%;
 }
-/* line 131, ../sass/screen.scss */
+/* line 112, ../sass/screen.scss */
 #header .container {
   padding-left: 0px;
   position: relative;
 }
-/* line 137, ../sass/screen.scss */
-#header #logo img {
-  height: 53px;
-}
-/* line 141, ../sass/screen.scss */
-#header #logo a {
-  border: 0px none;
-  display: block;
-  height: 56px;
-  width: 205px;
-  padding-right: 0px;
-  background: transparent top left no-repeat url("../img/logo-lechatdesnoisettes2.png");
-}
-/* line 150, ../sass/screen.scss */
-#header #logo a:hover {
-  background: transparent top left no-repeat url("../img/logo-lechatdesnoisettes2-hover.png");
-}
-/* line 154, ../sass/screen.scss */
-#header #logo a.selec {
-  border: 0px none;
-}
-/* line 160, ../sass/screen.scss */
-#header h1 {
-  font-size: 25px;
-  line-height: 30px;
-  text-align: center;
-  font-family: "comfortaalight";
-}
-/* line 167, ../sass/screen.scss */
-#header h2 {
-  font-size: 18px;
-  line-height: 30px;
-  text-align: center;
-  font-family: "myriadpro-light";
-}
-/* line 174, ../sass/screen.scss */
-#header #logo, #header nav ul li a {
-  padding: 20px 0px;
-}
-/* line 178, ../sass/screen.scss */
-#header a#link-commander {
-  float: right;
-  display: block;
-  height: 95px;
-  padding-left: 15px;
-  padding-right: 15px;
-  line-height: 55px;
-  border-bottom: solid 4px white;
-  -moz-transition: all 0.2s linear;
-  -o-transition: all 0.2s linear;
-  -webkit-transition: all 0.2s linear;
-  transition: all 0.2s linear;
-  text-decoration: none;
-}
-/* line 190, ../sass/screen.scss */
-#header a#link-commander:hover {
-  border-bottom: solid 4px #fdd44b;
-}
-/* line 194, ../sass/screen.scss */
-#header a#link-commander:hover, #header a#link-commander:active, #header a#link-commander:focus, #header a#link-commander.selec {
-  text-decoration: none;
-  outline: none;
-}
-/* line 199, ../sass/screen.scss */
-#header a#link-commander span {
-  font-size: 30px;
+/* line 117, ../sass/screen.scss */
+#header #link-home {
   position: relative;
-  top: 40px;
+  top: 15px;
 }
-/* line 206, ../sass/screen.scss */
-#header a#link-commander .icon {
-  height: 50px;
-  position: relative;
-  top: 21px;
+/* line 120, ../sass/screen.scss */
+#header #link-home img {
+  width: 37px;
 }
-/* line 213, ../sass/screen.scss */
+/* line 126, ../sass/screen.scss */
 #header nav {
-  padding: 0px;
-  float: left;
+  position: relative;
+  bottom: 25px;
 }
-/* line 219, ../sass/screen.scss */
+/* line 129, ../sass/screen.scss */
 #header nav ul {
-  list-style-type: none;
-  padding-left: 0px;
-}
-/* line 222, ../sass/screen.scss */
-#header nav ul li {
   float: right;
-  padding-left: 0px;
 }
-/* line 236, ../sass/screen.scss */
+/* line 132, ../sass/screen.scss */
 #header nav ul li a {
-  position: relative;
-  color: black;
-  display: block;
-  height: 95px;
-  padding-left: 15px;
-  padding-right: 15px;
-  line-height: 55px;
-  color: #333;
-  border-bottom: solid 4px white;
-  -moz-transition: all 0.2s linear;
-  -o-transition: all 0.2s linear;
-  -webkit-transition: all 0.2s linear;
-  transition: all 0.2s linear;
   text-decoration: none;
 }
-/* line 250, ../sass/screen.scss */
-#header nav ul li a.selec {
-  border-bottom: solid 4px #fdd44b;
+/* line 135, ../sass/screen.scss */
+#header nav ul li a.active {
+  background-color: #eee;
 }
-/* line 255, ../sass/screen.scss */
-#header nav ul li a:hover {
-  border-bottom: solid 4px #fdd44b;
-}
-/* line 259, ../sass/screen.scss */
-#header nav ul li a:hover, #header nav ul li a:active, #header nav ul li a:focus, #header nav ul li a.selec {
-  text-decoration: none;
-  outline: none;
-}
-/* line 264, ../sass/screen.scss */
-#header nav ul li a span {
-  display: none;
-}
-/* line 270, ../sass/screen.scss */
-#header nav ul li .icon {
-  height: 50px;
-  position: relative;
-}
-/* line 279, ../sass/screen.scss */
-#header nav ul li.points-vente .icon {
-  height: 40px;
-  top: 6px;
-}
-/* line 284, ../sass/screen.scss */
-#header nav ul li.gamme .icon {
-  height: 65px;
-  top: -2px;
-}
-/* line 289, ../sass/screen.scss */
-#header nav ul li.methode .icon {
-  height: 40px;
-  top: 5px;
-}
-/* line 294, ../sass/screen.scss */
-#header nav ul li.fournisseurs .icon {
-  height: 45px;
-  top: 5px;
-}
-/* line 299, ../sass/screen.scss */
-#header nav ul li.contact .icon {
-  height: 40px;
-  top: 5px;
-}
-
-/* line 310, ../sass/screen.scss */
-#header nav {
-  width: 521px;
-  width: 601px;
-  width: 669px;
-  width: 756px;
+/* line 144, ../sass/screen.scss */
+#header #link-logout .nom {
+  font-size: 10px;
+  /*position: relative ;
+  left: 20px ;
+  top: -3px ;*/
 }
 
-/*#header nav {
-	width: 206px ;
-}*/
-/* line 321, ../sass/screen.scss */
+/* line 153, ../sass/screen.scss */
 #main {
   padding: 0px;
 }
 
-/* line 326, ../sass/screen.scss */
-.connected #content {
-  padding-top: 150px;
-}
-
-/* line 331, ../sass/screen.scss */
+/* line 163, ../sass/screen.scss */
 #content {
   position: relative;
   padding: 20px 0px;
   padding-bottom: 0px;
-  padding-top: 100px;
+  padding-top: 15px;
   min-height: 500px;
 }
-/* line 339, ../sass/screen.scss */
+/* line 171, ../sass/screen.scss */
 #content #description img {
   width: 100%;
 }
-/* line 344, ../sass/screen.scss */
+/* line 176, ../sass/screen.scss */
 #content .item {
   position: relative;
-  min-height: 400px;
+  min-height: 250px;
 }
-/* line 348, ../sass/screen.scss */
+/* line 180, ../sass/screen.scss */
 #content .item .container {
   padding: 20px;
   position: relative;
 }
-/* line 353, ../sass/screen.scss */
+/* line 185, ../sass/screen.scss */
 #content .item .separateur {
   width: 600px;
   border-top: 1px solid #e0e0e0;
@@ -379,15 +218,7 @@ ul li {
   padding-top: 20px;
   margin-top: 20px;
 }
-/* line 361, ../sass/screen.scss */
-#content .item.back1 {
-  background-color: white;
-}
-/* line 366, ../sass/screen.scss */
-#content .item.back2 {
-  background-color: white;
-}
-/* line 374, ../sass/screen.scss */
+/* line 193, ../sass/screen.scss */
 #content .item h2 {
   color: black;
   padding-bottom: 50px;
@@ -399,442 +230,49 @@ ul li {
   position: relative;
   margin-top: 30px;
 }
-/* line 386, ../sass/screen.scss */
+/* line 205, ../sass/screen.scss */
 #content .item h3 {
   color: black;
   font-family: "comfortaalight";
   font-size: 20px;
   padding-bottom: 12px;
 }
-/* line 393, ../sass/screen.scss */
+/* line 212, ../sass/screen.scss */
 #content .item .icon {
   position: absolute;
 }
-/* line 399, ../sass/screen.scss */
-#content .bloc-right {
-  float: right;
-  line-height: 23px;
-  background-color: white;
-  padding: 16px;
-  background-color: #f9f9f9;
-  border-bottom: solid 1px #d8d8d8;
-  border-left: solid 1px #d8d8d8;
-}
-
-/* line 412, ../sass/screen.scss */
-#sidebar {
-  padding: 0px;
-}
-/* line 415, ../sass/screen.scss */
-#sidebar .item {
-  padding: 15px;
-  border-bottom: solid 1px #e0e0e0;
-}
-
-/* line 423, ../sass/screen.scss */
-#main #content #presentation h1 {
-  text-align: center;
-  font-size: 50px;
-  font-family: "comfortaabold";
-  font-family: "comfortaaregular";
-  font-family: "comfortaalight";
-  padding-bottom: 22px;
-  padding-top: 38px;
-  color: #333;
-  color: white;
-  color: #333;
-  position: relative;
-  top: -20px;
-  width: 600px;
-  margin: 0px auto;
-  /*border-left: solid 1px #e0e0e0 ;
-  border-right: solid 1px #e0e0e0 ;*/
-  border-bottom: solid 1px #e0e0e0;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
-}
-/* line 448, ../sass/screen.scss */
-#main #content #presentation .col-md-6 {
-  text-align: center;
-}
-/* line 452, ../sass/screen.scss */
-#main #content #presentation h2 {
-  font-family: "myriadpro-regular";
-  font-size: 35px;
-  line-height: 45px;
-  padding-bottom: 9px;
-  text-transform: none;
-  text-align: left;
-  margin-top: 5px;
-  text-align: center;
-}
-/* line 463, ../sass/screen.scss */
-#main #content #presentation p {
-  line-height: 20px;
-}
-/* line 467, ../sass/screen.scss */
-#main #content #presentation ul {
-  float: right;
-  list-style-type: circle;
-  margin-top: 20px;
-}
-/* line 474, ../sass/screen.scss */
-#main #content #presentation #fournil, #main #content #presentation #epicerie {
-  position: absolute;
-  top: 160px;
-  width: 45%;
-  /*height: 141px ;
-  height: 155px ;*/
-  background-color: white;
-  padding: 20px;
-  border-right: solid 1px #e0e0e0;
-  border-bottom: solid 1px #e0e0e0;
-  -moz-box-shadow: 0px 0px 5px black;
-  -webkit-box-shadow: 0px 0px 5px black;
-  box-shadow: 0px 0px 5px black;
-  border-left: solid 4px #e08702;
-  border-left: solid 4px #fdd44b;
-}
-/* line 488, ../sass/screen.scss */
-#main #content #presentation #fournil p, #main #content #presentation #epicerie p {
-  line-height: 22px;
-  font-size: 15px;
-}
-/* line 494, ../sass/screen.scss */
-#main #content #presentation #fournil {
-  left: 20px;
-}
-/* line 498, ../sass/screen.scss */
-#main #content #presentation #epicerie {
-  right: 20px;
-}
-
-/* line 506, ../sass/screen.scss */
-#horaires .icon {
-  width: 50px;
-  top: -12px;
-  margin-left: -60px;
-}
-/* line 514, ../sass/screen.scss */
-#horaires table .jour {
-  width: 100px;
-}
-/* line 517, ../sass/screen.scss */
-#horaires table .jour span {
-  font-size: 12px;
-  line-height: 10px;
-}
-/* line 523, ../sass/screen.scss */
-#horaires table .horaire {
-  text-align: center;
-}
-/* line 527, ../sass/screen.scss */
-#horaires table th {
-  font-weight: bold;
-  text-align: center;
-}
-
-/* line 536, ../sass/screen.scss */
-#content #points-vente .icon {
-  width: 50px;
-  top: -12px;
-  margin-left: -60px;
-}
-/* line 542, ../sass/screen.scss */
-#content #points-vente iframe {
-  width: 100%;
-  height: 400px;
-  border: 0px none;
-}
-/* line 548, ../sass/screen.scss */
-#content #points-vente .content {
-  padding-left: 50px;
-}
-/* line 551, ../sass/screen.scss */
-#content #points-vente .content ul {
-  list-style-type: disc;
-}
-/* line 553, ../sass/screen.scss */
-#content #points-vente .content ul li {
-  line-height: 25px;
-}
-/* line 558, ../sass/screen.scss */
-#content #points-vente .content h3.top {
-  margin-top: 0px;
-}
-/* line 562, ../sass/screen.scss */
-#content #points-vente .content strong {
-  position: relative;
-  font-weight: bold;
-  font-style: none;
-}
-/* line 567, ../sass/screen.scss */
-#content #points-vente .content strong span {
-  position: absolute;
-  left: -12px;
-}
-/* line 573, ../sass/screen.scss */
-#content #points-vente .content .bloc {
-  padding-bottom: 20px;
-}
-/* line 576, ../sass/screen.scss */
-#content #points-vente .content .bloc address {
-  padding-left: 10px;
-  padding-bottom: 10px;
-  line-height: 19px;
-}
 
-/* line 586, ../sass/screen.scss */
-.home #content #gamme, .home #content #vrac {
-  position: relative;
-}
-/* line 590, ../sass/screen.scss */
-.home #content #gamme .icon, .home #content #vrac .icon {
-  width: 85px;
-  top: -23px;
-  margin-left: -95px;
-}
-/* line 596, ../sass/screen.scss */
-.home #content #gamme .img-right, .home #content #vrac .img-right {
-  position: absolute;
-  right: 0px;
-  top: 590px;
-  width: 465px;
-}
-/* line 603, ../sass/screen.scss */
-.home #content #gamme .table, .home #content #gamme .produits, .home #content #vrac .table, .home #content #vrac .produits {
-  width: auto;
-}
-/* line 606, ../sass/screen.scss */
-.home #content #gamme .table td, .home #content #gamme .produits td, .home #content #vrac .table td, .home #content #vrac .produits td {
-  width: 291px;
-  height: 120px;
-}
-/* line 612, ../sass/screen.scss */
-.home #content #gamme .table div.vrac, .home #content #gamme .produits div.vrac, .home #content #vrac .table div.vrac, .home #content #vrac .produits div.vrac {
-  padding-left: 0px;
-  width: 280px;
-  height: 130px;
-  float: left;
-  padding-right: 42px;
-}
-/* line 619, ../sass/screen.scss */
-.home #content #gamme .table div.vrac span.prix, .home #content #gamme .produits div.vrac span.prix, .home #content #vrac .table div.vrac span.prix, .home #content #vrac .produits div.vrac span.prix {
-  font-weight: normal;
-}
-/* line 624, ../sass/screen.scss */
-.home #content #gamme .table img, .home #content #gamme .produits img, .home #content #vrac .table img, .home #content #vrac .produits img {
-  width: 71px;
-}
-/* line 629, ../sass/screen.scss */
-.home #content #gamme .table .illu, .home #content #gamme .produits .illu, .home #content #vrac .table .illu, .home #content #vrac .produits .illu {
-  float: left;
-  margin-right: 15px;
-}
-/* line 634, ../sass/screen.scss */
-.home #content #gamme .table .nom, .home #content #gamme .produits .nom, .home #content #vrac .table .nom, .home #content #vrac .produits .nom {
-  font-weight: bold;
-  font-family: "comfortaalight";
-  text-transform: uppercase;
-  font-size: 18px;
-}
-/* line 643, ../sass/screen.scss */
-.home #content #gamme .table p.nom, .home #content #gamme .produits p.nom, .home #content #vrac .table p.nom, .home #content #vrac .produits p.nom {
-  padding-bottom: 2px;
-  margin-bottom: 0px;
-}
-/* line 647, ../sass/screen.scss */
-.home #content #gamme .table p.description, .home #content #gamme .produits p.description, .home #content #vrac .table p.description, .home #content #vrac .produits p.description {
-  font-family: "comfortaalight";
-  text-transform: uppercase;
-  font-size: 15px;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-/* line 655, ../sass/screen.scss */
-.home #content #gamme .table p.jours, .home #content #gamme .produits p.jours, .home #content #vrac .table p.jours, .home #content #vrac .produits p.jours {
-  margin-top: 10px;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-  font-size: 11px;
-  text-transform: uppercase;
-}
-/* line 664, ../sass/screen.scss */
-.home #content #gamme .table a, .home #content #gamme .produits a, .home #content #vrac .table a, .home #content #vrac .produits a {
-  text-decoration: none;
-}
-/* line 667, ../sass/screen.scss */
-.home #content #gamme .table a:hover, .home #content #gamme .produits a:hover, .home #content #vrac .table a:hover, .home #content #vrac .produits a:hover {
-  color: #505050;
-}
-/* line 672, ../sass/screen.scss */
-.home #content #gamme .table .contenu, .home #content #gamme .produits .contenu, .home #content #vrac .table .contenu, .home #content #vrac .produits .contenu {
-  padding-left: 86px;
-}
-/* line 678, ../sass/screen.scss */
-.home #content #gamme .table > thead > tr > th,
-.home #content #gamme .table > tbody > tr > th,
-.home #content #gamme .table > tfoot > tr > th,
-.home #content #gamme .table > thead > tr > td,
-.home #content #gamme .table > tbody > tr > td,
-.home #content #gamme .table > tfoot > tr > td, .home #content #vrac .table > thead > tr > th,
-.home #content #vrac .table > tbody > tr > th,
-.home #content #vrac .table > tfoot > tr > th,
-.home #content #vrac .table > thead > tr > td,
-.home #content #vrac .table > tbody > tr > td,
-.home #content #vrac .table > tfoot > tr > td {
-  border-top: 0px none;
-}
-/* line 688, ../sass/screen.scss */
-.home #content #gamme .saison, .home #content #vrac .saison {
-  display: none;
-}
-/* line 694, ../sass/screen.scss */
-.home #content #gamme ul#tab-gamme-saison li a, .home #content #vrac ul#tab-gamme-saison li a {
-  color: #333;
-  text-decoration: none;
-}
-/* line 705, ../sass/screen.scss */
-.home #content #gamme .modal-dialog .modal-title, .home #content #vrac .modal-dialog .modal-title {
-  text-align: left;
-}
-/* line 708, ../sass/screen.scss */
-.home #content #gamme .modal-dialog .modal-title .nom, .home #content #vrac .modal-dialog .modal-title .nom {
-  font-family: "comfortaalight";
-  font-weight: bold;
-  text-transform: uppercase;
-  font-size: 24px;
-}
-/* line 715, ../sass/screen.scss */
-.home #content #gamme .modal-dialog .modal-title .description, .home #content #vrac .modal-dialog .modal-title .description {
-  font-style: italic;
-}
-/* line 721, ../sass/screen.scss */
-.home #content #gamme .modal-dialog p.recette, .home #content #vrac .modal-dialog p.recette {
-  padding-bottom: 0px;
-  margin-bottom: 0px;
-}
-/* line 726, ../sass/screen.scss */
-.home #content #gamme .modal-dialog .modal-body, .home #content #vrac .modal-dialog .modal-body {
-  text-align: center;
-}
-/* line 729, ../sass/screen.scss */
-.home #content #gamme .modal-dialog .modal-body .illustration, .home #content #vrac .modal-dialog .modal-body .illustration {
-  width: 200px;
-  height: auto;
-}
-/* line 734, ../sass/screen.scss */
-.home #content #gamme .modal-dialog .modal-body .photo, .home #content #vrac .modal-dialog .modal-body .photo {
-  width: 500px;
-}
-/* line 738, ../sass/screen.scss */
-.home #content #gamme .modal-dialog .modal-body .credit, .home #content #vrac .modal-dialog .modal-body .credit {
-  text-align: right;
-  font-style: italic;
-  font-size: 13px;
-}
-/* line 748, ../sass/screen.scss */
-.home #content #gamme #fournisseurs .modal-dialog .modal-body,
-.home #content #gamme #panification .modal-dialog .modal-body, .home #content #vrac #fournisseurs .modal-dialog .modal-body,
-.home #content #vrac #panification .modal-dialog .modal-body {
-  text-align: left;
-}
-
-/* line 756, ../sass/screen.scss */
-#content #methode .icon {
-  width: 60px;
-  margin-left: -75px;
-  top: -12px;
-}
-/* line 762, ../sass/screen.scss */
-#content #methode .img {
-  max-width: 100%;
-  float: right;
-  margin-left: 20px;
-}
-/* line 768, ../sass/screen.scss */
-#content #methode .logo-np {
-  float: left;
-}
-
-/* line 775, ../sass/screen.scss */
-#content #fournisseurs .icon {
-  width: 49px;
-  margin-left: -62px;
-  top: -12px;
-}
-/* line 781, ../sass/screen.scss */
-#content #fournisseurs iframe {
-  width: 100%;
-  height: 400px;
-  border: 0px none;
-}
-/* line 787, ../sass/screen.scss */
-#content #fournisseurs h3.top {
-  margin-top: 0px;
-}
-/* line 791, ../sass/screen.scss */
-#content #fournisseurs address {
-  position: relative;
-  padding-left: 10px;
-  padding-bottom: 10px;
-  line-height: 19px;
-}
-/* line 797, ../sass/screen.scss */
-#content #fournisseurs address strong {
-  position: relative;
-  font-weight: bold;
-  font-style: none;
-}
-/* line 802, ../sass/screen.scss */
-#content #fournisseurs address strong span {
-  position: absolute;
-  left: -12px;
-}
-/* line 810, ../sass/screen.scss */
-#content #fournisseurs address .logo-ab, #content #fournisseurs address .logo-np {
-  position: absolute;
-  top: 3px;
-  right: 20px;
-  height: 30px;
-}
-
-/* line 821, ../sass/screen.scss */
+/* line 223, ../sass/screen.scss */
 #content #contact .icon {
   width: 55px;
   top: -15px;
   margin-left: -70px;
 }
-/* line 830, ../sass/screen.scss */
+/* line 232, ../sass/screen.scss */
 #content #contact .form-control:focus {
-  -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px #fdd44b;
-  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px #fdd44b;
-  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px #fdd44b;
-  border-color: #fdd44b;
+  /*@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px $jaune) ;
+  border-color: $jaune ;*/
 }
-/* line 835, ../sass/screen.scss */
+/* line 237, ../sass/screen.scss */
 #content #contact .form-group {
   text-align: center;
 }
-/* line 839, ../sass/screen.scss */
+/* line 241, ../sass/screen.scss */
 #content #contact .img-right {
   float: right;
 }
-/* line 842, ../sass/screen.scss */
+/* line 244, ../sass/screen.scss */
 #content #contact .img-right img {
   width: 300px;
 }
 
-/* line 849, ../sass/screen.scss */
+/* line 251, ../sass/screen.scss */
 .form-control:focus {
-  -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px #fdd44b;
-  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px #fdd44b;
-  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px #fdd44b;
-  border-color: #fdd44b;
+  /*@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px $jaune) ;
+  border-color: $jaune ;*/
 }
 
-/* line 854, ../sass/screen.scss */
+/* line 256, ../sass/screen.scss */
 #footer {
   height: 50px;
   background-color: white;
@@ -844,31 +282,31 @@ ul li {
   padding-bottom: 60px;
   position: relative;
 }
-/* line 870, ../sass/screen.scss */
+/* line 268, ../sass/screen.scss */
 #footer a {
   color: #7e7e7e;
   text-transform: uppercase;
   text-decoration: none;
 }
-/* line 875, ../sass/screen.scss */
+/* line 273, ../sass/screen.scss */
 #footer a:hover {
   color: black;
 }
 
-/* line 881, ../sass/screen.scss */
+/* line 279, ../sass/screen.scss */
 #content #mentions {
   padding-top: 20px;
 }
-/* line 884, ../sass/screen.scss */
+/* line 282, ../sass/screen.scss */
 #content #mentions div.content {
   width: 60%;
   font-size: 90%;
 }
-/* line 889, ../sass/screen.scss */
+/* line 287, ../sass/screen.scss */
 #content #mentions p {
   padding-bottom: 15px;
 }
-/* line 893, ../sass/screen.scss */
+/* line 291, ../sass/screen.scss */
 #content #mentions h2 {
   color: black;
   padding-bottom: 40px;
@@ -876,7 +314,7 @@ ul li {
   line-height: 35px;
   font-family: "myriadpro-regular";
 }
-/* line 901, ../sass/screen.scss */
+/* line 299, ../sass/screen.scss */
 #content #mentions h3 {
   font-family: "comfortaaregular";
   font-size: 18px;
@@ -885,116 +323,34 @@ ul li {
   color: black;
 }
 
-/* line 912, ../sass/screen.scss */
+/* line 310, ../sass/screen.scss */
 .mentions #main, .mentions body {
   background-color: white;
 }
 
-/* line 917, ../sass/screen.scss */
+/* line 315, ../sass/screen.scss */
 .vegas-loading {
   display: none;
 }
 
-/* message fermeture */
-/* line 923, ../sass/screen.scss */
-#message-fermeture {
-  text-align: center;
-  font-size: 15px;
-  padding: 15px;
-  margin: 20px 0px;
-  border: solid 1px #e0e0e0;
-  border-left: solid 5px #fdd44b;
-  -moz-box-shadow: 0px 0px 5px #e0e0e0;
-  -webkit-box-shadow: 0px 0px 5px #e0e0e0;
-  box-shadow: 0px 0px 5px #e0e0e0;
-}
-/* line 937, ../sass/screen.scss */
-#message-fermeture .line1 {
-  font-family: "myriadpro-regular";
-  font-size: 20px;
-}
-/* line 942, ../sass/screen.scss */
-#message-fermeture .line2 {
-  font-size: 13px;
-}
-/* line 946, ../sass/screen.scss */
-#message-fermeture span {
-  font-style: italic;
-}
-
-/* menu user */
-/* line 954, ../sass/screen.scss */
-#menu-user2 {
-  display: none;
-  position: fixed;
-  top: 121px;
-  top: 99px;
-  right: 0px;
-  background-color: white;
-  z-index: 100;
-}
-/* line 963, ../sass/screen.scss */
-#menu-user2 .dropdown-toggle {
-  -moz-border-radius: 0px 0px 4px 4px;
-  -webkit-border-radius: 0px;
-  border-radius: 0px 0px 4px 4px;
-}
-/* line 967, ../sass/screen.scss */
-#menu-user2 li {
-  padding-left: 0px;
-}
-/* line 971, ../sass/screen.scss */
-#menu-user2 a {
-  text-decoration: none;
-}
-
-/* line 977, ../sass/screen.scss */
-#menu-user {
-  background-color: white;
-  border-bottom: solid 1px #e0e0e0;
-  position: fixed;
-  top: 99px;
-  z-index: 90;
-  width: 100%;
-}
-/* line 986, ../sass/screen.scss */
-#menu-user .container {
-  padding-left: 0px;
-}
-/* line 990, ../sass/screen.scss */
-#menu-user .container ul li {
-  list-style-type: none;
-  float: left;
-  border-right: solid 1px #e0e0e0;
-  padding-left: 0px;
-}
-/* line 995, ../sass/screen.scss */
-#menu-user .container ul li a {
-  text-decoration: none;
-}
-/* line 998, ../sass/screen.scss */
-#menu-user .container ul li a:hover, #menu-user .container ul li a.active {
-  background-color: #F9F9F9;
-}
-
-/* line 1009, ../sass/screen.scss */
+/* line 322, ../sass/screen.scss */
 #profil-user .form-group.field-user-no_mail label {
   font-weight: normal;
 }
-/* line 1013, ../sass/screen.scss */
+/* line 326, ../sass/screen.scss */
 #profil-user .form-group label {
   cursor: pointer;
 }
-/* line 1018, ../sass/screen.scss */
+/* line 331, ../sass/screen.scss */
 #profil-user #mails-jours-prod .form-group {
   float: left;
   margin-right: 15px;
 }
-/* line 1021, ../sass/screen.scss */
+/* line 334, ../sass/screen.scss */
 #profil-user #mails-jours-prod .form-group label {
   font-weight: normal;
 }
-/* line 1027, ../sass/screen.scss */
+/* line 340, ../sass/screen.scss */
 #profil-user p.strong {
   font-weight: bold;
 }
@@ -1151,7 +507,7 @@ h2 {
 }
 /* line 157, ../sass/_systeme_commandes.scss */
 .commande-form ul#points-vente .point-vente.selected {
-  border-left: solid 5px #fdd44b;
+  border-left: solid 5px black;
   -moz-box-shadow: 0px 0px 5px #d8d8d8;
   -webkit-box-shadow: 0px 0px 5px #d8d8d8;
   box-shadow: 0px 0px 5px #d8d8d8;
@@ -1322,7 +678,7 @@ h2 {
 /* line 324, ../sass/_systeme_commandes.scss */
 .ui-datepicker .ui-widget-header {
   background: none;
-  background-color: #fdd44b;
+  background-color: gray;
   border: 0px none;
   color: black;
   font-weight: normal;
@@ -1331,7 +687,8 @@ h2 {
 .ui-datepicker .ui-datepicker-current-day a,
 .ui-datepicker a.ui-state-hover {
   background: none;
-  background-color: #fdd44b;
+  background-color: gray;
+  border-color: black;
   color: black;
 }
 

frontend/web/sass/_responsive.scss

@@ -1,61 +1,61 @@
 @media screen and (max-width: 1000px) {
 
-	#content {
-		padding-top: 0px ;
-	}
-
-	#header {
-		position: relative ;
-
-		nav {
-			
-			ul {
-				margin-top: 5px ;
-				float: left ;
-				li {
-					float: right ;
-					display: none ;
-
-					a {
-						padding: 5px ;
-						height: auto ;
-						line-height: 20px ;
-					}
-				}
-			}
-		}
-		
-		nav {
-			width: 100% ;
-			ul {
-				float: none ;
-				margin: 0px none ;
-			}
-		}
-		
-		nav ul li#logo {
-			display: block ;
-			a {
-				//margin: 0px auto ;
-			}
-		}
-		
-		a#link-commander {
-			display: none ;
-		} 
-	}
-
-	 #content #points-vente .content {
-	 	padding-left: 10px ;
-	 	margin-top: 30px ;
-	 }
-         
-         #menu-user {
-             position: relative ;
-             top: 0px ;
-         }
-         
-         .connected #content {
-             padding-top: 0px ;
-         }
+    #content {
+        padding-top: 0px ;
+    }
+
+    #header {
+        position: relative ;
+
+        nav {
+
+            ul {
+                margin-top: 5px ;
+                float: left ;
+                li {
+                    float: right ;
+                    display: none ;
+
+                    a {
+                        padding: 5px ;
+                        height: auto ;
+                        line-height: 20px ;
+                    }
+                }
+            }
+        }
+
+        nav {
+            width: 100% ;
+            ul {
+                float: none ;
+                margin: 0px none ;
+            }
+        }
+
+        nav ul li#logo {
+            display: block ;
+            a {
+                //margin: 0px auto ;
+            }
+        }
+
+        a#link-commander {
+            display: none ;
+        } 
+    }
+
+    #content #points-vente .content {
+        padding-left: 10px ;
+        margin-top: 30px ;
+    }
+
+    #menu-user {
+        position: relative ;
+        top: 0px ;
+    }
+
+    .connected #content {
+        padding-top: 0px ;
+    }
 }

frontend/web/sass/_systeme_commandes.scss

@@ -155,7 +155,7 @@ h2 {
 			}
 			
 			&.selected {
-				border-left: solid 5px $jaune ;
+				border-left: solid 5px black ;
 				@include box-shadow(0px 0px 5px #d8d8d8) ;
 				
 				.contenu {
@@ -323,7 +323,7 @@ h2 {
 	//@include border-radius(0px) ;
 	.ui-widget-header {
 		background: none ;
-		background-color: #fdd44b ;
+		background-color: gray ;
 		border: 0px none ;
 		color: black ;
 		font-weight: normal ;
@@ -332,7 +332,9 @@ h2 {
 	.ui-datepicker-current-day a,
 	a.ui-state-hover {
 		background: none ;
-		background-color: #fdd44b ;
+		//background-color: #fdd44b ;
+                background-color: gray ;
+                border-color: black ;
 		color: black ;
 	}
 	

frontend/web/sass/screen.scss

@@ -35,7 +35,7 @@ a {
 	text-decoration: underline ;
 
 	&:focus, &:active {
-		outline-color: $jaune ;
+		outline-color: gray ;
 		color: black ;		
 	}
 	
@@ -87,25 +87,6 @@ ul {
 	}
 }
 
-#back {
-	display: none ;
-	position: fixed ;
-	top: 100px ;
-	left: 0px; 
-	width: 100% ;
-	height: 100% ;
-	background: transparent top center no-repeat url($dir-img+'fournil.jpg') ;
-}
-
-.modal.contenu-annexe {
-	.modal-title {
-		font-family: "comfortaabold" ;
-		font-size: 24px ;
-		text-transform: uppercase ;
-		//font-weight: bold ;
-	}	
-}
-
 
 #main {
 	position: relative ;
@@ -117,214 +98,65 @@ ul {
 
 #header {
 	z-index: 100 ;
-	border-top: solid 4px $jaune ;
+	//border-top: solid 4px $jaune ;
 	border-bottom: solid 1px $gris1 ;	
 	background-color: white ;
-	height: 100px ;
+	height: 75px ;
 	@include box-shadow(0px 0px 5px #ededed) ;
 	@include box-shadow(0px 0px 5px #dcdcdc) ;
-	@include box-shadow(0px 0px 5px black) ;
+	//@include box-shadow(0px 0px 5px black) ;
 	
-	position: fixed ;
-	width: 100% ;
+	//position: fixed ;
+	//width: 100% ;
 
 	.container {
 		padding-left: 0px ;
 		position: relative ;
 	}
 
-	#logo {
-		img {
-			height: 53px ;
-		}
-		
-		a {
-			border: 0px none ;
-			display: block ;
-			height: 56px ;
-			width: 205px ;
-			padding-right: 0px ;
-			
-			background: transparent top left no-repeat url($dir-img+'logo-lechatdesnoisettes2.png') ;
-
-			&:hover {
-				background: transparent top left no-repeat url($dir-img+'logo-lechatdesnoisettes2-hover.png') ;				
-			}
-			
-			&.selec {
-				border: 0px none ;
-			}
-		}
-	}
-
-	h1 {
-		font-size: 25px ;
-		line-height: 30px ;
-		text-align: center ;
-		font-family: 'comfortaalight' ;
-	}
-
-	h2 {
-		font-size: 18px ;
-		line-height: 30px ;
-		text-align: center ;
-		font-family: 'myriadpro-light' ;
-	}	
-
-	#logo, nav ul li a {
-		padding: 20px 0px ;
-	}
-
-	a#link-commander {
-		float: right ;
-		display: block ;
-		//display: none ;
-		height: 95px ; 
-		padding-left: 15px ;
-		padding-right: 15px ;
-		line-height: 55px ;
-		border-bottom: solid 4px white ;
-		@include transition(all 0.2s linear) ;
-		text-decoration: none ;
-		
-		&:hover {
-			border-bottom: solid 4px $jaune ;
-		}
-		
-		&:hover, &:active, &:focus, &.selec {
-			text-decoration: none ;
-			outline: none ;
-		}
-		
-		span {
-			//display: none ;
-                        font-size: 30px ;
-                        position: relative ;
-                        top: 40px ;
-		}
-		
-		.icon {
-			height: 50px ;
-			position: relative ;
-			top: 21px ;
-		}
-	}
-
-	nav {
-		//width: 523px ;
-		padding: 0px ;
-		float: left ;
-		
-		
-		ul {
-			list-style-type: none ;
-			padding-left: 0px ;
-			li {
-				float: right ;
- 				padding-left: 0px ;
- 	
- 				//border-right: solid 1px $gris1 ;
-				&.first {
-					//border-left: solid 1px $gris1 ;	
-				}
- 				
- 
-				&.first a  {
-										
-				}
-
-				a {
-					position: relative ;
-					color: black;
-					display: block ;
-					height: 95px ; 
-					padding-left: 15px ;
-					padding-right: 15px ;
-					
-					line-height: 55px ;
-					color: #333 ;
-					border-bottom: solid 4px white ;
-					@include transition(all 0.2s linear) ;
-					text-decoration: none ;
-
-					&.selec {
-						//background-color: $color2 ;
-						border-bottom: solid 4px $jaune ;
-					}
-					
-					&:hover {
-						border-bottom: solid 4px $jaune ;
-					}
-					
-					&:hover, &:active, &:focus, &.selec {
-						text-decoration: none ;
-						outline: none ;
-					}
-					
-					span {
-						display: none ;
-					}
-
-				}
-				
-				.icon {
-					height: 50px ;
-					position: relative ;
-				}
-				
-				&.horaires .icon {
-					
-				}
-				
-				&.points-vente .icon {
-					height: 40px ;
-					top: 6px ;
-				}
-				
-				&.gamme .icon {
-					height: 65px ;
-					top: -2px ;
-				}
-				
-				&.methode .icon {
-					height: 40px ;
-					top: 5px ;
-				}
-				
-				&.fournisseurs .icon {
-					height: 45px ;
-					top: 5px ;
-				}
-				
-				&.contact .icon {
-					height: 40px ;
-					top: 5px ;
-				}
-			}
-		}
-	}
-	
-	
-}
-
-#header nav {
-	width: 521px ;
-	width: 601px ;
-	width: 669px ;
-	width: 756px ;
+        #link-home {
+            position: relative ;
+            top: 15px ;
+            img {
+                width: 37px ;
+                
+            }
+        }
+        
+        nav {
+            position: relative ;
+            bottom: 25px ;
+            ul {
+                float: right ;
+                li {
+                    a {
+                        text-decoration: none ;
+                        
+                        &.active {
+                            background-color: #eee ;
+                        }
+                    }
+                }
+            }
+        }
+        
+        #link-logout {
+            .nom {
+                font-size: 10px ;
+                /*position: relative ;
+                left: 20px ;
+                top: -3px ;*/
+            }
+        }
 }
 
-/*#header nav {
-	width: 206px ;
-}*/
-
 #main {
 	padding: 0px ;
 }
 
 .connected {
     #content {
-        padding-top: 150px ;
+        //padding-top: 15px ;
     }
 }
 
@@ -332,7 +164,7 @@ ul {
         position: relative ;
 	padding: 20px 0px ;
 	padding-bottom: 0px ;
-	padding-top: 100px ;
+	padding-top: 15px ;
 	min-height: 500px ;
 	
 	#description {
@@ -343,7 +175,7 @@ ul {
 
 	.item {
 		position: relative ;
-		min-height: 400px ;
+		min-height: 250px ;
 
 		.container {
 			padding: 20px ;
@@ -358,19 +190,6 @@ ul {
 			margin-top: 20px ;
 		}
 
-		&.back1 {
-			//background-color: $color2 ;
-			background-color: white ;
-		}
-
-		&.back2 {
-			background-color: white ;
-		}
-
-		&.back1, &.back2 {
-		}
-		
-
 		h2 {
 			color: black ;
 			padding-bottom: 50px ;
@@ -396,425 +215,8 @@ ul {
 
 	}
 
-	.bloc-right {
-		float: right ;
-		line-height: 23px ;
-		background-color: white ;
-		padding: 16px ;
-		background-color: #f9f9f9 ;
-		border-bottom: solid 1px #d8d8d8 ;
-		border-left: solid 1px #d8d8d8 ; 
-	}
-
-}
-
-
-#sidebar {
-	padding: 0px ;
-
-	.item {		
-		padding: 15px ;
-		border-bottom: solid 1px $gris1 ;
-	}
-}
-
-#main #content #presentation {
-
-	h1 {
-		text-align: center ;
-		font-size: 50px ;
-		font-family: 'comfortaabold' ;
-		font-family: 'comfortaaregular' ;
-		font-family: 'comfortaalight' ;
-		padding-bottom: 22px ;
-		padding-top: 38px ;
-		color: #333 ;
-		color: white ;
-		//@include text-shadow(0px 0px 4px black) ;
-		color: #333 ;
-		
-		position: relative ;
-		top: -20px ;
-		width: 600px ;
-		margin: 0px auto ;
-		/*border-left: solid 1px #e0e0e0 ;
-		border-right: solid 1px #e0e0e0 ;*/
-		border-bottom: solid 1px #e0e0e0 ;
-		@include border-radius(5px) ;
-		//@include box-shadow(0px 0px 5px gray) ;
-		
-	}
-
-	.col-md-6 {
-		text-align: center ;
-	}
-
-	h2 {
-		font-family: 'myriadpro-regular' ;	
-		font-size: 35px ;
-		line-height: 45px ;
-		padding-bottom: 9px ;
-		text-transform: none ;
-		text-align: left ;
-		margin-top: 5px ;
-		text-align: center ;
-	}
-
-	p {
-		line-height: 20px ;
-	}
-
-	ul {
-		float: right ;
-		list-style-type: circle ;
-		margin-top: 20px ;
-
-	}
-
-	#fournil, #epicerie {
-		position: absolute ;
-		top: 160px ; 
-		width: 45% ;
-		/*height: 141px ;
-		height: 155px ;*/
-		background-color: white ;
-		padding: 20px ;
-		border-right: solid 1px $gris1 ;
-		border-bottom: solid 1px $gris1 ;
-		@include box-shadow(0px 0px 5px black) ;
-		border-left: solid 4px $orange ;
-		border-left: solid 4px $jaune ;
-		
-		p {
-			line-height: 22px ;
-			font-size: 15px ;
-		}
-	}
-
-	#fournil {
-		left: 20px ;
-	}
-
-	#epicerie {
-		right: 20px ;
-	}
-
-}
-
-#horaires {
-	
-	.icon {
-		width: 50px ;
-		top: -12px ;
-		margin-left: -60px ;
-	}
-	
-	table {
-	
-		.jour {
-			width: 100px ;
-			
-			span {
-				font-size: 12px ;
-				line-height: 10px ;
-			}
-		}
-
-		.horaire {
-			text-align: center ;
-		}
-
-		th {
-			font-weight: bold ;
-			text-align: center ;
-		}
-	}
-}
-
- #content #points-vente {
-
-	.icon {
-		width: 50px ;
-		top: -12px ;
-		margin-left: -60px ;
-	}
-
-	iframe {
-		width: 100% ;
-		height: 400px ;
-		border: 0px none ;
-	}
-
-	.content {
-		padding-left: 50px ;
-
-		ul {
-			list-style-type: disc ;
-			li {
-				line-height: 25px ;
-			}
-		}
-		
-		h3.top {
-			margin-top: 0px ;
-		}
-
-		strong {
-			position: relative ;
-			font-weight: bold ;
-			font-style: none ;
-
-			span {
-				position: absolute ;
-				left: -12px ;
-			}
-		}
-
-		.bloc {
-			padding-bottom: 20px ;
-
-			address {
-				padding-left: 10px ;
-				padding-bottom: 10px ;
-				line-height: 19px ;
-			}
-		}
-	}
-}
-
-.home {
-#content #gamme, #content #vrac {
-	
-	position: relative ;
-	
-	.icon {
-		width: 85px ;
-		top: -23px ;
-		margin-left: -95px ;
-	}
-	
-	.img-right {
-		position: absolute ;
-		right: 0px ;
-		top: 590px ;
-		width: 465px ;
-	}
-
-	.table, .produits {
-		width: auto ;
-		
-		td {
-			//text-align: center ;
-			width: 291px ;
-			height: 120px ;
-		}
-		
-		div.vrac {
-			padding-left: 0px ;
-			width: 280px ;
-			height: 130px ;
-			float: left ;
-			padding-right: 42px ;
-			
-			span.prix {
-				font-weight: normal ;
-			}
-		}
-		
-		img {
-			//height: 70px ;
-			width: 71px ;
-		}
-		
-		.illu {
-			float: left ;
-			margin-right: 15px ;
-		}
-		
-		.nom {
-			font-weight: bold ;
-			font-family: "comfortaalight" ;
-			text-transform: uppercase ;
-			font-size: 18px ;
-		}
-		
-		
-		
-		p.nom {
-			padding-bottom: 2px ;
-			margin-bottom: 0px ;
-		}
-		p.description {
-			font-family: "comfortaalight" ;
-			text-transform: uppercase ;
-			font-size: 15px ;
-			margin-bottom: 0px ;
-			padding-bottom: 0px ;
-		}
-		
-		p.jours {
-			margin-top: 10px ;
-			margin-bottom: 0px ;
-			padding-bottom: 0px ;
-			font-size: 11px; 
-			//font-style: italic ;
-			text-transform: uppercase ;
-		}
-		
-		a {
-			text-decoration: none ;
-			
-			&:hover {
-				color: $courant ;
-			}
-		}
-		
-		.contenu {
-			padding-left: 86px ;
-		}
-		
-	}
-
-	.table > thead > tr > th, 
-	.table > tbody > tr > th, 
-	.table > tfoot > tr > th, 
-	.table > thead > tr > td, 
-	.table > tbody > tr > td, 
-	.table > tfoot > tr > td {
-		border-top: 0px none ;
-		//border-bottom: 1px solid #DDDDDD ;		
-	}
-	
-	.saison {
-		display: none ;
-	}
-
-	ul#tab-gamme-saison {
-		li {
-			a {
-				color: #333 ;
-				text-decoration: none ;
-			}
-			&.active a {
-				
-			}
-		} 
-	}
-	
-	.modal-dialog {
-		.modal-title {
-			text-align: left ;
-			
-			.nom  {
-				font-family: "comfortaalight" ;
-				font-weight: bold ;
-				text-transform: uppercase ;
-				font-size: 24px ;
-			}
-			
-			.description {
-				font-style: italic;
-			}
-			
-		}
-		
-		p.recette {
-			padding-bottom: 0px ;
-			margin-bottom: 0px ;
-		}
-		
-		.modal-body {
-			text-align: center ;
-			
-			.illustration {
-				width: 200px ;
-				height: auto ;
-			}
-			
-			.photo {
-				width: 500px ;
-			}
-			
-			.credit {
-				text-align: right ;
-				font-style: italic ;
-				font-size: 13px ;
-			}
-		}
-	}
-	
-	#fournisseurs, 
-	#panification {
-		.modal-dialog .modal-body {
-			text-align: left ;
-		}
-	}
-}
 }
 
-#content #methode {
-	.icon {
-		width: 60px ;
-		margin-left: -75px ;
-		top: -12px ;
-	}
-	
-	.img {
-		max-width: 100% ;
-		float: right ;
-		margin-left: 20px ;
-	}
-	
-	.logo-np {
-		float: left ;
-	}
-	
-}
-
-#content #fournisseurs {
-	.icon {
-		width: 49px ;
-		margin-left: -62px ;
-		top: -12px ;
-	}
-	
-	iframe {
-		width: 100% ;
-		height: 400px ;
-		border: 0px none ;
-	}
-	
-	h3.top {
-		margin-top: 0px ;
-	}
-	
-	address {
-		position: relative ;
-		padding-left: 10px ;
-		padding-bottom: 10px ;
-		line-height: 19px ;
-		
-		strong {
-			position: relative ;
-			font-weight: bold ;
-			font-style: none ;
-
-			span {
-				position: absolute ;
-				left: -12px ;
-			}
-		}
-	}
-	
-	address {
-		.logo-ab, .logo-np {
-			position: absolute ;
-			top: 3px ;
-			right: 20px ;
-			height: 30px ;
-		}
-	}
-}
 
 #content #contact {
 	
@@ -828,8 +230,8 @@ ul {
 	}
 
 	.form-control:focus {
-		@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px $jaune) ;
-		border-color: $jaune ;
+		/*@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px $jaune) ;
+		border-color: $jaune ;*/
 	}
 	
 	.form-group {
@@ -847,18 +249,14 @@ ul {
 }
 
 .form-control:focus {
-		@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px $jaune) ;
-		border-color: $jaune ;
+		/*@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px $jaune) ;
+		border-color: $jaune ;*/
 }
 
 #footer {
 	
 	height: 50px ;
-	
 	background-color: white ;
-	
-	//border-left: solid 10px $jaune ;
-	
 	text-align: center ;
 	border-top: 1px solid #e0e0e0 ;
 	
@@ -918,91 +316,6 @@ ul {
 	display: none ;
 }
 
-/* message fermeture */
-
-#message-fermeture {
-    text-align: center ;
-    font-size: 15px ;
-    
-    padding: 15px ;
-    margin: 20px 0px ;
-    border: solid 1px #e0e0e0 ;
-    border-left: solid 5px $jaune ;
-    @include box-shadow(0px 0px 5px #e0e0e0) ;
-    
-    .ferme {
-        //text-transform: uppercase ;
-    }
-    
-    .line1 {
-        font-family: "myriadpro-regular" ;
-        font-size: 20px ;
-    }
-    
-    .line2 {
-        font-size: 13px ;
-    }
-    
-    span {
-        font-style: italic ;
-    }
-}
-
-/* menu user */
-
-
-#menu-user2 {
-    display: none ;
-    position: fixed ;
-    top: 121px ;
-    top: 99px ;
-    right: 0px ;
-    background-color: white ;
-    z-index: 100 ;
-    
-    .dropdown-toggle {
-        @include border-radius(0px 0px 4px 4px) ;
-    }
-    
-    li {
-        padding-left: 0px ;
-    }
-    
-    a {
-        text-decoration: none ;
-    }
-    
-}
-
-#menu-user {
-
-    background-color: white ;
-    border-bottom: solid 1px #e0e0e0 ;
-    position: fixed ;
-    top: 99px ;
-    z-index: 90 ;
-    width: 100% ;
-    
-    .container {
-        //height: 50px ;
-        padding-left: 0px ;
-        ul {
-            li {
-                list-style-type: none ;
-                float: left ;
-                border-right: solid 1px #e0e0e0 ;
-                padding-left: 0px ;
-                a {
-                    text-decoration: none ;
-                    
-                    &:hover, &.active {
-                        background-color: #F9F9F9 ;
-                    }
-                }
-            }
-        }
-    }   
-}
 
 #profil-user {