Skip to content

GitLab

R
re2o
Commit aa39918e authored by chirac's avatar chirac
Browse files
Options

Merge branch 'code-cleanup' into 'master' 

Code cleanup

See merge request federez/re2o!52
parents 518845f7 b25aeaee
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 104 deletions
machines/templates/machines/machine.html
View file @ aa39918e
......@@ -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 %}
<form class="form" method="post">
{% csrf_token %}
{% if machineform %}
<h3>Machine</h3>
{% bootstrap_form machineform %}
<h3>Machine</h3>
{% bootstrap_form machineform %}
{% endif %}
{% if interfaceform %}
<h3>Interface</h3>
<h3>Interface</h3>
{% 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 %}
<h3>Domaine</h3>
{% bootstrap_form domainform %}
<h3>Domaine</h3>
{% bootstrap_form domainform %}
{% endif %}
{% if iptypeform %}
<h3>Type d'IP</h3>
{% bootstrap_form iptypeform %}
<h3>Type d'IP</h3>
{% bootstrap_form iptypeform %}
{% endif %}
{% if machinetypeform %}
<h3>Type de machine</h3>
{% bootstrap_form machinetypeform %}
<h3>Type de machine</h3>
{% bootstrap_form machinetypeform %}
{% endif %}
{% if extensionform %}
<h3>Extension</h3>
{% massive_bootstrap_form extensionform 'origin' %}
<h3>Extension</h3>
{% massive_bootstrap_form extensionform 'origin' %}
{% endif %}
{% if soaform %}
<h3>Enregistrement SOA</h3>
{% bootstrap_form soaform %}
<h3>Enregistrement SOA</h3>
{% bootstrap_form soaform %}
{% endif %}
{% if mxform %}
<h3>Enregistrement MX</h3>
{% massive_bootstrap_form mxform 'name' %}
<h3>Enregistrement MX</h3>
{% massive_bootstrap_form mxform 'name' %}
{% endif %}
{% if nsform %}
<h3>Enregistrement NS</h3>
{% massive_bootstrap_form nsform 'ns' %}
<h3>Enregistrement NS</h3>
{% massive_bootstrap_form nsform 'ns' %}
{% endif %}
{% if txtform %}
<h3>Enregistrement TXT</h3>
{% bootstrap_form txtform %}
<h3>Enregistrement TXT</h3>
{% bootstrap_form txtform %}
{% endif %}
{% if srvform %}
<h3>Enregistrement SRV</h3>
{% massive_bootstrap_form srvform 'target' %}
<h3>Enregistrement SRV</h3>
{% massive_bootstrap_form srvform 'target' %}
{% endif %}
{% if aliasform %}
<h3>Alias</h3>
{% bootstrap_form aliasform %}
<h3>Alias</h3>
{% bootstrap_form aliasform %}
{% endif %}
{% if serviceform %}
<h3>Service</h3>
{% massive_bootstrap_form serviceform 'servers' %}
<h3>Service</h3>
{% massive_bootstrap_form serviceform 'servers' %}
{% endif %}
{% if vlanform %}
<h3>Vlan</h3>
{% bootstrap_form vlanform %}
<h3>Vlan</h3>
{% bootstrap_form vlanform %}
{% endif %}
{% if nasform %}
<h3>NAS</h3>
{% bootstrap_form nasform %}
<h3>NAS</h3>
{% bootstrap_form nasform %}
{% endif %}
{% bootstrap_button "Créer ou modifier" button_type="submit" icon="star" %}
</form>
......
templates/base.html
View file @ aa39918e
......@@ -94,18 +94,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<span class="glyphicon glyphicon-log-in"></span> Login
</a>
{% endif %}
</li>
</ul>
</li>
</ul>
{% if is_cableur %}
<ul class="nav navbar-nav navbar-right">
<li>
<a href="{% url 'preferences:display-options' %}">
<span class="glyphicon glyphicon-cog"></span> Preferences
</a>
</li>
</ul>
{% endif %}
</div>
</li>
</ul>
{% endif %}
</div>
</div>
</nav>
......@@ -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">
......@@ -146,9 +144,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<th scope="row">Connexion</th>
<td class="text-right">
{% if request_user.has_access %}
<i class="text-success">jusqu'au {{ request.user.end_access|date:"d b Y" }}</i>
<i class="text-success">jusqu'au {{ request.user.end_access|date:"d b Y" }}</i>
{% else %}
<i class="text-danger">Désactivée</i>
<i class="text-danger">Désactivée</i>
{% endif %}
</td>
</tr>
......@@ -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
View file @ aa39918e
......@@ -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
View file @ aa39918e
......@@ -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
View file @ aa39918e
......@@ -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
View file @ aa39918e
......@@ -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 %}
<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 }}
</label>
<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 }}
</label>
<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 }}</label>
{% endfor %}
</div>
{% for error in field.errors %}
<div class="help-block">{{ error }}</div>
<div class="help-block">{{ error }}</div>
{% endfor %}
<div class="help-block">{{ field.help_text }}</div>
</div>
templates/buttons/suppr.html
View file @ aa39918e
......@@ -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/pagination.html
View file @ aa39918e
......@@ -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" %}
<li class="{% if list.number == page %}active{% endif %}"><a href="{% url_insert_param request.get_full_path page=page %}">{{ page }}</a></li>
<li class="{% if list.number == page %}active{% endif %}"><a href="{% url_insert_param request.get_full_path page=page %}">{{ page }}</a></li>
{% endif %}
{% endfor %}
{% if list.has_next %}
<li><a href="{% url_insert_param request.get_full_path page=list.next_page_number %}"> > </a></li>
<li><a href="{% url_insert_param request.get_full_path page=list.paginator.page_range|length %}"> >> </a></li>
<li><a href="{% url_insert_param request.get_full_path page=list.paginator.page_range|length %}"> >> </a></li>
{% endif %}
</ul>
templates/registration/login.html
View file @ aa39918e
......@@ -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
View file @ aa39918e
......@@ -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>
......@@ -44,17 +43,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</a>
</td>
</tr>
<tr>
<td>
<tr>
<td>
<div class="collapse in" id="collapseRight_{{key}}">
<ul class="list-group" style="margin-bottom: 0px">
{% for user in values.rights %}
<li class="list-group-item col-xs-6 col-sm-4 col-md-3" style="border: none;">{{ user }}</li>
{% endfor %}
</ul>
<li class="list-group-item col-xs-6 col-sm-4 col-md-3" style="border: none;">{{ user }}</li>
{% endfor %}
</ul>
</div>
</td>
</tr>
</tr>
{% endfor %}
</tbody>
</table>
......@@ -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
View file @ aa39918e
......@@ -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
View file @ aa39918e
......@@ -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 %}
<br />
<br />
<br />
<h3>Les utilisateurs suivant seront archivés ({{ to_archive_list|length }}):</h3>
{% include "users/aff_users.html" with users_list=to_archive_list %}
<br />
<br />
<br />
{% endblock %}
users/templates/users/profil.html
View file @ aa39918e
......@@ -73,7 +73,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<th>Chambre</th>
<td>{{ user.room }}</td>
<th>Téléphone</th>
<td>{{ user.telephone }}</td>
<td>{{ user.telephone }}</td>
</tr>
<tr>
<th>École</th>
......@@ -81,7 +81,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<th>Commentaire</th>
<td>{{ user.comment }}</td>
</tr>
<tr>
<tr>
<th>Date d'inscription</th>
<td>{{ user.registered }}</td>
<th>Dernière connexion</th>
......@@ -119,7 +119,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<tr>
<th>Accès internet</th>
{% if user.has_access == True %}
<td><i class="text-success">Actif (jusqu'au {{ user.end_access }})</i></td>
<td><i class="text-success">Actif (jusqu'au {{ user.end_access }})</i></td>
{% else %}
<td><i class="text-danger">Désactivé</i></td>
{% endif %}
......@@ -130,16 +130,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<td>Aucun</td>
{% endif %}
</tr>
{% if user_solde %}
{% if user_solde %}
<tr>
<th>Solde</th>
<td>{{ user.solde }} €</td>
</tr>
{% endif %}
{% if user.shell %}
<th>Shell</th>
<td>{{ user.shell }}</td>
{% endif %}
{% endif %}
{% if user.shell %}
<th>Shell</th>
<td>{{ user.shell }}</td>
{% endif %}
</table>
{% if user.is_class_club %}
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-club-admin-members' user.club.id %}">
......@@ -213,4 +213,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<br />
<br />
{% endblock %}
users/templates/users/user.html
View file @ aa39918e
......@@ -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 %}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment