Laclic
/
Souke
關註 5
收藏 0
複製 1
程式碼 問題管理 1 合併請求 0 版本發佈 0 Wiki Activity
瀏覽代碼

Lien CGS sur toutes les pages 

Ajouter un lien vers les conditions générales de service sur toutes les pages (notamment admin).
prodstable
keun 7 年之前
父節點
231cd6a904
當前提交
dcb3459087
共有 5 個文件被更改，包括 197 次插入 和 159 次删除
分割檢視 顯示文件統計
  1. +7
    -3
      backend/views/layouts/main.php
  2. 二進制
      backend/web/.sass-cache/c8fef7d48da4dc7f024edc2b0fada9d8d6de5dac/screen.scssc
  3. +153
    -146
      backend/web/css/screen.css
  4. +11
    -0
      backend/web/sass/screen.scss
  5. +26
    -10
      common/helpers/Url.php

+ 7
- 3
backend/views/layouts/main.php 查看文件

@@ -208,9 +208,13 @@ AppAsset::register($this);
<div id="alerts-fixed"></div>
<footer class="footer">
<div class="container">
<p class="pull-left"></p>
<p class="pull-right"><?= Yii::powered() ?></p>
<div class="container-fluid">
<p class="pull-left">
<a href="<?php echo Url::frontend('site/contact') ; ?>">Contact</a> &bull;
<a href="<?php echo Url::frontend('site/mentions') ; ?>">Mentions légales</a> &bull;
<a href="<?php echo Url::frontend('site/cgv') ; ?>">CGS</a>
</p>
<p class="pull-right"><?= Yii::powered() ?></p>
</div>
</footer>


二進制
backend/web/.sass-cache/c8fef7d48da4dc7f024edc2b0fada9d8d6de5dac/screen.scssc 查看文件


+ 153
- 146
backend/web/css/screen.css 查看文件

@@ -303,42 +303,49 @@ a:hover, a:focus, a:active {
text-align: center;
}

/* line 255, ../sass/screen.scss */
/* line 253, ../sass/screen.scss */
.footer .pull-left a {
margin-right: 5px;
margin-left: 5px;
color: gray;
}

/* line 266, ../sass/screen.scss */
.site-index .panel .panel-title .btn {
float: right;
font-family: "myriadpro-regular";
}
/* line 259, ../sass/screen.scss */
/* line 270, ../sass/screen.scss */
.site-index .panel .panel-title .btn.btn-success {
background-color: #5cb85c;
color: white;
border-color: #5cb85c;
}
/* line 265, ../sass/screen.scss */
/* line 276, ../sass/screen.scss */
.site-index .panel .panel-title .btn.margin-left {
margin-left: 5px;
}
/* line 270, ../sass/screen.scss */
/* line 281, ../sass/screen.scss */
.site-index .panel .panel-body {
height: 250px;
}
/* line 276, ../sass/screen.scss */
/* line 287, ../sass/screen.scss */
.site-index #facturation h2 {
font-size: 25px;
text-align: center;
}
/* line 282, ../sass/screen.scss */
/* line 293, ../sass/screen.scss */
.site-index #facturation .mois-en-cours .montant span {
background-color: white;
color: #333;
border: solid 1px gray;
}
/* line 289, ../sass/screen.scss */
/* line 300, ../sass/screen.scss */
.site-index #facturation .montant {
margin-top: 35px;
text-align: center;
}
/* line 292, ../sass/screen.scss */
/* line 303, ../sass/screen.scss */
.site-index #facturation .montant span {
font-size: 22px;
color: white;
@@ -350,84 +357,84 @@ a:hover, a:focus, a:active {
border-radius: 5px;
}

/* line 312, ../sass/screen.scss */
/* line 323, ../sass/screen.scss */
#page-commande h1 .btn-group {
float: right;
}
/* line 317, ../sass/screen.scss */
/* line 328, ../sass/screen.scss */
#page-commande #col-left, #page-commande #col-right {
padding-left: 0px;
padding-right: 0px;
}
/* line 321, ../sass/screen.scss */
/* line 332, ../sass/screen.scss */
#page-commande #col-right {
padding-left: 20px;
}
/* line 325, ../sass/screen.scss */
/* line 336, ../sass/screen.scss */
#page-commande #jours-production {
display: none;
}
/* line 331, ../sass/screen.scss */
/* line 342, ../sass/screen.scss */
#page-commande #calendar h2 {
font-size: 20px;
position: relative;
top: 3px;
}
/* line 337, ../sass/screen.scss */
/* line 348, ../sass/screen.scss */
#page-commande #calendar .fc-header-title {
margin-left: 10px;
}
/* line 343, ../sass/screen.scss */
/* line 354, ../sass/screen.scss */
#page-commande #calendar .dayWithEvent {
background-color: #fee48d;
cursor: pointer;
}
/* line 347, ../sass/screen.scss */
/* line 358, ../sass/screen.scss */
#page-commande #calendar .fc-event-container {
display: none;
}
/* line 348, ../sass/screen.scss */
/* line 359, ../sass/screen.scss */
#page-commande #calendar .fc-today {
border-bottom: solid 1px #C9302C;
background-color: white;
}
/* line 352, ../sass/screen.scss */
/* line 363, ../sass/screen.scss */
#page-commande #calendar .fc-today.dayWithEvent {
background-color: #fee48d;
}
/* line 357, ../sass/screen.scss */
/* line 368, ../sass/screen.scss */
#page-commande #calendar .fc-day {
cursor: pointer;
text-align: center;
}
/* line 360, ../sass/screen.scss */
/* line 371, ../sass/screen.scss */
#page-commande #calendar .fc-day:hover {
-moz-box-shadow: 0px 0px 2px black inset;
-webkit-box-shadow: 0px 0px 2px black inset;
box-shadow: 0px 0px 2px black inset;
}
/* line 365, ../sass/screen.scss */
/* line 376, ../sass/screen.scss */
#page-commande #calendar .current-date {
-moz-box-shadow: 0px 0px 2px black inset;
-webkit-box-shadow: 0px 0px 2px black inset;
box-shadow: 0px 0px 2px black inset;
}
/* line 369, ../sass/screen.scss */
/* line 380, ../sass/screen.scss */
#page-commande #calendar .fc-day-number {
float: none;
padding-top: 2px;
}
/* line 377, ../sass/screen.scss */
/* line 388, ../sass/screen.scss */
#page-commande #bloc-production .label {
float: right;
font-size: 13px;
}
/* line 382, ../sass/screen.scss */
/* line 393, ../sass/screen.scss */
#page-commande #bloc-production .btn-success {
background-color: #5cb85c;
border-color: #4cae4c;
}
/* line 387, ../sass/screen.scss */
/* line 398, ../sass/screen.scss */
#page-commande #bloc-production #productions-point-vente {
margin-top: 15px;
padding: 10px;
@@ -437,76 +444,76 @@ a:hover, a:focus, a:active {
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* line 393, ../sass/screen.scss */
/* line 404, ../sass/screen.scss */
#page-commande #bloc-production #productions-point-vente label {
display: block;
font-weight: normal;
}
/* line 398, ../sass/screen.scss */
/* line 409, ../sass/screen.scss */
#page-commande #bloc-production #productions-point-vente .checkbox-list {
margin-left: 10px;
margin-top: 10px;
}
/* line 411, ../sass/screen.scss */
/* line 422, ../sass/screen.scss */
#page-commande #produits-production .overflow table {
width: 100%;
}
/* line 415, ../sass/screen.scss */
/* line 426, ../sass/screen.scss */
#page-commande #produits-production .overflow thead, #page-commande #produits-production .overflow tbody, #page-commande #produits-production .overflow tr, #page-commande #produits-production .overflow td, #page-commande #produits-production .overflow th {
display: block;
}
/* line 417, ../sass/screen.scss */
/* line 428, ../sass/screen.scss */
#page-commande #produits-production .overflow tr:after {
content: ' ';
display: block;
visibility: hidden;
clear: both;
}
/* line 424, ../sass/screen.scss */
/* line 435, ../sass/screen.scss */
#page-commande #produits-production .overflow thead th {
height: 30px;
/*text-align: left;*/
}
/* line 430, ../sass/screen.scss */
/* line 441, ../sass/screen.scss */
#page-commande #produits-production .overflow tbody {
height: 500px;
overflow-y: auto;
}
/* line 438, ../sass/screen.scss */
/* line 449, ../sass/screen.scss */
#page-commande #produits-production .overflow thead th {
width: 32%;
float: left;
}
/* line 443, ../sass/screen.scss */
/* line 454, ../sass/screen.scss */
#page-commande #produits-production .overflow tbody td {
width: 33%;
float: left;
}
/* line 448, ../sass/screen.scss */
/* line 459, ../sass/screen.scss */
#page-commande #produits-production .overflow .td-produit {
width: 60%;
}
/* line 451, ../sass/screen.scss */
/* line 462, ../sass/screen.scss */
#page-commande #produits-production .overflow .td-actif, #page-commande #produits-production .overflow .td-max {
width: 20%;
text-align: center;
}
/* line 457, ../sass/screen.scss */
/* line 468, ../sass/screen.scss */
#page-commande #produits-production .overflow thead .td-produit {
width: 57%;
}
/* line 463, ../sass/screen.scss */
/* line 474, ../sass/screen.scss */
#page-commande #produits-production input.quantite-max {
background-color: white;
border: 1px solid #e0e0e0;
text-align: center;
width: 50px;
}
/* line 471, ../sass/screen.scss */
/* line 482, ../sass/screen.scss */
#page-commande #produits-production td label {
font-weight: normal;
}
/* line 477, ../sass/screen.scss */
/* line 488, ../sass/screen.scss */
#page-commande #btn-export-commandes,
#page-commande #btn-commande-auto {
float: right;
@@ -515,30 +522,30 @@ a:hover, a:focus, a:active {
right: -7px;
padding: 2px 5px;
}
/* line 486, ../sass/screen.scss */
/* line 497, ../sass/screen.scss */
#page-commande #btn-export-commandes {
color: white;
margin-left: 10px;
padding: 1px 5px;
}
/* line 494, ../sass/screen.scss */
/* line 505, ../sass/screen.scss */
#page-commande #bloc-totaux .table-produits .depasse {
color: #b32815;
}
/* line 498, ../sass/screen.scss */
/* line 509, ../sass/screen.scss */
#page-commande #bloc-totaux .table-produits .total strong span {
font-weight: normal;
font-size: 13px;
}
/* line 507, ../sass/screen.scss */
/* line 518, ../sass/screen.scss */
#page-commande #commandes-points-vente .tab-pane {
padding-top: 20px;
}
/* line 514, ../sass/screen.scss */
/* line 525, ../sass/screen.scss */
#page-commande #commandes-points-vente .recap-pv.no-commande .recettes {
display: none;
}
/* line 518, ../sass/screen.scss */
/* line 529, ../sass/screen.scss */
#page-commande #commandes-points-vente .recap-pv .recettes {
float: right;
color: #BB8757;
@@ -551,11 +558,11 @@ a:hover, a:focus, a:active {
position: relative;
top: -3px;
}
/* line 532, ../sass/screen.scss */
/* line 543, ../sass/screen.scss */
#page-commande #commandes-points-vente .alert.commentaire {
display: none;
}
/* line 536, ../sass/screen.scss */
/* line 547, ../sass/screen.scss */
#page-commande #commandes-points-vente ul.liste-commandes {
margin-top: 10px;
list-style-type: none;
@@ -567,16 +574,16 @@ a:hover, a:focus, a:active {
width: 100%;
overflow-y: scroll;
}
/* line 548, ../sass/screen.scss */
/* line 559, ../sass/screen.scss */
#page-commande #commandes-points-vente ul.liste-commandes.no-commande {
display: none;
}
/* line 552, ../sass/screen.scss */
/* line 563, ../sass/screen.scss */
#page-commande #commandes-points-vente ul.liste-commandes li {
padding: 0;
margin: 0;
}
/* line 555, ../sass/screen.scss */
/* line 566, ../sass/screen.scss */
#page-commande #commandes-points-vente ul.liste-commandes li a {
text-align: left;
-moz-border-radius: 0px;
@@ -586,22 +593,22 @@ a:hover, a:focus, a:active {
padding: 7px;
color: #333;
}
/* line 563, ../sass/screen.scss */
/* line 574, ../sass/screen.scss */
#page-commande #commandes-points-vente ul.liste-commandes li a .montant {
float: right;
color: #BB8757;
font-weight: bold;
}
/* line 568, ../sass/screen.scss */
/* line 579, ../sass/screen.scss */
#page-commande #commandes-points-vente ul.liste-commandes li a .montant.paye {
color: #5cb85c;
color: #519951;
}
/* line 574, ../sass/screen.scss */
/* line 585, ../sass/screen.scss */
#page-commande #commandes-points-vente ul.liste-commandes li a .glyphicon-comment {
color: #BB8757;
}
/* line 578, ../sass/screen.scss */
/* line 589, ../sass/screen.scss */
#page-commande #commandes-points-vente ul.liste-commandes li a:hover, #page-commande #commandes-points-vente ul.liste-commandes li a:active, #page-commande #commandes-points-vente ul.liste-commandes li a.active {
text-decoration: none;
background-color: #FCF8E3;
@@ -612,82 +619,82 @@ a:hover, a:focus, a:active {
-webkit-transition: all 0.1s;
transition: all 0.1s;
}
/* line 592, ../sass/screen.scss */
/* line 603, ../sass/screen.scss */
#page-commande #commandes-points-vente .creer-commande,
#page-commande #commandes-points-vente .commandes-auto {
width: 100%;
margin-bottom: 10px;
}
/* line 598, ../sass/screen.scss */
/* line 609, ../sass/screen.scss */
#page-commande #commandes-points-vente .bloc-commande {
padding-top: 20px;
margin-top: 20px;
display: none;
}
/* line 604, ../sass/screen.scss */
/* line 615, ../sass/screen.scss */
#page-commande #commandes-points-vente .title-user {
display: none;
font-size: 19px;
margin-top: 0px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
/* line 610, ../sass/screen.scss */
/* line 621, ../sass/screen.scss */
#page-commande #commandes-points-vente .title-user .btn-edit, #page-commande #commandes-points-vente .title-user .btn-remove,
#page-commande #commandes-points-vente .title-user .btn-cancel, #page-commande #commandes-points-vente .title-user .btn-save {
float: right;
position: relative;
top: -6px;
}
/* line 617, ../sass/screen.scss */
/* line 628, ../sass/screen.scss */
#page-commande #commandes-points-vente .title-user .btn-edit, #page-commande #commandes-points-vente .title-user .btn-cancel {
margin-right: 10px;
}
/* line 621, ../sass/screen.scss */
/* line 632, ../sass/screen.scss */
#page-commande #commandes-points-vente .title-user .buttons-save-cancel {
display: none;
}
/* line 625, ../sass/screen.scss */
/* line 636, ../sass/screen.scss */
#page-commande #commandes-points-vente .title-user .choix-user {
display: none;
}
/* line 628, ../sass/screen.scss */
/* line 639, ../sass/screen.scss */
#page-commande #commandes-points-vente .title-user .choix-user .form-control {
width: 200px;
display: inline;
}
/* line 636, ../sass/screen.scss */
/* line 647, ../sass/screen.scss */
#page-commande #commandes-points-vente table.table-produits .td-commande {
text-align: center;
}
/* line 639, ../sass/screen.scss */
/* line 650, ../sass/screen.scss */
#page-commande #commandes-points-vente table.table-produits input.form-control {
text-align: center;
}
/* line 645, ../sass/screen.scss */
/* line 656, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-produit,
#page-commande #commandes-points-vente .th-produit {
width: 70%;
}
/* line 650, ../sass/screen.scss */
/* line 661, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-commande,
#page-commande #commandes-points-vente .th-commande {
width: 30%;
text-align: center;
}
/* line 656, ../sass/screen.scss */
/* line 667, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-produit {
text-transform: uppercase;
}
/* line 660, ../sass/screen.scss */
/* line 671, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-commande {
font-weight: bold;
}
/* line 664, ../sass/screen.scss */
/* line 675, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-total {
font-size: 18px;
text-align: center;
}
/* line 668, ../sass/screen.scss */
/* line 679, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-total span {
padding: 2px 10px;
background-color: #BB8757;
@@ -697,33 +704,33 @@ a:hover, a:focus, a:active {
-webkit-border-radius: 8px;
border-radius: 8px;
}
/* line 678, ../sass/screen.scss */
/* line 689, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-paiement .buttons-credit {
float: right;
}
/* line 684, ../sass/screen.scss */
/* line 695, ../sass/screen.scss */
#page-commande #commandes-points-vente .panel-commande-automatique .field-commandeautoform-id_user,
#page-commande #commandes-points-vente .panel-commande-automatique .field-commandeautoform-id_etablissement {
display: none;
}
/* line 691, ../sass/screen.scss */
/* line 702, ../sass/screen.scss */
#page-commande #commandes-points-vente .panel-commande-automatique .jours .form-group {
float: left;
margin-right: 10px;
}
/* line 700, ../sass/screen.scss */
/* line 711, ../sass/screen.scss */
#page-commande #old-commandes {
display: none;
}
/* line 704, ../sass/screen.scss */
/* line 715, ../sass/screen.scss */
#page-commande .form-commandes-point-vente {
margin-top: 20px;
}
/* line 708, ../sass/screen.scss */
/* line 719, ../sass/screen.scss */
#page-commande .form-commandes-point-vente table {
border-bottom: solid 1px #e0e0e0;
}
/* line 712, ../sass/screen.scss */
/* line 723, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .title-point-vente {
background-color: #fff8e2;
border-left: solid 3px #BB8757;
@@ -731,76 +738,76 @@ a:hover, a:focus, a:active {
text-align: left;
padding: 10px;
}
/* line 720, ../sass/screen.scss */
/* line 731, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .title-totaux {
text-align: center;
}
/* line 724, ../sass/screen.scss */
/* line 735, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .border-left {
border-left: solid 1px #e0e0e0;
}
/* line 728, ../sass/screen.scss */
/* line 739, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .border-right {
border-right: solid 1px #e0e0e0;
}
/* line 732, ../sass/screen.scss */
/* line 743, ../sass/screen.scss */
#page-commande .form-commandes-point-vente input.quantite {
width: 30px;
background-color: white;
border: solid 1px #e0e0e0;
text-align: center;
}
/* line 740, ../sass/screen.scss */
/* line 751, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .td-produit {
text-align: center;
}
/* line 744, ../sass/screen.scss */
/* line 755, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .submit-pv {
float: right;
}
/* line 748, ../sass/screen.scss */
/* line 759, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .select-user {
background-color: #F9F9F9;
border: solid 1px #e0e0e0;
}
/* line 753, ../sass/screen.scss */
/* line 764, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .date-commande {
font-size: 12px;
}
/* line 757, ../sass/screen.scss */
/* line 768, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .datepicker, #page-commande .form-commandes-point-vente .text {
background-color: white;
border: solid 1px #e0e0e0;
margin-top: 3px;
width: 100px;
}
/* line 765, ../sass/screen.scss */
/* line 776, ../sass/screen.scss */
#page-commande .form-commandes-point-vente td.center {
text-align: center;
}
/* line 771, ../sass/screen.scss */
/* line 782, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .depasse {
color: #b32815;
}
/* line 775, ../sass/screen.scss */
/* line 786, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .total strong span {
font-weight: normal;
font-size: 13px;
}
/* line 780, ../sass/screen.scss */
/* line 791, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .vrac {
display: none;
}
/* line 784, ../sass/screen.scss */
/* line 795, ../sass/screen.scss */
#page-commande .form-commandes-point-vente td.client {
text-align: left;
padding: 3px;
}
/* line 787, ../sass/screen.scss */
/* line 798, ../sass/screen.scss */
#page-commande .form-commandes-point-vente td.client .date-commande {
color: gray;
}
/* line 794, ../sass/screen.scss */
/* line 805, ../sass/screen.scss */
#page-commande .table-header-rotated {
border-top: 0px;
border-left: 0px;
@@ -808,15 +815,15 @@ a:hover, a:focus, a:active {
width: 100%;
width: auto;
}
/* line 801, ../sass/screen.scss */
/* line 812, ../sass/screen.scss */
#page-commande .table-header-rotated .total strong {
border-bottom: solid 1px gray;
}
/* line 806, ../sass/screen.scss */
/* line 817, ../sass/screen.scss */
#page-commande .table-header-rotated th.row-header {
width: auto;
}
/* line 810, ../sass/screen.scss */
/* line 821, ../sass/screen.scss */
#page-commande .table-header-rotated td {
width: 40px;
border-top: 1px solid #dddddd;
@@ -825,7 +832,7 @@ a:hover, a:focus, a:active {
vertical-align: middle;
text-align: center;
}
/* line 819, ../sass/screen.scss */
/* line 830, ../sass/screen.scss */
#page-commande .table-header-rotated th.rotate-45 {
font-weight: normal;
height: 80px;
@@ -839,7 +846,7 @@ a:hover, a:focus, a:active {
line-height: 1;
border: 0px none;
}
/* line 833, ../sass/screen.scss */
/* line 844, ../sass/screen.scss */
#page-commande .table-header-rotated th.rotate-45 > div {
background-color: #F5F5F5;
position: relative;
@@ -857,7 +864,7 @@ a:hover, a:focus, a:active {
border-right: 1px solid #dddddd;
border-top: 1px solid #dddddd;
}
/* line 850, ../sass/screen.scss */
/* line 861, ../sass/screen.scss */
#page-commande .table-header-rotated th.rotate-45 span {
-ms-transform: skew(45deg, 0deg) rotate(315deg);
-moz-transform: skew(45deg, 0deg) rotate(315deg);
@@ -875,51 +882,51 @@ a:hover, a:focus, a:active {
text-align: left;
}

/* line 871, ../sass/screen.scss */
/* line 882, ../sass/screen.scss */
#email-masse-form #ids-users {
line-height: 30px;
}
/* line 873, ../sass/screen.scss */
/* line 884, ../sass/screen.scss */
#email-masse-form #ids-users .label {
text-transform: capitalize;
}

/* line 881, ../sass/screen.scss */
/* line 892, ../sass/screen.scss */
.produit-create #jours-production .form-group, .produit-update #jours-production .form-group {
float: left;
margin-right: 15px;
}
/* line 885, ../sass/screen.scss */
/* line 896, ../sass/screen.scss */
.produit-create #jours-production .form-group label, .produit-update #jours-production .form-group label {
font-weight: normal;
}
/* line 890, ../sass/screen.scss */
/* line 901, ../sass/screen.scss */
.produit-create .field-produit-id_etablissement, .produit-update .field-produit-id_etablissement {
display: none;
}

/* line 895, ../sass/screen.scss */
/* line 906, ../sass/screen.scss */
.table-striped > tbody > tr:nth-of-type(2n) {
background-color: white;
}

/* line 900, ../sass/screen.scss */
/* line 911, ../sass/screen.scss */
.wrap .produit-index .td-photo {
max-width: 100px;
width: 100px;
}
/* line 904, ../sass/screen.scss */
/* line 915, ../sass/screen.scss */
.wrap .produit-index .photo-produit {
max-width: 100px;
}
/* line 908, ../sass/screen.scss */
/* line 919, ../sass/screen.scss */
.wrap .produit-index .ui-state-highlight {
height: 75px;
background-color: #F8F1DD;
}

/* communiquer */
/* line 916, ../sass/screen.scss */
/* line 927, ../sass/screen.scss */
.communiquer-mode-emploi {
border: solid 1px #e0e0e0;
padding: 10px;
@@ -929,18 +936,18 @@ a:hover, a:focus, a:active {
margin-bottom: 30px;
font-family: "myriadpro-regular";
}
/* line 924, ../sass/screen.scss */
/* line 935, ../sass/screen.scss */
.communiquer-mode-emploi .header .logo {
float: left;
width: 75px;
padding-right: 20px;
padding-top: 10px;
}
/* line 930, ../sass/screen.scss */
/* line 941, ../sass/screen.scss */
.communiquer-mode-emploi .header .logo img {
width: 75px;
}
/* line 936, ../sass/screen.scss */
/* line 947, ../sass/screen.scss */
.communiquer-mode-emploi .header h1 {
font-family: "comfortaaregular";
font-size: 40px;
@@ -948,7 +955,7 @@ a:hover, a:focus, a:active {
margin-bottom: 0px;
font-weight: normal;
}
/* line 944, ../sass/screen.scss */
/* line 955, ../sass/screen.scss */
.communiquer-mode-emploi .header h2 {
margin-top: 0px;
font-family: "myriadpro-regular";
@@ -958,7 +965,7 @@ a:hover, a:focus, a:active {
left: 2px;
font-weight: normal;
}
/* line 955, ../sass/screen.scss */
/* line 966, ../sass/screen.scss */
.communiquer-mode-emploi h3 {
font-family: "comfortaalight";
font-family: "myriadpro-regular";
@@ -968,45 +975,45 @@ a:hover, a:focus, a:active {
margin-bottom: 0px;
}

/* line 965, ../sass/screen.scss */
/* line 976, ../sass/screen.scss */
.communiquer-mode-emploi-encart {
width: 420px;
margin-top: 20px;
}
/* line 969, ../sass/screen.scss */
/* line 980, ../sass/screen.scss */
.communiquer-mode-emploi-encart .header .logo {
width: 60px;
margin-right: 20px;
padding-top: 5px;
}
/* line 974, ../sass/screen.scss */
/* line 985, ../sass/screen.scss */
.communiquer-mode-emploi-encart .header .logo img {
width: 60px;
}
/* line 980, ../sass/screen.scss */
/* line 991, ../sass/screen.scss */
.communiquer-mode-emploi-encart .header h1 {
margin-bottom: 3px;
}
/* line 989, ../sass/screen.scss */
/* line 1000, ../sass/screen.scss */
.communiquer-mode-emploi-encart h3 {
margin-top: 15px;
margin-bottom: 15px;
}

/* line 995, ../sass/screen.scss */
/* line 1006, ../sass/screen.scss */
.bloc-mode-emploi-pdf {
width: 49.9%;
float: left;
border-bottom: dotted 1px gray;
}

/* line 1001, ../sass/screen.scss */
/* line 1012, ../sass/screen.scss */
.bloc-mode-emploi-border {
border-right: dotted 1px gray;
border-bottom: dotted 1px gray;
}

/* line 1006, ../sass/screen.scss */
/* line 1017, ../sass/screen.scss */
.communiquer-mode-emploi-pdf {
border: 0px none;
-moz-border-radius: 0px;
@@ -1015,120 +1022,120 @@ a:hover, a:focus, a:active {
margin-bottom: 0px;
padding: 20px 0px 20px 30px;
}
/* line 1014, ../sass/screen.scss */
/* line 1025, ../sass/screen.scss */
.communiquer-mode-emploi-pdf .header .logo {
float: left;
width: 55px;
padding-right: 15px;
padding-top: 10px;
}
/* line 1020, ../sass/screen.scss */
/* line 1031, ../sass/screen.scss */
.communiquer-mode-emploi-pdf .header .logo img {
width: 55px;
}
/* line 1024, ../sass/screen.scss */
/* line 1035, ../sass/screen.scss */
.communiquer-mode-emploi-pdf .header h1 {
font-size: 32px;
}
/* line 1027, ../sass/screen.scss */
/* line 1038, ../sass/screen.scss */
.communiquer-mode-emploi-pdf .header h2 {
font-size: 16px;
}
/* line 1032, ../sass/screen.scss */
/* line 1043, ../sass/screen.scss */
.communiquer-mode-emploi-pdf h3 {
font-weight: normal;
}

/* line 1037, ../sass/screen.scss */
/* line 1048, ../sass/screen.scss */
.bloc-mode-emploi-bottom {
border-bottom: 0px none;
border-bottom: solid 1px white;
}

/* commandes auto */
/* line 1047, ../sass/screen.scss */
/* line 1058, ../sass/screen.scss */
.commandeauto-form #bloc-select-user {
padding-left: 0px;
}
/* line 1051, ../sass/screen.scss */
/* line 1062, ../sass/screen.scss */
.commandeauto-form #or-user {
font-size: 20px;
text-align: center;
}
/* line 1054, ../sass/screen.scss */
/* line 1065, ../sass/screen.scss */
.commandeauto-form #or-user span {
position: relative;
top: 24px;
}
/* line 1060, ../sass/screen.scss */
/* line 1071, ../sass/screen.scss */
.commandeauto-form .field-commandeautoform-id_etablissement {
display: none;
}
/* line 1064, ../sass/screen.scss */
/* line 1075, ../sass/screen.scss */
.commandeauto-form .jours .form-group {
float: left;
margin-right: 20px;
}
/* line 1071, ../sass/screen.scss */
/* line 1082, ../sass/screen.scss */
.commandeauto-form .produits .table {
width: 500px;
}
/* line 1074, ../sass/screen.scss */
/* line 1085, ../sass/screen.scss */
.commandeauto-form .produits .quantite {
text-align: center;
}

/* points de vente */
/* line 1083, ../sass/screen.scss */
/* line 1094, ../sass/screen.scss */
.point-vente-form #pointvente-users {
display: none;
height: 500px;
overflow-y: scroll;
}
/* line 1087, ../sass/screen.scss */
/* line 1098, ../sass/screen.scss */
.point-vente-form #pointvente-users label {
font-weight: normal;
display: block;
}
/* line 1091, ../sass/screen.scss */
/* line 1102, ../sass/screen.scss */
.point-vente-form #pointvente-users .commentaire {
display: none;
margin-left: 17px;
width: 200px;
}
/* line 1099, ../sass/screen.scss */
/* line 1110, ../sass/screen.scss */
.point-vente-form #jours-livraison .form-group {
float: left;
margin-right: 15px;
}
/* line 1103, ../sass/screen.scss */
/* line 1114, ../sass/screen.scss */
.point-vente-form #jours-livraison .form-group label {
font-weight: normal;
}

/* utilisateurs */
/* line 1113, ../sass/screen.scss */
/* line 1124, ../sass/screen.scss */
.user-index .input-group {
width: 180px;
}
/* line 1116, ../sass/screen.scss */
/* line 1127, ../sass/screen.scss */
.user-index .input-group .input-credit {
text-align: center;
}

/* facturation */
/* line 1124, ../sass/screen.scss */
/* line 1135, ../sass/screen.scss */
#estimation-facture {
text-align: center;
margin-bottom: 30px;
padding-bottom: 20px;
background-color: #F9F9F9;
}
/* line 1130, ../sass/screen.scss */
/* line 1141, ../sass/screen.scss */
#estimation-facture h2 {
font-family: "myriadpro-it";
}
/* line 1134, ../sass/screen.scss */
/* line 1145, ../sass/screen.scss */
#estimation-facture .montant span {
font-size: 25px;
color: white;

+ 11
- 0
backend/web/sass/screen.scss 查看文件

@@ -248,6 +248,17 @@ a {
}
}

.footer {
.pull-left {
a {
margin-right: 5px ;
margin-left: 5px ;
//text-transform: uppercase ;
color: gray ;
}
}
}

// tableau de bord
.site-index {
.panel {

+ 26
- 10
common/helpers/Url.php 查看文件

@@ -12,52 +12,68 @@ use yii ;

class Url
{
public static function frontend()
public static function frontend($action = '')
{
$server_name = Yii::$app->getRequest()->serverName ;
$address = '' ;
if($server_name == 'localhost')
{
return 'http://localhost/reservation_pain/frontend/web/' ;
$address = 'http://localhost/reservation_pain/frontend/web/' ;
}
elseif($server_name == 'www.laboiteapain.net' ||
$server_name == 'boulanger.laboiteapain.net')
{
return 'http://www.laboiteapain.net/' ;
$address = 'http://www.laboiteapain.net/' ;
}
elseif($server_name == 'dev.laboiteapain.net' ||
$server_name == 'boulanger-dev.laboiteapain.net')
{
return 'http://dev.laboiteapain.net/' ;
$address = 'http://dev.laboiteapain.net/' ;
}
elseif($server_name == 'demo.laboiteapain.net' ||
$server_name == 'boulanger-demo.laboiteapain.net')
{
return 'http://demo.laboiteapain.net/' ;
$address = 'http://demo.laboiteapain.net/' ;
}
if(strlen($action))
{
$address .= 'index.php?r='.$action ;
}
return $address ;
}
public static function backend()
public static function backend($action = '')
{
$server_name = Yii::$app->getRequest()->serverName ;
$address = '' ;
if($server_name == 'localhost')
{
return 'http://localhost/reservation_pain/backend/web/' ;
$address = 'http://localhost/reservation_pain/backend/web/' ;
}
elseif($server_name == 'www.laboiteapain.net' ||
$server_name == 'boulanger.laboiteapain.net')
{
return 'http://boulanger.laboiteapain.net/' ;
$address = 'http://boulanger.laboiteapain.net/' ;
}
elseif($server_name == 'dev.laboiteapain.net' ||
$server_name == 'boulanger-dev.laboiteapain.net')
{
return 'http://boulanger-dev.laboiteapain.net/' ;
$address = 'http://boulanger-dev.laboiteapain.net/' ;
}
elseif($server_name == 'demo.laboiteapain.net' ||
$server_name == 'boulanger-demo.laboiteapain.net')
{
return 'http://boulanger-demo.laboiteapain.net/' ;
$address = 'http://boulanger-demo.laboiteapain.net/' ;
}
if(strlen($action))
{
$address .= 'index.php?r='.$action ;
}
return $address ;
}
public static function env($env, $section)

Write Preview
Loading…
取消
儲存