diff --git a/cotisations/templates/cotisations/aff_article.html b/cotisations/templates/cotisations/aff_article.html index 6951e4e6..91c37e81 100644 --- a/cotisations/templates/cotisations/aff_article.html +++ b/cotisations/templates/cotisations/aff_article.html @@ -1,10 +1,10 @@ - + - + @@ -14,8 +14,16 @@ - + {% endfor %}
Nom de l'articleArticle Prix CotisationDurée (en mois)Durée (mois)
{{ article.prix }} {{ article.cotisation }} {{ article.duration }}{% if is_trez %} Editer{% endif %} - Historique + {% if is_trez %} + + + + {% endif %} + + + +
diff --git a/cotisations/templates/cotisations/aff_banque.html b/cotisations/templates/cotisations/aff_banque.html index 4a4a9de5..73f88256 100644 --- a/cotisations/templates/cotisations/aff_banque.html +++ b/cotisations/templates/cotisations/aff_banque.html @@ -8,8 +8,16 @@ {% for banque in banque_list %} {{ banque.name }} - {% if is_trez %} Editer{% endif %} - Historique + + {% if is_trez %} + + + + {% endif %} + + + + {% endfor %} diff --git a/cotisations/templates/cotisations/aff_cotisations.html b/cotisations/templates/cotisations/aff_cotisations.html index 744fb5bc..73907e34 100644 --- a/cotisations/templates/cotisations/aff_cotisations.html +++ b/cotisations/templates/cotisations/aff_cotisations.html @@ -1,5 +1,5 @@ {% if facture_list.paginator %} -{% include "pagination.html" with list=facture_list %} +{% include "pagination.html" with list=facture_list %} {% endif %} @@ -10,8 +10,8 @@ - - + + @@ -23,22 +23,38 @@ {% if is_cableur %} - + + + {% endif %} - - + + {% endfor %}
Prix total Moyen de paiement Date
{{ facture.paiement }} {{ facture.date }}
+
+
{% if facture.valid %} PDF{% else %}Facture invalide{% endif %} Historique + {% if facture.valid %} + + + PDF + + {% else %} + Facture invalide + {% endif %} + + + + +
diff --git a/cotisations/templates/cotisations/aff_paiement.html b/cotisations/templates/cotisations/aff_paiement.html index 3c678ae3..0a952d64 100644 --- a/cotisations/templates/cotisations/aff_paiement.html +++ b/cotisations/templates/cotisations/aff_paiement.html @@ -8,8 +8,16 @@ {% for paiement in paiement_list %} {{ paiement.moyen }} - {% if is_trez %} Editer{% endif %} - Historique + + {% if is_trez %} + + + + {% endif %} + + + + {% endfor %} diff --git a/cotisations/templates/cotisations/sidebar.html b/cotisations/templates/cotisations/sidebar.html index 11475ceb..3c12954f 100644 --- a/cotisations/templates/cotisations/sidebar.html +++ b/cotisations/templates/cotisations/sidebar.html @@ -1,10 +1,30 @@ {% extends "base.html" %} {% block sidebar %} -

Liste des factures

-

Liste des articles en vente

-

Liste des banques

-

Liste des moyens de paiement

- {% if is_trez %}

Controler les factures

-

Créer une nouvelle facture

{% endif %} + {% if is_trez %} + + + Créer une facture + + + + Contrôler les factures + + {% endif %} + + + Factures + + + + Articles en vente + + + + Banques + + + + Moyens de paiement + {% endblock %} diff --git a/logs/templates/logs/aff_actions.html b/logs/templates/logs/aff_actions.html index 798f4224..ee6a85f9 100644 --- a/logs/templates/logs/aff_actions.html +++ b/logs/templates/logs/aff_actions.html @@ -12,17 +12,24 @@ Modification par Date de modification Commentaire - + - {% for revision in revisions_list %} + {% for revision in revisions_list %} {% for reversion in revision.version_set.all %}{{ reversion.object|truncatechars:20 }}{% endfor %} {% for reversion in revision.version_set.all %}{{ reversion.object|classname }}{% endfor %} {{ revision.user }} {{ revision.date_created }} {{ revision.comment }} - {% if is_bureau %}Annuler

{% endif %} - + {% if is_bureau %} + + + + Annuler + + + {% endif %} + {% endfor %} diff --git a/logs/templates/logs/sidebar.html b/logs/templates/logs/sidebar.html index dc0e2ff6..dc4a2bf1 100644 --- a/logs/templates/logs/sidebar.html +++ b/logs/templates/logs/sidebar.html @@ -2,8 +2,21 @@ {% block sidebar %} {% if is_cableur %} -

Statistiques base de donnée

-

Statistiques des actions de cablage

-

Statistiques utilisateurs

+ + + Évènements + + + + Base de données + + + + Actions de cablage + + + + Utilisateurs + {% endif %} {% endblock %} diff --git a/machines/templates/machines/aff_extension.html b/machines/templates/machines/aff_extension.html index c0ca761f..1ae5ef8c 100644 --- a/machines/templates/machines/aff_extension.html +++ b/machines/templates/machines/aff_extension.html @@ -3,14 +3,17 @@ Extension - {% for extension in extension_list %} {{ extension.name }} - {% if is_infra %} Editer{% endif %} - Historique + + {% if is_infra %} + {% include 'buttons/edit.html' with href='machines:edit-extension' id=extension.id %} + {% endif %} + {% include 'buttons/history.html' with href='machines:history' name='extension' id=extension.id %} + {% endfor %} diff --git a/machines/templates/machines/aff_iptype.html b/machines/templates/machines/aff_iptype.html index 5343b890..04496540 100644 --- a/machines/templates/machines/aff_iptype.html +++ b/machines/templates/machines/aff_iptype.html @@ -17,8 +17,12 @@ {{ type.need_infra }} {{ type.domaine_ip }} {{ type.domaine_range }} - {% if is_infra %} Editer{% endif %} - Historique + + {% if is_infra %} + {% include 'buttons/edit.html' with href='machines:edit-iptype' id=type.id %} + {% endif %} + {% include 'buttons/history.html' with href='machines:history' name='iptype' id=type.id %} + {% endfor %} diff --git a/machines/templates/machines/aff_machines.html b/machines/templates/machines/aff_machines.html index 035710d8..227fef1e 100644 --- a/machines/templates/machines/aff_machines.html +++ b/machines/templates/machines/aff_machines.html @@ -19,15 +19,9 @@ {% if forloop.first %} - - - - - - - - - + {% include 'buttons/add.html' with href='machines:new-interface' id=machine.id desc='Ajouter une interface' %} + {% include 'buttons/suppr.html' with href='machines:del-machine' id=machine.id %} + {% include 'buttons/history.html' with href='machines:history' name='machine' id=machine.id %}

{{ machine.user }} diff --git a/machines/templates/machines/aff_machinetype.html b/machines/templates/machines/aff_machinetype.html index 7c5055b3..4c7dc284 100644 --- a/machines/templates/machines/aff_machinetype.html +++ b/machines/templates/machines/aff_machinetype.html @@ -4,15 +4,18 @@ Type de machine Type d'ip correspondant - {% for type in machinetype_list %} {{ type.type }} {{ type.ip_type }} - {% if is_infra %} Editer{% endif %} - Historique + + {% if is_infra %} + {% include 'buttons/edit.html' with href='machines:edit-machinetype' id=type.id %} + {% endif %} + {% include 'buttons/history.html' with href='machines:history' name='machinetype' id=type.id %} + {% endfor %} diff --git a/machines/templates/machines/sidebar.html b/machines/templates/machines/sidebar.html index 80650a2d..2f4ae051 100644 --- a/machines/templates/machines/sidebar.html +++ b/machines/templates/machines/sidebar.html @@ -2,8 +2,21 @@ {% block sidebar %} {% if is_cableur %} -

Liste des types de machine

-

Liste des types des extensions

-

Liste des types d'ip

+ + + Machines + + + + Types de machines + + + + Extensions (zones) + + + + Plages d'IP + {% endif %} {% endblock %} diff --git a/search/templates/search/sidebar.html b/search/templates/search/sidebar.html index a55edd13..8f0eb436 100644 --- a/search/templates/search/sidebar.html +++ b/search/templates/search/sidebar.html @@ -1,6 +1,12 @@ {% extends "base.html" %} {% block sidebar %} -

Recherche simple

-

Recherche avancée

+ + + Recherche simple + + + + Recherche avancée + {% endblock %} diff --git a/templates/base.html b/templates/base.html index b2dd1d2a..b43fca28 100644 --- a/templates/base.html +++ b/templates/base.html @@ -70,8 +70,12 @@
- {% block sidebar %} - {% endblock %} +
+
+ {% block sidebar %} + {% endblock %} +
+
{# Display django.contrib.messages as Bootstrap alerts #} diff --git a/templates/buttons/add.html b/templates/buttons/add.html new file mode 100644 index 00000000..800ae709 --- /dev/null +++ b/templates/buttons/add.html @@ -0,0 +1,3 @@ + + + diff --git a/templates/buttons/edit.html b/templates/buttons/edit.html new file mode 100644 index 00000000..fc89669b --- /dev/null +++ b/templates/buttons/edit.html @@ -0,0 +1,3 @@ + + + diff --git a/templates/buttons/history.html b/templates/buttons/history.html new file mode 100644 index 00000000..4e3c9468 --- /dev/null +++ b/templates/buttons/history.html @@ -0,0 +1,4 @@ + + + + diff --git a/templates/buttons/suppr.html b/templates/buttons/suppr.html new file mode 100644 index 00000000..b2413b1a --- /dev/null +++ b/templates/buttons/suppr.html @@ -0,0 +1,3 @@ + + + diff --git a/topologie/templates/topologie/aff_chambres.html b/topologie/templates/topologie/aff_chambres.html index b77ddbcc..10747590 100644 --- a/topologie/templates/topologie/aff_chambres.html +++ b/topologie/templates/topologie/aff_chambres.html @@ -10,9 +10,19 @@ {{room.name}} {{room.details}} - {% if is_infra %} Editer - Supprimer{% endif %} - Historique + + + + + {% if is_infra %} + + + + + + + {% endif %} + {% endfor %} diff --git a/topologie/templates/topologie/aff_port.html b/topologie/templates/topologie/aff_port.html index bb0b7a3a..53958f69 100644 --- a/topologie/templates/topologie/aff_port.html +++ b/topologie/templates/topologie/aff_port.html @@ -11,13 +11,21 @@ {% for port in port_list %} - {{ port.port }} - {{ port.room }} - {{ port.machine_interface }} - {{ port.related }} - {{ port.details }} - {% if is_infra %} Editer{% endif %} - Historique + {{ port.port }} + {{ port.room }} + {{ port.machine_interface }} + {{ port.related }} + {{ port.details }} + + + + + {% if is_infra %} + + + + {% endif %} + {% endfor %} diff --git a/topologie/templates/topologie/aff_switch.html b/topologie/templates/topologie/aff_switch.html index 1b962bed..6fb20e74 100644 --- a/topologie/templates/topologie/aff_switch.html +++ b/topologie/templates/topologie/aff_switch.html @@ -4,20 +4,27 @@ Dns Ipv4 Localisation - Nombre de ports + Ports Détails {% for switch in switch_list %} - {{switch.switch_interface.dns}} + + + {{switch.switch_interface.dns}} + + {{switch.switch_interface.ipv4}} {{switch.location}} {{switch.number}} {{switch.details}} - Configurer - Historique + + + + + {% endfor %} diff --git a/topologie/templates/topologie/sidebar.html b/topologie/templates/topologie/sidebar.html index bb8f906a..33372351 100644 --- a/topologie/templates/topologie/sidebar.html +++ b/topologie/templates/topologie/sidebar.html @@ -1,6 +1,12 @@ {% extends "base.html" %} {% block sidebar %} -

Liste des switchs

-

Liste des chambres

+ + + Chambres + + + + Switchs + {% endblock %} diff --git a/users/templates/users/aff_bans.html b/users/templates/users/aff_bans.html index 9db5ef0e..0f76a2c2 100644 --- a/users/templates/users/aff_bans.html +++ b/users/templates/users/aff_bans.html @@ -10,7 +10,6 @@ Date de début Date de fin - {% for ban in ban_list %} @@ -19,8 +18,12 @@ {{ ban.raison }} {{ ban.date_start }} {{ ban.date_end }} - {% if is_bofh %} Editer{% endif %} - Historique + + {% if is_bofh %} + {% include 'buttons/edit.html' with href='users:edit-ban' id=ban.id %} + {% endif %} + {% include 'buttons/history.html' with href='users:history' name='ban' id=ban.id %} + {% endfor %} diff --git a/users/templates/users/aff_listright.html b/users/templates/users/aff_listright.html index 109dc1ff..20e4ad33 100644 --- a/users/templates/users/aff_listright.html +++ b/users/templates/users/aff_listright.html @@ -11,8 +11,10 @@ {{ listright.listright }} {{ listright.gid }} - Editer - Historique + + {% include 'buttons/edit.html' with href='users:edit-listright' id=listright.id %} + {% include 'buttons/history.html' with href='users:history' name='listright' id=listright.id %} + {% endfor %} diff --git a/users/templates/users/aff_schools.html b/users/templates/users/aff_schools.html index ed2e524b..a03e9e68 100644 --- a/users/templates/users/aff_schools.html +++ b/users/templates/users/aff_schools.html @@ -3,14 +3,15 @@ Etablissement - {% for school in school_list %} {{ school.name }} - Editer - Historique + + {% include 'buttons/edit.html' with href='users:edit-school' id=school.id %} + {% include 'buttons/history.html' with href='users:history' name='school' id=school.id %} + {% endfor %} diff --git a/users/templates/users/aff_whitelists.html b/users/templates/users/aff_whitelists.html index 426a99c2..13a046bb 100644 --- a/users/templates/users/aff_whitelists.html +++ b/users/templates/users/aff_whitelists.html @@ -6,7 +6,6 @@ Date de début Date de fin - {% for whitelist in white_list %} @@ -15,8 +14,12 @@ {{ whitelist.raison }} {{ whitelist.date_start }} {{ whitelist.date_end }} - {% if is_cableur %} Editer{% endif %} - Historique + + {% if is_cableur %} + {% include 'buttons/edit.html' with href='users:edit-whitelist' id=whitelist.id %} + {% endif %} + {% include 'buttons/history.html' with href='users:history' name='whitelist' id=whitelist.id %} + {% endfor %} diff --git a/users/templates/users/sidebar.html b/users/templates/users/sidebar.html index 9461ac1f..12d0ed2a 100644 --- a/users/templates/users/sidebar.html +++ b/users/templates/users/sidebar.html @@ -2,14 +2,35 @@ {% block sidebar %} {% if is_cableur %} -

Créer un adhérent

-

Liste des adhérents

-

Liste des bannissements

-

Liste des accès à titre gracieux

-

Liste des établissements

-

Liste des droits

- {% if is_bureau %} -

Retirer un droit

- {% endif %} + + + Créer un adhérent + + + + Adhérents + + + + Bannissements + + + + Accès à titre gracieux + + + + Établissements + + + + Droits + + {% if is_bureau %} + + + Retirer un droit + + {% endif %} {% endif %} {% endblock %}