Laclic
/
Souke
Следить 5
В избранное 0
Форкнуть 1
Код Задачи 1 Pull Request'ы 0 Релизы 0 Вики Активность
Просмотр исходного кода

Merge branch 'dev'

prodstable
Guillaume Bourgeois 5 лет назад
Родитель
2108cd3e07 78ada7fc5f
Сommit
924dc3a8b7
9 измененных файлов: 485 добавлений и 399 удалений
Разделённый вид Показать статистику Diff
  1. +7
    -0
      backend/views/producer/update.php
  2. +157
    -148
      producer/views/layouts/main.php
  3. +1
    -1
      producer/views/order/confirm.php
  4. +2
    -2
      producer/views/order/order.php
  5. +3
    -15
      producer/views/site/index.php
  6. +187
    -149
      producer/web/css/screen.css
  7. +10
    -1
      producer/web/js/boulange.js
  8. +106
    -73
      producer/web/sass/_layout.scss
  9. +12
    -10
      producer/web/sass/_responsive.scss

+ 7
- 0
backend/views/producer/update.php Просмотреть файл

@@ -82,6 +82,13 @@ $this->addBreadcrumb($this->getTitle()) ;
<?= $form->field($model, 'code')->hint("Saisissez ce champs si vous souhaitez protéger l'accès à votre boutique par un code, sinon laissez-le vide.<br />"
. "Ce code est à communiquer à vos client pour qu'ils puissent ajouter votre établissement à leur tableau de bord.<br />"
. "<a href=\"".Yii::$app->urlManager->createUrl(['communicate/index'])."\">Cliquez ici</a> pour télécharger un mode d'emploi comprenant ce code à distribuer à vos clients.") ?>
<?= $form->field($model, 'logo')->fileInput() ?>
<?php
if (strlen($model->logo)) {
echo '<img src="'.Yii::$app->urlManagerProducer->getBaseUrl().'/uploads/' . $model->logo . '" width="400px" /><br />';
echo '<input type="checkbox" name="delete_logo" id="delete_logo" /> <label for="delete_logo">Supprimer le logo</label><br /><br />';
}
?>
<?= $form->field($model, 'photo')->fileInput() ?>
<?php
if (strlen($model->photo)) {

+ 157
- 148
producer/views/layouts/main.php Просмотреть файл

@@ -123,11 +123,116 @@ if(!Yii::$app->user->isGuest) {
?>
</div>
<header id="header">
<div class="container">
<h1><?= Html::encode($producer->name); ?></h1>
<h2>
<?= Html::encode($producer->type) ?> à <?= Html::encode($producer->city); ?> (<?= Html::encode($producer->postcode); ?>) /
<div class="container">
<div id="left" class="col-md-3">
<div class="fixed">
<?php if(strlen($producer->logo)): ?>
<div id="logo">
<a href="<?= Yii::$app->urlManager->createUrl(['site/index']) ?>">
<img class="img-logo" src="<?= Yii::$app->urlManager->baseUrl; ?>/uploads/<?= $producer->logo; ?>" alt="Logo <?= Html::encode($producer->name) ?>" />
</a>
</div>
<?php endif; ?>
<h1><?= Html::encode($producer->name); ?></h1>
<h2><?= Html::encode($producer->type) ?> à <?= Html::encode($producer->city); ?> (<?= Html::encode($producer->postcode); ?>)</h2>

<nav id="main-nav">
<?php

$credit = '' ;
if(isset($userProducer) && $userProducer) {
$labelType = $userProducer->credit > 0 ? 'success' : 'danger' ;
$credit = ' <span class="label label-'.$labelType.'">'.number_format($userProducer->credit, 2).' €</span>' ;
}

$countSubcriptions = Subscription::find()
->where([
'subscription.id_user' => User::getCurrentId(),
'subscription.id_producer' => Producer::getId(),
])->count() ;
$labelSubscription = $countSubcriptions > 0 ? 'success' : 'default' ;

$countOrders = Order::find()
->joinWith(['distribution'])
->where([
'id_user' => User::getCurrentId(),
'distribution.id_producer' => Producer::getId()
])
->params([':date_today' => date('Y-m-d')])
->andWhere('distribution.date >= :date_today')
->count();
$labelOrders = $countOrders > 0 ? 'success' : 'default' ;


echo Nav::widget([
'encodeLabels' => false,
'options' => ['class' =>'nav'],
'items' => [
[
'label' => '<span class="glyphicon glyphicon-th-large"></span> Accueil',
'url' => Yii::$app->urlManager->createUrl(['site/index']),
'active' => $this->getControllerAction() == 'site/index',
],
[
'label' => '<span class="glyphicon glyphicon-plus"></span> Commander',
'url' => Yii::$app->urlManager->createUrl(['order/order']),
'visible' => !Yii::$app->user->isGuest,
'active' => $this->getControllerAction() == 'order/order',
],
[
'label' => '<span class="glyphicon glyphicon-plus"></span> Commander',
'url' => Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/producer','id' => $this->context->getProducer()->id,'return_url' => Yii::$app->urlManagerProducer->createAbsoluteUrl(['order/order','slug_producer' => $this->context->getProducer()->slug])]),
'visible' => Yii::$app->user->isGuest,
'active' => $this->getControllerAction() == 'order/order',
],
[
'label' => '<span class="glyphicon glyphicon-folder-open"></span> Mes commandes <span class="label label-'.$labelOrders.'">'.$countOrders.'</span>',
'url' => Yii::$app->urlManager->createUrl(['order/history']),
'visible' => !Yii::$app->user->isGuest,
'active' => $this->getControllerAction() == 'order/history',
],
[
'label' => '<span class="glyphicon glyphicon-repeat"></span> Abonnements <span class="label label-'.$labelSubscription.'">'.$countSubcriptions.'</span>',
'url' => Yii::$app->urlManager->createUrl(['subscription/index']),
'visible' => !Yii::$app->user->isGuest && $producer->user_manage_subscription,
'active' => $this->getControllerAction() == 'subscription/index',
],
[
'label' => '<span class="glyphicon glyphicon-euro"></span> Crédit'.$credit,
'url' => Yii::$app->urlManager->createUrl(['credit/history']),
'visible' => !Yii::$app->user->isGuest && $producer->credit,
'active' => $this->getControllerAction() == 'credit/history',
],
[
'label' => '<span class="glyphicon glyphicon-envelope"></span> Contact',
'url' => Yii::$app->urlManager->createUrl(['site/contact']),
'active' => $this->getControllerAction() == 'site/contact',
],
[
'label' => '<span class="glyphicon glyphicon-cog"></span> Administration',
'url' => Yii::$app->urlManagerBackend->createAbsoluteUrl(['site/index']),
'visible' => isset(Yii::$app->user->identity) && Yii::$app->user->identity->isProducer(),
'options' => ['id' => 'btn-administration']
],
],
]);
?>
</nav>
</div>
</div>

<div id="main" class="col-md-9">
<?php if(strlen($producer->photo)): ?>
<div id="img-big">
<img class="img-photo" src="<?= Yii::$app->urlManager->baseUrl; ?>/uploads/<?= $producer->photo; ?>" alt="Photo <?= Html::encode($producer->name) ?>" />
</div>
<?php endif; ?>
<div id="infos-producer">
<span data-toggle="tooltip" data-placement="bottom" title="Heure limite de commande">
<span class="glyphicon glyphicon-time"></span> Commande avant
<strong><?php echo Html::encode($producer->order_deadline) ?> h</strong></span>,
<span data-toggle="tooltip" data-placement="bottom" title="Exemple : commande le lundi pour le <?php if($producer->order_delay == 1): ?>mardi<?php elseif($producer->order_delay == 2): ?>mercredi<?php elseif($producer->order_delay == 3): ?>jeudi<?php elseif($producer->order_delay == 4): ?>vendredi<?php elseif($producer->order_delay == 5): ?>samedi<?php elseif($producer->order_delay == 6): ?>dimanche<?php elseif($producer->order_delay == 7): ?>lundi d'après<?php endif; ?>"><strong><?= Html::encode($producer->order_delay) ?> jour<?php if($producer->order_delay > 1): ?>s<?php endif; ?></strong> à l'avance</span>

<?php if(!Yii::$app->user->isGuest): ?>
<span class="favorite">
<?php if($userProducer && $userProducer->bookmark): ?>
@@ -137,159 +242,63 @@ if(!Yii::$app->user->isGuest) {
<?php endif; ?>
</span>
<?php endif; ?>
</h2>
<div id="infos">
<span data-toggle="tooltip" data-placement="bottom" title="Heure limite de commande">
<span class="glyphicon glyphicon-time"></span> Commande avant
<strong><?php echo Html::encode($producer->order_deadline) ?> h</strong></span>,
<span data-toggle="tooltip" data-placement="bottom" title="Exemple : commande le lundi pour le <?php if($producer->order_delay == 1): ?>mardi<?php elseif($producer->order_delay == 2): ?>mercredi<?php elseif($producer->order_delay == 3): ?>jeudi<?php elseif($producer->order_delay == 4): ?>vendredi<?php elseif($producer->order_delay == 5): ?>samedi<?php elseif($producer->order_delay == 6): ?>dimanche<?php elseif($producer->order_delay == 7): ?>lundi d'après<?php endif; ?>"><strong><?= Html::encode($producer->order_delay) ?> jour<?php if($producer->order_delay > 1): ?>s<?php endif; ?></strong> à l'avance</span>
<div class="clr"></div>
</div>
</div>
</header>
<div id="main">
<div class="container">
<nav id="main-nav">
<?php
$credit = '' ;
if(isset($userProducer) && $userProducer) {
$labelType = $userProducer->credit > 0 ? 'success' : 'danger' ;
$credit = ' <span class="label label-'.$labelType.'">'.number_format($userProducer->credit, 2).' €</span>' ;
}
$countSubcriptions = Subscription::find()
->where([
'subscription.id_user' => User::getCurrentId(),
'subscription.id_producer' => Producer::getId(),
])->count() ;
$labelSubscription = $countSubcriptions > 0 ? 'success' : 'default' ;
$countOrders = Order::find()
->joinWith(['distribution'])
->where([
'id_user' => User::getCurrentId(),
'distribution.id_producer' => Producer::getId()
])
->params([':date_today' => date('Y-m-d')])
->andWhere('distribution.date >= :date_today')
->count();
$labelOrders = $countOrders > 0 ? 'success' : 'default' ;
echo Nav::widget([
'encodeLabels' => false,
'options' => ['class' =>'nav nav-pills'],
'items' => [
[
'label' => '<span class="glyphicon glyphicon-th-large"></span> Accueil',
'url' => Yii::$app->urlManager->createUrl(['site/index']),
'active' => $this->getControllerAction() == 'site/index',
],
[
'label' => '<span class="glyphicon glyphicon-plus"></span> Commander',
'url' => Yii::$app->urlManager->createUrl(['order/order']),
'visible' => !Yii::$app->user->isGuest,
'active' => $this->getControllerAction() == 'order/order',
],
[
'label' => '<span class="glyphicon glyphicon-plus"></span> Commander',
'url' => Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/producer','id' => $this->context->getProducer()->id,'return_url' => Yii::$app->urlManagerProducer->createAbsoluteUrl(['order/order','slug_producer' => $this->context->getProducer()->slug])]),
'visible' => Yii::$app->user->isGuest,
'active' => $this->getControllerAction() == 'order/order',
],
[
'label' => '<span class="glyphicon glyphicon-folder-open"></span> Mes commandes <span class="label label-'.$labelOrders.'">'.$countOrders.'</span>',
'url' => Yii::$app->urlManager->createUrl(['order/history']),
'visible' => !Yii::$app->user->isGuest,
'active' => $this->getControllerAction() == 'order/history',
],
[
'label' => '<span class="glyphicon glyphicon-repeat"></span> Abonnements <span class="label label-'.$labelSubscription.'">'.$countSubcriptions.'</span>',
'url' => Yii::$app->urlManager->createUrl(['subscription/index']),
'visible' => !Yii::$app->user->isGuest && $producer->user_manage_subscription,
'active' => $this->getControllerAction() == 'subscription/index',
],
[
'label' => '<span class="glyphicon glyphicon-euro"></span> Crédit'.$credit,
'url' => Yii::$app->urlManager->createUrl(['credit/history']),
'visible' => !Yii::$app->user->isGuest && $producer->credit,
'active' => $this->getControllerAction() == 'credit/history',
],
[
'label' => '<span class="glyphicon glyphicon-envelope"></span> Contact',
'url' => Yii::$app->urlManager->createUrl(['site/contact']),
'active' => $this->getControllerAction() == 'site/contact',
],
[
'label' => '<span class="glyphicon glyphicon-cog"></span> Administration',
'url' => Yii::$app->urlManagerBackend->createAbsoluteUrl(['site/index']),
'visible' => isset(Yii::$app->user->identity) && Yii::$app->user->identity->isProducer(),
'options' => ['id' => 'btn-administration']
],
],
]);
?>
</nav>
<?php if(strlen($this->getTitle())): ?>
<h2 id="page-title">
<?= $this->getTitle(); ?>
<?php
if(count($this->buttons)): ?>
<span id="buttons">
<?php foreach($this->buttons as $button) {
echo '<a href="'.Yii::$app->urlManagerProducer->createUrl($button['url']).'" class="'.$button['class'].'">'.$button['label'].'</a>' ;
}
?>
</span>
<?php endif; ?>
</h2>
<?php endif; ?>
<section id="content">
<?php if (Yii::$app->session->hasFlash('error')): ?>
<div class="alert alert-danger" role="alert">
<?= Yii::$app->session->getFlash('error') ?>
</div>
<?php endif; ?>
<?php if (Yii::$app->session->hasFlash('success')): ?>
<div class="alert alert-success" role="alert">
<?= Yii::$app->session->getFlash('success') ?>
</div>
<?php if(strlen($this->getTitle())): ?>
<h2 id="page-title">
<?= $this->getTitle(); ?>
<?php
if(count($this->buttons)): ?>
<span id="buttons">
<?php foreach($this->buttons as $button) {
echo '<a href="'.Yii::$app->urlManagerProducer->createUrl($button['url']).'" class="'.$button['class'].'">'.$button['label'].'</a>' ;
}
?>
</span>
<?php endif; ?>
</h2>
<?php endif; ?>
<?= $content ?>
</section>
<?php if(strlen($producer->mentions) || strlen($producer->gcs)): ?>
<section id="footer-producer">
<?= Html::encode($producer->name) ?> :
<?php if(strlen($producer->mentions)): ?>
<a href="<?php echo Yii::$app->urlManager->createUrl(['site/mentions']) ; ?>">Mentions légales</a>
<?php endif; ?>
<?php if(strlen($producer->mentions) && strlen($producer->gcs)): ?>
&bull;

<section id="content">
<?php if (Yii::$app->session->hasFlash('error')): ?>
<div class="alert alert-danger" role="alert">
<?= Yii::$app->session->getFlash('error') ?>
</div>
<?php endif; ?>
<?php if(strlen($producer->gcs)): ?>
<a href="<?php echo Yii::$app->urlManager->createUrl(['site/gcs']) ; ?>">Conditions générales de vente</a>
<?php if (Yii::$app->session->hasFlash('success')): ?>
<div class="alert alert-success" role="alert">
<?= Yii::$app->session->getFlash('success') ?>
</div>
<?php endif; ?>

<?= $content ?>
</section>
<?php endif; ?>

<?php if(strlen($producer->mentions) || strlen($producer->gcs)): ?>
<section id="footer-producer">
<?= Html::encode($producer->name) ?> :
<?php if(strlen($producer->mentions)): ?>
<a href="<?php echo Yii::$app->urlManager->createUrl(['site/mentions']) ; ?>">Mentions légales</a>
<?php endif; ?>
<?php if(strlen($producer->mentions) && strlen($producer->gcs)): ?>
&bull;
<?php endif; ?>
<?php if(strlen($producer->gcs)): ?>
<a href="<?php echo Yii::$app->urlManager->createUrl(['site/gcs']) ; ?>">Conditions générales de vente</a>
<?php endif; ?>
</section>
<?php endif; ?>
</div>
</div>

<footer id="footer">
<div class="container">
<div class="overflow"></div>
<div class="content">
<a href="<?php echo Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/index']) ; ?>">distrib</a> &bull;
<a href="<?php echo Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/mentions']) ; ?>">Mentions légales</a> &bull;
<a href="<?php echo Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/cgv']) ; ?>">CGS</a> &bull;
<a id="code-source" href="https://framagit.org/guillaume-bourgeois/distrib">Code source <img src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/logo-framagit.png" alt="Hébergé par Framasoft" /> <img src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/logo-gitlab.png" alt="Propulsé par Gitlab" /></a>
</div>
<footer id="footer" class="col-md-9">
<div class="content">
<a href="<?php echo Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/index']) ; ?>">distrib</a> &bull;
<a href="<?php echo Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/mentions']) ; ?>">Mentions légales</a> &bull;
<a href="<?php echo Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/cgv']) ; ?>">CGS</a> &bull;
<a id="code-source" href="https://framagit.org/guillaume-bourgeois/distrib">Code source <img src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/logo-framagit.png" alt="Hébergé par Framasoft" /> <img src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/logo-gitlab.png" alt="Propulsé par Gitlab" /></a>
</div>
</footer>


+ 1
- 1
producer/views/order/confirm.php Просмотреть файл

@@ -38,7 +38,7 @@ termes.

use common\models\Order ;

$this->setPageTitle('Confirmation de commande') ;
$this->setTitle('Confirmation de commande') ;

?>


+ 2
- 2
producer/views/order/order.php Просмотреть файл

@@ -53,7 +53,7 @@ $this->setTitle('Commander') ;
Aucune distribution n'est prévue chez ce producteur.
</div>
<div v-else>
<div :class="(producer != null && producer.order_infos.length) ? 'col-md-9' : 'col-md-12'">
<div>
<div id="steps">
<ul>
<li id="step-date" :class="'col-md-3 '+((step == 'date') ? 'active' : '')">
@@ -279,7 +279,7 @@ $this->setTitle('Commander') ;
</transition>
</div>
</div>
<div id="infos" class="col-md-3" v-if="producer != null && producer.order_infos.length">
<div id="infos" v-if="producer != null && producer.order_infos.length">
<div class="panel panel-default">
<div class="panel-heading">
Informations

+ 3
- 15
producer/views/site/index.php Просмотреть файл

@@ -37,31 +37,19 @@ termes.
*/

$producer = $this->context->getProducer() ;
$this->setTitle('Accueil');
$this->setPageTitle(Html::encode($producer->type.' à '.$producer->city)) ;
?>

<?php if(strlen($producer->description) || strlen($producer->photo)): ?>
<?php
if(strlen($producer->description) && strlen($producer->photo))
$colSize = 'col-md-6' ;
else
$colSize = 'col-md-12' ;
?>

<section id="presentation">
<?php if(strlen($producer->photo)): ?>
<div class="photo <?= $colSize ?>">
<img class="img-photo" src="<?= Yii::$app->urlManager->baseUrl; ?>/uploads/<?= $producer->photo; ?>" alt="Photo <?= Html::encode($producer->name) ?>" />
</div>
<?php endif; ?>
<?php if(strlen($producer->description)): ?>
<div class="description <?= $colSize ?>">
<div class="description">
<?= nl2br(Html::encode($producer->description)); ?>
</div>
<?php endif; ?>
<div class="clr"></div>
</section>
<?php endif; ?>

<section id="points-sale">
<h3><span>Points de vente</span></h3>

+ 187
- 149
producer/web/css/screen.css Просмотреть файл

@@ -137,7 +137,7 @@ termes.
/* line 45, ../sass/_layout.scss */
body {
font-family: "Arial";
background-color: white;
background-color: #FFF8DC;
color: #333;
line-height: 20px;
font-size: 14px;
@@ -278,132 +278,182 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
}

/* line 192, ../sass/_layout.scss */
#header {
#left {
background-color: #FFF8DC;
text-align: center;
padding-top: 25px;
padding-bottom: 10px;
margin-top: 15px;
padding: 0px;
position: relative;
}
/* line 198, ../sass/_layout.scss */
#header .container {
/* line 199, ../sass/_layout.scss */
#left .fixed {
position: fixed;
display: none;
}
/* line 205, ../sass/_layout.scss */
#left #logo {
position: relative;
padding: 0px;
background-color: white;
width: 110px;
height: 110px;
margin: 0px auto;
margin-bottom: 20px;
-moz-border-radius: 110px;
-webkit-border-radius: 110px;
border-radius: 110px;
border: solid 1px gray;
text-align: center;
overflow: hidden;
}
/* line 204, ../sass/_layout.scss */
#header h1, #header h2, #header #infos, #header #infos a {
/* line 217, ../sass/_layout.scss */
#left #logo img {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
max-width: 90px;
max-height: 90px;
}
/* line 227, ../sass/_layout.scss */
#left h1, #left h2, #left #infos, #left #infos a {
color: #323232;
}
/* line 208, ../sass/_layout.scss */
#header h1 {
/* line 231, ../sass/_layout.scss */
#left h1 {
text-transform: uppercase;
font-family: "highvoltageregular";
font-size: 35px;
line-height: 35px;
font-size: 25px;
line-height: 25px;
font-weight: bold;
padding-bottom: 5px;
text-align: center;
font-weight: normal;
}
/* line 219, ../sass/_layout.scss */
#header h2 {
/* line 242, ../sass/_layout.scss */
#left h2 {
font-family: "capsuularegular";
font-size: 20px;
font-size: 15px;
font-weight: normal;
text-align: center;
}
/* line 225, ../sass/_layout.scss */
#header h2 .favorite {
/* line 248, ../sass/_layout.scss */
#left h2 .favorite {
padding-left: 0px;
}
/* line 228, ../sass/_layout.scss */
#header h2 .favorite .glyphicon {
/* line 251, ../sass/_layout.scss */
#left h2 .favorite .glyphicon {
font-size: 14px;
}
/* line 233, ../sass/_layout.scss */
#header h2 a {
/* line 256, ../sass/_layout.scss */
#left h2 a {
color: #323232;
}
/* line 239, ../sass/_layout.scss */
#header #infos {
text-align: center;
padding-bottom: 10px;
padding-top: 20px;
margin-bottom: 0px;
font-size: 16px;
font-family: "capsuularegular";
}
/* line 247, ../sass/_layout.scss */
#header #infos strong {
font-weight: bold;
}

/* line 253, ../sass/_layout.scss */
#main {
background-color: #FFF8DC;
}
/* line 256, ../sass/_layout.scss */
#main nav#main-nav {
width: 100%;
/* line 262, ../sass/_layout.scss */
#left nav#main-nav {
background-color: white;
border-top: solid 1px #e0e0e0;
border-bottom: solid 1px #e0e0e0;
margin-bottom: 30px;
border: solid 1px #e0e0e0;
border-bottom: 0px none;
margin-top: 20px;
}
/* line 265, ../sass/_layout.scss */
#main nav#main-nav ul li a {
/* line 269, ../sass/_layout.scss */
#left nav#main-nav ul li {
display: block;
}
/* line 272, ../sass/_layout.scss */
#left nav#main-nav ul li a {
color: #323232;
color: black;
border-right: solid 1px #e0e0e0;
border-bottom: solid 1px #e0e0e0;
font-family: "capsuularegular";
font-size: 18px;
display: block;
text-align: left;
}
/* line 272, ../sass/_layout.scss */
#main nav#main-nav ul li a .glyphicon {
/* line 281, ../sass/_layout.scss */
#left nav#main-nav ul li a .glyphicon {
font-size: 15px;
margin-right: 3px;
}
/* line 277, ../sass/_layout.scss */
#main nav#main-nav ul li a span.label {
/* line 286, ../sass/_layout.scss */
#left nav#main-nav ul li a span.label {
padding-bottom: 3px;
font-family: "Arial";
float: right;
}
/* line 284, ../sass/_layout.scss */
#main nav#main-nav ul li.active span.label, #main nav#main-nav ul li a:hover span.label {
/* line 294, ../sass/_layout.scss */
#left nav#main-nav ul li.active span.label, #left nav#main-nav ul li a:hover span.label {
background-color: #e67200;
color: white;
}
/* line 290, ../sass/_layout.scss */
#main nav#main-nav ul li a:hover, #main nav#main-nav ul li.active a {
/* line 300, ../sass/_layout.scss */
#left nav#main-nav ul li a:hover, #left nav#main-nav ul li.active a {
background: #FF7F00;
color: white;
-moz-border-radius: 0px;
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 297, ../sass/_layout.scss */
#main nav#main-nav ul li#btn-administration {
float: right;
border-left: solid 1px #e0e0e0;
}
/* line 301, ../sass/_layout.scss */
#main nav#main-nav ul li#btn-administration a {
/* line 309, ../sass/_layout.scss */
#left nav#main-nav ul li#btn-administration a {
color: #FF7F00;
}
/* line 304, ../sass/_layout.scss */
#main nav#main-nav ul li#btn-administration a:hover {
/* line 312, ../sass/_layout.scss */
#left nav#main-nav ul li#btn-administration a:hover {
color: white;
}
/* line 312, ../sass/_layout.scss */
#main nav#main-nav #user {
/* line 320, ../sass/_layout.scss */
#left nav#main-nav #user {
color: #FF7F00;
float: right;
padding: 10px;
}
/* line 319, ../sass/_layout.scss */

/* line 328, ../sass/_layout.scss */
#main {
background-color: #FFF8DC;
border: solid 1px #e0e0e0;
margin-top: 15px;
padding: 0px;
background-color: white;
}
/* line 335, ../sass/_layout.scss */
#main #img-big {
height: 130px;
overflow: hidden;
}
/* line 338, ../sass/_layout.scss */
#main #img-big img.img-photo {
width: 100%;
}
/* line 344, ../sass/_layout.scss */
#main #infos-producer {
padding: 5px 10px;
margin-bottom: 0px;
font-size: 16px;
font-family: "capsuularegular";
background-color: white;
border-bottom: solid 1px #e0e0e0;
color: gray;
}
/* line 353, ../sass/_layout.scss */
#main #infos-producer strong {
font-weight: bold;
}
/* line 357, ../sass/_layout.scss */
#main #infos-producer .favorite {
float: right;
color: gray;
}
/* line 360, ../sass/_layout.scss */
#main #infos-producer .favorite a {
color: black;
}
/* line 366, ../sass/_layout.scss */
#main h2#page-title {
padding-left: 15px;
padding-right: 15px;
padding-bottom: 15px;
padding-top: 30px;
border-bottom: solid 1px #e0e0e0;
margin-bottom: 10px;
font-family: "highvoltageregular";
@@ -413,74 +463,68 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
top: -10px;
text-align: left;
}
/* line 332, ../sass/_layout.scss */
/* line 380, ../sass/_layout.scss */
#main h2#page-title #buttons {
margin-bottom: 15px;
font-family: "Arial";
}
/* line 339, ../sass/_layout.scss */
#main .container {
padding: 0px;
background-color: white;
min-height: 500px;
border-left: solid 1px #e0e0e0;
border-right: solid 1px #e0e0e0;
}
/* line 347, ../sass/_layout.scss */
/* line 387, ../sass/_layout.scss */
#main #content {
padding: 0px 20px 20px 20px;
padding-bottom: 40px;
min-height: 300px;
}
/* line 351, ../sass/_layout.scss */
/* line 392, ../sass/_layout.scss */
#main #content h1, #main #content h2, #main #content h3, #main #content h4, #main #content h5, #main #content h6 {
font-family: "highvoltageregular";
margin-top: 30px;
margin-bottom: 20px;
}
/* line 356, ../sass/_layout.scss */
/* line 397, ../sass/_layout.scss */
#main #content h1.first, #main #content h2.first, #main #content h3.first, #main #content h4.first, #main #content h5.first, #main #content h6.first {
margin-top: 0px;
}
/* line 361, ../sass/_layout.scss */
/* line 402, ../sass/_layout.scss */
#main #content h1 {
font-size: 30px;
}
/* line 365, ../sass/_layout.scss */
/* line 406, ../sass/_layout.scss */
#main #content h2 {
font-size: 25px;
}
/* line 370, ../sass/_layout.scss */
/* line 411, ../sass/_layout.scss */
#main #content h3 {
font-family: "highvoltageregular";
font-family: "capsuularegular";
text-transform: uppercase;
font-size: 23px;
text-align: left;
margin-bottom: 30px;
margin-top: 45px;
}
/* line 378, ../sass/_layout.scss */
/* line 420, ../sass/_layout.scss */
#main #content h3 span {
padding-top: 14px;
color: #323232;
}
/* line 384, ../sass/_layout.scss */
/* line 426, ../sass/_layout.scss */
#main #content h4 {
font-size: 20px;
}
/* line 388, ../sass/_layout.scss */
/* line 430, ../sass/_layout.scss */
#main #content h5 {
font-size: 18px;
}
/* line 392, ../sass/_layout.scss */
/* line 434, ../sass/_layout.scss */
#main #content h6 {
font-size: 16px;
}
/* line 398, ../sass/_layout.scss */
/* line 440, ../sass/_layout.scss */
#main #content form .form-group .hint-block {
color: gray;
}

/* line 406, ../sass/_layout.scss */
/* line 448, ../sass/_layout.scss */
#footer-producer {
text-align: center;
position: absolute;
@@ -488,51 +532,41 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
left: 0px;
width: 100%;
}
/* line 413, ../sass/_layout.scss */
/* line 455, ../sass/_layout.scss */
#footer-producer a {
color: #FF7F00;
}
/* line 415, ../sass/_layout.scss */
/* line 457, ../sass/_layout.scss */
#footer-producer a:active {
text-decoration: underline;
}

/* line 421, ../sass/_layout.scss */
/* line 463, ../sass/_layout.scss */
#footer {
background-color: #FFF8DC;
height: 100px;
float: right;
text-align: center;
}
/* line 425, ../sass/_layout.scss */
#footer .container {
padding: 0px;
}
/* line 427, ../sass/_layout.scss */
#footer .container .overflow {
height: 30px;
background-color: white;
border-left: solid 1px #e0e0e0;
border-right: solid 1px #e0e0e0;
border-bottom: solid 1px #e0e0e0;
}
/* line 435, ../sass/_layout.scss */
#footer .container .content {
/* line 469, ../sass/_layout.scss */
#footer .content {
padding-top: 20px;
color: black;
}
/* line 439, ../sass/_layout.scss */
#footer .container .content a {
/* line 473, ../sass/_layout.scss */
#footer .content a {
color: black;
font-family: "capsuularegular";
font-size: 18px;
padding-left: 10px;
padding-right: 10px;
}
/* line 446, ../sass/_layout.scss */
#footer .container .content a:hover {
/* line 480, ../sass/_layout.scss */
#footer .content a:hover {
text-decoration: underline;
}
/* line 453, ../sass/_layout.scss */
#footer .container #code-source img {
/* line 487, ../sass/_layout.scss */
#footer #code-source img {
height: 20px;
}

@@ -1711,82 +1745,82 @@ termes.
left: 0px;
text-align: center;
width: 100%;
padding: 0px;
}
/* line 46, ../sass/_responsive.scss */
/* line 48, ../sass/_responsive.scss */
#header-bap #logo {
margin-left: 10px;
}

/* line 52, ../sass/_responsive.scss */
#header .container {
margin-left: 15px;
margin-right: 15px;
}
/* line 58, ../sass/_responsive.scss */
#header #credit .info {
display: block;
/* line 54, ../sass/_responsive.scss */
#left .fixed {
position: relative;
}

/* line 67, ../sass/_responsive.scss */
/* line 62, ../sass/_responsive.scss */
#main #img-big {
display: none;
}
/* line 68, ../sass/_responsive.scss */
#main nav#main-nav ul li {
display: block;
float: none;
}
/* line 71, ../sass/_responsive.scss */
/* line 72, ../sass/_responsive.scss */
#main nav#main-nav ul li.active a {
border-bottom: solid 1px white;
background-color: #FF7F00;
color: white;
}
/* line 76, ../sass/_responsive.scss */
/* line 77, ../sass/_responsive.scss */
#main nav#main-nav ul li.active a:hover {
background-color: #FF7F00;
color: white;
}
/* line 82, ../sass/_responsive.scss */
/* line 83, ../sass/_responsive.scss */
#main nav#main-nav ul li a {
display: block;
border-bottom: solid 1px #e0e0e0;
}
/* line 86, ../sass/_responsive.scss */
/* line 87, ../sass/_responsive.scss */
#main nav#main-nav ul li a:hover {
background-color: white;
color: #FF7F00;
}
/* line 93, ../sass/_responsive.scss */
/* line 94, ../sass/_responsive.scss */
#main nav#main-nav ul li#btn-administration {
float: none;
}
/* line 95, ../sass/_responsive.scss */
/* line 96, ../sass/_responsive.scss */
#main nav#main-nav ul li#btn-administration a:hover {
background-color: white;
color: #FF7F00;
}
/* line 103, ../sass/_responsive.scss */
/* line 104, ../sass/_responsive.scss */
#main h2#page-title {
text-align: center;
}
/* line 109, ../sass/_responsive.scss */
/* line 110, ../sass/_responsive.scss */
#main #products td {
padding: 3px;
}
/* line 113, ../sass/_responsive.scss */
/* line 114, ../sass/_responsive.scss */
#main #products .td-photo, #main #products .th-photo {
display: none;
}
/* line 117, ../sass/_responsive.scss */
/* line 118, ../sass/_responsive.scss */
#main #products .product {
font-size: 12px;
}
/* line 119, ../sass/_responsive.scss */
/* line 120, ../sass/_responsive.scss */
#main #products .product .nom {
font-size: 15px;
}
/* line 126, ../sass/_responsive.scss */
/* line 127, ../sass/_responsive.scss */
#main #bar-fixed {
position: relative;
}
/* line 128, ../sass/_responsive.scss */
/* line 129, ../sass/_responsive.scss */
#main #bar-fixed .btn-comment {
float: none;
display: block;
@@ -1795,66 +1829,70 @@ termes.
margin-top: 15px;
}

/* line 138, ../sass/_responsive.scss */
/* line 139, ../sass/_responsive.scss */
.order-create #main #content .order-form #products .table .input-group,
.order-update #main #content .order-form #products .table .input-group {
width: 60px;
}
/* line 142, ../sass/_responsive.scss */
/* line 143, ../sass/_responsive.scss */
.order-create #main #content .order-form #products .table .input-group .form-control,
.order-update #main #content .order-form #products .table .input-group .form-control {
width: 20px;
padding: 3px;
}

/* line 148, ../sass/_responsive.scss */
/* line 149, ../sass/_responsive.scss */
.order-create #main #content .order-form #bar-fixed #checkbox-credit,
.order-update #main #content .order-form #bar-fixed #checkbox-credit {
width: 100%;
margin: 0px;
padding: 5px 0px;
}
/* line 154, ../sass/_responsive.scss */
/* line 155, ../sass/_responsive.scss */
.order-create #main #content .order-form #bar-fixed #checkbox-credit .the-credit,
.order-update #main #content .order-form #bar-fixed #checkbox-credit .the-credit {
word-break: break-all;
}

/* line 159, ../sass/_responsive.scss */
/* line 160, ../sass/_responsive.scss */
.order-create #main #content .order-form #bar-fixed #block-confirm-order button,
.order-update #main #content .order-form #bar-fixed #block-confirm-order button {
width: 100%;
}

/* line 168, ../sass/_responsive.scss */
.order-order #app-order-order #steps ul {
height: auto;
}
/* line 170, ../sass/_responsive.scss */
.order-order #app-order-order #steps ul li {
padding-left: 0px;
padding-right: 0px;
}
/* line 172, ../sass/_responsive.scss */
/* line 174, ../sass/_responsive.scss */
.order-order #app-order-order #steps ul li .info-step {
display: none;
}
/* line 176, ../sass/_responsive.scss */
/* line 178, ../sass/_responsive.scss */
.order-order #app-order-order #steps ul li .btn::after,
.order-order #app-order-order #steps ul li .btn::before {
display: none;
}
/* line 187, ../sass/_responsive.scss */
/* line 189, ../sass/_responsive.scss */
.order-order #app-order-order table#products td.name .recipe {
display: none;
}
/* line 193, ../sass/_responsive.scss */
/* line 195, ../sass/_responsive.scss */
.order-order #app-order-order table#products td.td-quantity .input-group-btn {
width: 100%;
display: block;
}
/* line 197, ../sass/_responsive.scss */
/* line 199, ../sass/_responsive.scss */
.order-order #app-order-order table#products td.td-quantity .input-group-btn button {
width: 100%;
display: block;
}
/* line 207, ../sass/_responsive.scss */
/* line 209, ../sass/_responsive.scss */
.order-order #app-order-order #order-success .alert .glyphicon-big {
font-size: 90px;
color: white;
@@ -1864,13 +1902,13 @@ termes.
text-align: center;
margin-bottom: 20px;
}
/* line 216, ../sass/_responsive.scss */
/* line 218, ../sass/_responsive.scss */
.order-order #app-order-order #order-success .alert div.content {
margin-left: 0px;
text-align: center;
}

/* line 227, ../sass/_responsive.scss */
/* line 229, ../sass/_responsive.scss */
#footer .content {
text-align: center;
}

+ 10
- 1
producer/web/js/boulange.js Просмотреть файл

@@ -37,9 +37,18 @@ $(document).ready(function()
{
boulange_signup() ;
boulange_add_boulangerie() ;
boulange_fix_width_sidebar() ;
});

function boulange_fix_width_sidebar() {
var diffWidth = 20 ;
$('#left .fixed').width($('#left').width() - diffWidth) ;
$( window ).resize(function() {
$('#left .fixed').width($('#left').width() - diffWidth) ;
});
$('#left .fixed').show() ;
}

function boulange_scroll(id) {
if($("#"+id).size())
$('html,body').animate({

+ 106
- 73
producer/web/sass/_layout.scss Просмотреть файл

@@ -38,13 +38,13 @@ termes.
$color1: #FF7F00 ;
$color2: white ;
$courant: #323232 ;
$color-back: #F7F7F7 ;
$color-back: #FFEBCD ;
$color-back: #E9EBEE ;
//$color-back: #FFEBCD ;
$color-back: #FFF8DC ;

body {
font-family: 'Arial' ;
background-color: white ;
background-color: $color-back ;
color: #333 ;
line-height: 20px ;
font-size: 14px ;
@@ -189,16 +189,39 @@ ul.pagination {
}
}

#header {
#left {
background-color: $color-back ;
text-align: center ;
padding-top: 25px ;
padding-bottom: 10px ;
margin-top: 15px ;
padding: 0px ;
position: relative ;
.container {
.fixed {
position: fixed ;
display: none ;
}
$width-logo: 110px ;
#logo {
position: relative ;
padding: 0px ;
background-color: white ;
width: $width-logo ;
height: $width-logo ;
margin: 0px auto ;
margin-bottom: 20px ;
@include border-radius($width-logo) ;
border: solid 1px gray ;
text-align: center;
overflow: hidden ;

img {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
max-width: $width-logo - 20 ;
max-height: $width-logo - 20 ;
}
}
h1, h2, #infos, #infos a {
@@ -208,8 +231,8 @@ ul.pagination {
h1 {
text-transform: uppercase ;
font-family: 'highvoltageregular' ;
font-size: 35px ;
line-height: 35px ;
font-size: 25px ;
line-height: 25px ;
font-weight: bold ;
padding-bottom: 5px ;
text-align: center ;
@@ -218,7 +241,7 @@ ul.pagination {
h2 {
font-family: 'capsuularegular' ;
font-size: 20px ;
font-size: 15px ;
font-weight: normal ;
text-align: center ;
@@ -236,38 +259,24 @@ ul.pagination {
}
}
#infos {
text-align: center ;
padding-bottom: 10px ;
padding-top: 20px;
margin-bottom: 0px ;
font-size: 16px ;
font-family: 'capsuularegular' ;

strong {
font-weight: bold ;
}
}
}

#main {
background-color: $color-back ;
nav#main-nav {
width: 100% ;
background-color: white ;
border-top: solid 1px #e0e0e0 ;
border-bottom: solid 1px #e0e0e0 ;
margin-bottom: 30px ;
border: solid 1px #e0e0e0 ;
border-bottom: 0px none ;
margin-top: 20px;
ul {
li {
display: block ;
a {
color: $courant ;
color: black;
border-right: solid 1px #e0e0e0 ;
border-bottom: solid 1px #e0e0e0 ;
font-family: 'capsuularegular' ;
font-size: 18px ;
display: block ;
text-align: left ;
.glyphicon {
font-size: 15px ;
@@ -277,6 +286,7 @@ ul.pagination {
span.label {
padding-bottom: 3px ;
font-family: 'Arial' ;
float: right ;
}
}
@@ -295,8 +305,6 @@ ul.pagination {
}
&#btn-administration {
float: right ;
border-left: solid 1px #e0e0e0 ;
a {
color: $color1 ;
@@ -315,11 +323,51 @@ ul.pagination {
padding: 10px ;
}
}
}

#main {
background-color: $color-back ;
border: solid 1px #e0e0e0 ;
margin-top: 15px ;
padding: 0px ;
background-color: white ;
#img-big {
height: 130px ;
overflow: hidden ;
img.img-photo {
width: 100% ;
}
}
#infos-producer {
padding: 5px 10px ;
margin-bottom: 0px ;
font-size: 16px ;
font-family: 'capsuularegular' ;
background-color: white ;
border-bottom: solid 1px #e0e0e0 ;
color: gray ;
strong {
font-weight: bold ;
}
.favorite {
float: right ;
color: gray ;
a {
color: black ;
}
}
}
h2#page-title {
padding-left: 15px ;
padding-right: 15px ;
padding-bottom: 15px ;
padding-top: 30px ;
border-bottom: solid 1px #e0e0e0 ;
margin-bottom: 10px ;
font-family: 'highvoltageregular' ;
@@ -336,17 +384,10 @@ ul.pagination {
}
}
.container {
padding: 0px ;
background-color: white ;
min-height: 500px ;
border-left: solid 1px #e0e0e0 ;
border-right: solid 1px #e0e0e0 ;
}
#content {
padding: 0px 20px 20px 20px ;
padding-bottom: 40px ;
min-height: 300px ;
h1, h2, h3, h4, h5, h6 {
font-family: 'highvoltageregular' ;
@@ -369,6 +410,7 @@ ul.pagination {
h3 {
font-family: 'highvoltageregular' ;
font-family: 'capsuularegular' ;
text-transform: uppercase ;
font-size: 23px ;
text-align: left ;
@@ -421,38 +463,29 @@ ul.pagination {
#footer {
background-color: $color-back ;
height: 100px ;
.container {
padding: 0px ;
.overflow {
height: 30px ;
background-color: white ;
border-left: solid 1px #e0e0e0 ;
border-right: solid 1px #e0e0e0 ;
border-bottom: solid 1px #e0e0e0 ;
}
.content {
padding-top: 20px ;
float: right ;
text-align: center ;
.content {
padding-top: 20px ;
color: black ;

a {
color: black ;
a {
color: black ;
font-family: 'capsuularegular' ;
font-size: 18px ;
padding-left: 10px ;
padding-right: 10px ;
&:hover {
text-decoration: underline ;
}
font-family: 'capsuularegular' ;
font-size: 18px ;
padding-left: 10px ;
padding-right: 10px ;

&:hover {
text-decoration: underline ;
}
}
#code-source {
img {
height: 20px ;
}
}

#code-source {
img {
height: 20px ;
}
}
}

+ 12
- 10
producer/web/sass/_responsive.scss Просмотреть файл

@@ -43,25 +43,26 @@ termes.
left: 0px ;
text-align: center ;
width: 100% ;
padding: 0px ;
#logo {
margin-left: 10px ;
}
}
#header {
.container {
margin-left: 15px ;
margin-right: 15px ;
}
#credit {
.info {
display: block ;
}
#left {
.fixed {
position: relative ;
}
}
#main {
#img-big {
display: none ;
}
nav#main-nav {
ul {
li {
@@ -165,6 +166,7 @@ termes.
#app-order-order {
#steps {
ul {
height: auto ;
li {
padding-left: 0px ;
padding-right: 0px ;

Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить