From 6b8b5764529507ef604f1d101a4437e4074d9e09 Mon Sep 17 00:00:00 2001 From: Hugo LEVY-FALK Date: Tue, 6 Mar 2018 16:31:02 +0100 Subject: [PATCH 1/6] Ajout du tag can_view_any_app et autorise de mettre plusieurs apps dans can_view_app --- re2o/templatetags/acl.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/re2o/templatetags/acl.py b/re2o/templatetags/acl.py index 28a7b4d3..c14fcbd6 100644 --- a/re2o/templatetags/acl.py +++ b/re2o/templatetags/acl.py @@ -180,13 +180,17 @@ def get_callback(tag_name, obj=None): if tag_name == 'cannot_view_all': return acl_fct(obj.can_view_all, True) if tag_name == 'can_view_app': - return acl_fct(sys.modules[obj].can_view, False) + return acl_fct(lambda x : (not any(not sys.modules[o].can_view(x) for o in obj), None), False) if tag_name == 'cannot_view_app': - return acl_fct(sys.modules[obj].can_view, True) + return acl_fct(lambda x : (not any(not sys.modules[o].can_view(x) for o in obj), None), True) if tag_name == 'can_edit_history': return acl_fct(lambda user:(user.has_perm('admin.change_logentry'),None),False) if tag_name == 'cannot_edit_history': return acl_fct(lambda user:(user.has_perm('admin.change_logentry'),None),True) + if tag_name == 'can_view_any_app': + return acl_fct(lambda x : (any(sys.modules[o].can_view(x) for o in obj), None), False) + if tag_name == 'cannot_view_any_app': + return acl_fct(lambda x : (any(sys.modules[o].can_view(x) for o in obj), None), True) raise template.TemplateSyntaxError( "%r tag is not a valid can_xxx tag" % tag_name @@ -228,22 +232,25 @@ def acl_history_filter(parser, token): return AclNode(callback, oknodes, konodes) +@register.tag('can_view_any_app') +@register.tag('cannot_view_any_app') @register.tag('can_view_app') @register.tag('cannot_view_app') def acl_app_filter(parser, token): """Templatetag for acl checking on applications.""" try: - tag_name, app_name = token.split_contents() + tag_name, *app_name = token.split_contents() except ValueError: raise template.TemplateSyntaxError( - "%r tag require 1 argument : the application" + "%r tag require 1 argument : an application" % token.contents.split()[0] ) - if not app_name in sys.modules.keys(): - raise template.TemplateSyntaxError( - "%r is not a registered application for acl." - % app_name - ) + for name in app_name: + if not name in sys.modules.keys(): + raise template.TemplateSyntaxError( + "%r is not a registered application for acl." + % name + ) callback = get_callback(tag_name, app_name) From 0e282037d5d435bd5f8ab521912d12dcac200dc8 Mon Sep 17 00:00:00 2001 From: Yoann Pietri Date: Tue, 6 Mar 2018 16:38:47 +0100 Subject: [PATCH 2/6] Modification de la navbar --- re2o/acl.py | 87 ++++++++++++++++++++++++++------------------- templates/base.html | 45 +++++++++++++---------- 2 files changed, 77 insertions(+), 55 deletions(-) diff --git a/re2o/acl.py b/re2o/acl.py index f7fa75d0..a4c0027c 100644 --- a/re2o/acl.py +++ b/re2o/acl.py @@ -33,7 +33,13 @@ from django.contrib import messages from django.shortcuts import redirect from django.urls import reverse -import cotisations, logs, machines, preferences, search, topologie, users +import cotisations +import logs +import machines +import preferences +import search +import topologie +import users def can_create(model): @@ -46,7 +52,8 @@ def can_create(model): def wrapper(request, *args, **kwargs): can, msg = model.can_create(request.user, *args, **kwargs) if not can: - messages.error(request, msg or "Vous ne pouvez pas accéder à ce menu") + messages.error( + request, msg or "Vous ne pouvez pas accéder à ce menu") return redirect(reverse('index')) return view(request, *args, **kwargs) return wrapper @@ -67,22 +74,25 @@ def can_edit(model, *field_list): except model.DoesNotExist: messages.error(request, u"Entrée inexistante") return redirect(reverse('users:profil', - kwargs={'userid':str(request.user.id)} - )) + kwargs={'userid': str(request.user.id)} + )) can, msg = instance.can_edit(request.user) if not can: - messages.error(request, msg or "Vous ne pouvez pas accéder à ce menu") + messages.error( + request, msg or "Vous ne pouvez pas accéder à ce menu") return redirect(reverse('users:profil', - kwargs={'userid':str(request.user.id)} - )) + kwargs={'userid': str(request.user.id)} + )) for field in field_list: can_change = getattr(instance, 'can_change_' + field) can, msg = can_change(request.user, *args, **kwargs) if not can: - messages.error(request, msg or "Vous ne pouvez pas accéder à ce menu") + messages.error( + request, msg or "Vous ne pouvez pas accéder à ce menu") return redirect(reverse('users:profil', - kwargs={'userid':str(request.user.id)} - )) + kwargs={'userid': str( + request.user.id)} + )) return view(request, instance, *args, **kwargs) return wrapper return decorator @@ -98,10 +108,12 @@ def can_change(model, *field_list): can_change = getattr(model, 'can_change_' + field) can, msg = can_change(request.user, *args, **kwargs) if not can: - messages.error(request, msg or "Vous ne pouvez pas accéder à ce menu") + messages.error( + request, msg or "Vous ne pouvez pas accéder à ce menu") return redirect(reverse('users:profil', - kwargs={'userid':str(request.user.id)} - )) + kwargs={'userid': str( + request.user.id)} + )) return view(request, *args, **kwargs) return wrapper return decorator @@ -121,14 +133,15 @@ def can_delete(model): except model.DoesNotExist: messages.error(request, u"Entrée inexistante") return redirect(reverse('users:profil', - kwargs={'userid':str(request.user.id)} - )) + kwargs={'userid': str(request.user.id)} + )) can, msg = instance.can_delete(request.user) if not can: - messages.error(request, msg or "Vous ne pouvez pas accéder à ce menu") + messages.error( + request, msg or "Vous ne pouvez pas accéder à ce menu") return redirect(reverse('users:profil', - kwargs={'userid':str(request.user.id)} - )) + kwargs={'userid': str(request.user.id)} + )) return view(request, instance, *args, **kwargs) return wrapper return decorator @@ -149,8 +162,8 @@ def can_delete_set(model): if not instances: messages.error(request, "Vous ne pouvez pas accéder à ce menu") return redirect(reverse('users:profil', - kwargs={'userid':str(request.user.id)} - )) + kwargs={'userid': str(request.user.id)} + )) return view(request, instances, *args, **kwargs) return wrapper return decorator @@ -170,14 +183,15 @@ def can_view(model): except model.DoesNotExist: messages.error(request, u"Entrée inexistante") return redirect(reverse('users:profil', - kwargs={'userid':str(request.user.id)} - )) + kwargs={'userid': str(request.user.id)} + )) can, msg = instance.can_view(request.user) if not can: - messages.error(request, msg or "Vous ne pouvez pas accéder à ce menu") + messages.error( + request, msg or "Vous ne pouvez pas accéder à ce menu") return redirect(reverse('users:profil', - kwargs={'userid':str(request.user.id)} - )) + kwargs={'userid': str(request.user.id)} + )) return view(request, instance, *args, **kwargs) return wrapper return decorator @@ -190,10 +204,11 @@ def can_view_all(model): def wrapper(request, *args, **kwargs): can, msg = model.can_view_all(request.user) if not can: - messages.error(request, msg or "Vous ne pouvez pas accéder à ce menu") + messages.error( + request, msg or "Vous ne pouvez pas accéder à ce menu") return redirect(reverse('users:profil', - kwargs={'userid':str(request.user.id)} - )) + kwargs={'userid': str(request.user.id)} + )) return view(request, *args, **kwargs) return wrapper return decorator @@ -203,16 +218,17 @@ def can_view_app(app_name): """Decorator to check if an user can view an application. """ assert app_name in sys.modules.keys() + def decorator(view): def wrapper(request, *args, **kwargs): app = sys.modules[app_name] - can,msg = app.can_view(request.user) + can, msg = app.can_view(request.user) if can: return view(request, *args, **kwargs) messages.error(request, msg) return redirect(reverse('users:profil', - kwargs={'userid':str(request.user.id)} - )) + kwargs={'userid': str(request.user.id)} + )) return wrapper return decorator @@ -223,11 +239,10 @@ def can_edit_history(view): if request.user.has_perm('admin.change_logentry'): return view(request, *args, **kwargs) messages.error( - request, - "Vous ne pouvez pas éditer l'historique." + request, + "Vous ne pouvez pas éditer l'historique." ) return redirect(reverse('users:profil', - kwargs={'userid':str(request.user.id)} - )) + kwargs={'userid': str(request.user.id)} + )) return wrapper - diff --git a/templates/base.html b/templates/base.html index 1b2adfcc..d49e0717 100644 --- a/templates/base.html +++ b/templates/base.html @@ -36,6 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc., + {# Load CSS and JavaScript #} {% bootstrap_css %} @@ -69,22 +70,28 @@ with this program; if not, write to the Free Software Foundation, Inc., From 97f1d927b30b12b097a28f023c07965265035bd6 Mon Sep 17 00:00:00 2001 From: matthieu Michelet Date: Tue, 6 Mar 2018 17:33:48 +0100 Subject: [PATCH 4/6] Chirac est un con --- contributors.py | 2 +- re2o/management/commands/gen_contrib.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/contributors.py b/contributors.py index 358fd27b..02a2015c 100644 --- a/contributors.py +++ b/contributors.py @@ -1,3 +1,3 @@ #!/usr/bin/env python3 -contributeurs = ['Gabriel Detraz', 'chirac', 'Maël Kervella', 'LEVY-FALK Hugo', 'Dalahro', 'lhark', 'root', 'Chirac', 'Hugo LEVY-FALK', 'guimoz', 'Mael Kervella', 'klafyvel', 'matthieu', 'Yoann Pietri', 'Simon Brélivet', 'chibrac', 'David Sinquin', 'Pierre Cadart', 'moamoak', 'Éloi Alain', 'FERNET Laouen', 'Hugo Levy-Falk', 'Yoann PIETRI', 'B', 'Daniel STAN', 'Eloi Alain', 'Guimoz', 'Hugo Hervieux', 'Joanne Steiner', 'Laouen Fernet', 'Lemesle', 'MICHELET matthieu', 'Nymous', 'Thibault de BOUTRAY', 'Tipunchetrhum', 'Éloi ALAIN'] \ No newline at end of file +contributeurs = ['Gabriel Detraz', 'chirac', 'Maël Kervella', 'LEVY-FALK Hugo', 'Dalahro', 'lhark', 'root', 'Hugo LEVY-FALK', 'Chirac', 'guimoz', 'Mael Kervella', 'klafyvel', 'matthieu', 'Yoann Pietri', 'Simon Brélivet', 'chibrac', 'David Sinquin', 'Pierre Cadart', 'moamoak', 'Éloi Alain', 'FERNET Laouen', 'Hugo Levy-Falk', 'Joanne Steiner', 'Matthieu Michelet', 'Yoann PIETRI', 'B', 'Daniel STAN', 'Eloi Alain', 'Guimoz', 'Hugo Hervieux', 'Laouen Fernet', 'Lemesle', 'MICHELET matthieu', 'Nymous', 'Thibault de BOUTRAY', 'Tipunchetrhum', 'Éloi ALAIN'] \ No newline at end of file diff --git a/re2o/management/commands/gen_contrib.py b/re2o/management/commands/gen_contrib.py index 7d7f1b02..d33b560d 100644 --- a/re2o/management/commands/gen_contrib.py +++ b/re2o/management/commands/gen_contrib.py @@ -23,8 +23,6 @@ Write in a python file the list of all contributors sorted by number of commits. This list is extracted from the FedeRez gitlab repository. """ -fous moi un truc adapté au dessus aussi - from django.core.management.base import BaseCommand, CommandError import os From 8cd7ed1a547bcf5ec7966bd4952f04518c35455e Mon Sep 17 00:00:00 2001 From: Yoann Pietri Date: Wed, 7 Mar 2018 11:45:03 +0100 Subject: [PATCH 5/6] Modification de la navbar et passage sous font awesome --- .../templates/cotisations/aff_article.html | 4 ++-- .../templates/cotisations/aff_banque.html | 4 ++-- .../cotisations/aff_cotisations.html | 8 +++---- .../templates/cotisations/aff_paiement.html | 4 ++-- .../templates/cotisations/control.html | 4 ++-- .../templates/cotisations/index_article.html | 4 ++-- .../templates/cotisations/index_banque.html | 4 ++-- .../templates/cotisations/index_paiement.html | 4 ++-- .../templates/cotisations/new_facture.html | 4 ++-- .../cotisations/new_facture_solde.html | 4 ++-- .../templates/cotisations/sidebar.html | 12 +++++----- logs/templates/logs/aff_stats_logs.html | 2 +- logs/templates/logs/aff_summary.html | 10 ++++---- logs/templates/logs/sidebar.html | 12 +++++----- machines/templates/machines/aff_machines.html | 18 +++++++------- machines/templates/machines/index_alias.html | 4 ++-- .../templates/machines/index_extension.html | 24 +++++++++---------- machines/templates/machines/index_iptype.html | 4 ++-- machines/templates/machines/index_ipv6.html | 2 +- .../templates/machines/index_machinetype.html | 4 ++-- machines/templates/machines/index_nas.html | 4 ++-- .../templates/machines/index_portlist.html | 4 ++-- .../templates/machines/index_service.html | 4 ++-- machines/templates/machines/index_vlan.html | 4 ++-- machines/templates/machines/sidebar.html | 16 ++++++------- .../preferences/display_preferences.html | 16 ++++++------- search/templates/search/sidebar.html | 4 ++-- templates/base.html | 10 ++++---- templates/buttons/add.html | 2 +- templates/buttons/edit.html | 2 +- templates/buttons/history.html | 2 +- templates/buttons/sort.html | 8 +++---- templates/buttons/suppr.html | 2 +- .../templates/topologie/aff_chambres.html | 6 ++--- .../topologie/aff_constructor_switch.html | 6 ++--- .../templates/topologie/aff_model_switch.html | 6 ++--- topologie/templates/topologie/aff_port.html | 6 ++--- topologie/templates/topologie/aff_stacks.html | 12 +++++----- .../templates/topologie/edit_stack_sw.html | 6 ++--- topologie/templates/topologie/index.html | 2 +- .../topologie/index_model_switch.html | 4 ++-- topologie/templates/topologie/index_p.html | 6 ++--- topologie/templates/topologie/index_room.html | 2 +- .../templates/topologie/index_stack.html | 2 +- topologie/templates/topologie/sidebar.html | 8 +++---- users/templates/users/aff_clubs.html | 10 ++++---- users/templates/users/aff_listright.html | 2 +- users/templates/users/aff_users.html | 8 +++---- users/templates/users/index_listright.html | 4 ++-- users/templates/users/index_schools.html | 4 ++-- users/templates/users/index_serviceusers.html | 2 +- users/templates/users/profil.html | 18 +++++++------- users/templates/users/sidebar.html | 20 ++++++++-------- 53 files changed, 175 insertions(+), 173 deletions(-) diff --git a/cotisations/templates/cotisations/aff_article.html b/cotisations/templates/cotisations/aff_article.html index f4880caf..833b7de0 100644 --- a/cotisations/templates/cotisations/aff_article.html +++ b/cotisations/templates/cotisations/aff_article.html @@ -45,11 +45,11 @@ with this program; if not, write to the Free Software Foundation, Inc., {% can_edit article %} - + {% acl_end %} - + diff --git a/cotisations/templates/cotisations/aff_banque.html b/cotisations/templates/cotisations/aff_banque.html index f31bf55a..1ef4cb76 100644 --- a/cotisations/templates/cotisations/aff_banque.html +++ b/cotisations/templates/cotisations/aff_banque.html @@ -37,11 +37,11 @@ with this program; if not, write to the Free Software Foundation, Inc., {% can_edit banque %} - + {% acl_end %} - + diff --git a/cotisations/templates/cotisations/aff_cotisations.html b/cotisations/templates/cotisations/aff_cotisations.html index 2e6eea3f..b73bc107 100644 --- a/cotisations/templates/cotisations/aff_cotisations.html +++ b/cotisations/templates/cotisations/aff_cotisations.html @@ -57,21 +57,21 @@ with this program; if not, write to the Free Software Foundation, Inc., {% if facture.valid %} - + PDF {% else %} diff --git a/cotisations/templates/cotisations/aff_paiement.html b/cotisations/templates/cotisations/aff_paiement.html index f2f9abe3..09e5acc3 100644 --- a/cotisations/templates/cotisations/aff_paiement.html +++ b/cotisations/templates/cotisations/aff_paiement.html @@ -37,11 +37,11 @@ with this program; if not, write to the Free Software Foundation, Inc., {% can_edit paiement %} - + {% acl_end %} - + diff --git a/cotisations/templates/cotisations/control.html b/cotisations/templates/cotisations/control.html index baa4938e..48071429 100644 --- a/cotisations/templates/cotisations/control.html +++ b/cotisations/templates/cotisations/control.html @@ -55,8 +55,8 @@ with this program; if not, write to the Free Software Foundation, Inc., {% for form in controlform.forms %} {% bootstrap_form_errors form %} - - + + {{ form.instance.user.name }} {{ form.instance.user.surname }} diff --git a/cotisations/templates/cotisations/index_article.html b/cotisations/templates/cotisations/index_article.html index edc71c09..7803c2ca 100644 --- a/cotisations/templates/cotisations/index_article.html +++ b/cotisations/templates/cotisations/index_article.html @@ -31,9 +31,9 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

Liste des types d'articles

{% can_create Article %} - Ajouter un type d'articles + Ajouter un type d'articles {% acl_end %} - Supprimer un ou plusieurs types d'articles + Supprimer un ou plusieurs types d'articles {% include "cotisations/aff_article.html" with article_list=article_list %}

diff --git a/cotisations/templates/cotisations/index_banque.html b/cotisations/templates/cotisations/index_banque.html index dda89843..77c23977 100644 --- a/cotisations/templates/cotisations/index_banque.html +++ b/cotisations/templates/cotisations/index_banque.html @@ -31,9 +31,9 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

Liste des banques

{% can_create Banque %} - Ajouter une banque + Ajouter une banque {% acl_end %} - Supprimer une ou plusieurs banques + Supprimer une ou plusieurs banques {% include "cotisations/aff_banque.html" with banque_list=banque_list %}

diff --git a/cotisations/templates/cotisations/index_paiement.html b/cotisations/templates/cotisations/index_paiement.html index a27cb824..414c6b38 100644 --- a/cotisations/templates/cotisations/index_paiement.html +++ b/cotisations/templates/cotisations/index_paiement.html @@ -31,9 +31,9 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

Liste des types de paiements

{% can_create Paiement %} - Ajouter un type de paiement + Ajouter un type de paiement {% acl_end %} - Supprimer un ou plusieurs types de paiements + Supprimer un ou plusieurs types de paiements {% include "cotisations/aff_paiement.html" with paiement_list=paiement_list %}

diff --git a/cotisations/templates/cotisations/new_facture.html b/cotisations/templates/cotisations/new_facture.html index c1206aa2..10aa69fd 100644 --- a/cotisations/templates/cotisations/new_facture.html +++ b/cotisations/templates/cotisations/new_facture.html @@ -49,7 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,   {% endfor %} @@ -73,7 +73,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,   ` function add_article(){ diff --git a/cotisations/templates/cotisations/new_facture_solde.html b/cotisations/templates/cotisations/new_facture_solde.html index 2efd8e81..2c06fdb0 100644 --- a/cotisations/templates/cotisations/new_facture_solde.html +++ b/cotisations/templates/cotisations/new_facture_solde.html @@ -46,7 +46,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,   {% endfor %} @@ -70,7 +70,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,   ` function add_article(){ diff --git a/cotisations/templates/cotisations/sidebar.html b/cotisations/templates/cotisations/sidebar.html index 3506e5e8..513eb60b 100644 --- a/cotisations/templates/cotisations/sidebar.html +++ b/cotisations/templates/cotisations/sidebar.html @@ -28,35 +28,35 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block sidebar %} {% can_change Facture pdf %} - + Créer une facture - + Contrôler les factures {% acl_end %} {% can_view_all Facture %} - + Factures {% acl_end %} {% can_view_all Article %} - + Articles en vente {% acl_end %} {% can_view_all Banque %} - + Banques {% acl_end %} {% can_view_all Paiement %} - + Moyens de paiement {% acl_end %} diff --git a/logs/templates/logs/aff_stats_logs.html b/logs/templates/logs/aff_stats_logs.html index be0b5a41..77e9e9b4 100644 --- a/logs/templates/logs/aff_stats_logs.html +++ b/logs/templates/logs/aff_stats_logs.html @@ -51,7 +51,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% can_edit_history %} - + Annuler diff --git a/logs/templates/logs/aff_summary.html b/logs/templates/logs/aff_summary.html index c6eca27b..f743d637 100644 --- a/logs/templates/logs/aff_summary.html +++ b/logs/templates/logs/aff_summary.html @@ -54,7 +54,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% can_edit_history %} - + Annuler @@ -77,7 +77,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% can_edit_history%} - + Annuler @@ -96,7 +96,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% can_edit_history %} - + Annuler @@ -115,7 +115,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% can_edit_history %} - + Annuler @@ -134,7 +134,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% can_edit_history %} - + Annuler diff --git a/logs/templates/logs/sidebar.html b/logs/templates/logs/sidebar.html index fe7e63e7..0e3048e3 100644 --- a/logs/templates/logs/sidebar.html +++ b/logs/templates/logs/sidebar.html @@ -28,27 +28,27 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block sidebar %} {% can_view_app logs %} - + Résumé - + Évènements - + Général - + Base de données - + Actions de cablage - + Utilisateurs {% acl_end %} diff --git a/machines/templates/machines/aff_machines.html b/machines/templates/machines/aff_machines.html index dbb3e40d..c286fcd6 100644 --- a/machines/templates/machines/aff_machines.html +++ b/machines/templates/machines/aff_machines.html @@ -46,9 +46,9 @@ with this program; if not, write to the Free Software Foundation, Inc., {% for machine in machines_list %} - {{ machine.name|default:'Pas de nom' }} + {{ machine.name|default:'Pas de nom' }} - {{ machine.user }} + {{ machine.user }} @@ -92,7 +92,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% include 'buttons/history.html' with href='machines:history' name='interface' id=interface.id %} {% can_delete interface %} @@ -102,28 +102,28 @@ with this program; if not, write to the Free Software Foundation, Inc., {% can_edit interface %}
  • - Editer + Editer
    • {% acl_end %} {% can_create Domain interface.id %}
  • - Gerer les alias + Gerer les alias
    • {% acl_end %} {% can_create Ipv6List interface.id %}
  • - Gerer les ipv6 + Gerer les ipv6
    • {% acl_end %} {% can_create OuverturePortList %}
  • - Gerer la configuration des ports + Gerer la configuration des ports
    • {% acl_end %} @@ -138,7 +138,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
      {% for ipv6 in interface.ipv6.all %} -
    • +
    • {{ipv6}}
      • {% endfor %} @@ -158,7 +158,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
    • {{ al }} - +
      • {% endfor %} diff --git a/machines/templates/machines/index_alias.html b/machines/templates/machines/index_alias.html index 7e9522e6..07750754 100644 --- a/machines/templates/machines/index_alias.html +++ b/machines/templates/machines/index_alias.html @@ -29,8 +29,8 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

      Liste des alias de l'interface

      - Ajouter un alias - Supprimer un ou plusieurs alias + Ajouter un alias + Supprimer un ou plusieurs alias {% include "machines/aff_alias.html" with alias_list=alias_list %}

      diff --git a/machines/templates/machines/index_extension.html b/machines/templates/machines/index_extension.html index a0159974..6ee1bdff 100644 --- a/machines/templates/machines/index_extension.html +++ b/machines/templates/machines/index_extension.html @@ -32,40 +32,40 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

      Liste des extensions

      {% can_create Extension %} - Ajouter une extension + Ajouter une extension {% acl_end %} - Supprimer une ou plusieurs extensions + Supprimer une ou plusieurs extensions {% include "machines/aff_extension.html" with extension_list=extension_list %}

      Liste des enregistrements SOA

      {% can_create SOA %} - Ajouter un enregistrement SOA + Ajouter un enregistrement SOA {% acl_end %} - Supprimer un enregistrement SOA + Supprimer un enregistrement SOA {% include "machines/aff_soa.html" with soa_list=soa_list %}

      Liste des enregistrements MX

      {% can_create Mx %} - Ajouter un enregistrement MX + Ajouter un enregistrement MX {% acl_end %} - Supprimer un enregistrement MX + Supprimer un enregistrement MX {% include "machines/aff_mx.html" with mx_list=mx_list %}

      Liste des enregistrements NS

      {% can_create Ns %} - Ajouter un enregistrement NS + Ajouter un enregistrement NS {% acl_end %} - Supprimer un enregistrement NS + Supprimer un enregistrement NS {% include "machines/aff_ns.html" with ns_list=ns_list %}

      Liste des enregistrements TXT

      {% can_create Txt %} - Ajouter un enregistrement TXT + Ajouter un enregistrement TXT {% acl_end %} - Supprimer un enregistrement TXT + Supprimer un enregistrement TXT {% include "machines/aff_txt.html" with txt_list=txt_list %}

      Liste des enregistrements SRV

      {% can_create Srv %} - Ajouter un enregistrement SRV + Ajouter un enregistrement SRV {% acl_end %} - Supprimer un enregistrement SRV + Supprimer un enregistrement SRV {% include "machines/aff_srv.html" with srv_list=srv_list %}

      diff --git a/machines/templates/machines/index_iptype.html b/machines/templates/machines/index_iptype.html index cd582183..4dacf96e 100644 --- a/machines/templates/machines/index_iptype.html +++ b/machines/templates/machines/index_iptype.html @@ -32,9 +32,9 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

      Liste des types d'ip

      {% can_create IpType %} - Ajouter un type d'ip + Ajouter un type d'ip {% acl_end %} - Supprimer un ou plusieurs types d'ip + Supprimer un ou plusieurs types d'ip {% include "machines/aff_iptype.html" with iptype_list=iptype_list %}

      diff --git a/machines/templates/machines/index_ipv6.html b/machines/templates/machines/index_ipv6.html index 3cc3933b..584dc00a 100644 --- a/machines/templates/machines/index_ipv6.html +++ b/machines/templates/machines/index_ipv6.html @@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

      Liste des ipv6 de l'interface

      {% can_create Ipv6List interface_id %} - Ajouter une ipv6 + Ajouter une ipv6 {% acl_end %} {% include "machines/aff_ipv6.html" with ipv6_list=ipv6_list %}
      diff --git a/machines/templates/machines/index_machinetype.html b/machines/templates/machines/index_machinetype.html index 96fa2d7e..a0bfd7e5 100644 --- a/machines/templates/machines/index_machinetype.html +++ b/machines/templates/machines/index_machinetype.html @@ -32,9 +32,9 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

      Liste des types de machines

      {% can_create MachineType %} - Ajouter un type de machine + Ajouter un type de machine {% acl_end %} - Supprimer un ou plusieurs types de machines + Supprimer un ou plusieurs types de machines {% include "machines/aff_machinetype.html" with machinetype_list=machinetype_list %}

      diff --git a/machines/templates/machines/index_nas.html b/machines/templates/machines/index_nas.html index b4f99ac4..3f1cb90f 100644 --- a/machines/templates/machines/index_nas.html +++ b/machines/templates/machines/index_nas.html @@ -34,9 +34,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
      La correpondance nas-machinetype relie le type de nas à un type de machine. Elle est utile pour l'autoenregistrement des macs par radius, et permet de choisir le type de machine à affecter aux machines en fonction du type de nas
      {% can_create Nas %} - Ajouter un type de nas + Ajouter un type de nas {% acl_end %} - Supprimer un ou plusieurs types nas + Supprimer un ou plusieurs types nas {% include "machines/aff_nas.html" with nas_list=nas_list %}

      diff --git a/machines/templates/machines/index_portlist.html b/machines/templates/machines/index_portlist.html index 5c0c148a..e505ad43 100644 --- a/machines/templates/machines/index_portlist.html +++ b/machines/templates/machines/index_portlist.html @@ -9,7 +9,7 @@ {% block content %}

      Liste des configurations de ports

      {% can_create OuverturePortList %} - Ajouter une configuration + Ajouter une configuration {% acl_end %} @@ -61,5 +61,5 @@


      - + {% endblock %} diff --git a/machines/templates/machines/index_service.html b/machines/templates/machines/index_service.html index b21c4921..3bc88189 100644 --- a/machines/templates/machines/index_service.html +++ b/machines/templates/machines/index_service.html @@ -31,9 +31,9 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

      Liste des services

      {% can_create machines.Service %} - Ajouter un service + Ajouter un service {% acl_end %} - Supprimer un ou plusieurs service + Supprimer un ou plusieurs service {% include "machines/aff_service.html" with service_list=service_list %}

      Etat des serveurs

      {% include "machines/aff_servers.html" with servers_list=servers_list %} diff --git a/machines/templates/machines/index_vlan.html b/machines/templates/machines/index_vlan.html index d9a4f8f9..beb6c80e 100644 --- a/machines/templates/machines/index_vlan.html +++ b/machines/templates/machines/index_vlan.html @@ -32,9 +32,9 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

      Liste des vlans

      {% can_create Vlan %} - Ajouter un vlan + Ajouter un vlan {% acl_end %} - Supprimer un ou plusieurs vlan + Supprimer un ou plusieurs vlan {% include "machines/aff_vlan.html" with vlan_list=vlan_list %}

      diff --git a/machines/templates/machines/sidebar.html b/machines/templates/machines/sidebar.html index 31ccdbe2..5a0f975d 100644 --- a/machines/templates/machines/sidebar.html +++ b/machines/templates/machines/sidebar.html @@ -28,49 +28,49 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block sidebar %} {% can_view_all Machine %} - + Machines {% acl_end %} {% can_view_all MachineType %} - + Types de machines {% acl_end %} {% can_view_all Extension %} - + Extensions et zones {% acl_end %} {% can_view_all IpType %} - + Plages d'IP {% acl_end %} {% can_view_all Vlan %} - + Vlans {% acl_end %} {% can_view_all Nas %} - + Gestion des nas {% acl_end %} {% can_view_all machines.Service %} - + Services (dhcp, dns...) {% acl_end %} {% can_view_all OuverturePortList %} - + Ouverture de ports {% acl_end %} diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html index 0f534417..67666bac 100644 --- a/preferences/templates/preferences/display_preferences.html +++ b/preferences/templates/preferences/display_preferences.html @@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

      Préférences utilisateur

      - + Editer

      @@ -72,7 +72,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

      Préférences machines

      - + Editer

      @@ -97,7 +97,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

      Préférences topologie

      - + Editer

      @@ -118,7 +118,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

      Préférences generales

      - + Editer

      @@ -155,7 +155,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

      Données de l'association

      - + Editer

      @@ -192,7 +192,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

      Messages personalisé dans les mails

      - + Editer

      @@ -209,9 +209,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,

      Liste des services page d'accueil

      {% can_create preferences.Service%} - Ajouter un service + Ajouter un service {% acl_end %} - Supprimer un ou plusieurs service + Supprimer un ou plusieurs service {% include "preferences/aff_service.html" with service_list=service_list %}

      diff --git a/search/templates/search/sidebar.html b/search/templates/search/sidebar.html index dbb10130..8e29d379 100644 --- a/search/templates/search/sidebar.html +++ b/search/templates/search/sidebar.html @@ -26,11 +26,11 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block sidebar %} - + Recherche simple - + Recherche avancée {% endblock %} diff --git a/templates/base.html b/templates/base.html index 3f2a3d40..fee0f09f 100644 --- a/templates/base.html +++ b/templates/base.html @@ -70,6 +70,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
    diff --git a/templates/buttons/suppr.html b/templates/buttons/suppr.html index 907345be..a03ea42a 100644 --- a/templates/buttons/suppr.html +++ b/templates/buttons/suppr.html @@ -22,5 +22,5 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. {% endcomment %} - + diff --git a/topologie/templates/topologie/aff_chambres.html b/topologie/templates/topologie/aff_chambres.html index 6d0cee37..3ca4651d 100644 --- a/topologie/templates/topologie/aff_chambres.html +++ b/topologie/templates/topologie/aff_chambres.html @@ -42,16 +42,16 @@ with this program; if not, write to the Free Software Foundation, Inc., {{room.details}} - + {% can_edit room %} - + {% acl_end %} {% can_delete room %} - + {% acl_end %} diff --git a/topologie/templates/topologie/aff_constructor_switch.html b/topologie/templates/topologie/aff_constructor_switch.html index 9b601e1b..f9d8827c 100644 --- a/topologie/templates/topologie/aff_constructor_switch.html +++ b/topologie/templates/topologie/aff_constructor_switch.html @@ -40,16 +40,16 @@ with this program; if not, write to the Free Software Foundation, Inc., {{constructor_switch}} - + {% can_edit constructor_switch %} - + {% acl_end %} {% can_delete constructor_switch %} - + {% acl_end %} diff --git a/topologie/templates/topologie/aff_model_switch.html b/topologie/templates/topologie/aff_model_switch.html index f6c0d3b8..a1aa88cf 100644 --- a/topologie/templates/topologie/aff_model_switch.html +++ b/topologie/templates/topologie/aff_model_switch.html @@ -42,16 +42,16 @@ with this program; if not, write to the Free Software Foundation, Inc., {{model_switch.constructor}} - + {% can_edit model_switch %} - + {% acl_end %} {% can_delete model_switch %} - + {% acl_end %} diff --git a/topologie/templates/topologie/aff_port.html b/topologie/templates/topologie/aff_port.html index 61c4bf4b..4fe08862 100644 --- a/topologie/templates/topologie/aff_port.html +++ b/topologie/templates/topologie/aff_port.html @@ -60,16 +60,16 @@ with this program; if not, write to the Free Software Foundation, Inc., {{ port.details }} - + {% can_edit port %} - + {% acl_end %} {% can_delete port %} - + {% acl_end %} diff --git a/topologie/templates/topologie/aff_stacks.html b/topologie/templates/topologie/aff_stacks.html index 8d91d41c..def83036 100644 --- a/topologie/templates/topologie/aff_stacks.html +++ b/topologie/templates/topologie/aff_stacks.html @@ -46,16 +46,16 @@ with this program; if not, write to the Free Software Foundation, Inc., {% if forloop.first %} - + {% can_edit stack %} - + {% acl_end %} {% can_delete stack %} - + {% acl_end %} @@ -69,16 +69,16 @@ with this program; if not, write to the Free Software Foundation, Inc., Aucun - + {% can_edit stack %} - + {% acl_end %} {% can_delete stack %} - + {% acl_end %} diff --git a/topologie/templates/topologie/edit_stack_sw.html b/topologie/templates/topologie/edit_stack_sw.html index 04987add..75faaf84 100644 --- a/topologie/templates/topologie/edit_stack_sw.html +++ b/topologie/templates/topologie/edit_stack_sw.html @@ -39,16 +39,16 @@ with this program; if not, write to the Free Software Foundation, Inc., {{stack.details}} - + {% can_edit stack %} - + {% acl_end %} {% can_delete stack %} - + {% acl_end %} diff --git a/topologie/templates/topologie/index.html b/topologie/templates/topologie/index.html index 11f533c4..9838499a 100644 --- a/topologie/templates/topologie/index.html +++ b/topologie/templates/topologie/index.html @@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

    Switchs

    {% can_create Switch %} - Ajouter un switch + Ajouter un switch
    {% acl_end %} {% include "topologie/aff_switch.html" with switch_list=switch_list %} diff --git a/topologie/templates/topologie/index_model_switch.html b/topologie/templates/topologie/index_model_switch.html index e185a9b8..e375dd36 100644 --- a/topologie/templates/topologie/index_model_switch.html +++ b/topologie/templates/topologie/index_model_switch.html @@ -31,13 +31,13 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

    Modèles de switches

    {% can_create ModelSwitch %} - Ajouter un modèle + Ajouter un modèle
    {% acl_end %} {% include "topologie/aff_model_switch.html" with model_switch_list=model_switch_list %}

    Constructeurs de switches

    {% can_create ConstructorSwitch %} - Ajouter un constructeur + Ajouter un constructeur
    {% acl_end %} {% include "topologie/aff_constructor_switch.html" with constructor_switch_list=constructor_switch_list %} diff --git a/topologie/templates/topologie/index_p.html b/topologie/templates/topologie/index_p.html index 3cea6968..1ba7c01a 100644 --- a/topologie/templates/topologie/index_p.html +++ b/topologie/templates/topologie/index_p.html @@ -30,11 +30,11 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

    Switch {{ nom_switch }}

    - Editer + Editer {% can_create Port %} - Ajouter un port + Ajouter un port {% acl_end %} - Ajouter des ports + Ajouter des ports {% include "topologie/aff_port.html" with port_list=port_list %}

    diff --git a/topologie/templates/topologie/index_room.html b/topologie/templates/topologie/index_room.html index 15493d92..0d586452 100644 --- a/topologie/templates/topologie/index_room.html +++ b/topologie/templates/topologie/index_room.html @@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

    Chambres

    {% can_create Room %} - Ajouter une chambre + Ajouter une chambre
    {% acl_end %} {% include "topologie/aff_chambres.html" with room_list=room_list %} diff --git a/topologie/templates/topologie/index_stack.html b/topologie/templates/topologie/index_stack.html index fb39009d..1ba49b5a 100644 --- a/topologie/templates/topologie/index_stack.html +++ b/topologie/templates/topologie/index_stack.html @@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

    Stacks

    {% can_create Stack %} - Ajouter une stack + Ajouter une stack {% acl_end %} {% include "topologie/aff_stacks.html" with stack_list=stack_list %}
    diff --git a/topologie/templates/topologie/sidebar.html b/topologie/templates/topologie/sidebar.html index a2d42896..826169f2 100644 --- a/topologie/templates/topologie/sidebar.html +++ b/topologie/templates/topologie/sidebar.html @@ -26,19 +26,19 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block sidebar %} - + Chambres - + Switchs - + Stacks - + Modèles switches et constructeurs {% endblock %} diff --git a/users/templates/users/aff_clubs.html b/users/templates/users/aff_clubs.html index 425e1f28..4fb6bd0d 100644 --- a/users/templates/users/aff_clubs.html +++ b/users/templates/users/aff_clubs.html @@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endcomment %} {% if clubs_list.paginator %} -{% include "pagination.html" with list=clubs_list %} +{% include "pagination.html" with list=clubs_list %} {% endif %} {% load acl %} @@ -39,9 +39,9 @@ with this program; if not, write to the Free Software Foundation, Inc., Profil - {% for club in clubs_list %} + {% for club in clubs_list %} {% can_view club %} - + {{ club.surname }} {{ club.pseudo }} {{ club.room }} @@ -52,7 +52,7 @@ with this program; if not, write to the Free Software Foundation, Inc., Désactivée {% endif %} - + {% acl_end %} @@ -60,5 +60,5 @@ with this program; if not, write to the Free Software Foundation, Inc., {% if clubs_list.paginator %} -{% include "pagination.html" with list=clubs_list %} +{% include "pagination.html" with list=clubs_list %} {% endif %} diff --git a/users/templates/users/aff_listright.html b/users/templates/users/aff_listright.html index b8a8008c..be94b146 100644 --- a/users/templates/users/aff_listright.html +++ b/users/templates/users/aff_listright.html @@ -77,7 +77,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
  • {{user}} - +
    • {% endfor %} diff --git a/users/templates/users/aff_users.html b/users/templates/users/aff_users.html index 22f9a8dd..199b2f17 100644 --- a/users/templates/users/aff_users.html +++ b/users/templates/users/aff_users.html @@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endcomment %} {% if users_list.paginator %} -{% include "pagination.html" with list=users_list %} +{% include "pagination.html" with list=users_list %} {% endif %} @@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc., - {% for user in users_list %} + {% for user in users_list %} @@ -51,12 +51,12 @@ with this program; if not, write to the Free Software Foundation, Inc., Désactivée {% endif %} - {% endfor %}
    Profil
    {{ user.name }} {{ user.surname }} +
    {% if users_list.paginator %} -{% include "pagination.html" with list=users_list %} +{% include "pagination.html" with list=users_list %} {% endif %} diff --git a/users/templates/users/index_listright.html b/users/templates/users/index_listright.html index eb2c5370..57165792 100644 --- a/users/templates/users/index_listright.html +++ b/users/templates/users/index_listright.html @@ -31,9 +31,9 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}

    Liste des droits

    {% can_create ListRight %} - Ajouter un droit ou groupe + Ajouter un droit ou groupe {% acl_end %} - Supprimer un ou plusieurs droits/groupes + Supprimer un ou plusieurs droits/groupes {% include "users/aff_listright.html" with listright_list=listright_list %}

    diff --git a/users/templates/users/index_schools.html b/users/templates/users/index_schools.html index ff2b8b8b..93bb0737 100644 --- a/users/templates/users/index_schools.html +++ b/users/templates/users/index_schools.html @@ -32,9 +32,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,

    Liste des Établissements

    Ensemble des établissements d'enseignement ou d'activité des utilisateurs crées
    {% can_create School %} - Ajouter un établissement + Ajouter un établissement {% acl_end %} - Supprimer un ou plusieurs établissements + Supprimer un ou plusieurs établissements {% include "users/aff_schools.html" with school_list=school_list %}

    diff --git a/users/templates/users/index_serviceusers.html b/users/templates/users/index_serviceusers.html index bb1c2d3c..497445b0 100644 --- a/users/templates/users/index_serviceusers.html +++ b/users/templates/users/index_serviceusers.html @@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
    Les service users LDAP sont des utilisateurs spéciaux qui disposent d'un accès uniquement sur le ldap pour effectuer des opération d'authentification. Il est recommandé de créer un service-user doté d'un login/mdp par service concerné
    {% can_create ServiceUser %} - Ajouter un service user + Ajouter un service user {% acl_end %} {% include "users/aff_serviceusers.html" with serviceusers_list=serviceusers_list %}
    diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index 53056e95..2dacd48c 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -31,27 +31,27 @@ with this program; if not, write to the Free Software Foundation, Inc.,

    {{ users.class_name }} : {{ users.surname }} {{users.name}}

    - + Editer - + Changer le mot de passe {% can_change User state %} - + Changer le statut {% acl_end %} {% can_change User groups %} - + Gérer les groupes {% acl_end %} - + Historique
    @@ -150,7 +150,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% if users.is_class_club %} - + Gérer admin et membres

    Administrateurs du club

    @@ -190,7 +190,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endif %}

    Machines

    {% can_create Machine users.id %} -

    Ajouter une machine

    +

    Ajouter une machine

    {% acl_end %} {% if machines_list %} {% include "machines/aff_machines.html" with machines_list=machines_list %} @@ -205,14 +205,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,

    Aucune facture

    {% endif %}

    Bannissements

    - {% can_create Ban %}

    Ajouter un bannissement

    {% acl_end %} + {% can_create Ban %}

    Ajouter un bannissement

    {% acl_end %} {% if ban_list %} {% include "users/aff_bans.html" with ban_list=ban_list %} {% else %}

    Aucun bannissement

    {% endif %}

    Accès à titre gracieux :

    - {% can_create Whitelist %}

    Accorder un accès à titre gracieux

    {% acl_end %} + {% can_create Whitelist %}

    Accorder un accès à titre gracieux

    {% acl_end %} {% if white_list %} {% include "users/aff_whitelists.html" with white_list=white_list %} {% else %} diff --git a/users/templates/users/sidebar.html b/users/templates/users/sidebar.html index fa2f2c76..4b561b49 100644 --- a/users/templates/users/sidebar.html +++ b/users/templates/users/sidebar.html @@ -28,62 +28,62 @@ with this program; if not, write to the Free Software Foundation, Inc., {% if request.user.is_authenticated%} {% can_create Club %} - + Créer un club/association {% acl_end %} {% can_create Adherent %} - + Créer un adhérent {% acl_end %} {% endif %} {% can_view_all Club %} - + Clubs et assos {% acl_end %} {% can_view_all Adherent %} - + Adherents {% acl_end %} {% can_view_all Ban %} - + Bannissements {% acl_end %} {% can_view_all Whitelist %} - + Accès à titre gracieux {% acl_end %} {% can_view_all School %} - + Établissements {% acl_end %} {% can_view_all ListRight %} - + Groupes de droits {% acl_end %} {% can_view_all ServiceUser %} - + Gérer les service users {% acl_end %} {% can_change User state %} - + Archiver en masse {% acl_end %} From e6bf3a65585eb99bd500892f942d4b6c4cc45c49 Mon Sep 17 00:00:00 2001 From: Yoann Pietri Date: Thu, 8 Mar 2018 08:10:50 +0100 Subject: [PATCH 6/6] Piggy bank --- users/templates/users/profil.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index 2dacd48c..6823c751 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -137,7 +137,7 @@ with this program; if not, write to the Free Software Foundation, Inc., Solde {{ users.solde }} € - + Recharger @@ -198,7 +198,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

    Aucune machine

    {% endif %}

    Cotisations

    -

    {% can_create Facture %} Ajouter une cotisation {% if user_solde %} Modifier le solde{% endif%}{% acl_else %}{% if user_solde %} Ajouter une cotisation par solde{% endif %}{% acl_end %}

    +

    {% can_create Facture %} Ajouter une cotisation {% if user_solde %} Modifier le solde{% endif%}{% acl_else %}{% if user_solde %} Ajouter une cotisation par solde{% endif %}{% acl_end %}

    {% if facture_list %} {% include "cotisations/aff_cotisations.html" with facture_list=facture_list %} {% else %}