Merge branch 'code-cleanup' into 'master'

Code cleanup

See merge request federez/re2o!52

machines/templates/machines/machine.html

@@ -31,46 +31,46 @@ 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 %}
 
 <form class="form" method="post">

templates/base.html

@@ -122,9 +122,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                     <div class="col-sm-8 text-left">
                         {# Display django.contrib.messages as Bootstrap alerts #}
                         {% bootstrap_messages %}
-
                         <hr>
-
                         {% block content %}{% endblock %}
                     </div>
                     <div class="col-sm-2 sidenav">
@@ -201,8 +199,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 <p>Re2o 2016 - Gabriel Détraz, <a href="https://gitlab.rezometz.org/lhark">Goulven Kermarec</a>, Augustin Lemesle, Maël Kervella</p>
             </div>
         </footer>
-
-
         {# Read the documentation for more information #}
     </body>
 </html>

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 %}
-
 <a class="btn btn-primary btn-sm" role="button" href="{% url href  id %}" title="{{ desc|default:"Ajouter" }}">
     <i class="glyphicon glyphicon-plus"></i>
 </a>

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 %}
-
 <a class="btn btn-primary btn-sm" role="button" title="{{ desc|default:"Éditer" }}" href="{% url href id %}">
     <i class="glyphicon glyphicon-edit"></i>
 </a>

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 %}
-
 <a class="btn btn-info btn-sm" role="button" title="Historique" href="{% url href name id %}">
     <i class="glyphicon glyphicon-time"></i>
 </a>

templates/buttons/multiple_checkbox_alt.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 %}
-
 <div class="form-group {% if field.form.errors %}{% if field.errors %}has-error{% else %}has-success{% endif %}{% endif %}">
     <label class="control-label" for="{{ field.id_for_label }}">
         {{ field.label }}
@@ -29,8 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <div id="{{ field.auto_id }}" data-toggle="buttons">
         {% for val in field.field.choices %}
             <label for="id_u_{{ val.0 }}" class="btn btn-default{% if val.0 in field.initial %} active{% endif %}">
-            <input {% if val.0 in field.initial %}checked="checked" {% endif %}class="" id="id_u_{{ val.0 }}" name="{{ field.name }}" title="" type="checkbox" value="{{ val.0 }}" /> {{ val.1 }}
+            <input {% if val.0 in field.initial %}checked="checked" {% endif %}class="" id="id_u_{{ val.0 }}" name="{{ field.name }}" title="" type="checkbox" value="{{ val.0 }}" /> {{ val.1 }}</label>
-        </label>
         {% endfor %}
     </div>
     {% for error in field.errors %}

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 %}
-
 <a class="btn btn-danger btn-sm" role="button" href="{% url href id %}" title="{{ desc|default:"Supprimer" }}">
     <i class="glyphicon glyphicon-trash"></i>
 </a>

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 %}

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 %}
 
 <h1>Gestion des droits</h1>
@@ -70,7 +69,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     } );
 </script>
 
-  <br />
+<br />
-  <br />
+<br />
-  <br />
+<br />
 {% endblock %}

users/templates/users/delete.html

@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h4>Attention, voulez-vous vraiment supprimer cet objet {{ objet_name }} ( {{ objet }} ) ?</h4>
     {% bootstrap_button "Confirmer" button_type="submit" icon="trash" %}
 </form>
-  <br />
+<br />
-  <br />
+<br />
-  <br />
+<br />
 {% endblock %}

users/templates/users/mass_archive.html

@@ -35,12 +35,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <input type="submit" name="valider" value="Valider définitivement" class="btn btn-primary" id="submit-id-submit">
 </form>
 
-
+<h3>Les utilisateurs suivant seront archivés ({{ to_archive_list|length }}):</h3>
-
+{%  include "users/aff_users.html" with  users_list=to_archive_list %}
-  <h3>Les utilisateurs suivant seront archivés ({{ to_archive_list|length }}):</h3>
+<br />
-  {%  include "users/aff_users.html" with  users_list=to_archive_list %}
+<br />
-  <br />
+<br />
-  <br />
-  <br />
 {% endblock %}
 

users/templates/users/profil.html

@@ -213,4 +213,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <br />
     <br />
 {% endblock %}
-

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" %}
 </form>
-  <br />
+<br/>
-  <br />
+<br/>
-  <br />
+<br/>
 {% endblock %}