浏览代码

Amélioration système titrages

dev
keun 6 年前
父节点
当前提交
73229b287d
共有 10 个文件被更改,包括 69 次插入71 次删除
  1. +6
    -17
      common/components/MyView.php
  2. +1
    -7
      producer/views/commande/_form.php
  3. +1
    -6
      producer/views/commande/create.php
  4. +1
    -4
      producer/views/commande/historique.php
  5. +1
    -10
      producer/views/commande/update.php
  6. +5
    -1
      producer/views/layouts/main.php
  7. +1
    -1
      producer/views/producer/index.php
  8. 二进制
      producer/web/.sass-cache/df296f4d5446ec0f190b7ff1f23eb998ea1b56e7/_layout.scssc
  9. +38
    -24
      producer/web/css/screen.css
  10. +15
    -1
      producer/web/sass/_layout.scss

+ 6
- 17
common/components/MyView.php 查看文件

@@ -4,14 +4,15 @@ namespace common\components ;

class MyView extends \yii\web\View {
var $icon ;
var $title ;
var $page_title ;
var $subtitle ;
public function setTitle($title, $icon = '') {
public function setTitle($title, $page_title = '') {
$this->title = $title ;
$this->page_title = $title ;
$this->icon = $icon ;
if(strlen($page_title))
$this->page_title = $page_title ;
else
$this->page_title = $title ;
}
public function getTitle() {
@@ -26,18 +27,6 @@ class MyView extends \yii\web\View {
return $this->page_title ;
}
public function setSubtitle($subtitle) {
$this->subtitle = $subtitle ;
}
public function getSubtitle() {
return $this->subtitle ;
}

public function getTitleIcon() {
return $this->icon ;
}
public function getControllerAction() {
return Yii::$app->controller->id.'/'.Yii::$app->controller->action->id ;
}

+ 1
- 7
producer/views/commande/_form.php 查看文件

@@ -1,12 +1,7 @@
<?php

use yii\helpers\Html;
use yii\widgets\ActiveForm;
use common\models\Etablissement;

/* @var $this yii\web\View */
/* @var $model common\models\Commande */
/* @var $form ActiveForm */
?>
<div class="commande-form">
@@ -18,8 +13,7 @@ use common\models\Etablissement;
<?php if($id_etablissement && $etablissement_paiement_ok): ?>
<div class="col-md-6">
<h2 id="step-choix-date">Date de commande</h2>
<div id="step-choix-date" class="col-md-6">
<?= $form->field($model, 'id_production')->label('')->hiddenInput(); ?>

<?php if (isset($model->id)): ?>

+ 1
- 6
producer/views/commande/create.php 查看文件

@@ -1,12 +1,7 @@
<?php

use yii\helpers\Html;
$this->setTitle('Passer une commande') ;


/* @var $this yii\web\View */
/* @var $model app\models\Produit */

$this->title = 'Passer une commande';
?>
<div class="commande-create">


+ 1
- 4
producer/views/commande/historique.php 查看文件

@@ -1,11 +1,8 @@
<?php
/* @var $this yii\web\View */

use yii\helpers\Html;
use yii\bootstrap\ActiveForm;
use common\models\Commande ;

$this->title = 'Commande' ;
$this->setTitle('Historique de mes commandes') ;

?>


+ 1
- 10
producer/views/commande/update.php 查看文件

@@ -1,18 +1,9 @@
<?php

use yii\helpers\Html;
$this->setTitle('Modifier une commande') ;


/* @var $this yii\web\View */
/* @var $model app\models\Produit */

$this->title = 'Modifier une commande';
//$this->params['breadcrumbs'][] = ['label' => 'Produits', 'url' => ['index']];
//$this->params['breadcrumbs'][] = $this->title;
?>
<div class="commande-update">

<h1 class="title-systeme-commande"><span class="glyphicon glyphicon-pencil"></span> <?= Html::encode($this->title) ?></h1>
<?php if($commande_introuvable): ?>
<div class="alert alert-danger">Cette commande est introuvable</div><br />

+ 5
- 1
producer/views/layouts/main.php 查看文件

@@ -124,7 +124,11 @@ $producer = $this->context->getProducer() ;
?>
</nav>
<section id="content">
<?php if(strlen($this->getTitle())): ?>
<h2 id="page-title"><?= $this->getTitle(); ?></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') ?>

+ 1
- 1
producer/views/producer/index.php 查看文件

@@ -1,6 +1,6 @@
<?php
$producer = $this->context->getProducer() ;
$this->setTitle(Html::encode($producer->type.' à '.$producer->ville)) ;
$this->setPageTitle(Html::encode($producer->type.' à '.$producer->ville)) ;
?>

<?php if(strlen($producer->description) || strlen($producer->photo)): ?>

二进制
producer/web/.sass-cache/df296f4d5446ec0f190b7ff1f23eb998ea1b56e7/_layout.scssc 查看文件


+ 38
- 24
producer/web/css/screen.css 查看文件

@@ -160,15 +160,16 @@ body {
text-transform: uppercase;
font-family: "myriadpro-regular";
font-size: 35px;
padding-bottom: 10px;
padding-bottom: 20px;
font-weight: bold;
}
/* line 100, ../sass/_layout.scss */
#header h2 {
font-family: "myriadpro-it";
font-size: 18px;
padding-bottom: 15px;
}
/* line 105, ../sass/_layout.scss */
/* line 106, ../sass/_layout.scss */
#header #credit {
position: absolute;
top: 0px;
@@ -178,16 +179,16 @@ body {
border-bottom: solid 1px white;
padding: 7px 0px;
}
/* line 114, ../sass/_layout.scss */
/* line 115, ../sass/_layout.scss */
#header #credit span {
font-family: "myriadpro-light";
}

/* line 120, ../sass/_layout.scss */
/* line 121, ../sass/_layout.scss */
#main {
background-color: #F8F1DD;
}
/* line 123, ../sass/_layout.scss */
/* line 124, ../sass/_layout.scss */
#main #main-nav {
width: 100%;
position: relative;
@@ -195,14 +196,14 @@ body {
background-color: white;
border-bottom: solid 1px #e0e0e0;
}
/* line 132, ../sass/_layout.scss */
/* line 133, ../sass/_layout.scss */
#main #main-nav ul li a {
color: #BB8757;
text-transform: uppercase;
font-family: "myriadpro-regular";
border-right: solid 1px #e0e0e0;
}
/* line 139, ../sass/_layout.scss */
/* line 140, ../sass/_layout.scss */
#main #main-nav ul li a:hover, #main #main-nav ul li.active a {
background: none;
border-bottom: solid 1px #BB8757;
@@ -210,18 +211,31 @@ body {
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 146, ../sass/_layout.scss */
/* line 147, ../sass/_layout.scss */
#main #main-nav ul li#btn-administration {
background-color: #F8F1DD;
float: right;
}
/* line 153, ../sass/_layout.scss */
/* line 154, ../sass/_layout.scss */
#main #main-nav #user {
color: #BB8757;
float: right;
padding: 10px;
}
/* line 160, ../sass/_layout.scss */
/* line 161, ../sass/_layout.scss */
#main #page-title {
padding-left: 15px;
padding-right: 15px;
padding-bottom: 15px;
border-bottom: solid 1px #e0e0e0;
margin-bottom: 10px;
font-family: "myriadpro-light";
font-size: 30px;
position: relative;
top: -10px;
text-align: center;
}
/* line 174, ../sass/_layout.scss */
#main .container {
padding: 0px;
background-color: white;
@@ -229,55 +243,55 @@ body {
border-left: solid 1px #e0e0e0;
border-right: solid 1px #e0e0e0;
}
/* line 168, ../sass/_layout.scss */
/* line 182, ../sass/_layout.scss */
#main #content {
padding: 0px 20px 20px 20px;
}
/* line 171, ../sass/_layout.scss */
/* line 185, ../sass/_layout.scss */
#main #content h1, #main #content h2, #main #content h3, #main #content h4, #main #content h5, #main #content h6 {
font-family: "myriadpro-regular";
margin-top: 30px;
margin-bottom: 20px;
}
/* line 176, ../sass/_layout.scss */
/* line 190, ../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 181, ../sass/_layout.scss */
/* line 195, ../sass/_layout.scss */
#main #content h1 {
font-size: 30px;
}
/* line 185, ../sass/_layout.scss */
/* line 199, ../sass/_layout.scss */
#main #content h2 {
font-size: 25px;
}
/* line 190, ../sass/_layout.scss */
/* line 204, ../sass/_layout.scss */
#main #content h3 {
font-size: 22px;
}
/* line 194, ../sass/_layout.scss */
/* line 208, ../sass/_layout.scss */
#main #content h4 {
font-size: 20px;
}
/* line 198, ../sass/_layout.scss */
/* line 212, ../sass/_layout.scss */
#main #content h5 {
font-size: 18px;
}
/* line 202, ../sass/_layout.scss */
/* line 216, ../sass/_layout.scss */
#main #content h6 {
font-size: 16px;
}

/* line 208, ../sass/_layout.scss */
/* line 222, ../sass/_layout.scss */
#footer {
background-color: #BB8757;
height: 100px;
}
/* line 212, ../sass/_layout.scss */
/* line 226, ../sass/_layout.scss */
#footer .container {
padding: 0px;
}
/* line 214, ../sass/_layout.scss */
/* line 228, ../sass/_layout.scss */
#footer .container .overflow {
height: 30px;
background-color: white;
@@ -285,12 +299,12 @@ body {
border-right: solid 1px #e0e0e0;
border-bottom: solid 1px #e0e0e0;
}
/* line 222, ../sass/_layout.scss */
/* line 236, ../sass/_layout.scss */
#footer .container .content {
padding-top: 20px;
color: white;
}
/* line 226, ../sass/_layout.scss */
/* line 240, ../sass/_layout.scss */
#footer .container .content a {
color: white;
text-decoration: underline;

+ 15
- 1
producer/web/sass/_layout.scss 查看文件

@@ -93,13 +93,14 @@ body {
text-transform: uppercase ;
font-family: 'myriadpro-regular' ;
font-size: 35px ;
padding-bottom: 10px ;
padding-bottom: 20px ;
font-weight: bold ;
}
h2 {
font-family: 'myriadpro-it' ;
font-size: 18px ;
padding-bottom: 15px ;
}
#credit {
@@ -157,6 +158,19 @@ body {
}
}
#page-title {
padding-left: 15px ;
padding-right: 15px ;
padding-bottom: 15px ;
border-bottom: solid 1px #e0e0e0 ;
margin-bottom: 10px ;
font-family: 'myriadpro-light' ;
font-size: 30px ;
position: relative ;
top: -10px ;
text-align: center ;
}
.container {
padding: 0px ;
background-color: white ;

正在加载...
取消
保存