Bläddra i källkod

Améliorer le thème front

prodstable
keun 8 år sedan
förälder
incheckning
5674e4c49a
11 ändrade filer med 409 tillägg och 305 borttagningar
  1. +17
    -19
      frontend/views/commande/_form.php
  2. +39
    -0
      frontend/views/commande/_liste_etablissements.php
  3. +1
    -3
      frontend/views/commande/create.php
  4. +13
    -47
      frontend/views/commande/index.php
  5. +2
    -2
      frontend/views/commande/update.php
  6. Binär
      frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/_systeme_commandes.scssc
  7. Binär
      frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/screen.scssc
  8. +216
    -165
      frontend/web/css/screen.css
  9. +3
    -3
      frontend/web/js/lechatdesnoisettes.js
  10. +117
    -66
      frontend/web/sass/_systeme_commandes.scss
  11. +1
    -0
      frontend/web/sass/screen.scss

+ 17
- 19
frontend/views/commande/_form.php Visa fil

@@ -9,19 +9,16 @@ use yii\widgets\ActiveForm;
?>
<div class="commande-form">

<h2>Boulangerie</h2>
<h2>Je choisis ma boulangerie</h2>
<?php if(count($etablissements)): ?>
<?php //if(!$id_etablissement): ?>
<div class="alert alert-info">Choisissez la boulangerie dans laquelle vous souhaitez passer commande.</div>
<?php //endif; ?>
<div class="blocs">
<?php foreach($etablissements as $e): ?>
<a class="bloc <?php if($e['id'] == $id_etablissement): ?>selected<?php endif; ?>" href="<?= Yii::$app->urlManager->createUrl(['commande/create', 'id_etablissement' => $e['id']]) ?>">
<span class="nom"><?= Html::encode($e['nom']) ?></span><br />
<span class="adresse">à <?= Html::encode($e['ville']) ?></span>
</a>
<?php endforeach; ?>
</div>
<?=
$this->render('_liste_etablissements.php',[
'etablissements' => $etablissements,
'context' => 'commande',
'id_etablissement' => $id_etablissement
]) ;
?>
<div class="clr"></div>
<?php else: ?>
<div class="alert alert-info">Veuiller <a href="<?= Yii::$app->urlManager->createUrl(['commande/index']) ; ?>">ajouter une boulangerie</a> à votre tableau de bord avant de passer commande.</div>
@@ -35,7 +32,7 @@ use yii\widgets\ActiveForm;
<?php if($id_etablissement): ?>
<h2>Pour quelle date ?</h2>
<h2>Date de commande</h2>

<?= $form->field($model, 'id_production')->label('')->hiddenInput(); ?>

@@ -66,11 +63,11 @@ use yii\widgets\ActiveForm;

<div class="clr"></div>

<!--<h2>Où souhaitez-vous récupérer votre commande ?</h2>-->
<div id="depots">
<h2>Je choisis un dépôt</h2>
<?=
$form->field($model, 'id_point_vente')
->label('Où souhaitez-vous récupérer votre commande ?')
->label('')
->hiddenInput();
//->dropDownList($points_vente) ;
?>
@@ -100,9 +97,11 @@ use yii\widgets\ActiveForm;
?>
</ul>
<div class="clr"></div>

</div>
<div id="produits">
<strong id="label-produits">Quels produits désirez-vous ?</strong>
<h2>Mes produits</h2>

<?php // confiance ?>
<input type="hidden" id="confiance" value="<?php echo (int) Yii::$app->user->identity->confiance; ?>" />
@@ -116,7 +115,6 @@ use yii\widgets\ActiveForm;
<?php endif; ?>

<div id="pain">
<h2>Pain</h2>
<div class="alert alert-warning indisponible">Pain indisponible pour ce point de vente</div>
<table class="table table-bordered" id="table-produits">
<thead>

+ 39
- 0
frontend/views/commande/_liste_etablissements.php Visa fil

@@ -0,0 +1,39 @@
<?php

use yii\helpers\Html ;

?>
<div class="liste-etablissements">
<?php if(count($etablissements)): ?>
<?php foreach($etablissements as $e): ?>
<div class="col-md-6 boulangerie <?php if(isset($id_etablissement) && $e['id'] == $id_etablissement): ?>selected<?php endif; ?>">
<div class="panel panel-default">
<div class="panel-heading">
<?php if(isset($e['photo']) && strlen($e['photo'])): ?>
<img class="img-back" src="./uploads/<?= $e['photo'] ?>" />
<?php endif; ?>
</div>
<div class="panel-body">
<h3 class="panel-title">
<?php echo Html::encode($e['nom']); ?>
</h3>
<div class="localite"> à <?php echo Html::encode($e['ville']).' ('.Html::encode($e['code_postal']).')'; ?></div>
<?php if(isset($id_etablissement) && $e['id'] == $id_etablissement): ?>
<span class="glyphicon glyphicon-check"></span>
<?php endif; ?>
<?php if($context == 'index'): ?>
<a href="<?= Yii::$app->urlManager->createUrl(['commande/remove-etablissement','id'=>$e['id']]); ?>" class="btn btn-xs btn-default remove"><span class="glyphicon glyphicon-remove"></span></a>
<?php endif; ?>
<?php if($context == 'index'): ?>
<a class="btn btn-primary" href="<?= Yii::$app->urlManager->createUrl(['commande/create', 'id_etablissement' => $e['id']]) ?>">Commander</a>
<?php elseif($context == 'commande'): ?>
<a class="btn btn-primary" href="<?= Yii::$app->urlManager->createUrl(['commande/create', 'id_etablissement' => $e['id']]) ?>">Sélectionner</a>
<?php endif; ?>
</div>
</div>
</div>
<?php endforeach; ?>
<?php endif; ?>
</div>

+ 1
- 3
frontend/views/commande/create.php Visa fil

@@ -7,12 +7,10 @@ use yii\helpers\Html;
/* @var $model app\models\Produit */

$this->title = 'Passer une commande';
//$this->params['breadcrumbs'][] = ['label' => 'Produits', 'url' => ['index']];
//$this->params['breadcrumbs'][] = $this->title;
?>
<div class="commande-create">
<h1 class="title-systeme-commande"><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/order.png" alt="" /> <?= Html::encode($this->title) ?></h1>
<h1 class="title-systeme-commande"><span class="glyphicon glyphicon-plus"></span> <?= Html::encode($this->title) ?></h1>

<?= $this->render('_form', [
'model' => $model,

+ 13
- 47
frontend/views/commande/index.php Visa fil

@@ -10,44 +10,20 @@ $this->title = 'Commande' ;

<div id="index-commande">

<h1 class="title-systeme-commande"><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/order.png" alt="" /> Tableau de bord</h1>
<h1 class="title-systeme-commande"><span class="glyphicon glyphicon-th-list"></span> Tableau de bord</h1>

<h2>Boulangeries</h2>

<div id="liste-boulangeries">
<!--<div id="bloc-liste-boulangeries" class="col-md-6">-->
<?php if(count($etablissements)): ?>
<?php foreach($etablissements as $e): ?>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">
<?php if(isset($e['photo']) && strlen($e['photo'])): ?>
<img class="img-back" src="./uploads/<?= $e['photo'] ?>" />
<?php endif; ?>
</div>
<div class="panel-body">
<h3 class="panel-title">
<?php echo Html::encode($e['nom']); ?>
</h3>
<div class="localite"> à <?php echo Html::encode($e['ville']).' ('.Html::encode($e['code_postal']).')'; ?></div>
<a href="<?= Yii::$app->urlManager->createUrl(['commande/remove-etablissement','id'=>$e['id']]); ?>" class="btn btn-xs btn-default remove"><span class="glyphicon glyphicon-remove"></span></a>
<a class="btn btn-primary" href="<?= Yii::$app->urlManager->createUrl(['commande/create', 'id_etablissement' => $e['id']]) ?>">Commander</a>
<?php if(strlen($e['logo'])): ?>
<img class="logo" src="uploads/<?= Html::encode($e['logo']); ?>" />
<?php endif; ?>
</div>
</div>
</div>
<?php endforeach; ?>
<?php else: ?>
<!--<div class="alert alert-info">Aucune boulangerie</div>-->
<?php endif; ?>
</div>
<?=
$this->render('_liste_etablissements.php',[
'etablissements' => $etablissements,
'context' => 'index'
]) ;
?>
<div class="col-md-6" id="bloc-add-etablissement">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><span class="glyphicon glyphicon-plus"></span> Ajouter une boulangerie</h3>
@@ -59,15 +35,9 @@ $this->title = 'Commande' ;
<?php ActiveForm::end(); ?>
</div>
</div>
</div>
<!--</div>-->
<div class="clr"></div>

<!--<div class="accueil">
<a class="btn btn-primary btn-lg" href="<?php echo Yii::$app->urlManager->createUrl(['commande/create']); ?>">Passer une commande</a>
</div>-->
<div class="clr"></div>
</div>

<h2>Historique</h2>
<?php if(count($commandes)): ?>
@@ -77,10 +47,7 @@ $this->title = 'Commande' ;
<?php if($commande_ok): ?>
<div class="alert alert-success">
<div class="icon"></div>
Votre commande a bien été prise en compte !
<?php if($pate_deja_petrie): ?>
<br /><strong>Cette fournée étant déjà pétrie, la livraison se fera suivant les stocks disponibles. Merci pour votre compréhension.</strong>
<?php endif; ?>
Votre commande a bien été prise en compte.
</div>
<?php endif; ?>
@@ -132,7 +99,6 @@ $this->title = 'Commande' ;
<?php elseif($c->production->date <= $date_limite): ?>En cours de préparation
<?php else: ?>
<!-- <a href="<?php echo Yii::$app->urlManager->createUrl(['commande/update','id'=>$c->id]) ; ?>" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span> Modifier</a>-->
<div class="btn-group">
<a href="<?php echo Yii::$app->urlManager->createUrl(['commande/update','id'=>$c->id, 'id_etablissement'=>$c->production->etablissement->id]) ; ?>" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span> Modifier</a>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
@@ -151,7 +117,7 @@ $this->title = 'Commande' ;
</tbody>
</table>
<?php else: ?>
<p>Vous n'avez pas encore passé de commandes</p>
<div class="alert alert-info">Vous n'avez pas encore passé de commandes</div>
<?php endif; ?>

</div>

+ 2
- 2
frontend/views/commande/update.php Visa fil

@@ -12,9 +12,9 @@ $this->title = 'Modifier une commande';
?>
<div class="commande-update">

<h1 class="title-systeme-commande"><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/order.png" alt="" /> <?= Html::encode($this->title) ?></h1>
<h1 class="title-systeme-commande"><span class="glyphicon glyphicon-pencil"></span> <?= Html::encode($this->title) ?></h1>
<?php if($commande_introuvable): ?>
<?php if($commande_introuvable): ?>
<div class="alert alert-danger">Cette commande est introuvable</div><br />
<a class="btn btn-default" href="<?php echo Yii::$app->urlManager->createUrl(['commande/index']); ?>">Retour</a>
<?php else: ?>

Binär
frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/_systeme_commandes.scssc Visa fil


Binär
frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/screen.scssc Visa fil


+ 216
- 165
frontend/web/css/screen.css Visa fil

@@ -51,12 +51,12 @@
font-weight: normal;
font-style: normal;
}
/* line 25, ../sass/screen.scss */
/* line 26, ../sass/screen.scss */
html {
height: 100%;
}

/* line 29, ../sass/screen.scss */
/* line 30, ../sass/screen.scss */
body {
position: relative;
color: #505050;
@@ -67,92 +67,92 @@ body {
padding: 0;
}

/* line 39, ../sass/screen.scss */
/* line 40, ../sass/screen.scss */
strong {
font-weight: bold;
}

/* line 43, ../sass/screen.scss */
/* line 44, ../sass/screen.scss */
#main a {
color: #505050;
text-decoration: underline;
}
/* line 47, ../sass/screen.scss */
/* line 48, ../sass/screen.scss */
#main a:focus, #main a:active {
outline-color: gray;
color: black;
}
/* line 52, ../sass/screen.scss */
/* line 53, ../sass/screen.scss */
#main a:hover {
color: black;
}
/* line 56, ../sass/screen.scss */
/* line 57, ../sass/screen.scss */
#main a.btn {
text-decoration: none;
}
/* line 60, ../sass/screen.scss */
/* line 61, ../sass/screen.scss */
#main a.btn-primary {
background-color: #BB8757;
border: solid 1px #BB8757;
color: white;
}
/* line 65, ../sass/screen.scss */
/* line 66, ../sass/screen.scss */
#main a.btn-primary:hover, #main a.btn-primary:active, #main a.btn-primary:focus {
background-color: #b17a48;
border: solid 1px #BB8757;
}

/* line 72, ../sass/screen.scss */
/* line 73, ../sass/screen.scss */
p {
padding-bottom: 20px;
line-height: 21px;
}

/* line 77, ../sass/screen.scss */
/* line 78, ../sass/screen.scss */
ul {
padding-left: 20px;
list-style-type: disc;
margin-bottom: 10px;
}
/* line 82, ../sass/screen.scss */
/* line 83, ../sass/screen.scss */
ul li {
padding-left: 5px;
}

/* line 87, ../sass/screen.scss */
/* line 88, ../sass/screen.scss */
.clr {
clear: both;
}

/* line 91, ../sass/screen.scss */
/* line 92, ../sass/screen.scss */
.btn {
background-image: none;
}

/* line 95, ../sass/screen.scss */
/* line 96, ../sass/screen.scss */
#main .alert {
background-image: none;
background-color: white;
border-bottom-width: 3px;
}

/* line 103, ../sass/screen.scss */
/* line 104, ../sass/screen.scss */
.alert.alert-warning a {
color: #8a6d3b;
}

/* line 112, ../sass/screen.scss */
/* line 113, ../sass/screen.scss */
#main {
position: relative;
padding-bottom: 150px;
}
/* line 115, ../sass/screen.scss */
/* line 116, ../sass/screen.scss */
#main .inner {
width: 960px;
margin: 0px auto;
}

/* line 121, ../sass/screen.scss */
/* line 122, ../sass/screen.scss */
#header {
z-index: 100;
border-bottom: solid 1px #e0e0e0;
@@ -164,11 +164,11 @@ ul li {
background-color: #f8f1dd;
height: 86px;
}
/* line 142, ../sass/screen.scss */
/* line 143, ../sass/screen.scss */
#header .container {
position: relative;
}
/* line 147, ../sass/screen.scss */
/* line 148, ../sass/screen.scss */
#header #link-home {
/*position: fixed ;
z-index: 1000 ;
@@ -189,39 +189,39 @@ ul li {
font-size: 22px;
color: black;
}
/* line 168, ../sass/screen.scss */
/* line 169, ../sass/screen.scss */
#header #link-home img {
height: 60px;
margin-bottom: 5px;
}
/* line 174, ../sass/screen.scss */
/* line 175, ../sass/screen.scss */
#header #link-espace-boulanger {
border-left: solid 1px #e0e0e0;
}
/* line 178, ../sass/screen.scss */
/* line 179, ../sass/screen.scss */
#header nav {
padding-top: 22px;
}
/* line 180, ../sass/screen.scss */
/* line 181, ../sass/screen.scss */
#header nav ul {
float: right;
}
/* line 183, ../sass/screen.scss */
/* line 184, ../sass/screen.scss */
#header nav ul li a {
text-decoration: none;
color: #505050;
}
/* line 186, ../sass/screen.scss */
/* line 187, ../sass/screen.scss */
#header nav ul li a.active {
background-color: white;
border: 1px solid #e0e0e0;
}
/* line 191, ../sass/screen.scss */
/* line 192, ../sass/screen.scss */
#header nav ul li a:hover {
color: black;
background-color: transparent;
}
/* line 201, ../sass/screen.scss */
/* line 202, ../sass/screen.scss */
#header #link-logout .nom {
font-size: 10px;
/*position: relative ;
@@ -229,7 +229,7 @@ ul li {
top: -3px ;*/
}

/* line 217, ../sass/screen.scss */
/* line 218, ../sass/screen.scss */
#content {
position: relative;
padding: 20px 0px;
@@ -237,12 +237,12 @@ ul li {
padding-top: 35px;
min-height: 500px;
}
/* line 224, ../sass/screen.scss */
/* line 225, ../sass/screen.scss */
#content h1#title-site {
font-family: "comfortaalight";
font-size: 50px;
}
/* line 231, ../sass/screen.scss */
/* line 232, ../sass/screen.scss */
#content h2 {
color: black;
padding-bottom: 15px;
@@ -253,16 +253,16 @@ ul li {
position: relative;
margin-top: 30px;
}
/* line 242, ../sass/screen.scss */
/* line 243, ../sass/screen.scss */
#content h3 {
color: black;
font-size: 20px;
}
/* line 250, ../sass/screen.scss */
/* line 251, ../sass/screen.scss */
#content #description img {
width: 100%;
}
/* line 255, ../sass/screen.scss */
/* line 256, ../sass/screen.scss */
#content #main-img {
max-width: 100%;
border: solid 1px #e0e0e0;
@@ -271,83 +271,83 @@ ul li {
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* line 262, ../sass/screen.scss */
/* line 263, ../sass/screen.scss */
#content #row-presentation {
text-align: center;
}
/* line 266, ../sass/screen.scss */
/* line 267, ../sass/screen.scss */
#content #row-signup {
text-align: center;
margin-top: 20px;
}
/* line 271, ../sass/screen.scss */
/* line 272, ../sass/screen.scss */
#content #row-clients-boulanger {
margin-bottom: 50px;
}
/* line 273, ../sass/screen.scss */
/* line 274, ../sass/screen.scss */
#content #row-clients-boulanger h2 {
text-align: center;
margin-bottom: 15px;
padding-bottom: 0px;
}
/* line 277, ../sass/screen.scss */
/* line 278, ../sass/screen.scss */
#content #row-clients-boulanger h2 img {
height: 70px;
margin-bottom: 60px;
}
/* line 283, ../sass/screen.scss */
/* line 284, ../sass/screen.scss */
#content #row-clients-boulanger ul {
text-align: center;
}
/* line 285, ../sass/screen.scss */
/* line 286, ../sass/screen.scss */
#content #row-clients-boulanger ul li {
list-style-type: none;
}
/* line 290, ../sass/screen.scss */
/* line 291, ../sass/screen.scss */
#content #row-clients-boulanger #clients {
border-right: dotted 1px gray;
}
/* line 294, ../sass/screen.scss */
/* line 295, ../sass/screen.scss */
#content #row-clients-boulanger .prix {
padding-top: 15px;
font-size: 18px;
}

/* line 303, ../sass/screen.scss */
/* line 304, ../sass/screen.scss */
#content #contact {
display: none;
}
/* line 307, ../sass/screen.scss */
/* line 308, ../sass/screen.scss */
#content #contact .icon {
width: 55px;
top: -15px;
margin-left: -70px;
}
/* line 316, ../sass/screen.scss */
/* line 317, ../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 321, ../sass/screen.scss */
/* line 322, ../sass/screen.scss */
#content #contact .form-group {
text-align: center;
}
/* line 325, ../sass/screen.scss */
/* line 326, ../sass/screen.scss */
#content #contact .img-right {
float: right;
}
/* line 328, ../sass/screen.scss */
/* line 329, ../sass/screen.scss */
#content #contact .img-right img {
width: 300px;
}

/* line 335, ../sass/screen.scss */
/* line 336, ../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 340, ../sass/screen.scss */
/* line 341, ../sass/screen.scss */
#footer {
position: absolute;
bottom: 0px;
@@ -360,7 +360,7 @@ ul li {
padding-top: 30px;
padding-bottom: 60px;
}
/* line 356, ../sass/screen.scss */
/* line 357, ../sass/screen.scss */
#footer a {
color: #7e7e7e;
color: white;
@@ -371,29 +371,29 @@ ul li {
border-right: solid 1px #7e7e7e;
border-right: solid 1px white;
}
/* line 365, ../sass/screen.scss */
/* line 366, ../sass/screen.scss */
#footer a:hover {
color: gray;
}
/* line 369, ../sass/screen.scss */
/* line 370, ../sass/screen.scss */
#footer a:last-child {
border: 0px none;
}

/* line 375, ../sass/screen.scss */
/* line 376, ../sass/screen.scss */
#content #mentions {
padding-top: 20px;
}
/* line 378, ../sass/screen.scss */
/* line 379, ../sass/screen.scss */
#content #mentions div.content {
width: 60%;
font-size: 90%;
}
/* line 383, ../sass/screen.scss */
/* line 384, ../sass/screen.scss */
#content #mentions p {
padding-bottom: 15px;
}
/* line 387, ../sass/screen.scss */
/* line 388, ../sass/screen.scss */
#content #mentions h2 {
color: black;
padding-bottom: 40px;
@@ -401,7 +401,7 @@ ul li {
line-height: 35px;
font-family: "myriadpro-regular";
}
/* line 395, ../sass/screen.scss */
/* line 396, ../sass/screen.scss */
#content #mentions h3 {
font-family: "comfortaaregular";
font-size: 18px;
@@ -410,40 +410,40 @@ ul li {
color: black;
}

/* line 406, ../sass/screen.scss */
/* line 407, ../sass/screen.scss */
.mentions #main, .mentions body {
background-color: white;
}

/* line 411, ../sass/screen.scss */
/* line 412, ../sass/screen.scss */
.vegas-loading {
display: none;
}

/* line 418, ../sass/screen.scss */
/* line 419, ../sass/screen.scss */
#profil-user .form-group.field-user-no_mail label {
font-weight: normal;
}
/* line 422, ../sass/screen.scss */
/* line 423, ../sass/screen.scss */
#profil-user .form-group label {
cursor: pointer;
}
/* line 427, ../sass/screen.scss */
/* line 428, ../sass/screen.scss */
#profil-user #mails-jours-prod .form-group {
float: left;
margin-right: 15px;
}
/* line 430, ../sass/screen.scss */
/* line 431, ../sass/screen.scss */
#profil-user #mails-jours-prod .form-group label {
font-weight: normal;
}
/* line 436, ../sass/screen.scss */
/* line 437, ../sass/screen.scss */
#profil-user p.strong {
font-weight: bold;
}

/* signup */
/* line 445, ../sass/screen.scss */
/* line 446, ../sass/screen.scss */
#form-signup #champs-boulanger {
display: none;
}
@@ -472,64 +472,63 @@ h2 {
text-transform: uppercase;
}

/* line 27, ../sass/_systeme_commandes.scss */
#index-commande {
position: relative;
/* line 33, ../sass/_systeme_commandes.scss */
.liste-etablissements .boulangerie {
padding-left: 0px;
padding-right: 30px;
}
/* line 30, ../sass/_systeme_commandes.scss */
#index-commande #logout {
position: absolute;
/*top: 45px ;
right: 93px ;*/
top: 0;
right: 0;
z-index: 10;
/* line 37, ../sass/_systeme_commandes.scss */
.liste-etablissements .boulangerie.selected .panel {
border-bottom: solid 3px #BB8757;
}
/* line 39, ../sass/_systeme_commandes.scss */
#index-commande .accueil {
text-align: center;
padding-bottom: 20px;
}
/* line 50, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .panel-heading {
/* line 41, ../sass/_systeme_commandes.scss */
.liste-etablissements .boulangerie .panel-heading {
height: 200px;
overflow: hidden;
padding: 0px;
background: none;
background-color: #F8F1DD;
}
/* line 56, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .panel-heading .img-back {
/* line 48, ../sass/_systeme_commandes.scss */
.liste-etablissements .boulangerie .panel-heading .img-back {
width: 100%;
height: auto;
position: relative;
top: -50%;
}
/* line 65, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .panel-body {
/* line 57, ../sass/_systeme_commandes.scss */
.liste-etablissements .boulangerie .panel-body {
position: relative;
width: 100%;
height: 120px;
max-height: 120px;
text-align: center;
}
/* line 72, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .panel-body h3 {
/* line 64, ../sass/_systeme_commandes.scss */
.liste-etablissements .boulangerie .panel-body h3 {
margin-bottom: 4px;
}
/* line 76, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .panel-body .localite {
/* line 68, ../sass/_systeme_commandes.scss */
.liste-etablissements .boulangerie .panel-body .localite {
color: gray;
margin-bottom: 10px;
}
/* line 82, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .panel-body .remove {
/* line 73, ../sass/_systeme_commandes.scss */
.liste-etablissements .boulangerie .panel-body .glyphicon-check {
color: #BB8757;
font-size: 40px;
position: absolute;
top: 34px;
left: 32px;
}
/* line 81, ../sass/_systeme_commandes.scss */
.liste-etablissements .boulangerie .panel-body .remove {
position: absolute;
top: 10px;
right: 10px;
}
/* line 88, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .panel-body .logo {
/* line 87, ../sass/_systeme_commandes.scss */
.liste-etablissements .boulangerie .panel-body .logo {
display: none;
width: 150px;
position: absolute;
@@ -539,113 +538,167 @@ h2 {
background-color: white;
padding: 10px 20px;
}
/* line 105, ../sass/_systeme_commandes.scss */

/* line 101, ../sass/_systeme_commandes.scss */
#index-commande {
position: relative;
}
/* line 104, ../sass/_systeme_commandes.scss */
#index-commande #logout {
position: absolute;
/*top: 45px ;
right: 93px ;*/
top: 0;
right: 0;
z-index: 10;
}
/* line 113, ../sass/_systeme_commandes.scss */
#index-commande .accueil {
text-align: center;
padding-bottom: 20px;
}
/* line 118, ../sass/_systeme_commandes.scss */
#index-commande #bloc-add-etablissement {
padding-left: 0px;
padding-right: 30px;
}
/* line 122, ../sass/_systeme_commandes.scss */
#index-commande #bloc-add-etablissement .help-block {
padding-bottom: 0px;
}
/* line 109, ../sass/_systeme_commandes.scss */
/* line 126, ../sass/_systeme_commandes.scss */
#index-commande #bloc-add-etablissement .field-addetablissementform-id_etablissement {
width: 80%;
float: left;
}
/* line 114, ../sass/_systeme_commandes.scss */
/* line 131, ../sass/_systeme_commandes.scss */
#index-commande #bloc-add-etablissement .btn {
float: right;
position: relative;
top: 20px;
}
/* line 120, ../sass/_systeme_commandes.scss */
/* line 137, ../sass/_systeme_commandes.scss */
#index-commande #bloc-add-etablissement .panel-heading {
background: none;
background-color: white;
cursor: pointer;
}
/* line 126, ../sass/_systeme_commandes.scss */
/* line 143, ../sass/_systeme_commandes.scss */
#index-commande #bloc-add-etablissement .panel-body {
display: none;
}
/* line 132, ../sass/_systeme_commandes.scss */
/* line 149, ../sass/_systeme_commandes.scss */
#index-commande #addetablissementform-id_etablissement option:disabled {
font-weight: bold;
color: black;
}
/* line 139, ../sass/_systeme_commandes.scss */
/* line 156, ../sass/_systeme_commandes.scss */
#index-commande #historique-commandes .statut, #index-commande #historique-commandes .montant {
width: 175px;
}
/* line 142, ../sass/_systeme_commandes.scss */
/* line 159, ../sass/_systeme_commandes.scss */
#index-commande #historique-commandes .montant {
width: 100px;
}
/* line 149, ../sass/_systeme_commandes.scss */
/* line 166, ../sass/_systeme_commandes.scss */
#index-commande #historique-commandes .localite {
font-size: 11px;
lin-height: 11px;
}
/* line 154, ../sass/_systeme_commandes.scss */
/* line 171, ../sass/_systeme_commandes.scss */
#index-commande #historique-commandes a {
text-decoration: none;
}

/* line 161, ../sass/_systeme_commandes.scss */
/* line 178, ../sass/_systeme_commandes.scss */
.commande-form {
min-height: 600px;
padding-bottom: 60px;
}
/* line 166, ../sass/_systeme_commandes.scss */
/* line 183, ../sass/_systeme_commandes.scss */
.commande-form h2 {
font-family: "myriadpro-regular";
}
/* line 170, ../sass/_systeme_commandes.scss */
/* line 187, ../sass/_systeme_commandes.scss */
.commande-form #infos-importantes.alert-warning {
float: right;
}
/* line 176, ../sass/_systeme_commandes.scss */
/* line 193, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .ui-datepicker {
float: left;
margin-right: 20px;
font-size: 20px;
}
/* line 199, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .ui-datepicker-header {
background-color: #BB8757;
}
/* line 203, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .ui-datepicker-title {
color: white;
}
/* line 209, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .ui-datepicker-prev:hover,
.commande-form #datepicker-production .ui-datepicker-next:hover {
border: 0px none;
background: none;
}
/* line 181, ../sass/_systeme_commandes.scss */
/* line 215, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .ui-helper-clearfix:after {
clear: none;
}
/* line 185, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .alert-info {
float: left;
/* line 220, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .ui-datepicker-calendar a {
text-decoration: none;
background-color: #F8F1DD;
}
/* line 190, ../sass/_systeme_commandes.scss */
/* line 223, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .ui-datepicker-calendar a.ui-state-hover, .commande-form #datepicker-production .ui-datepicker-calendar a.ui-state-active {
background-color: #BB8757;
color: white;
border-color: #cdc3b7;
}
/* line 232, ../sass/_systeme_commandes.scss */
.commande-form #has-commande-en-cours {
margin-top: 15px;
}
/* line 193, ../sass/_systeme_commandes.scss */
/* line 235, ../sass/_systeme_commandes.scss */
.commande-form #has-commande-en-cours a {
color: #a94442;
text-decoration: none;
font-weight: bold;
}
/* line 200, ../sass/_systeme_commandes.scss */
/* line 242, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_production {
display: none;
}
/* line 246, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_point_vente {
margin-top: 30px;
}
/* line 204, ../sass/_systeme_commandes.scss */
/* line 250, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_production {
margin-bottom: 0px;
}
/* line 206, ../sass/_systeme_commandes.scss */
/* line 252, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_production label {
margin-bottom: 0px;
}
/* line 210, ../sass/_systeme_commandes.scss */
/* line 256, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_production .help-block {
margin-bottom: 0px;
}
/* line 215, ../sass/_systeme_commandes.scss */
/* line 261, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_point_vente {
display: none;
}
/* line 265, ../sass/_systeme_commandes.scss */
.commande-form .blocs {
list-style-type: none;
margin: 0px;
padding: 0px;
}
/* line 220, ../sass/_systeme_commandes.scss */
/* line 270, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc {
text-decoration: none;
width: 268px;
@@ -657,109 +710,107 @@ h2 {
cursor: pointer;
float: left;
background-color: #f9f9f9;
background-color: white;
border: 1px solid #d8d8d8;
}
/* line 234, ../sass/_systeme_commandes.scss */
/* line 285, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc .nom {
font-family: "comfortaalight";
font-size: 20px;
}
/* line 240, ../sass/_systeme_commandes.scss */
/* line 291, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc .adresse {
color: gray;
font-size: 13px;
line-height: 16px;
}
/* line 246, ../sass/_systeme_commandes.scss */
/* line 297, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc .horaires {
margin-top: 7px;
}
/* line 248, ../sass/_systeme_commandes.scss */
/* line 299, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc .horaires .jour {
font-weight: bold;
display: none;
}
/* line 254, ../sass/_systeme_commandes.scss */
/* line 305, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc.selected {
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;
border-left: solid 5px #BB8757;
}
/* line 258, ../sass/_systeme_commandes.scss */
/* line 309, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc.selected .contenu {
position: relative;
left: -4px;
}
/* line 264, ../sass/_systeme_commandes.scss */
/* line 315, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc:hover {
-moz-box-shadow: 0px 0px 5px #d8d8d8;
-webkit-box-shadow: 0px 0px 5px #d8d8d8;
box-shadow: 0px 0px 5px #d8d8d8;
}
/* line 269, ../sass/_systeme_commandes.scss */
/* line 320, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc.disabled {
display: none;
}
/* line 276, ../sass/_systeme_commandes.scss */
/* line 327, ../sass/_systeme_commandes.scss */
.commande-form #produits {
margin-top: 15px;
}
/* line 279, ../sass/_systeme_commandes.scss */
/* line 330, ../sass/_systeme_commandes.scss */
.commande-form #produits #label-produits {
display: block;
margin-bottom: 5px;
}
/* line 284, ../sass/_systeme_commandes.scss */
/* line 335, ../sass/_systeme_commandes.scss */
.commande-form #produits .table {
margin-top: 7px;
}
/* line 287, ../sass/_systeme_commandes.scss */
/* line 338, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .illu {
float: left;
height: auto;
width: 70px;
margin-right: 15px;
}
/* line 294, ../sass/_systeme_commandes.scss */
/* line 345, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .photo {
float: right;
margin-left: 10px;
width: 200px;
}
/* line 300, ../sass/_systeme_commandes.scss */
/* line 351, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .nom {
font-family: "comfortaalight";
font-weight: bold;
text-transform: uppercase;
font-size: 18px;
}
/* line 307, ../sass/_systeme_commandes.scss */
/* line 358, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .description {
font-style: italic;
}
/* line 311, ../sass/_systeme_commandes.scss */
/* line 362, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .recette {
font-size: 12px;
}
/* line 315, ../sass/_systeme_commandes.scss */
/* line 366, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .input-group {
width: 133px;
}
/* line 317, ../sass/_systeme_commandes.scss */
/* line 368, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .input-group .quantity {
text-align: center;
}
/* line 322, ../sass/_systeme_commandes.scss */
/* line 373, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .colonne-quantite, .commande-form #produits .table .prix-unit, .commande-form #produits .table .total {
width: 150px;
text-align: center;
}
/* line 327, ../sass/_systeme_commandes.scss */
/* line 378, ../sass/_systeme_commandes.scss */
.commande-form #produits .table td#total-commande, .commande-form #produits .table td#total-commande-vrac, .commande-form #produits .table td.total {
text-align: center;
}
/* line 331, ../sass/_systeme_commandes.scss */
/* line 382, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .epuise {
display: none;
text-transform: uppercase;
@@ -768,32 +819,32 @@ h2 {
font-size: 16px;
text-align: center;
}
/* line 340, ../sass/_systeme_commandes.scss */
/* line 391, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .quantite-restante {
font-size: 12px;
margin-top: 8px;
}
/* line 344, ../sass/_systeme_commandes.scss */
/* line 395, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .quantite-restante .nb {
font-weight: bold;
}
/* line 349, ../sass/_systeme_commandes.scss */
/* line 400, ../sass/_systeme_commandes.scss */
.commande-form #produits .table td.produit, .commande-form #produits .table th.produit {
width: 70%;
}
/* line 353, ../sass/_systeme_commandes.scss */
/* line 404, ../sass/_systeme_commandes.scss */
.commande-form #produits .table td.prix-unit, .commande-form #produits .table th.prix-unit {
width: 10%;
}
/* line 357, ../sass/_systeme_commandes.scss */
/* line 408, ../sass/_systeme_commandes.scss */
.commande-form #produits .table td.colonne-quantite, .commande-form #produits .table th.colonne-quantite {
width: 10%;
}
/* line 361, ../sass/_systeme_commandes.scss */
/* line 412, ../sass/_systeme_commandes.scss */
.commande-form #produits .table td.total, .commande-form #produits .table th.total {
width: 10%;
}
/* line 367, ../sass/_systeme_commandes.scss */
/* line 418, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed {
position: fixed;
bottom: 0px;
@@ -810,7 +861,7 @@ h2 {
background-color: #F9F9F9;
text-align: center;
}
/* line 381, ../sass/_systeme_commandes.scss */
/* line 432, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed #total-commande-bottom {
background-color: white;
-moz-border-radius: 20px;
@@ -819,37 +870,37 @@ h2 {
padding: 5px 25px;
border: solid 1px #e0e0e0;
}
/* line 388, ../sass/_systeme_commandes.scss */
/* line 439, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .valider-commande, .commande-form #bar-fixed .btn-commentaire {
float: right;
}
/* line 392, ../sass/_systeme_commandes.scss */
/* line 443, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .btn-commentaire {
margin-right: 10px;
}
/* line 396, ../sass/_systeme_commandes.scss */
/* line 447, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .btn-retour, .commande-form #bar-fixed .annuler-commande {
float: left;
margin-right: 5px;
}
/* line 401, ../sass/_systeme_commandes.scss */
/* line 452, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .annuler-commande {
color: #b92c28;
background-color: white;
}
/* line 406, ../sass/_systeme_commandes.scss */
/* line 457, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed #total-commande-bottom {
display: none;
font-weight: bold;
font-family: "comfortaalight";
font-size: 24px;
}
/* line 413, ../sass/_systeme_commandes.scss */
/* line 464, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .field-commande-commentaire {
display: none;
}

/* line 421, ../sass/_systeme_commandes.scss */
/* line 472, ../sass/_systeme_commandes.scss */
.ui-datepicker .ui-widget-header {
background: none;
background-color: gray;
@@ -857,7 +908,7 @@ h2 {
color: black;
font-weight: normal;
}
/* line 429, ../sass/_systeme_commandes.scss */
/* line 480, ../sass/_systeme_commandes.scss */
.ui-datepicker .ui-datepicker-current-day a,
.ui-datepicker a.ui-state-hover {
background: none;

+ 3
- 3
frontend/web/js/lechatdesnoisettes.js Visa fil

@@ -126,7 +126,7 @@ function chat_systeme_commande() {
if($('.commande-form').size()) {
// affichage des différentes parties du formulaire
if(!$('#commande-id_production').val()) {
$('.field-commande-id_point_vente, #points-vente, #produits, .valider-commande, #info-horaire-retrait-commande, .btn-commentaire').hide() ;
$('#depots, #points-vente, #produits, .valider-commande, #info-horaire-retrait-commande, .btn-commentaire').hide() ;
}
else if(!$('#commande-id_point_vente').val()) {
$('#produits, .valider-commande, .btn-commentaire').hide() ;
@@ -188,7 +188,7 @@ function chat_systeme_commande() {
$('#has-commande-en-cours').show() ;
has_commande_en_cours = true ;
$('.field-commande-id_point_vente, #points-vente, #produits, #info-horaire-retrait-commande').hide() ;
$('#depots, #points-vente, #produits, #info-horaire-retrait-commande').hide() ;
}
}) ;
@@ -203,7 +203,7 @@ function chat_systeme_commande() {
$('#commande-id_point_vente').val('') ;
// affichage points de vente
$('.field-commande-id_point_vente, #points-vente, #info-horaire-retrait-commande').fadeIn() ;
$('#depots, #points-vente, #info-horaire-retrait-commande').fadeIn() ;
}
}

+ 117
- 66
frontend/web/sass/_systeme_commandes.scss Visa fil

@@ -24,6 +24,80 @@ h2 {
}


.liste-etablissements {
#bloc-liste-boulangeries {

}

.boulangerie {
padding-left: 0px ;
padding-right: 30px ;

&.selected .panel {
border-bottom: solid 3px $color1 ;
}
.panel-heading {

height: 200px ;
overflow: hidden ;
padding: 0px ;
background: none ;
background-color: #F8F1DD ;
.img-back {
//display: none ;
width: 100% ;
height: auto ;
position: relative;
top: -50% ;
}
}

.panel-body {
position: relative ;
width: 100% ;
height: 120px ;
max-height: 120px;
text-align: center ;

h3 {
margin-bottom: 4px ;
}

.localite {
color: gray ;
margin-bottom: 10px ;
}

.glyphicon-check {
color: $color1 ;
font-size: 40px ;
position: absolute ;
top: 34px ;
left: 32px ;
}
.remove {
position: absolute ;
top: 10px;
right: 10px ;
}

.logo {
display: none ;
width: 150px ;
position: absolute ;
top: -40px ;
left: 50% ;
margin-left: -75px ;
background-color: white ;
padding: 10px 20px ;
}
}
}
}

#index-commande {
position: relative ;
@@ -41,66 +115,9 @@ h2 {
padding-bottom: 20px;
}
#liste-boulangeries {
#bloc-liste-boulangeries {
//border-right: solid 1px #e0e0e0 ;
}

.panel-heading {
height: 200px ;
overflow: hidden ;
padding: 0px ;
background: none ;
background-color: #F8F1DD ;
.img-back {
//display: none ;
width: 100% ;
height: auto ;
position: relative;
top: -50% ;
}
}
.panel-body {
position: relative ;
width: 100% ;
height: 120px ;
max-height: 120px;
text-align: center ;
h3 {
margin-bottom: 4px ;
}

.localite {
//float: right ;
color: gray ;
margin-bottom: 10px ;
}

.remove {
position: absolute ;
top: 10px;
right: 10px ;
}
.logo {
display: none ;
width: 150px ;
position: absolute ;
top: -40px ;
left: 50% ;
margin-left: -75px ;
background-color: white ;
padding: 10px 20px ;
}
}
}
#bloc-add-etablissement {
padding-left: 0px ;
padding-right: 30px ;
.help-block {
padding-bottom: 0px ;
@@ -176,15 +193,40 @@ h2 {
.ui-datepicker {
float: left ;
margin-right: 20px ;
font-size: 20px ;
}
.ui-datepicker-header {
background-color: $color1 ;
}
.ui-datepicker-title {
color: white
}
.ui-datepicker-prev,
.ui-datepicker-next {
&:hover {
border: 0px none ;
background: none ;
}
}
.ui-helper-clearfix:after {
clear: none ;
}
.alert-info {
float: left ;
}
.ui-datepicker-calendar {
a {
text-decoration: none ;
background-color: $color2 ;
&.ui-state-hover, &.ui-state-active {
background-color: $color1 ;
color: white ;
border-color: #cdc3b7 ;
}
}
}
}
#has-commande-en-cours {
@@ -196,6 +238,10 @@ h2 {
font-weight: bold ;
}
}
.field-commande-id_production {
display: none ;
}
.field-commande-id_point_vente {
margin-top: 30px ;
@@ -211,6 +257,10 @@ h2 {
margin-bottom: 0px ;
}
}
.field-commande-id_point_vente {
display: none ;
}
.blocs {
list-style-type: none ;
@@ -228,7 +278,8 @@ h2 {
cursor: pointer ;
float: left ;
background-color: #f9f9f9 ;
background-color: white ;
border: 1px solid #d8d8d8 ;
.nom {
@@ -252,8 +303,8 @@ h2 {
}
&.selected {
border-left: solid 5px black ;
@include box-shadow(0px 0px 5px #d8d8d8) ;
border-left: solid 5px $color1 ;
//@include box-shadow(0px 0px 5px #d8d8d8) ;
.contenu {
position: relative ;

+ 1
- 0
frontend/web/sass/screen.scss Visa fil

@@ -19,6 +19,7 @@ $color2: #fff2c7 ;
$color2: #fff6d5 ;
$color1: #BB8757 ;
$color2: #F8F1DD ;

@import "_fonts.scss" ;


Laddar…
Avbryt
Spara