Pārlūkot izejas kodu

Merge branch 'dev'

prodstable
keun pirms 6 gadiem
vecāks
revīzija
6e57153087
4 mainītis faili ar 215 papildinājumiem un 168 dzēšanām
  1. +9
    -3
      backend/views/site/index.php
  2. Binārs
      backend/web/.sass-cache/2a0ffb00578c9d5a537db16d14c734a22b18f35c/screen.scssc
  3. +185
    -165
      backend/web/css/screen.css
  4. +21
    -0
      backend/web/sass/screen.scss

+ 9
- 3
backend/views/site/index.php Parādīt failu

@@ -242,6 +242,7 @@ $this->title = 'Tableau de bord';
<thead>
<tr>
<th></th>
<th>Historique</th>
<th>Date</th>
<th>Client</th>
<th>Produits</th>
@@ -251,8 +252,14 @@ $this->title = 'Tableau de bord';
</thead>
<tbody>
<?php foreach($commandes as $c): ?>
<tr>
<td><?= $c->getStrType(true); ?></td>
<tr class="<?php if(!is_null($c->date_update)): ?>commande-update<?php endif; ?>">
<td class="infos"><?= $c->getStrType(true); ?></td>
<td class="historique">
<div class="small"><span class="glyphicon glyphicon-plus"></span> Création <br /> <strong><?= date('d/m/Y à G\hi', strtotime($c->date)) ?></strong></div>
<?php if(!is_null($c->date_update)): ?>
<div class="small"><span class="update"><span class="glyphicon glyphicon-pencil"></span> Dernière modification</span><br /> <strong><?= date('d/m/Y à G\hi', strtotime($c->date_update)) ?></strong></div>
<?php endif; ?>
</td>
<td class="date">
<div class="bloc-date">
<div class="jour"><?= strftime('%A', strtotime($c->production->date)) ?></div>
@@ -262,7 +269,6 @@ $this->title = 'Tableau de bord';
</td>
<td>
<?= $c->getStrUser(); ?><br />
<span class="small">Le <?= date('d/m/Y à G\hi', strtotime($c->date)) ?></span>
</td>
<td><?= $c->getResumePanier() ; ?></td>
<td><?= $c->getResumePointVente() ; ?></td>

Binārs
backend/web/.sass-cache/2a0ffb00578c9d5a537db16d14c734a22b18f35c/screen.scssc Parādīt failu


+ 185
- 165
backend/web/css/screen.css
Failā izmaiņas netiks attēlotas, jo tās ir par lielu
Parādīt failu


+ 21
- 0
backend/web/sass/screen.scss Parādīt failu

@@ -289,6 +289,13 @@ a {
}
#dernieres-commandes {
tr.commande-update {
td {
background-color: $color2 ;
}
}
.small, .localite {
font-size: 12px ;
color: gray ;
@@ -297,6 +304,20 @@ a {
font-size: 12px ;
}
td.historique {
min-width: 170px ;
.small {
margin-bottom: 7px ;
}
strong {
margin-left: 15px ;
}
.update {
color: $color1 ;
}
}
.date {
text-align: center ;

Notiek ielāde…
Atcelt
Saglabāt