Quellcode durchsuchen

[Site & boutique] Environnement beta : ajout meta robots noindex + badge indiquant qu'on est dans un environnement beta

feature/rotating_product
Guillaume Bourgeois vor 5 Monaten
Ursprung
Commit
d9392170c0
11 geänderte Dateien mit 449 neuen und 353 gelöschten Zeilen
  1. +3
    -4
      backend/views/layouts/header.php
  2. +101
    -95
      backend/web/css/screen.css
  3. +6
    -0
      backend/web/sass/_adminlte.scss
  4. +21
    -0
      common/helpers/Environment.php
  5. +4
    -0
      common/views/nav_user_top.php
  6. +95
    -72
      common/web/css/screen.css
  7. +22
    -0
      common/web/sass/_common.scss
  8. +3
    -0
      frontend/views/layouts/main.php
  9. +187
    -182
      frontend/web/css/screen.css
  10. +5
    -0
      frontend/web/sass/screen.scss
  11. +2
    -0
      producer/views/layouts/main.php

+ 3
- 4
backend/views/layouts/header.php Datei anzeigen

@@ -43,6 +43,7 @@ use domain\Distribution\Distribution\Distribution;
use domain\Producer\Producer\Producer;
use domain\Producer\Producer\ProducerModule;
use domain\User\User\UserModule;
use common\helpers\Environment;
use yii\helpers\Html;

$userModule = UserModule::getInstance();
@@ -53,10 +54,8 @@ $userCurrent = GlobalParam::getCurrentUser();
?>

<header class="main-header">
<?=
Html::a('<span class="logo-mini"><img src="' . Yii::$app->urlManagerBackend->getBaseUrl() . '/img/logo-souke.svg" /></span><span class="logo-lg"><img src="' . Yii::$app->urlManagerBackend->getBaseUrl() . '/img/logo-souke.svg" /></span>', Yii::$app->homeUrl, ['class' => 'logo'])
?>

<?php $beta = Environment::badgeBeta(); ?>
<?= Html::a('<span class="logo-mini"><img src="' . Yii::$app->urlManagerBackend->getBaseUrl() . '/img/logo-souke.svg" /></span><span class="logo-lg"><img src="' . Yii::$app->urlManagerBackend->getBaseUrl() . '/img/logo-souke.svg" />'.$beta.'</span>'.$beta, Yii::$app->homeUrl, ['class' => 'logo']) ?>

<?php /*Html::a(
'Opendistrib',

+ 101
- 95
backend/web/css/screen.css Datei anzeigen

@@ -1541,50 +1541,56 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
text-align: center;
}

/* line 5, ../sass/_adminlte.scss */
/* line 4, ../sass/_adminlte.scss */
body.skin-black .badge-environment-beta {
top: 7px;
font-size: 11px;
padding: 0px 7px;
}
/* line 11, ../sass/_adminlte.scss */
body.skin-black .ui-tooltip {
white-space: pre-wrap;
}
/* line 10, ../sass/_adminlte.scss */
/* line 16, ../sass/_adminlte.scss */
body.skin-black .user-without-account {
color: gray;
font-style: italic;
}
/* line 16, ../sass/_adminlte.scss */
/* line 22, ../sass/_adminlte.scss */
body.skin-black .main-header .logo {
background-color: white;
font-family: 'highvoltageregular';
font-size: 23px;
position: relative;
}
/* line 22, ../sass/_adminlte.scss */
/* line 28, ../sass/_adminlte.scss */
body.skin-black .main-header .logo:hover, body.skin-black .main-header .logo:focus {
background-color: white;
text-decoration: none;
}
/* line 27, ../sass/_adminlte.scss */
/* line 33, ../sass/_adminlte.scss */
body.skin-black .main-header .logo img {
position: relative;
max-width: 300px;
max-height: 300px;
height: auto;
}
/* line 35, ../sass/_adminlte.scss */
/* line 41, ../sass/_adminlte.scss */
body.skin-black .main-header .logo .logo-lg img {
width: 90px;
top: -2px;
}
/* line 41, ../sass/_adminlte.scss */
/* line 47, ../sass/_adminlte.scss */
body.skin-black .main-header .logo .logo-mini img {
width: 50px;
}
/* line 46, ../sass/_adminlte.scss */
/* line 52, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar {
display: block;
background-color: white;
padding: 0px;
}
/* line 51, ../sass/_adminlte.scss */
/* line 57, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .producer-panel {
position: relative;
float: left;
@@ -1592,11 +1598,11 @@ body.skin-black .main-header .navbar .producer-panel {
padding-left: 50px;
margin-left: 7px;
}
/* line 58, ../sass/_adminlte.scss */
/* line 64, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .producer-panel.without-logo {
padding-left: 10px;
}
/* line 62, ../sass/_adminlte.scss */
/* line 68, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .producer-panel .logo {
position: absolute;
top: 5px;
@@ -1611,7 +1617,7 @@ body.skin-black .main-header .navbar .producer-panel .logo {
text-align: center;
overflow: hidden;
}
/* line 74, ../sass/_adminlte.scss */
/* line 80, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .producer-panel .logo .img-logo {
position: absolute;
top: 50%;
@@ -1620,131 +1626,131 @@ body.skin-black .main-header .navbar .producer-panel .logo .img-logo {
max-width: 35px;
max-height: 35px;
}
/* line 84, ../sass/_adminlte.scss */
/* line 90, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .producer-panel .title {
position: relative;
top: 2px;
text-transform: uppercase;
}
/* line 89, ../sass/_adminlte.scss */
/* line 95, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .producer-panel .title a {
color: #333;
}
/* line 92, ../sass/_adminlte.scss */
/* line 98, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .producer-panel .title a:hover {
text-decoration: underline;
}
/* line 97, ../sass/_adminlte.scss */
/* line 103, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .producer-panel .title .producer-id {
color: gray;
font-size: 13px;
}
/* line 104, ../sass/_adminlte.scss */
/* line 110, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .sidebar-toggle {
color: #333;
}
/* line 108, ../sass/_adminlte.scss */
/* line 114, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .link-support {
float: left;
padding: 15px 15px;
border-right: solid 1px #e0e0e0;
color: #333;
}
/* line 114, ../sass/_adminlte.scss */
/* line 120, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .link-support:hover {
text-decoration: none;
color: #F39C12;
}
/* line 120, ../sass/_adminlte.scss */
/* line 126, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .navbar-custom-menu .nav {
display: block;
}
/* line 124, ../sass/_adminlte.scss */
/* line 130, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .navbar-custom-menu .navbar-nav > li > a,
body.skin-black .main-header .navbar .navbar-right > li > a {
border-left: solid 1px #e0e0e0;
color: #333;
}
/* line 130, ../sass/_adminlte.scss */
/* line 136, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .nav > li > a:hover, body.skin-black .main-header .navbar .nav > li > a:active, body.skin-black .main-header .navbar .nav > li > a:focus,
body.skin-black .main-header .navbar .nav .open > a, body.skin-black .main-header .navbar .nav .open > a:hover, body.skin-black .main-header .navbar .nav .open > a:focus,
body.skin-black .main-header .navbar .nav > .active > a {
color: #F39C12;
}
/* line 136, ../sass/_adminlte.scss */
/* line 142, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .dropdown-menu {
-moz-box-shadow: 0px 0px 4px gray;
-webkit-box-shadow: 0px 0px 4px gray;
box-shadow: 0px 0px 4px gray;
}
/* line 141, ../sass/_adminlte.scss */
/* line 147, ../sass/_adminlte.scss */
body.skin-black .main-header .logo, body.skin-black .main-header .navbar .sidebar-toggle {
border-right: solid 1px #e0e0e0;
}
/* line 145, ../sass/_adminlte.scss */
/* line 151, ../sass/_adminlte.scss */
body.skin-black .main-header .link-control-sidebar {
display: none;
}
/* line 150, ../sass/_adminlte.scss */
/* line 156, ../sass/_adminlte.scss */
body.skin-black .main-header .notifications-menu ul.menu {
max-height: 300px;
}
/* line 153, ../sass/_adminlte.scss */
/* line 159, ../sass/_adminlte.scss */
body.skin-black .main-header .notifications-menu ul.menu li a {
padding-top: 4px;
padding-bottom: 4px;
}
/* line 157, ../sass/_adminlte.scss */
/* line 163, ../sass/_adminlte.scss */
body.skin-black .main-header .notifications-menu ul.menu li a h5 {
margin-bottom: 2px;
}
/* line 160, ../sass/_adminlte.scss */
/* line 166, ../sass/_adminlte.scss */
body.skin-black .main-header .notifications-menu ul.menu li a h5 small {
float: right;
}
/* line 165, ../sass/_adminlte.scss */
/* line 171, ../sass/_adminlte.scss */
body.skin-black .main-header .notifications-menu ul.menu li a p {
margin-left: 10px;
}
/* line 176, ../sass/_adminlte.scss */
/* line 182, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .nav li.producer-menu .dropdown-menu {
width: 400px;
}
/* line 180, ../sass/_adminlte.scss */
/* line 186, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .nav li.producer-menu .search-producer {
margin: 10px;
width: 94%;
}
/* line 185, ../sass/_adminlte.scss */
/* line 191, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .nav li.producer-menu .li-alert-no-results {
display: none;
}
/* line 188, ../sass/_adminlte.scss */
/* line 194, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .nav li.producer-menu .li-alert-no-results .alert {
margin-bottom: 0px;
margin-left: 10px;
margin-right: 10px;
padding: 15px 15px 10px 15px;
}
/* line 196, ../sass/_adminlte.scss */
/* line 202, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .nav li.producer-menu .label {
position: relative;
top: -2px;
left: 0px;
}
/* line 202, ../sass/_adminlte.scss */
/* line 208, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .nav li.producer-menu #link-display-producers-offline {
color: #F39C12;
}
/* line 206, ../sass/_adminlte.scss */
/* line 212, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .nav li.producer-menu .offline {
display: none;
}
/* line 210, ../sass/_adminlte.scss */
/* line 216, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .nav li.producer-menu a {
color: #333;
}
/* line 214, ../sass/_adminlte.scss */
/* line 220, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .nav li.producer-menu .producer-id {
position: relative;
top: 4px;
@@ -1752,100 +1758,100 @@ body.skin-black .main-header .navbar .nav li.producer-menu .producer-id {
font-size: 12px;
float: right;
}
/* line 225, ../sass/_adminlte.scss */
/* line 231, ../sass/_adminlte.scss */
body.skin-black .sidebar .sidebar-menu > li.header {
color: #899397;
}
/* line 229, ../sass/_adminlte.scss */
/* line 235, ../sass/_adminlte.scss */
body.skin-black .sidebar .label {
padding-top: 5px;
position: relative;
top: -3px;
}
/* line 236, ../sass/_adminlte.scss */
/* line 242, ../sass/_adminlte.scss */
body.skin-black .sidebar-menu > li.active > a {
border-color: #F39C12;
}
/* line 241, ../sass/_adminlte.scss */
/* line 247, ../sass/_adminlte.scss */
body.skin-black section.sidebar .user-panel {
text-align: center;
}
/* line 244, ../sass/_adminlte.scss */
/* line 250, ../sass/_adminlte.scss */
body.skin-black section.sidebar .user-panel .image {
margin-bottom: 3px;
}
/* line 248, ../sass/_adminlte.scss */
/* line 254, ../sass/_adminlte.scss */
body.skin-black section.sidebar .user-panel .title {
font-weight: bold;
color: white;
}
/* line 255, ../sass/_adminlte.scss */
/* line 261, ../sass/_adminlte.scss */
body.skin-black .content-wrapper {
background-color: #f5f5f5;
}
/* line 258, ../sass/_adminlte.scss */
/* line 264, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .content-header {
background-color: #F5F5F5;
padding-bottom: 15px;
border-bottom: solid 1px #e0e0e0;
border-top: solid 1px #e0e0e0;
}
/* line 264, ../sass/_adminlte.scss */
/* line 270, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .content-header .btn {
padding: 3px 6px;
font-size: 10px;
font-family: Arial;
text-transform: uppercase;
}
/* line 271, ../sass/_adminlte.scss */
/* line 277, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .content-header h1 {
font-family: 'myriadpro-light';
font-size: 20px;
}
/* line 277, ../sass/_adminlte.scss */
/* line 283, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .col-no-padding-left {
padding-left: 0px;
}
/* line 281, ../sass/_adminlte.scss */
/* line 287, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .col-no-padding-right {
padding-right: 0px;
}
/* line 285, ../sass/_adminlte.scss */
/* line 291, ../sass/_adminlte.scss */
body.skin-black .content-wrapper a {
color: #e08e0b;
}
/* line 288, ../sass/_adminlte.scss */
/* line 294, ../sass/_adminlte.scss */
body.skin-black .content-wrapper a.disable {
pointer-events: none;
cursor: default;
}
/* line 294, ../sass/_adminlte.scss */
/* line 300, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .label {
padding-top: 4px;
padding-bottom: 1px;
}
/* line 299, ../sass/_adminlte.scss */
/* line 305, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .btn {
color: white;
}
/* line 303, ../sass/_adminlte.scss */
/* line 309, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .btn-default {
color: #333;
background-color: white;
}
/* line 308, ../sass/_adminlte.scss */
/* line 314, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .btn-primary {
background-color: #F39C12;
color: white;
border-color: #F39C12;
}
/* line 315, ../sass/_adminlte.scss */
/* line 321, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .nav.nav-tabs .badge {
margin-left: 4px;
background-color: #e0e0e0;
color: #444;
}
/* line 322, ../sass/_adminlte.scss */
/* line 328, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .tab-content {
border-left: solid 1px #ddd;
border-bottom: solid 1px #ddd;
@@ -1853,20 +1859,20 @@ body.skin-black .content-wrapper .tab-content {
padding: 30px 15px 15px 15px;
background-color: white;
}
/* line 330, ../sass/_adminlte.scss */
/* line 336, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .alert {
position: relative;
}
/* line 333, ../sass/_adminlte.scss */
/* line 339, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .alert a {
color: white;
}
/* line 336, ../sass/_adminlte.scss */
/* line 342, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .alert a.btn {
color: #333;
text-decoration: none;
}
/* line 341, ../sass/_adminlte.scss */
/* line 347, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .alert .close {
font-size: 30px;
position: absolute;
@@ -1876,83 +1882,83 @@ body.skin-black .content-wrapper .alert .close {
color: white;
opacity: 0.6;
}
/* line 350, ../sass/_adminlte.scss */
/* line 356, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .alert .close:hover {
opacity: 1;
}
/* line 355, ../sass/_adminlte.scss */
/* line 361, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .alert.alert-dark {
background-color: #ece4d8;
color: black;
}
/* line 362, ../sass/_adminlte.scss */
/* line 368, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .small-box h3 {
font-size: 28px;
font-family: 'Source Sans Pro',sans-serif;
}
/* line 367, ../sass/_adminlte.scss */
/* line 373, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .small-box .icon {
top: -2px;
}
/* line 371, ../sass/_adminlte.scss */
/* line 377, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .small-box .small-box-footer {
color: white;
padding-top: 6px;
padding-bottom: 2px;
}
/* line 380, ../sass/_adminlte.scss */
/* line 386, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .callout h4 .fa {
margin-right: 7px;
}
/* line 383, ../sass/_adminlte.scss */
/* line 389, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .callout a {
color: white;
}
/* line 386, ../sass/_adminlte.scss */
/* line 392, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .callout .btn {
color: #333;
text-decoration: none;
}
/* line 393, ../sass/_adminlte.scss */
/* line 399, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .table th {
font-size: 13px;
}
/* line 396, ../sass/_adminlte.scss */
/* line 402, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .table th.column-actions, body.skin-black .content-wrapper .table td.column-actions {
width: 172px;
text-align: right;
}
/* line 400, ../sass/_adminlte.scss */
/* line 406, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .table td.text-small, body.skin-black .content-wrapper .table th.text-small {
font-size: 12px;
}
/* line 404, ../sass/_adminlte.scss */
/* line 410, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .table.table-bordered > thead > tr > th, body.skin-black .content-wrapper .table.table-bordered > tbody > tr > th, body.skin-black .content-wrapper .table.table-bordered > tfoot > tr > th, body.skin-black .content-wrapper .table.table-bordered > thead > tr > td, body.skin-black .content-wrapper .table.table-bordered > tbody > tr > td, body.skin-black .content-wrapper .table.table-bordered > tfoot > tr > td {
border: 1px solid #ddd;
}
/* line 413, ../sass/_adminlte.scss */
/* line 419, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .table.table-bordered > thead > tr > th, body.skin-black .content-wrapper .table.table-bordered > thead > tr > td {
border-bottom-width: 2px;
}
/* line 419, ../sass/_adminlte.scss */
/* line 425, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .pagination > .active > a, body.skin-black .content-wrapper .pagination > .active > span, body.skin-black .content-wrapper .pagination > .active > a:hover, body.skin-black .content-wrapper .pagination > .active > span:hover, body.skin-black .content-wrapper .pagination > .active > a:focus, body.skin-black .content-wrapper .pagination > .active > span:focus {
background-color: #F39C12;
border: solid 1px #F39C12;
color: white;
}
/* line 425, ../sass/_adminlte.scss */
/* line 431, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .pagination > li > a, body.skin-black .content-wrapper .pagination > li > span {
color: #F39C12;
}
/* line 427, ../sass/_adminlte.scss */
/* line 433, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .pagination > li > a:hover, body.skin-black .content-wrapper .pagination > li > span:hover {
color: #c87f0a;
}
/* line 432, ../sass/_adminlte.scss */
/* line 438, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .submenu {
margin-bottom: 25px;
}
/* line 436, ../sass/_adminlte.scss */
/* line 442, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .form-actions {
position: fixed;
bottom: 0;
@@ -1966,71 +1972,71 @@ body.skin-black .content-wrapper .form-actions {
z-index: 10;
border-top: solid 1px #e0e0e0;
}
/* line 449, ../sass/_adminlte.scss */
/* line 455, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .form-actions a, body.skin-black .content-wrapper .form-actions button {
margin-left: 10px;
}
/* line 454, ../sass/_adminlte.scss */
/* line 460, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .form-buttons {
margin-top: 25px;
text-align: right;
}
/* line 461, ../sass/_adminlte.scss */
/* line 467, ../sass/_adminlte.scss */
body.skin-black .main-footer a {
color: #F39C12;
}
/* line 466, ../sass/_adminlte.scss */
/* line 472, ../sass/_adminlte.scss */
body.skin-black .gridview-pagesize {
float: right;
margin-bottom: 8px;
}
/* line 471, ../sass/_adminlte.scss */
/* line 477, ../sass/_adminlte.scss */
body.skin-black #yii-debug-toolbar {
bottom: 64px;
}

/* line 476, ../sass/_adminlte.scss */
/* line 482, ../sass/_adminlte.scss */
body.login-page {
background: none;
background-color: white;
}
/* line 480, ../sass/_adminlte.scss */
/* line 486, ../sass/_adminlte.scss */
body.login-page .login-box .login-logo {
text-align: center;
font-family: 'worksans_bold';
}
/* line 484, ../sass/_adminlte.scss */
/* line 490, ../sass/_adminlte.scss */
body.login-page .login-box .login-logo img {
width: 150px;
}
/* line 490, ../sass/_adminlte.scss */
/* line 496, ../sass/_adminlte.scss */
body.login-page .login-box .login-box-body,
body.login-page .login-box .login-box-body input#loginform-email,
body.login-page .login-box .login-box-body input#loginform-password,
body.login-page .login-box .login-box-body .btn-primary {
font-size: 14px;
}
/* line 497, ../sass/_adminlte.scss */
/* line 503, ../sass/_adminlte.scss */
body.login-page .login-box .login-box-body .btn-primary {
background-color: #F39C12;
border-color: #F39C12;
padding: 5px 10px;
margin-bottom: 15px;
}
/* line 503, ../sass/_adminlte.scss */
/* line 509, ../sass/_adminlte.scss */
body.login-page .login-box .login-box-body .btn-primary:active {
background-color: #f4a62a;
border-color: #F39C12;
}
/* line 509, ../sass/_adminlte.scss */
/* line 515, ../sass/_adminlte.scss */
body.login-page .login-box .login-box-body a {
color: #F39C12;
}
/* line 511, ../sass/_adminlte.scss */
/* line 517, ../sass/_adminlte.scss */
body.login-page .login-box .login-box-body a:hover {
color: #f4a62a;
}
/* line 516, ../sass/_adminlte.scss */
/* line 522, ../sass/_adminlte.scss */
body.login-page .login-box .login-box-body .checkbox label input {
position: relative;
top: 0px;

+ 6
- 0
backend/web/sass/_adminlte.scss Datei anzeigen

@@ -1,6 +1,12 @@

body.skin-black {

.badge-environment-beta {
top: 7px;
font-size: 11px;
padding: 0px 7px;
}

// Gestion des retours à la ligne (à cause de la difficulté à gérer du HTMl dans les tooltip)
.ui-tooltip {
white-space: pre-wrap;

+ 21
- 0
common/helpers/Environment.php Datei anzeigen

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

namespace common\helpers;

class Environment
{
public static function isBetaEnvironment(): bool
{
return YII_ENV == 'dev';
}

public static function badgeBeta(): string
{
return self::isBetaEnvironment() ? '<span class="badge-environment-beta">BETA</span>' : '';
}

public static function metaRobotsNoIndexBeta(): string
{
return self::isBetaEnvironment() ? '<meta name="robots" content="noindex">' : '';
}
}

+ 4
- 0
common/views/nav_user_top.php Datei anzeigen

@@ -4,6 +4,7 @@ use common\helpers\GlobalParam;
use domain\Producer\Producer\Producer;
use domain\Producer\Producer\ProducerModule;
use domain\User\User\UserModule;
use common\helpers\Environment;
use yii\bootstrap5\Nav;
use yii\helpers\Html;

@@ -19,6 +20,9 @@ if ($isUserCurrentGrantedAsProducer && $userCurrent->id_producer) {

?>
<div class="container container-nav-user-top">
<?php if($context == 'producer'): ?>
<?= Environment::badgeBeta(); ?>
<?php endif; ?>
<div class="nav-user-top">
<nav class="navbar navbar-expand-lg">
<div class="container-fluid">

+ 95
- 72
common/web/css/screen.css Datei anzeigen

@@ -139,7 +139,24 @@ termes.
font-weight: normal;
font-style: normal;
}
/* line 3, ../sass/_common.scss */
/* Environnement beta */
/* line 4, ../sass/_common.scss */
.badge-environment-beta {
position: relative;
display: inline-block;
font-size: 13px;
line-height: 20px;
font-family: 'worksans_semibold';
font-weight: normal;
padding: 1px 10px;
border-radius: 10px;
color: white;
background-color: black;
text-align: center;
vertical-align: baseline;
}

/* line 19, ../sass/_common.scss */
#main {
/* Boutons */
/* Alertes */
@@ -147,7 +164,7 @@ termes.
/* Tables */
/* Formulaires */
}
/* line 5, ../sass/_common.scss */
/* line 21, ../sass/_common.scss */
#main .btn-primary,
#main .btn-secondary {
-moz-border-radius: 0px;
@@ -155,36 +172,36 @@ termes.
border-radius: 0px;
font-family: 'worksans_semibold';
}
/* line 10, ../sass/_common.scss */
/* line 26, ../sass/_common.scss */
#main .btn-primary .bi,
#main .btn-secondary .bi {
margin-right: 5px;
}
/* line 15, ../sass/_common.scss */
/* line 31, ../sass/_common.scss */
#main .btn-primary {
background-color: #ee6f42;
border: 0px none;
color: white;
}
/* line 20, ../sass/_common.scss */
/* line 36, ../sass/_common.scss */
#main .btn-primary:hover, #main .btn-primary:active, #main .btn-primary:focus {
filter: brightness(90%);
border: 0px none;
color: white;
}
/* line 27, ../sass/_common.scss */
/* line 43, ../sass/_common.scss */
#main .btn-secondary {
color: black;
background-color: #f4efe8;
border: solid 1px #f4efe8;
}
/* line 32, ../sass/_common.scss */
/* line 48, ../sass/_common.scss */
#main .btn-secondary:hover, #main .btn-secondary.active {
background-color: #ece4d8;
border: solid 1px #ece4d8;
color: black;
}
/* line 40, ../sass/_common.scss */
/* line 56, ../sass/_common.scss */
#main .alert {
border: 0px none;
-moz-border-radius: 0px !important;
@@ -194,99 +211,99 @@ termes.
padding: 20px;
margin-bottom: 20px;
}
/* line 47, ../sass/_common.scss */
/* line 63, ../sass/_common.scss */
#main .alert.alert-success {
background-color: #e4e9ad !important;
}
/* line 51, ../sass/_common.scss */
/* line 67, ../sass/_common.scss */
#main .alert.alert-info {
background-color: #97bfc4 !important;
}
/* line 55, ../sass/_common.scss */
/* line 71, ../sass/_common.scss */
#main .alert.alert-warning {
background-color: #ecd58e !important;
}
/* line 59, ../sass/_common.scss */
/* line 75, ../sass/_common.scss */
#main .alert.alert-danger {
background-color: #edbaa4 !important;
}
/* line 63, ../sass/_common.scss */
/* line 79, ../sass/_common.scss */
#main .alert.alert-dark {
background-color: #ece4d8 !important;
}
/* line 67, ../sass/_common.scss */
/* line 83, ../sass/_common.scss */
#main .alert a {
color: black;
}
/* line 71, ../sass/_common.scss */
/* line 87, ../sass/_common.scss */
#main .alert p:last-child {
margin-bottom: 0px;
}
/* line 77, ../sass/_common.scss */
/* line 93, ../sass/_common.scss */
#main .card {
-moz-border-radius: 0px;
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 87, ../sass/_common.scss */
/* line 103, ../sass/_common.scss */
#main .table thead tr th {
font-family: 'worksans_semibold';
}
/* line 97, ../sass/_common.scss */
/* line 113, ../sass/_common.scss */
#main .table.table-striped {
border: 0px none;
}
/* line 100, ../sass/_common.scss */
/* line 116, ../sass/_common.scss */
#main .table.table-striped.table-striped > tbody > tr:nth-of-type(2n) > *,
#main .table.table-striped thead tr th {
background-color: #ece4d8;
}
/* line 105, ../sass/_common.scss */
/* line 121, ../sass/_common.scss */
#main .table.table-striped.table-striped > tbody > tr:nth-of-type(2n+1) > * {
background-color: #f8f7f3;
}
/* line 109, ../sass/_common.scss */
/* line 125, ../sass/_common.scss */
#main .table.table-striped thead tr th,
#main .table.table-striped tbody tr td {
-moz-box-shadow: -20px 0 20px -20px rgba(0, 0, 0, 0.2) inset;
-webkit-box-shadow: -20px 0 20px -20px rgba(0, 0, 0, 0.2) inset;
box-shadow: -20px 0 20px -20px rgba(0, 0, 0, 0.2) inset;
}
/* line 113, ../sass/_common.scss */
/* line 129, ../sass/_common.scss */
#main .table.table-striped thead tr th:last-child,
#main .table.table-striped tbody tr td:last-child {
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
}
/* line 119, ../sass/_common.scss */
/* line 135, ../sass/_common.scss */
#main .table.table-striped thead tr {
border: 0px none;
}
/* line 121, ../sass/_common.scss */
/* line 137, ../sass/_common.scss */
#main .table.table-striped thead tr th {
border: 0px none;
padding: 10px 20px;
}
/* line 129, ../sass/_common.scss */
/* line 145, ../sass/_common.scss */
#main .table.table-striped tbody tr {
border: 0px none;
}
/* line 131, ../sass/_common.scss */
/* line 147, ../sass/_common.scss */
#main .table.table-striped tbody tr td {
border: 0px none;
padding: 20px;
}
/* line 139, ../sass/_common.scss */
/* line 155, ../sass/_common.scss */
#main .table .btn-secondary {
display: inline-block;
margin-bottom: 5px;
}
/* line 147, ../sass/_common.scss */
/* line 163, ../sass/_common.scss */
#main form .control-label {
font-family: 'worksans_medium';
}
/* line 151, ../sass/_common.scss */
/* line 167, ../sass/_common.scss */
#main form input[type="text"],
#main form input[type="email"],
#main form input[type="password"],
@@ -300,66 +317,72 @@ termes.
border-radius: 0px;
border: solid 1px #b7ab9b;
}
/* line 161, ../sass/_common.scss */
/* line 177, ../sass/_common.scss */
#main form .form-control {
-moz-appearance: auto;
-webkit-appearance: auto;
}
/* line 165, ../sass/_common.scss */
/* line 181, ../sass/_common.scss */
#main form .form-control:hover {
border: solid 1px gray;
}
/* line 169, ../sass/_common.scss */
/* line 185, ../sass/_common.scss */
#main form .form-control:focus {
-moz-box-shadow: 0px 0px 0px 1px #ee6f42;
-webkit-box-shadow: 0px 0px 0px 1px #ee6f42;
box-shadow: 0px 0px 0px 1px #ee6f42;
border: solid 1px #ee6f42;
}
/* line 175, ../sass/_common.scss */
/* line 191, ../sass/_common.scss */
#main form .has-error .control-label {
color: black;
}
/* line 179, ../sass/_common.scss */
/* line 195, ../sass/_common.scss */
#main form .has-error .form-control:focus, #main form .has-error .form-control {
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
border-color: #a94442;
}
/* line 184, ../sass/_common.scss */
/* line 200, ../sass/_common.scss */
#main form .has-error .help-block-error {
color: #a94442;
}
/* line 189, ../sass/_common.scss */
/* line 205, ../sass/_common.scss */
#main form .form-buttons {
text-align: right;
}

/* Divers */
/* line 196, ../sass/_common.scss */
/* line 212, ../sass/_common.scss */
.float-left {
float: left;
}

/* line 200, ../sass/_common.scss */
/* line 216, ../sass/_common.scss */
.float-right {
float: right;
}

/* line 204, ../sass/_common.scss */
/* line 220, ../sass/_common.scss */
.clr {
clear: both;
}

/* Navigation utilisateur en haut du site */
/* line 209, ../sass/_common.scss */
/* line 225, ../sass/_common.scss */
.container-nav-user-top {
position: relative;
z-index: 999;
background-color: white;
}
/* line 214, ../sass/_common.scss */
/* line 230, ../sass/_common.scss */
.container-nav-user-top .badge-environment-beta {
position: absolute;
top: 8px;
left: 15px;
}
/* line 236, ../sass/_common.scss */
.container-nav-user-top .nav-user-top {
position: absolute;
top: 0px;
@@ -367,7 +390,7 @@ termes.
background-color: white;
z-index: 100;
}
/* line 221, ../sass/_common.scss */
/* line 243, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar {
-moz-border-radius: 0px;
-webkit-border-radius: 0px;
@@ -377,16 +400,16 @@ termes.
margin: 0px;
min-height: 0px;
}
/* line 228, ../sass/_common.scss */
/* line 250, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul {
position: relative;
left: -10px;
}
/* line 232, ../sass/_common.scss */
/* line 254, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li {
padding-left: 5px;
}
/* line 235, ../sass/_common.scss */
/* line 257, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li a.nav-link {
padding-left: 10px;
padding-right: 10px;
@@ -396,12 +419,12 @@ termes.
color: black;
font-size: 16px;
}
/* line 244, ../sass/_common.scss */
/* line 266, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li a.nav-link:hover, .container-nav-user-top .nav-user-top .navbar ul li a.nav-link:focus, .container-nav-user-top .nav-user-top .navbar ul li a.nav-link.active {
background: none;
color: #ee6f42;
}
/* line 249, ../sass/_common.scss */
/* line 271, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li a.nav-link .bi {
color: #ee6f42;
font-size: 16px;
@@ -409,48 +432,48 @@ termes.
position: relative;
top: 1px;
}
/* line 259, ../sass/_common.scss */
/* line 281, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li .dropdown-menu a {
padding: 2px 20px;
}
/* line 262, ../sass/_common.scss */
/* line 284, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li .dropdown-menu a:hover, .container-nav-user-top .nav-user-top .navbar ul li .dropdown-menu a:focus {
background-color: #ece4d8;
}
/* line 271, ../sass/_common.scss */
/* line 293, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .dropdown-menu {
z-index: 9999;
}
/* line 273, ../sass/_common.scss */
/* line 295, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .dropdown-menu .divider.dropdown-header {
padding: 0px;
}

@media screen and (max-width: 991px) {
/* line 284, ../sass/_common.scss */
/* line 306, ../sass/_common.scss */
.container-nav-user-top .nav-user-top {
position: relative;
}
/* line 288, ../sass/_common.scss */
/* line 310, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul {
width: 100%;
display: block;
margin-right: 0px;
text-align: center;
}
/* line 294, ../sass/_common.scss */
/* line 316, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li {
display: inline-block;
}
/* line 298, ../sass/_common.scss */
/* line 320, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li.nav-item-producers .dropdown-menu {
right: -95px;
}
/* line 305, ../sass/_common.scss */
/* line 327, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar .link-text {
display: none;
}
/* line 309, ../sass/_common.scss */
/* line 331, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar .dropdown-menu {
position: absolute;
right: 5%;
@@ -461,32 +484,32 @@ termes.
-webkit-box-shadow: 0px 0px 4px gray;
box-shadow: 0px 0px 4px gray;
}
/* line 318, ../sass/_common.scss */
/* line 340, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar .dropdown-menu li a {
padding-left: 15px;
}
}
/* Block de date */
/* line 331, ../sass/_common.scss */
/* line 353, ../sass/_common.scss */
.block-date {
margin: 0px auto;
padding-top: 0px;
text-align: center;
}
/* line 336, ../sass/_common.scss */
/* line 358, ../sass/_common.scss */
.block-date .day {
text-transform: capitalize;
line-height: 15px;
font-size: 15px;
text-transform: uppercase;
}
/* line 343, ../sass/_common.scss */
/* line 365, ../sass/_common.scss */
.block-date .num {
font-size: 30px;
line-height: 35px;
font-weight: bold;
}
/* line 349, ../sass/_common.scss */
/* line 371, ../sass/_common.scss */
.block-date .month {
text-transform: uppercase;
line-height: 15px;
@@ -495,52 +518,52 @@ termes.
}

/* Page d'erreur */
/* line 359, ../sass/_common.scss */
/* line 381, ../sass/_common.scss */
#main #content .site-error .col-lg-6 {
margin: 0px auto;
float: none;
}
/* line 369, ../sass/_common.scss */
/* line 391, ../sass/_common.scss */
#main #content .site-error .panel h2 {
text-transform: none;
font-size: 25px;
margin-top: 0px;
margin-bottom: 20px;
}
/* line 376, ../sass/_common.scss */
/* line 398, ../sass/_common.scss */
#main #content .site-error .panel p:last-child {
margin-bottom: 0px;
padding-bottom: 0px;
}
/* line 382, ../sass/_common.scss */
/* line 404, ../sass/_common.scss */
#main #content .site-error .alert {
padding-bottom: 5px;
}
/* line 385, ../sass/_common.scss */
/* line 407, ../sass/_common.scss */
#main #content .site-error .alert h3 {
margin-top: 5px;
margin-bottom: 18px;
}
/* line 390, ../sass/_common.scss */
/* line 412, ../sass/_common.scss */
#main #content .site-error .alert p {
margin-bottom: 15px;
}
/* line 394, ../sass/_common.scss */
/* line 416, ../sass/_common.scss */
#main #content .site-error .alert .btn {
text-decoration: none;
}
/* line 399, ../sass/_common.scss */
/* line 421, ../sass/_common.scss */
#main #content .site-error p.error-message {
font-weight: bold;
}

/* Paiement */
/* line 405, ../sass/_common.scss */
/* line 427, ../sass/_common.scss */
.payment-detail-remaining-surplus {
font-size: 13px;
color: gray;
}
/* line 409, ../sass/_common.scss */
/* line 431, ../sass/_common.scss */
.payment-detail-remaining-surplus strong {
font-weight: bold;
}

+ 22
- 0
common/web/sass/_common.scss Datei anzeigen

@@ -1,5 +1,21 @@
@import "compass";

/* Environnement beta */
.badge-environment-beta {
position: relative;
display: inline-block;
font-size: 13px;
line-height: 20px;
font-family: 'worksans_semibold';
font-weight: normal;
padding: 1px 10px;
border-radius: 10px;
color: white;
background-color: black;
text-align: center;
vertical-align: baseline;
}

#main {
/* Boutons */
.btn-primary,
@@ -211,6 +227,12 @@
z-index: 999;
background-color: white;

.badge-environment-beta {
position: absolute;
top: 8px;
left: 15px;
}

.nav-user-top {
position: absolute;
top: 0px;

+ 3
- 0
frontend/views/layouts/main.php Datei anzeigen

@@ -39,6 +39,7 @@
use common\helpers\GlobalParam;
use domain\Setting\SettingModule;
use domain\User\User\UserModule;
use common\helpers\Environment;
use yii\bootstrap5\Nav;
use yii\helpers\Html;

@@ -63,6 +64,7 @@ $adminSettingBag = $settingModule->getAdminSettingBag();
<meta name="baseurl" content="<?= Yii::$app->urlManagerFrontend->baseUrl; ?>">
<meta name="baseurl-absolute"
content="<?= Yii::$app->urlManagerFrontend->getHostInfo() . Yii::$app->urlManagerBackend->baseUrl; ?>">
<?= Environment::metaRobotsNoIndexBeta(); ?>
<?= Html::csrfMetaTags() ?>
<link rel="icon" type="image/png" href="<?= $this->getUrlManager()->getBaseUrl(); ?>/img/favicon-souke-1.png">
<!--[if IE]><link rel="shortcut icon" type="image/x-icon" href="<?= \Yii::$app->urlManager->getBaseUrl(); ?>/img/favicon.ico"><![endif]-->
@@ -89,6 +91,7 @@ $adminSettingBag = $settingModule->getAdminSettingBag();
<div class="navbar-header">
<a id="link-home" class="" href="<?= $this->getUrlManager()->createUrl('site/index'); ?>">
<img src="<?= $this->getUrlManager()->baseUrl ?>/img/souke.png" alt="Souke"/>
<?= Environment::badgeBeta();; ?>
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#main-navbar" aria-controls="main-navbar" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>

+ 187
- 182
frontend/web/css/screen.css
Datei-Diff unterdrückt, da er zu groß ist
Datei anzeigen


+ 5
- 0
frontend/web/sass/screen.scss Datei anzeigen

@@ -295,6 +295,11 @@ section#header-title {
color: $color-primary;
}
}

.badge-environment-beta {
top: 28px;
left: 10px;
}
}

nav {

+ 2
- 0
producer/views/layouts/main.php Datei anzeigen

@@ -36,6 +36,7 @@
* termes.
*/

use common\helpers\Environment;
use common\helpers\GlobalParam;
use common\helpers\Image;
use domain\Feature\Feature\Feature;
@@ -85,6 +86,7 @@ $mainColor = $producer->option_main_color ?: '#ee6f42' ;
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="base-url" content="<?= \Yii::$app->urlManager->baseUrl; ?>">
<meta name="slug-producer" content="<?= $producer->slug; ?>">
<?= Environment::metaRobotsNoIndexBeta(); ?>
<?= Html::csrfMetaTags() ?>
<link rel="icon" type="image/png"
href="<?php echo \Yii::$app->urlManager->getBaseUrl(); ?>/img/favicon-souke-1.png"/>

Laden…
Abbrechen
Speichern