From f79fef700eb6987f377a57751c1f42f75474787c Mon Sep 17 00:00:00 2001 From: lhark Date: Mon, 18 Dec 2017 20:45:48 -0500 Subject: [PATCH 1/3] Fix machine template indentation --- machines/templates/machines/machine.html | 94 ++++++++++++------------ 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/machines/templates/machines/machine.html b/machines/templates/machines/machine.html index 796aac7b..9159a31d 100644 --- a/machines/templates/machines/machine.html +++ b/machines/templates/machines/machine.html @@ -31,113 +31,113 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %} {% if machineform %} -{% bootstrap_form_errors machineform %} + {% bootstrap_form_errors machineform %} {% endif %} {% if interfaceform %} -{% bootstrap_form_errors interfaceform %} + {% bootstrap_form_errors interfaceform %} {% endif %} {% if domainform %} -{% bootstrap_form_errors domainform %} + {% bootstrap_form_errors domainform %} {% endif %} {% if iptypeform %} -{% bootstrap_form_errors iptypeform %} + {% bootstrap_form_errors iptypeform %} {% endif %} {% if machinetypeform %} -{% bootstrap_form_errors machinetypeform %} + {% bootstrap_form_errors machinetypeform %} {% endif %} {% if extensionform %} -{% bootstrap_form_errors extensionform %} + {% bootstrap_form_errors extensionform %} {% endif %} {% if mxform %} -{% bootstrap_form_errors mxform %} + {% bootstrap_form_errors mxform %} {% endif %} {% if nsform %} -{% bootstrap_form_errors nsform %} + {% bootstrap_form_errors nsform %} {% endif %} {% if txtform %} -{% bootstrap_form_errors txtform %} + {% bootstrap_form_errors txtform %} {% endif %} {% if srvform %} -{% bootstrap_form_errors srvform %} + {% bootstrap_form_errors srvform %} {% endif %} {% if aliasform %} -{% bootstrap_form_errors aliasform %} + {% bootstrap_form_errors aliasform %} {% endif %} {% if serviceform %} -{% bootstrap_form_errors serviceform %} + {% bootstrap_form_errors serviceform %} {% endif %} {% if vlanform %} -{% bootstrap_form_errors vlanform %} + {% bootstrap_form_errors vlanform %} {% endif %} {% if nasform %} -{% bootstrap_form_errors nasform %} + {% bootstrap_form_errors nasform %} {% endif %}
{% csrf_token %} {% if machineform %} -

Machine

- {% bootstrap_form machineform %} +

Machine

+ {% bootstrap_form machineform %} {% endif %} {% if interfaceform %} -

Interface

+

Interface

{% if i_mbf_param %} - {% massive_bootstrap_form interfaceform 'ipv4,machine' mbf_param=i_mbf_param %} - {% else %} - {% massive_bootstrap_form interfaceform 'ipv4,machine' %} - {% endif %} + {% massive_bootstrap_form interfaceform 'ipv4,machine' mbf_param=i_mbf_param %} + {% else %} + {% massive_bootstrap_form interfaceform 'ipv4,machine' %} + {% endif %} {% endif %} {% if domainform %} -

Domaine

- {% bootstrap_form domainform %} +

Domaine

+ {% bootstrap_form domainform %} {% endif %} {% if iptypeform %} -

Type d'IP

- {% bootstrap_form iptypeform %} +

Type d'IP

+ {% bootstrap_form iptypeform %} {% endif %} {% if machinetypeform %} -

Type de machine

- {% bootstrap_form machinetypeform %} +

Type de machine

+ {% bootstrap_form machinetypeform %} {% endif %} {% if extensionform %} -

Extension

- {% massive_bootstrap_form extensionform 'origin' %} +

Extension

+ {% massive_bootstrap_form extensionform 'origin' %} {% endif %} {% if soaform %} -

Enregistrement SOA

- {% bootstrap_form soaform %} +

Enregistrement SOA

+ {% bootstrap_form soaform %} {% endif %} {% if mxform %} -

Enregistrement MX

- {% massive_bootstrap_form mxform 'name' %} +

Enregistrement MX

+ {% massive_bootstrap_form mxform 'name' %} {% endif %} {% if nsform %} -

Enregistrement NS

- {% massive_bootstrap_form nsform 'ns' %} +

Enregistrement NS

+ {% massive_bootstrap_form nsform 'ns' %} {% endif %} {% if txtform %} -

Enregistrement TXT

- {% bootstrap_form txtform %} +

Enregistrement TXT

+ {% bootstrap_form txtform %} {% endif %} {% if srvform %} -

Enregistrement SRV

- {% massive_bootstrap_form srvform 'target' %} +

Enregistrement SRV

+ {% massive_bootstrap_form srvform 'target' %} {% endif %} {% if aliasform %} -

Alias

- {% bootstrap_form aliasform %} +

Alias

+ {% bootstrap_form aliasform %} {% endif %} {% if serviceform %} -

Service

- {% massive_bootstrap_form serviceform 'servers' %} +

Service

+ {% massive_bootstrap_form serviceform 'servers' %} {% endif %} {% if vlanform %} -

Vlan

- {% bootstrap_form vlanform %} +

Vlan

+ {% bootstrap_form vlanform %} {% endif %} {% if nasform %} -

NAS

- {% bootstrap_form nasform %} +

NAS

+ {% bootstrap_form nasform %} {% endif %} {% bootstrap_button "Créer ou modifier" button_type="submit" icon="star" %}
From cc48d0b36a6adbdb11e9f448cdf50cfac50849a2 Mon Sep 17 00:00:00 2001 From: lhark Date: Mon, 18 Dec 2017 20:58:11 -0500 Subject: [PATCH 2/3] Fix templates indentation --- templates/base.html | 20 ++++++++------------ templates/buttons/add.html | 1 - templates/buttons/edit.html | 1 - templates/buttons/history.html | 1 - templates/buttons/multiple_checkbox_alt.html | 8 +++----- templates/buttons/suppr.html | 1 - templates/pagination.html | 4 ++-- 7 files changed, 13 insertions(+), 23 deletions(-) diff --git a/templates/base.html b/templates/base.html index aea0ea99..408abec1 100644 --- a/templates/base.html +++ b/templates/base.html @@ -94,18 +94,18 @@ with this program; if not, write to the Free Software Foundation, Inc., Login {% endif %} - - + + {% if is_cableur %} - {% endif %} - + + + {% endif %} + @@ -122,9 +122,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{# Display django.contrib.messages as Bootstrap alerts #} {% bootstrap_messages %} -
- {% block content %}{% endblock %}
@@ -146,9 +144,9 @@ with this program; if not, write to the Free Software Foundation, Inc., Connexion {% if request_user.has_access %} - jusqu'au {{ request.user.end_access|date:"d b Y" }} + jusqu'au {{ request.user.end_access|date:"d b Y" }} {% else %} - Désactivée + Désactivée {% endif %} @@ -201,8 +199,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,

Re2o 2016 - Gabriel Détraz, Goulven Kermarec, Augustin Lemesle, Maël Kervella

- - {# Read the documentation for more information #} diff --git a/templates/buttons/add.html b/templates/buttons/add.html index b0cb5fe7..0cffb9f4 100644 --- a/templates/buttons/add.html +++ b/templates/buttons/add.html @@ -21,7 +21,6 @@ You should have received a copy of the GNU General Public License along 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/templates/buttons/edit.html b/templates/buttons/edit.html index d5cfa277..aaa51261 100644 --- a/templates/buttons/edit.html +++ b/templates/buttons/edit.html @@ -21,7 +21,6 @@ You should have received a copy of the GNU General Public License along 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/templates/buttons/history.html b/templates/buttons/history.html index 8dc5b32a..42f08614 100644 --- a/templates/buttons/history.html +++ b/templates/buttons/history.html @@ -21,7 +21,6 @@ You should have received a copy of the GNU General Public License along 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/templates/buttons/multiple_checkbox_alt.html b/templates/buttons/multiple_checkbox_alt.html index 6346632c..e6fd7d58 100644 --- a/templates/buttons/multiple_checkbox_alt.html +++ b/templates/buttons/multiple_checkbox_alt.html @@ -21,20 +21,18 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. {% endcomment %} -
{% for val in field.field.choices %} - + {% endfor %}
{% for error in field.errors %} -
{{ error }}
+
{{ error }}
{% endfor %}
{{ field.help_text }}
diff --git a/templates/buttons/suppr.html b/templates/buttons/suppr.html index 383bca40..907345be 100644 --- a/templates/buttons/suppr.html +++ b/templates/buttons/suppr.html @@ -21,7 +21,6 @@ You should have received a copy of the GNU General Public License along 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/templates/pagination.html b/templates/pagination.html index 7ebd26c1..a3a51602 100644 --- a/templates/pagination.html +++ b/templates/pagination.html @@ -31,13 +31,13 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endif %} {% for page in list.paginator.page_range %} {% if list.number <= page|add:"3" and list.number >= page|add:"-3" %} -
  • {{ page }}
    • +
  • {{ page }}
    • {% endif %} {% endfor %} {% if list.has_next %}
  • >
    • -
  • >>
    • +
  • >>
    • {% endif %} From a8f817ff582285ef66e15d533a83229c671a7949 Mon Sep 17 00:00:00 2001 From: lhark Date: Mon, 18 Dec 2017 21:12:57 -0500 Subject: [PATCH 3/3] 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., - - + +
      {% for user in values.rights %} -
    • {{ user }}
      • - {% endfor %} -
    +
  • {{ 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 %}