diff --git a/cotisations/views.py b/cotisations/views.py index 2975e97e..08684ac5 100644 --- a/cotisations/views.py +++ b/cotisations/views.py @@ -15,7 +15,7 @@ from .models import Facture, Article, Vente, Cotisation, Paiement, Banque from .forms import NewFactureForm, TrezEditFactureForm, EditFactureForm, ArticleForm, DelArticleForm, PaiementForm, DelPaiementForm, BanqueForm, DelBanqueForm, NewFactureFormPdf, SelectArticleForm from users.models import User from .tex import render_tex -from re2o.settings_local import ASSO_NAME, ASSO_ADDRESS_LINE1, ASSO_ADDRESS_LINE2, ASSO_SIRET, ASSO_EMAIL, ASSO_PHONE, LOGO_PATH +from re2o.settings import ASSO_NAME, ASSO_ADDRESS_LINE1, ASSO_ADDRESS_LINE2, ASSO_SIRET, ASSO_EMAIL, ASSO_PHONE, LOGO_PATH from re2o import settings from dateutil.relativedelta import relativedelta diff --git a/machines/templates/machines/aff_machines.html b/machines/templates/machines/aff_machines.html index 5bf72384..40690a59 100644 --- a/machines/templates/machines/aff_machines.html +++ b/machines/templates/machines/aff_machines.html @@ -26,8 +26,15 @@ {{ interface.type }} {{ interface.mac_address }} {{ interface.ipv4 }} - Editer - Supprimer + {% endfor %} diff --git a/templates/base.html b/templates/base.html index eddf6595..0e42e9a1 100644 --- a/templates/base.html +++ b/templates/base.html @@ -70,9 +70,6 @@
{% block sidebar %} -

Link

-

Link

-

Link

{% endblock %}
@@ -91,7 +88,7 @@
  • Chambre : {{ request_user.room }}
  • Connexion : {% if request_user.has_access == True %}Active{% else %}Désactivée{% endif %}
  • Fin d'adhésion : {% if request_user.end_adhesion != None %}{{ request_user.end_adhesion }}{% else %}Non adhérent{% endif %}
  • -

    Voir mon profil

    +

    Voir mon profil

    {% else %}

    Vous n'êtes pas authentifié

    {% endif %} @@ -102,7 +99,7 @@ {% for interface in interfaces|slice:":5" %}
  • {{interface.dns}}
  • {% endfor %} -

    Voir toutes mes machines

    +

    Voir mes machines

    {% endif %}