diff --git a/kfet/static/kfet/css/index.css b/kfet/static/kfet/css/index.css index 0740655f..15b425e2 100644 --- a/kfet/static/kfet/css/index.css +++ b/kfet/static/kfet/css/index.css @@ -257,13 +257,13 @@ textarea { padding:0px 5px; } -.content-center .table .form-control { +.table .form-control { padding: 1px 12px ; height:28px; margin:3px 0px; } -.content-center .table-condensed input.form-control { +.table-condensed input.form-control { margin: 0 !important; border-top: 0; border-bottom: 0; @@ -630,3 +630,27 @@ thead .tooltip { font-weight: normal; margin-bottom: 0; } + +/* Statement creation */ + +.statement-create-summary table { + margin: 0 auto; +} + +.statement-create-summary tr td { + text-align: right; +} + +.statement-create-summary tr td:first-child { + padding-right: 15px; + font-weight: bold; +} + +.statement-create-summary tr td:last-child { + width: 80px; +} + +#detail_taken table td, +#detail_balance table td { + padding: 0; +} diff --git a/kfet/static/kfet/css/nav.css b/kfet/static/kfet/css/nav.css index 3a4edd82..a4dabed2 100644 --- a/kfet/static/kfet/css/nav.css +++ b/kfet/static/kfet/css/nav.css @@ -51,15 +51,6 @@ box-shadow: inset 0 5px 5px -5px #000; } -@media (max-width: 767px) { - .navbar-nav > li:hover > a, - .navbar-nav > li > a:focus, - .nav .open > a:hover, - .nav .open > a:focus { - box-shadow: inset 0 5px 5px -5px #000, inset 0 -5px 5px -5px #000; - } -} - .navbar-nav .dropdown .dropdown-menu { padding: 0; border: 0; diff --git a/kfet/templates/kfet/account.html b/kfet/templates/kfet/account.html index 76445e73..c8d9b4f9 100644 --- a/kfet/templates/kfet/account.html +++ b/kfet/templates/kfet/account.html @@ -1,67 +1,61 @@ -{% extends "kfet/base.html" %} +{% extends "kfet/base_col_2.html" %} {% block title %}Liste des comptes{% endblock %} -{% block content-header-title %}Comptes{% endblock %} +{% block header-title %}Comptes{% endblock %} -{% block content %} +{% block fixed-content %} -
-
-
-
-
{{ accounts|length|add:-1 }}
-
compte{{ accounts|length|add:-1|pluralize }}
-
-
- Créer un compte - {% if perms.kfet.manage_perms %} - Permissions - {% endif %} - {% if perms.kfet.view_negs %} - Négatifs - {% endif %} -
-
-
-
- {% include 'kfet/base_messages.html' %} -
-
-

Liste des comptes

-
- - - - - - - - - - - - - - {% for account in accounts %} - - - - - - - - - - {% endfor %} - -
TrigrammeNomBalanceCOFDptPromo
- - - - {{ account.trigramme }}{{ account.name }}{{ account.balance }}€{{ account.is_cof }}{{ account.departement }}{{ account.promo|default_if_none:'' }}
-
-
-
+
+
{{ accounts|length|add:-1 }}
+
compte{{ accounts|length|add:-1|pluralize }}
+
+
+ Créer un compte + {% if perms.kfet.manage_perms %} + Permissions + {% endif %} + {% if perms.kfet.view_negs %} + Négatifs + {% endif %} +
+ +{% endblock %} + +{% block main-content %} + +
+

Liste des comptes

+
+ + + + + + + + + + + + + + {% for account in accounts %} + + + + + + + + + + {% endfor %} + +
TrigrammeNomBalanceCOFDptPromo
+ + + + {{ account.trigramme }}{{ account.name }}{{ account.balance }}€{{ account.is_cof|yesno:"Oui,Non" }}{{ account.departement }}{{ account.promo|default_if_none:'' }}
diff --git a/kfet/templates/kfet/account_create.html b/kfet/templates/kfet/account_create.html index 1278a54b..b9e050b4 100644 --- a/kfet/templates/kfet/account_create.html +++ b/kfet/templates/kfet/account_create.html @@ -1,45 +1,39 @@ -{% extends "kfet/base.html" %} +{% extends "kfet/base_col_1.html" %} {% load staticfiles %} {% block title %}Nouveau compte{% endblock %} +{% block header-title %}Création d'un compte{% endblock %} {% block extra_head %} {% endblock %} -{% block content-header-title %}Création d'un compte{% endblock %} +{% block main-class %}content-form{% endblock %} -{% block content %} +{% block main-content %} -{% include 'kfet/base_messages.html' %} - -
-
-
- -
+
+
+

Les mots contenant des caractères non alphanumériques seront ignorés

+ +
+
+
+
+
+ {% include 'kfet/account_create_form.html' %} +
+ {% if not perms.kfet.add_account %} + {% include 'kfet/form_authentication_snippet.html' %} + {% endif %} +
+ + {% endblock %} -{% block content-header-title %}Création d'un compte{% endblock %} +{% block main-class %}content-form{% endblock %} -{% block content %} +{% block main-content %} -
-
- {% include 'kfet/base_messages.html' %} -
- -
+
+
+ +
+
+
+
+
+ {% include 'kfet/account_create_form.html' %} +
+ {% if not perms.kfet.add_account %} + {% include 'kfet/form_authentication_snippet.html' %} + {% endif %} +
+ {% endblock %} -{% block title %}Informations sur l'article {{ article }}{% endblock %} -{% block content-header-title %}Article - {{ article.name }}{% endblock %} +{% block title %}Article - {{ article.name }}{% endblock %} +{% block header-title %}Informations sur l'article {{ article.name }}{% endblock %} -{% block content %} +{% block fixed-content %} -
-
-
-
-
{{ article.name }}
-
{{ article.category }}
-
-
Prix (hors réduc.): {{ article.price }}€
-
Stock: {{ article.stock }}
-
En vente: {{ article.is_sold | yesno:"Oui,Non" }}
-
Affiché: {{ article.hidden | yesno:"Non,Oui" }}
-
-
-
- - Modifier - -
-
+
+
{{ article.name }}
+
{{ article.category }}
+
+
Prix (hors réduc.): {{ article.price }}€
+
Stock: {{ article.stock }}
+
En vente: {{ article.is_sold | yesno:"Oui,Non" }}
+
Affiché: {{ article.hidden | yesno:"Non,Oui" }}
-
- {% include 'kfet/base_messages.html' %} -
-
-

Historique

-
-
-

Inventaires

- - - - - - - - - - {% for inventoryart in inventoryarts %} - - - - - - {% endfor %} - -
DateStockErreur
{{ inventoryart.inventory.at }}{{ inventoryart.stock_new }}{{ inventoryart.stock_error }}
-
-
-

Prix fournisseurs

- - - - - - - - - - - - {% for supplierart in supplierarts %} - - - - - - - - {% endfor %} - -
DateFournisseurHTTVADroits
{{ supplierart.at }}{{ supplierart.supplier.name }}{{ supplierart.price_HT }}{{ supplierart.TVA }}{{ supplierart.rights }}
-
-
-
-
-

Statistiques

-
-
-
-

Ventes de {{ article.name }}

-
-
-
-
+
+
+ + Modifier + +
+ +{% endblock %} + +{% block main-content %} + +
+

Historique

+
+
+

Inventaires

+ + + + + + + + + + {% for inventoryart in inventoryarts %} + + + + + + {% endfor %} + +
DateStockErreur
{{ inventoryart.inventory.at }}{{ inventoryart.stock_new }}{{ inventoryart.stock_error }}
+
+
+

Prix fournisseurs

+
+ + + + + + + + + + + + {% for supplierart in supplierarts %} + + + + + + + + {% endfor %} + +
DateFournisseurHTTVADroits
{{ supplierart.at }}{{ supplierart.supplier.name }}{{ supplierart.price_HT }}{{ supplierart.TVA }}{{ supplierart.rights }}
+
+
+
+

Statistiques

+
+

Ventes

+
diff --git a/kfet/templates/kfet/article_update.html b/kfet/templates/kfet/article_update.html index 65ccec3b..d451df94 100644 --- a/kfet/templates/kfet/article_update.html +++ b/kfet/templates/kfet/article_update.html @@ -1,9 +1,11 @@ -{% extends 'kfet/base.html' %} +{% extends "kfet/base_col_1.html" %} -{% block title %}Édition de l'article {{ article.name }}{% endblock %} -{% block content-header-title %}Article {{ article.name }} - Édition{% endblock %} +{% block title %}{{ article.name }} - Édition{% endblock %} +{% block header-title %}Édition de l'article {{ article.name }}{% endblock %} -{% block content %} +{% block main-class %}content-form{% endblock %} + +{% block main-content %} {% include "kfet/base_form.html" with authz=perms.kfet.change_article submit_text="Mettre à jour"%} diff --git a/kfet/templates/kfet/base.html b/kfet/templates/kfet/base.html index 173a5fb7..da37abae 100644 --- a/kfet/templates/kfet/base.html +++ b/kfet/templates/kfet/base.html @@ -30,12 +30,12 @@ {% include "kfet/base_nav.html" %}
- {% block content-header %} -
-
-

{% block content-header-title %}{% endblock %}

-
+ {% block header %} +
+
+

{% block header-title %}{% endblock %}

+
{% endblock %} {% block content %}{% endblock %} {% include "kfet/base_footer.html" %} diff --git a/kfet/templates/kfet/base_col_1.html b/kfet/templates/kfet/base_col_1.html new file mode 100644 index 00000000..a4c26b82 --- /dev/null +++ b/kfet/templates/kfet/base_col_1.html @@ -0,0 +1,14 @@ +{% extends "kfet/base.html" %} + +{% block content %} + +
+
+ {% include "kfet/base_messages.html" %} +
+ {% block main-content %}{% endblock %} +
+
+
+ +{% endblock %} diff --git a/kfet/templates/kfet/base_col_2.html b/kfet/templates/kfet/base_col_2.html new file mode 100644 index 00000000..58c36d14 --- /dev/null +++ b/kfet/templates/kfet/base_col_2.html @@ -0,0 +1,19 @@ +{% extends "kfet/base.html" %} + +{% block content %} + +
+
+
+ {% block fixed-content %}{% endblock %} +
+
+
+ {% include "kfet/base_messages.html" %} +
+ {% block main-content %}{% endblock %} +
+
+
+ +{% endblock %} diff --git a/kfet/templates/kfet/base_form.html b/kfet/templates/kfet/base_form.html index 9fe79e32..1ac4c81b 100644 --- a/kfet/templates/kfet/base_form.html +++ b/kfet/templates/kfet/base_form.html @@ -1,17 +1,10 @@ {% load kfet_tags %} -
-
- {% include "kfet/base_messages.html" %} -
-
- {% csrf_token %} - {% include "kfet/form_snippet.html" %} - {% if not authz %} - {% include "kfet/form_authentication_snippet.html" %} - {% endif %} - {% include "kfet/form_submit_snippet.html" with value=submit_text %} -
-
-
-
+
+ {% csrf_token %} + {% include "kfet/form_snippet.html" %} + {% if not authz %} + {% include "kfet/form_authentication_snippet.html" %} + {% endif %} + {% include "kfet/form_submit_snippet.html" with value=submit_text %} +
diff --git a/kfet/templates/kfet/category.html b/kfet/templates/kfet/category.html index 5393bf59..b7797c49 100644 --- a/kfet/templates/kfet/category.html +++ b/kfet/templates/kfet/category.html @@ -1,52 +1,46 @@ -{% extends 'kfet/base.html' %} +{% extends "kfet/base_col_2.html" %} {% block title %}Categories d'articles{% endblock %} -{% block content-header-title %}Categories d'articles{% endblock %} +{% block header-title %}Categories d'articles{% endblock %} -{% block content %} +{% block fixed-content %} -
-
-
-
-
{{ categories|length }}
-
catégorie{{ categories|length|pluralize }}
-
-
-
-
- {% include 'kfet/base_messages.html' %} -
-
-

Liste des catégories

-
- - - - - - - - - - - {% for category in categories %} - - - - - - - {% endfor %} - -
NomNombre d'articlesPeut être majorée
- - - - {{ category.name }}{{ category.articles.all|length }}{{ category.has_addcost | yesno:"Oui,Non"}}
-
-
-
+
+
{{ categories|length }}
+
catégorie{{ categories|length|pluralize }}
+
+ +{% endblock %} + +{% block main-content %} + +
+

Liste des catégories

+
+ + + + + + + + + + + {% for category in categories %} + + + + + + + {% endfor %} + +
NomNombre d'articlesPeut être majorée
+ + + + {{ category.name }}{{ category.articles.all|length }}{{ category.has_addcost | yesno:"Oui,Non"}}
diff --git a/kfet/templates/kfet/category_update.html b/kfet/templates/kfet/category_update.html index af213e71..c535a31d 100644 --- a/kfet/templates/kfet/category_update.html +++ b/kfet/templates/kfet/category_update.html @@ -1,9 +1,11 @@ -{% extends 'kfet/base.html' %} +{% extends "kfet/base_col_1.html" %} -{% block title %}Édition de la catégorie {{ category.name }}{% endblock %} -{% block content-header-title %}Catégorie {{ category.name }} - Édition{% endblock %} +{% block title %}{{ articlecategory.name }} - Édition{% endblock %} +{% block header-title %}Édition de la catégorie {{ articlecategory.name }}{% endblock %} -{% block content %} +{% block main-class %}content-form{% endblock %} + +{% block main-content %} {% include "kfet/base_form.html" with authz=perms.kfet.edit_articlecategory submit_text="Enregistrer"%} diff --git a/kfet/templates/kfet/checkout.html b/kfet/templates/kfet/checkout.html index fb2d10a7..329b8bef 100644 --- a/kfet/templates/kfet/checkout.html +++ b/kfet/templates/kfet/checkout.html @@ -1,59 +1,53 @@ -{% extends "kfet/base.html" %} +{% extends "kfet/base_col_2.html" %} -{% block title %}Liste des caisses{% endblock %} -{% block content-header-title %}Caisses{% endblock %} +{% block title %}Caisses{% endblock %} +{% block header-title %}Caisses{% endblock %} -{% block content %} +{% block fixed-content %} -
-
-
-
-
{{ checkouts|length }}
-
caisse{{ checkouts|length|pluralize }}
-
-
- Créer une caisse -
-
-
-
- {% include 'kfet/base_messages.html' %} -
-
-

Liste des caisses

-
- - - - - - - - - - - - - {% for checkout in checkouts %} - - - - - - - - - {% endfor %} - -
NomBalanceDéb. valid.Fin valid.Protégée
- - - - {{ checkout.name }}{{ checkout.balance}}€{{ checkout.valid_from }}{{ checkout.valid_to }}{{ checkout.is_protected }}
-
-
-
+
+
{{ checkouts|length }}
+
caisse{{ checkouts|length|pluralize }}
+
+
+ Créer une caisse +
+ +{% endblock %} + +{% block main-content %} + +
+

Liste des caisses

+
+ + + + + + + + + + + + + {% for checkout in checkouts %} + + + + + + + + + {% endfor %} + +
NomBalanceDéb. valid.Fin valid.Protégée
+ + + + {{ checkout.name }}{{ checkout.balance}}€{{ checkout.valid_from }}{{ checkout.valid_to }}{{ checkout.is_protected }}
diff --git a/kfet/templates/kfet/checkout_create.html b/kfet/templates/kfet/checkout_create.html index 0f254f65..bed1b6ef 100644 --- a/kfet/templates/kfet/checkout_create.html +++ b/kfet/templates/kfet/checkout_create.html @@ -1,28 +1,13 @@ -{% extends "kfet/base.html" %} +{% extends "kfet/base_col_1.html" %} {% block extra_head %}{{ form.media }}{% endblock %} {% block title %}Nouvelle caisse{% endblock %} -{% block content-header-title %}Création d'une caisse{% endblock %} +{% block header-title %}Création d'une caisse{% endblock %} -{% block content %} +{% block main-class %}content-form{% endblock %} +{% block main-content %} -{% include 'kfet/base_messages.html' %} -
- {% csrf_token %} - {{ form.non_field_errors}} - {% for field in form %} - {{ field.errors }} - {{ field.label_tag }} -
{{ field }}
- {% if field.help_text %} -

{{ field.help_text|safe }}

- {% endif %} - {% endfor %} - {% if not perms.kfet.add_checkout %} - - {% endif %} - -
+{% include "kfet/base_form.html" with authz=perms.kfet.add_checkout submit_text="Enregistrer" %}