diff --git a/kfet/static/kfet/css/index.css b/kfet/static/kfet/css/index.css
index 8f1588cf..886aa8ae 100644
--- a/kfet/static/kfet/css/index.css
+++ b/kfet/static/kfet/css/index.css
@@ -13,6 +13,10 @@ h1,h2,h3,h4,h5,h6 {
font-family:Oswald;
}
+a {
+ color:#333;
+}
+
a:focus, a:hover {
color:#C8102E;
}
@@ -21,6 +25,50 @@ a:focus, a:hover {
outline:none;
}
+textarea {
+ font-family:'Roboto Mono';
+ border-radius:0 !important;
+}
+
+.table {
+ margin-bottom:0;
+}
+
+.table {
+ width:100%;
+}
+
+.table td {
+ vertical-align:middle !important;
+}
+
+.table td.no-padding {
+ padding:0;
+}
+
+.table thead {
+ background:#c8102e;
+ color:#fff;
+ font-weight:bold;
+ font-size:16px;
+}
+
+.table thead td {
+ padding:8px !important;
+}
+
+.table tr.section {
+ background:rgba(200,16,46,0.9);
+ color:#fff;
+ font-weight:bold;
+}
+
+.table tr.section td {
+ border-top:0;
+ font-size:16px;
+ padding:8px 30px;
+}
+
.btn, .btn-lg, .btn-group-lg>.btn {
border-radius:0;
}
@@ -141,13 +189,3 @@ a:focus, a:hover {
padding-left: 20px;
font-size:25px;
}
-
-.content-right-block table {
- width:100%;
-}
-
-.content-right-block table thead {
- background:#c8102e;
- color:#fff;
- font-weight:bold;
-}
diff --git a/kfet/templates/kfet/account.html b/kfet/templates/kfet/account.html
index b0123020..2f8bb6f0 100644
--- a/kfet/templates/kfet/account.html
+++ b/kfet/templates/kfet/account.html
@@ -26,14 +26,37 @@
Liste des comptes
-
-
- {% for account in accounts %}
- -
- {{ account }}
-
- {% endfor %}
-
+
+
+
+
+ |
+ Trigramme |
+ Nom |
+ Balance |
+ COF |
+ Dpt |
+ Promo |
+
+
+
+ {% for account in accounts %}
+
+
+
+
+
+ |
+ {{ account.trigramme }} |
+ {{ account.name }} |
+ {{ account.balance }}€ |
+ {{ account.is_cof }} |
+ {{ account.departement }} |
+ {{ account.promo }} |
+
+ {% endfor %}
+
+
diff --git a/kfet/templates/kfet/account_negative.html b/kfet/templates/kfet/account_negative.html
index 096fbcb2..77fdf118 100644
--- a/kfet/templates/kfet/account_negative.html
+++ b/kfet/templates/kfet/account_negative.html
@@ -32,40 +32,44 @@
Liste des comptes en négatifs
-
+
-
- |
- Tri |
- Nom |
- Balance |
- Réelle |
- Début |
- Découvert autorisé |
- Jusqu'au |
- Balance offset |
-
- {% for neg in negatives %}
+
-
-
-
-
- |
- {{ neg.account.trigramme }} |
- {{ neg.account.name }} |
- {{ neg.account.balance|floatformat:2 }}€ |
-
- {% if neg.account.balance_offset %}
- {{ neg.account.real_balance|floatformat:2 }}€
- {% endif %}
- |
- {{ neg.start|date:'d/m/Y H:i:s'}} |
- {{ neg.authz_overdraft_amount|default_if_none:'' }} |
- {{ neg.authz_overdrafy_until|default_if_none:'' }} |
- {{ neg.balance_offset|default_if_none:'' }} |
+ |
+ Tri |
+ Nom |
+ Balance |
+ Réelle |
+ Début |
+ Découvert autorisé |
+ Jusqu'au |
+ Balance offset |
- {% endfor %}
+
+
+ {% for neg in negatives %}
+
+
+
+
+
+ |
+ {{ neg.account.trigramme }} |
+ {{ neg.account.name }} |
+ {{ neg.account.balance|floatformat:2 }}€ |
+
+ {% if neg.account.balance_offset %}
+ {{ neg.account.real_balance|floatformat:2 }}€
+ {% endif %}
+ |
+ {{ neg.start|date:'d/m/Y H:i:s'}} |
+ {{ neg.authz_overdraft_amount|default_if_none:'' }} |
+ {{ neg.authz_overdrafy_until|default_if_none:'' }} |
+ {{ neg.balance_offset|default_if_none:'' }} |
+
+ {% endfor %}
+
diff --git a/kfet/templates/kfet/article.html b/kfet/templates/kfet/article.html
index 387806bd..1d0a86fd 100644
--- a/kfet/templates/kfet/article.html
+++ b/kfet/templates/kfet/article.html
@@ -24,36 +24,36 @@
Liste des articles
-
-
+
+
|
Nom |
- Prix |
- Stock |
- En vente |
- Dernier inventaire |
+ Prix |
+ Stock |
+ En vente |
+ Dernier inventaire |
{% for article in articles %}
{% ifchanged article.category %}
-
+
{{ article.category.name }} |
{% endifchanged %}
-
+ |
|
{{ article.name }} |
- {{ article.price }} |
- {{ article.stock }} |
- {{ article.is_sold }} |
- {{ article.inventory.0.at }} |
+ {{ article.price }}€ |
+ {{ article.stock }} |
+ {{ article.is_sold }} |
+ {{ article.inventory.0.at }} |
{% endfor %}
diff --git a/kfet/templates/kfet/base.html b/kfet/templates/kfet/base.html
index 22e4e9cb..c1db0c26 100644
--- a/kfet/templates/kfet/base.html
+++ b/kfet/templates/kfet/base.html
@@ -9,7 +9,7 @@
{# CSS #}
-
+
diff --git a/kfet/templates/kfet/checkout.html b/kfet/templates/kfet/checkout.html
index 55db6136..fb2d10a7 100644
--- a/kfet/templates/kfet/checkout.html
+++ b/kfet/templates/kfet/checkout.html
@@ -9,7 +9,8 @@
-
{{ checkouts|length }} caisses
+
{{ checkouts|length }}
+
caisse{{ checkouts|length|pluralize }}
diff --git a/kfet/templates/kfet/inventory.html b/kfet/templates/kfet/inventory.html
index bb1614ab..4f74b31e 100644
--- a/kfet/templates/kfet/inventory.html
+++ b/kfet/templates/kfet/inventory.html
@@ -22,11 +22,12 @@
Liste des inventaires
-
-
+
+
- Date/Heure |
+ |
+ Date |
Par |
Nb articles |
Commande |
@@ -35,6 +36,11 @@
{% for inventory in inventories %}
+
+
+
+
+ |
{{ inventory.at }} |
{{ inventory.by.trigramme }} |
{{ inventory.nb_articles }} |
diff --git a/kfet/templates/kfet/order.html b/kfet/templates/kfet/order.html
index d9441c15..f52e41a1 100644
--- a/kfet/templates/kfet/order.html
+++ b/kfet/templates/kfet/order.html
@@ -19,8 +19,8 @@
Fournisseurs
-
-
+
+
|
@@ -33,12 +33,12 @@
{% for supplier in suppliers %}
-
+ |
Passer une commande
|
-
+ |
@@ -56,26 +56,38 @@
Liste des commandes
-
-
- {% for order in orders %}
+
diff --git a/kfet/templates/kfet/order_read.html b/kfet/templates/kfet/order_read.html
index 26bdbbdc..f7436a22 100644
--- a/kfet/templates/kfet/order_read.html
+++ b/kfet/templates/kfet/order_read.html
@@ -19,8 +19,8 @@
Détails
-
-
+
+
Article |
@@ -32,7 +32,7 @@
{% for orderart in orderarts %}
{% ifchanged orderart.article.category %}
-
+
{{ orderart.article.category.name }} |
{% endifchanged %}
@@ -57,7 +57,7 @@
|