From b25aeaeec555227bf0bc0c40efa15c6fad607632 Mon Sep 17 00:00:00 2001 From: lhark Date: Mon, 18 Dec 2017 21:12:57 -0500 Subject: [PATCH] Fix indent 2 --- templates/registration/login.html | 1 - users/templates/users/del_right.html | 19 +++++++++---------- users/templates/users/delete.html | 6 +++--- users/templates/users/mass_archive.html | 12 +++++------- users/templates/users/profil.html | 19 +++++++++---------- users/templates/users/user.html | 6 +++--- 6 files changed, 29 insertions(+), 34 deletions(-) diff --git a/templates/registration/login.html b/templates/registration/login.html index b92ca027..7b986d3b 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. {% endcomment %} - {% load bootstrap3 %} {% block title %}Login{% endblock %} diff --git a/users/templates/users/del_right.html b/users/templates/users/del_right.html index 57e706a7..1e31f320 100644 --- a/users/templates/users/del_right.html +++ b/users/templates/users/del_right.html @@ -27,7 +27,6 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block title %}Création et modification d'utilisateur{% endblock %} - {% block content %}

Gestion des droits

@@ -44,17 +43,17 @@ with this program; if not, write to the Free Software Foundation, Inc., - - + +
+
  • {{ user }}
    • + {% endfor %} +
    - + {% endfor %} @@ -70,7 +69,7 @@ with this program; if not, write to the Free Software Foundation, Inc., } ); -
    -
    -
    +
    +
    +
    {% endblock %} diff --git a/users/templates/users/delete.html b/users/templates/users/delete.html index 727694d3..928c0001 100644 --- a/users/templates/users/delete.html +++ b/users/templates/users/delete.html @@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

    Attention, voulez-vous vraiment supprimer cet objet {{ objet_name }} ( {{ objet }} ) ?

    {% bootstrap_button "Confirmer" button_type="submit" icon="trash" %} -
    -
    -
    +
    +
    +
    {% endblock %} diff --git a/users/templates/users/mass_archive.html b/users/templates/users/mass_archive.html index fad77631..2626ae4e 100644 --- a/users/templates/users/mass_archive.html +++ b/users/templates/users/mass_archive.html @@ -35,12 +35,10 @@ with this program; if not, write to the Free Software Foundation, Inc., - - -

    Les utilisateurs suivant seront archivés ({{ to_archive_list|length }}):

    - {% include "users/aff_users.html" with users_list=to_archive_list %} -
    -
    -
    +

    Les utilisateurs suivant seront archivés ({{ to_archive_list|length }}):

    +{% include "users/aff_users.html" with users_list=to_archive_list %} +
    +
    +
    {% endblock %} diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index fb9e37d9..f2bdd54e 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -73,7 +73,7 @@ with this program; if not, write to the Free Software Foundation, Inc., Chambre {{ user.room }} Téléphone - {{ user.telephone }} + {{ user.telephone }} École @@ -81,7 +81,7 @@ with this program; if not, write to the Free Software Foundation, Inc., Commentaire {{ user.comment }} - + Date d'inscription {{ user.registered }} Dernière connexion @@ -119,7 +119,7 @@ with this program; if not, write to the Free Software Foundation, Inc., Accès internet {% if user.has_access == True %} - Actif (jusqu'au {{ user.end_access }}) + Actif (jusqu'au {{ user.end_access }}) {% else %} Désactivé {% endif %} @@ -130,16 +130,16 @@ with this program; if not, write to the Free Software Foundation, Inc., Aucun {% endif %} - {% if user_solde %} + {% if user_solde %} Solde {{ user.solde }} € - {% endif %} - {% if user.shell %} - Shell - {{ user.shell }} - {% endif %} + {% endif %} + {% if user.shell %} + Shell + {{ user.shell }} + {% endif %} {% if user.is_class_club %} @@ -213,4 +213,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,

    {% endblock %} - diff --git a/users/templates/users/user.html b/users/templates/users/user.html index bf1bef0f..26b7e0ee 100644 --- a/users/templates/users/user.html +++ b/users/templates/users/user.html @@ -36,7 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% massive_bootstrap_form userform 'room,school,administrators,members' %} {% bootstrap_button "Créer ou modifier" button_type="submit" icon="star" %} -
    -
    -
    +
    +
    +
    {% endblock %}