rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-22 11:23:10 +00:00
Code Issues Releases Wiki Activity

Merge branch 'code-cleanup' into 'master'

Browse source 
Code cleanup

See merge request federez/re2o!52
This commit is contained in:
chirac 2017-12-19 15:02:46 +01:00
commit aa39918eae
14 changed files with 89 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
machines/templates/machines/machine.html
View file

@ -31,113 +31,113 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block content %} {% block content %}
{% if machineform %} {% if machineform %}
{% bootstrap_form_errors machineform %} {% bootstrap_form_errors machineform %}
{% endif %} {% endif %}
{% if interfaceform %} {% if interfaceform %}
{% bootstrap_form_errors interfaceform %} {% bootstrap_form_errors interfaceform %}
{% endif %} {% endif %}
{% if domainform %} {% if domainform %}
{% bootstrap_form_errors domainform %} {% bootstrap_form_errors domainform %}
{% endif %} {% endif %}
{% if iptypeform %} {% if iptypeform %}
{% bootstrap_form_errors iptypeform %} {% bootstrap_form_errors iptypeform %}
{% endif %} {% endif %}
{% if machinetypeform %} {% if machinetypeform %}
{% bootstrap_form_errors machinetypeform %} {% bootstrap_form_errors machinetypeform %}
{% endif %} {% endif %}
{% if extensionform %} {% if extensionform %}
{% bootstrap_form_errors extensionform %} {% bootstrap_form_errors extensionform %}
{% endif %} {% endif %}
{% if mxform %} {% if mxform %}
{% bootstrap_form_errors mxform %} {% bootstrap_form_errors mxform %}
{% endif %} {% endif %}
{% if nsform %} {% if nsform %}
{% bootstrap_form_errors nsform %} {% bootstrap_form_errors nsform %}
{% endif %} {% endif %}
{% if txtform %} {% if txtform %}
{% bootstrap_form_errors txtform %} {% bootstrap_form_errors txtform %}
{% endif %} {% endif %}
{% if srvform %} {% if srvform %}
{% bootstrap_form_errors srvform %} {% bootstrap_form_errors srvform %}
{% endif %} {% endif %}
{% if aliasform %} {% if aliasform %}
{% bootstrap_form_errors aliasform %} {% bootstrap_form_errors aliasform %}
{% endif %} {% endif %}
{% if serviceform %} {% if serviceform %}
{% bootstrap_form_errors serviceform %} {% bootstrap_form_errors serviceform %}
{% endif %} {% endif %}
{% if vlanform %} {% if vlanform %}
{% bootstrap_form_errors vlanform %} {% bootstrap_form_errors vlanform %}
{% endif %} {% endif %}
{% if nasform %} {% if nasform %}
{% bootstrap_form_errors nasform %} {% bootstrap_form_errors nasform %}
{% endif %} {% endif %}
<form class="form" method="post"> <form class="form" method="post">
{% csrf_token %} {% csrf_token %}
{% if machineform %} {% if machineform %}
<h3>Machine</h3> <h3>Machine</h3>
{% bootstrap_form machineform %} {% bootstrap_form machineform %}
{% endif %} {% endif %}
{% if interfaceform %} {% if interfaceform %}
<h3>Interface</h3> <h3>Interface</h3>
{% if i_mbf_param %} {% if i_mbf_param %}
{% massive_bootstrap_form interfaceform 'ipv4,machine' mbf_param=i_mbf_param %} {% massive_bootstrap_form interfaceform 'ipv4,machine' mbf_param=i_mbf_param %}
{% else %} {% else %}
{% massive_bootstrap_form interfaceform 'ipv4,machine' %} {% massive_bootstrap_form interfaceform 'ipv4,machine' %}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if domainform %} {% if domainform %}
<h3>Domaine</h3> <h3>Domaine</h3>
{% bootstrap_form domainform %} {% bootstrap_form domainform %}
{% endif %} {% endif %}
{% if iptypeform %} {% if iptypeform %}
<h3>Type d'IP</h3> <h3>Type d'IP</h3>
{% bootstrap_form iptypeform %} {% bootstrap_form iptypeform %}
{% endif %} {% endif %}
{% if machinetypeform %} {% if machinetypeform %}
<h3>Type de machine</h3> <h3>Type de machine</h3>
{% bootstrap_form machinetypeform %} {% bootstrap_form machinetypeform %}
{% endif %} {% endif %}
{% if extensionform %} {% if extensionform %}
<h3>Extension</h3> <h3>Extension</h3>
{% massive_bootstrap_form extensionform 'origin' %} {% massive_bootstrap_form extensionform 'origin' %}
{% endif %} {% endif %}
{% if soaform %} {% if soaform %}
<h3>Enregistrement SOA</h3> <h3>Enregistrement SOA</h3>
{% bootstrap_form soaform %} {% bootstrap_form soaform %}
{% endif %} {% endif %}
{% if mxform %} {% if mxform %}
<h3>Enregistrement MX</h3> <h3>Enregistrement MX</h3>
{% massive_bootstrap_form mxform 'name' %} {% massive_bootstrap_form mxform 'name' %}
{% endif %} {% endif %}
{% if nsform %} {% if nsform %}
<h3>Enregistrement NS</h3> <h3>Enregistrement NS</h3>
{% massive_bootstrap_form nsform 'ns' %} {% massive_bootstrap_form nsform 'ns' %}
{% endif %} {% endif %}
{% if txtform %} {% if txtform %}
<h3>Enregistrement TXT</h3> <h3>Enregistrement TXT</h3>
{% bootstrap_form txtform %} {% bootstrap_form txtform %}
{% endif %} {% endif %}
{% if srvform %} {% if srvform %}
<h3>Enregistrement SRV</h3> <h3>Enregistrement SRV</h3>
{% massive_bootstrap_form srvform 'target' %} {% massive_bootstrap_form srvform 'target' %}
{% endif %} {% endif %}
{% if aliasform %} {% if aliasform %}
<h3>Alias</h3> <h3>Alias</h3>
{% bootstrap_form aliasform %} {% bootstrap_form aliasform %}
{% endif %} {% endif %}
{% if serviceform %} {% if serviceform %}
<h3>Service</h3> <h3>Service</h3>
{% massive_bootstrap_form serviceform 'servers' %} {% massive_bootstrap_form serviceform 'servers' %}
{% endif %} {% endif %}
{% if vlanform %} {% if vlanform %}
<h3>Vlan</h3> <h3>Vlan</h3>
{% bootstrap_form vlanform %} {% bootstrap_form vlanform %}
{% endif %} {% endif %}
{% if nasform %} {% if nasform %}
<h3>NAS</h3> <h3>NAS</h3>
{% bootstrap_form nasform %} {% bootstrap_form nasform %}
{% endif %} {% endif %}
{% bootstrap_button "Créer ou modifier" button_type="submit" icon="star" %} {% bootstrap_button "Créer ou modifier" button_type="submit" icon="star" %}
</form> </form>

20
templates/base.html
View file

@ -94,18 +94,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<span class="glyphicon glyphicon-log-in"></span> Login <span class="glyphicon glyphicon-log-in"></span> Login
</a> </a>
{% endif %} {% endif %}
</li> </li>
</ul> </ul>
{% if is_cableur %} {% if is_cableur %}
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li> <li>
<a href="{% url 'preferences:display-options' %}"> <a href="{% url 'preferences:display-options' %}">
<span class="glyphicon glyphicon-cog"></span> Preferences <span class="glyphicon glyphicon-cog"></span> Preferences
</a> </a>
</li> </li>
</ul> </ul>
{% endif %} {% endif %}
</div> </div>
</div> </div>
</nav> </nav>
@ -122,9 +122,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div class="col-sm-8 text-left"> <div class="col-sm-8 text-left">
{# Display django.contrib.messages as Bootstrap alerts #} {# Display django.contrib.messages as Bootstrap alerts #}
{% bootstrap_messages %} {% bootstrap_messages %}
<hr> <hr>
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
<div class="col-sm-2 sidenav"> <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> <th scope="row">Connexion</th>
<td class="text-right"> <td class="text-right">
{% if request_user.has_access %} {% 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 %} {% else %}
<i class="text-danger">Désactivée</i> <i class="text-danger">Désactivée</i>
{% endif %} {% endif %}
</td> </td>
</tr> </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> <p>Re2o 2016 - Gabriel Détraz, <a href="https://gitlab.rezometz.org/lhark">Goulven Kermarec</a>, Augustin Lemesle, Maël Kervella</p>
</div> </div>
</footer> </footer>
{# Read the documentation for more information #} {# Read the documentation for more information #}
</body> </body>
</html> </html>

1
templates/buttons/add.html
View file

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %} {% endcomment %}
<a class="btn btn-primary btn-sm" role="button" href="{% url href id %}" title="{{ desc|default:"Ajouter" }}"> <a class="btn btn-primary btn-sm" role="button" href="{% url href id %}" title="{{ desc|default:"Ajouter" }}">
<i class="glyphicon glyphicon-plus"></i> <i class="glyphicon glyphicon-plus"></i>
</a> </a>

1
templates/buttons/edit.html
View file

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %} {% endcomment %}
<a class="btn btn-primary btn-sm" role="button" title="{{ desc|default:"Éditer" }}" href="{% url href id %}"> <a class="btn btn-primary btn-sm" role="button" title="{{ desc|default:"Éditer" }}" href="{% url href id %}">
<i class="glyphicon glyphicon-edit"></i> <i class="glyphicon glyphicon-edit"></i>
</a> </a>

1
templates/buttons/history.html
View file

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %} {% endcomment %}
<a class="btn btn-info btn-sm" role="button" title="Historique" href="{% url href name id %}"> <a class="btn btn-info btn-sm" role="button" title="Historique" href="{% url href name id %}">
<i class="glyphicon glyphicon-time"></i> <i class="glyphicon glyphicon-time"></i>
</a> </a>

8
templates/buttons/multiple_checkbox_alt.html
View file

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %} {% endcomment %}
<div class="form-group {% if field.form.errors %}{% if field.errors %}has-error{% else %}has-success{% endif %}{% endif %}"> <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 }}"> <label class="control-label" for="{{ field.id_for_label }}">
{{ field.label }} {{ field.label }}
</label> </label>
<div id="{{ field.auto_id }}" data-toggle="buttons"> <div id="{{ field.auto_id }}" data-toggle="buttons">
{% for val in field.field.choices %} {% for val in field.field.choices %}
<label for="id_u_{{ val.0 }}" class="btn btn-default{% if val.0 in field.initial %} active{% endif %}"> <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 %} {% endfor %}
</div> </div>
{% for error in field.errors %} {% for error in field.errors %}
<div class="help-block">{{ error }}</div> <div class="help-block">{{ error }}</div>
{% endfor %} {% endfor %}
<div class="help-block">{{ field.help_text }}</div> <div class="help-block">{{ field.help_text }}</div>
</div> </div>

1
templates/buttons/suppr.html
View file

@ -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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %} {% endcomment %}
<a class="btn btn-danger btn-sm" role="button" href="{% url href id %}" title="{{ desc|default:"Supprimer" }}"> <a class="btn btn-danger btn-sm" role="button" href="{% url href id %}" title="{{ desc|default:"Supprimer" }}">
<i class="glyphicon glyphicon-trash"></i> <i class="glyphicon glyphicon-trash"></i>
</a> </a>

4
templates/pagination.html
View file

@ -31,13 +31,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endif %} {% endif %}
{% for page in list.paginator.page_range %} {% for page in list.paginator.page_range %}
{% if list.number <= page|add:"3" and list.number >= page|add:"-3" %} {% 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 %} {% endif %}
{% endfor %} {% endfor %}
{% if list.has_next %} {% 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.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 %} {% endif %}
</ul> </ul>

1
templates/registration/login.html
View file

@ -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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %} {% endcomment %}
{% load bootstrap3 %} {% load bootstrap3 %}
{% block title %}Login{% endblock %} {% block title %}Login{% endblock %}

19
users/templates/users/del_right.html
View file

@ -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 title %}Création et modification d'utilisateur{% endblock %}
{% block content %} {% block content %}
<h1>Gestion des droits</h1> <h1>Gestion des droits</h1>
@ -44,17 +43,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</a> </a>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div class="collapse in" id="collapseRight_{{key}}"> <div class="collapse in" id="collapseRight_{{key}}">
<ul class="list-group" style="margin-bottom: 0px"> <ul class="list-group" style="margin-bottom: 0px">
{% for user in values.rights %} {% for user in values.rights %}
<li class="list-group-item col-xs-6 col-sm-4 col-md-3" style="border: none;">{{ user }}</li> <li class="list-group-item col-xs-6 col-sm-4 col-md-3" style="border: none;">{{ user }}</li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
@ -70,7 +69,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
} ); } );
</script> </script>
<br /> <br />
<br /> <br />
<br /> <br />
{% endblock %} {% endblock %}

6
users/templates/users/delete.html
View file

@ -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> <h4>Attention, voulez-vous vraiment supprimer cet objet {{ objet_name }} ( {{ objet }} ) ?</h4>
{% bootstrap_button "Confirmer" button_type="submit" icon="trash" %} {% bootstrap_button "Confirmer" button_type="submit" icon="trash" %}
</form> </form>
<br /> <br />
<br /> <br />
<br /> <br />
{% endblock %} {% endblock %}

12
users/templates/users/mass_archive.html
View file

@ -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"> <input type="submit" name="valider" value="Valider définitivement" class="btn btn-primary" id="submit-id-submit">
</form> </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 %} {% endblock %}

19
users/templates/users/profil.html
View file

@ -73,7 +73,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<th>Chambre</th> <th>Chambre</th>
<td>{{ user.room }}</td> <td>{{ user.room }}</td>
<th>Téléphone</th> <th>Téléphone</th>
<td>{{ user.telephone }}</td> <td>{{ user.telephone }}</td>
</tr> </tr>
<tr> <tr>
<th>École</th> <th>École</th>
@ -81,7 +81,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<th>Commentaire</th> <th>Commentaire</th>
<td>{{ user.comment }}</td> <td>{{ user.comment }}</td>
</tr> </tr>
<tr> <tr>
<th>Date d'inscription</th> <th>Date d'inscription</th>
<td>{{ user.registered }}</td> <td>{{ user.registered }}</td>
<th>Dernière connexion</th> <th>Dernière connexion</th>
@ -119,7 +119,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<tr> <tr>
<th>Accès internet</th> <th>Accès internet</th>
{% if user.has_access == True %} {% 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 %} {% else %}
<td><i class="text-danger">Désactivé</i></td> <td><i class="text-danger">Désactivé</i></td>
{% endif %} {% endif %}
@ -130,16 +130,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<td>Aucun</td> <td>Aucun</td>
{% endif %} {% endif %}
</tr> </tr>
{% if user_solde %} {% if user_solde %}
<tr> <tr>
<th>Solde</th> <th>Solde</th>
<td>{{ user.solde }} €</td> <td>{{ user.solde }} €</td>
</tr> </tr>
{% endif %} {% endif %}
{% if user.shell %} {% if user.shell %}
<th>Shell</th> <th>Shell</th>
<td>{{ user.shell }}</td> <td>{{ user.shell }}</td>
{% endif %} {% endif %}
</table> </table>
{% if user.is_class_club %} {% if user.is_class_club %}
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-club-admin-members' user.club.id %}"> <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 />
<br /> <br />
{% endblock %} {% endblock %}

6
users/templates/users/user.html
View file

@ -36,7 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% massive_bootstrap_form userform 'room,school,administrators,members' %} {% massive_bootstrap_form userform 'room,school,administrators,members' %}
{% bootstrap_button "Créer ou modifier" button_type="submit" icon="star" %} {% bootstrap_button "Créer ou modifier" button_type="submit" icon="star" %}
</form> </form>
<br /> <br/>
<br /> <br/>
<br /> <br/>
{% endblock %} {% endblock %}