Browse Source

[Backend] Correctif assets + JS select établissement

dev
keun 6 years ago
parent
commit
36bee751fd
8 changed files with 216 additions and 196 deletions
  1. +2
    -0
      backend/views/layouts/main.php
  2. BIN
      backend/web/.sass-cache/2a0ffb00578c9d5a537db16d14c734a22b18f35c/_fonts.scssc
  3. BIN
      backend/web/.sass-cache/2a0ffb00578c9d5a537db16d14c734a22b18f35c/ie.scssc
  4. BIN
      backend/web/.sass-cache/2a0ffb00578c9d5a537db16d14c734a22b18f35c/print.scssc
  5. BIN
      backend/web/.sass-cache/2a0ffb00578c9d5a537db16d14c734a22b18f35c/screen.scssc
  6. +202
    -195
      backend/web/css/screen.css
  7. +7
    -1
      backend/web/js/lechatdesnoisettes.js
  8. +5
    -0
      backend/web/sass/screen.scss

+ 2
- 0
backend/views/layouts/main.php View File

@@ -13,6 +13,7 @@ use common\helpers\Url;
/* @var $this \yii\web\View */
/* @var $content string */

\common\assets\CommonAsset::register($this);
\backend\assets\AppAsset::register($this);

?>
@@ -22,6 +23,7 @@ use common\helpers\Url;
<head>
<meta charset="<?= Yii::$app->charset ?>">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="baseurl" content="<?= Yii::$app->urlManagerBackend->baseUrl ; ?>">
<link rel="icon" type="image/png" href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/favicon3.png" />
<?= Html::csrfMetaTags() ?>
<title><?= Html::encode($this->title) ?> - La boîte à pain</title>

BIN
backend/web/.sass-cache/2a0ffb00578c9d5a537db16d14c734a22b18f35c/_fonts.scssc View File


BIN
backend/web/.sass-cache/2a0ffb00578c9d5a537db16d14c734a22b18f35c/ie.scssc View File


BIN
backend/web/.sass-cache/2a0ffb00578c9d5a537db16d14c734a22b18f35c/print.scssc View File


BIN
backend/web/.sass-cache/2a0ffb00578c9d5a537db16d14c734a22b18f35c/screen.scssc View File


+ 202
- 195
backend/web/css/screen.css
File diff suppressed because it is too large
View File


+ 7
- 1
backend/web/js/lechatdesnoisettes.js View File

@@ -18,6 +18,12 @@ $(document).ready(function() {
chat_select_etablissement() ;
}) ;

var UrlManager = {
getBaseUrl: function() {
return $('meta[name=baseurl]').attr('content') ;
}
};

function chat_tooltip() {
$('[data-toggle="tooltip"]').tooltip();
}
@@ -148,7 +154,7 @@ function chat_points_vente_acces_event() {

function chat_select_etablissement() {
$('select[name="select_etablissement"]').change(function() {
window.location.href = 'index.php?r=site/change-etablissement&id='+$(this).val() ;
window.location.href = UrlManager.getBaseUrl()+'/site/change-etablissement?id='+$(this).val() ;
}) ;
}


+ 5
- 0
backend/web/sass/screen.scss View File

@@ -67,6 +67,7 @@ a {
.wrap {
.btn-primary,
.btn-success {
background: none ;
background-color: $color1 ;
border: solid 1px $color1 ;

@@ -98,6 +99,7 @@ a {
}

.navbar-inverse {
background: none;
background-color: $color1 ;
border-bottom: 0px none ;
@@ -119,6 +121,9 @@ a {
.navbar-nav > li.active,
.navbar-nav > .open {
a {
background: none ;
@include box-shadow(none) ;
@include text-shadow(none) ;
margin-left: 3px ;
background-color: $color2 ;
color: $color1 ;

Loading…
Cancel
Save