From 5deae74c9a826e566a01d9f5814a4441abb27ed2 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Tue, 16 Apr 2019 20:56:15 +0200 Subject: [PATCH] Use thead and tbody in tables --- copanier/static/app.css | 7 +++++-- copanier/templates/adjust_product.html | 20 ++++++++++++-------- copanier/templates/delivery.html | 4 +++- copanier/templates/place_order.html | 7 ++++++- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/copanier/static/app.css b/copanier/static/app.css index dc90790..35b4435 100644 --- a/copanier/static/app.css +++ b/copanier/static/app.css @@ -337,12 +337,15 @@ th.total { tr:nth-child(even) { background-color: #ddd; } -tr:nth-child(1) { +thead tr { background-color: #3498db; } -tr:nth-child(1) * { +thead tr * { color: #f1f1f1; } +thead th + th { + border-left: 1px solid white; +} article.order { max-width: 1200px; margin-left: auto; diff --git a/copanier/templates/adjust_product.html b/copanier/templates/adjust_product.html index b46b16d..cd01bb2 100644 --- a/copanier/templates/adjust_product.html +++ b/copanier/templates/adjust_product.html @@ -8,14 +8,18 @@

Manquant {{ delivery.product_missing(product) }}

- - {% for email, order in delivery.orders.items() %} - - - - - - {% endfor %} + + + + + {% for email, order in delivery.orders.items() %} + + + + + + {% endfor %} +
PersonneCommandeAjustement
{{ email }}{{ order[product].wanted }}
PersonneCommandeAjustement
{{ email }}{{ order[product].wanted }}
diff --git a/copanier/templates/delivery.html b/copanier/templates/delivery.html index 349459b..5451311 100644 --- a/copanier/templates/delivery.html +++ b/copanier/templates/delivery.html @@ -5,7 +5,7 @@ {% include "includes/delivery_head.html" %}
- + @@ -24,6 +24,8 @@ {% endfor %} + + {% for product in delivery.products %} diff --git a/copanier/templates/place_order.html b/copanier/templates/place_order.html index b5d5a11..922c505 100644 --- a/copanier/templates/place_order.html +++ b/copanier/templates/place_order.html @@ -6,6 +6,7 @@ {% include "includes/delivery_head.html" %}
Référence Produit
{{ product.ref }}
+ @@ -13,7 +14,10 @@ {% endif %} - {% if delivery.status == delivery.ADJUSTMENT %}{% endif %} + {% if delivery.status == delivery.ADJUSTMENT %}{% endif %} + + + {% for product in delivery.products %} {% endfor %} +
Produit PrixConditionnementQuantitéAjustement
Ajustement
{{ product }} @@ -33,6 +37,7 @@ {% endif %}

Total: {{ order.total(delivery.products) if order else 0 }} €

{% if delivery.is_passed %}