From c4f26c4090c16a1677e4cd142fd70746dc49262c Mon Sep 17 00:00:00 2001 From: lhark Date: Wed, 16 Nov 2016 20:55:28 +0100 Subject: [PATCH] Various UI improvements --- .../templates/cotisations/aff_article.html | 2 +- .../templates/cotisations/aff_banque.html | 2 +- .../cotisations/aff_cotisations.html | 2 +- .../templates/cotisations/aff_paiement.html | 2 +- .../templates/machines/aff_extension.html | 2 +- machines/templates/machines/aff_iptype.html | 2 +- machines/templates/machines/aff_machines.html | 101 +++++++++++------- .../templates/machines/aff_machinetype.html | 2 +- users/templates/users/aff_bans.html | 2 +- users/templates/users/aff_listright.html | 2 +- users/templates/users/aff_schools.html | 2 +- users/templates/users/aff_whitelists.html | 2 +- users/templates/users/profil.html | 2 +- 13 files changed, 73 insertions(+), 52 deletions(-) diff --git a/cotisations/templates/cotisations/aff_article.html b/cotisations/templates/cotisations/aff_article.html index c238ba13..6951e4e6 100644 --- a/cotisations/templates/cotisations/aff_article.html +++ b/cotisations/templates/cotisations/aff_article.html @@ -15,7 +15,7 @@ {{ article.cotisation }} {{ article.duration }} {% if is_trez %} Editer{% endif %} - Historique + Historique {% endfor %} diff --git a/cotisations/templates/cotisations/aff_banque.html b/cotisations/templates/cotisations/aff_banque.html index 5e2c0eee..4a4a9de5 100644 --- a/cotisations/templates/cotisations/aff_banque.html +++ b/cotisations/templates/cotisations/aff_banque.html @@ -9,7 +9,7 @@ {{ banque.name }} {% if is_trez %} Editer{% endif %} - Historique + Historique {% endfor %} diff --git a/cotisations/templates/cotisations/aff_cotisations.html b/cotisations/templates/cotisations/aff_cotisations.html index 944c90fc..744fb5bc 100644 --- a/cotisations/templates/cotisations/aff_cotisations.html +++ b/cotisations/templates/cotisations/aff_cotisations.html @@ -38,7 +38,7 @@ {% endif %} {% if facture.valid %} PDF{% else %}Facture invalide{% endif %} - Historique + Historique {% endfor %} diff --git a/cotisations/templates/cotisations/aff_paiement.html b/cotisations/templates/cotisations/aff_paiement.html index c6d838b7..3c678ae3 100644 --- a/cotisations/templates/cotisations/aff_paiement.html +++ b/cotisations/templates/cotisations/aff_paiement.html @@ -9,7 +9,7 @@ {{ paiement.moyen }} {% if is_trez %} Editer{% endif %} - Historique + Historique {% endfor %} diff --git a/machines/templates/machines/aff_extension.html b/machines/templates/machines/aff_extension.html index f1ab63d5..c0ca761f 100644 --- a/machines/templates/machines/aff_extension.html +++ b/machines/templates/machines/aff_extension.html @@ -10,7 +10,7 @@ {{ extension.name }} {% if is_infra %} Editer{% endif %} - Historique + Historique {% endfor %} diff --git a/machines/templates/machines/aff_iptype.html b/machines/templates/machines/aff_iptype.html index 7067b0cc..5343b890 100644 --- a/machines/templates/machines/aff_iptype.html +++ b/machines/templates/machines/aff_iptype.html @@ -18,7 +18,7 @@ {{ type.domaine_ip }} {{ type.domaine_range }} {% if is_infra %} Editer{% endif %} - Historique + Historique {% endfor %} diff --git a/machines/templates/machines/aff_machines.html b/machines/templates/machines/aff_machines.html index 225c76ed..035710d8 100644 --- a/machines/templates/machines/aff_machines.html +++ b/machines/templates/machines/aff_machines.html @@ -1,50 +1,71 @@ {% if machines_list.paginator %} -{% include "pagination.html" with list=machines_list %} -{% endif %} +{% include "pagination.html" with list=machines_list %} +{% endif %} - - - - - - - - {% for machine in machines_list %} +
ProprietaireInterfaces
+ - - {% endfor %} -

{{ machine.user }}

-

Ajouter une interface

-

Supprimer la machine

-

Historique

 - - - - - - - - - - {% for interface in machine.interface_set.all %} - + + + + + + + + + + {% for machine in machines_list %} + {% for interface in machine.interface_set.all %} + + {% if forloop.first %} + + + {% endif %} - - - {% endfor %} -
Nom dnsTypeMacIpv4
ActionsProprietaireNom dnsTypeMacIpv4
+ + + + + + + + + + +

{{ machine.user }} +

{{ interface.dns }} {{ interface.type }} {{ interface.mac_address }} {{ interface.ipv4 }}
- -
+ 		+
+ + +
+
+ + + + {% endfor %} + diff --git a/machines/templates/machines/aff_machinetype.html b/machines/templates/machines/aff_machinetype.html index 5bdbd127..7c5055b3 100644 --- a/machines/templates/machines/aff_machinetype.html +++ b/machines/templates/machines/aff_machinetype.html @@ -12,7 +12,7 @@ {{ type.type }} {{ type.ip_type }} {% if is_infra %} Editer{% endif %} - Historique + Historique {% endfor %} diff --git a/users/templates/users/aff_bans.html b/users/templates/users/aff_bans.html index 3ebbf2db..9db5ef0e 100644 --- a/users/templates/users/aff_bans.html +++ b/users/templates/users/aff_bans.html @@ -20,7 +20,7 @@ {{ ban.date_start }} {{ ban.date_end }} {% if is_bofh %} Editer{% endif %} - Historique + Historique {% endfor %} diff --git a/users/templates/users/aff_listright.html b/users/templates/users/aff_listright.html index b673a34e..109dc1ff 100644 --- a/users/templates/users/aff_listright.html +++ b/users/templates/users/aff_listright.html @@ -12,7 +12,7 @@ {{ listright.listright }} {{ listright.gid }} Editer - Historique + Historique {% endfor %} diff --git a/users/templates/users/aff_schools.html b/users/templates/users/aff_schools.html index 4853f5d5..ed2e524b 100644 --- a/users/templates/users/aff_schools.html +++ b/users/templates/users/aff_schools.html @@ -10,7 +10,7 @@ {{ school.name }} Editer - Historique + Historique {% endfor %} diff --git a/users/templates/users/aff_whitelists.html b/users/templates/users/aff_whitelists.html index 0aec79fa..426a99c2 100644 --- a/users/templates/users/aff_whitelists.html +++ b/users/templates/users/aff_whitelists.html @@ -16,7 +16,7 @@ {{ whitelist.date_start }} {{ whitelist.date_end }} {% if is_cableur %} Editer{% endif %} - Historique + Historique {% endfor %} diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index 6f4067e7..e2b1456f 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -9,7 +9,7 @@ Changer le mot de passe {% if is_bureau %} Changer le statut Ajouter un droit{% endif %} - Historique + Historique