rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-23 15:33:45 +00:00
Code Issues Releases Wiki Activity

Fix typo and update display port profils

Browse source
This commit is contained in:
grisel-davy 2020-10-23 19:13:02 +02:00
parent 57d22e9aaf
commit 685c88d2e5
2 changed files with 92 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
topologie/templates/topologie/aff_port_profile.html
View file

@ -3,7 +3,7 @@ Re2o est un logiciel d'administration développé initiallement au rezometz. Il
se veut agnostique au réseau considéré, de manière à être installable en se veut agnostique au réseau considéré, de manière à être installable en
quelques clics. quelques clics.
Copyright © 2018 Gabriel Détraz Copyleft © 2018 Gabriel Détraz
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -24,37 +24,44 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% load i18n %} {% load i18n %}
{% load logs_extra %} {% load logs_extra %}
<div class="table-responsive">
{% if port_profile_list.paginator %} {% for port_profile in port_profile_list %}
{% include 'pagination.html' with list=port_profile_list %} <div class="panel panel-default">
{% endif %} <div class="panel-heading">
<div class="container-fluid">
<div class="row">
<table class="table table-striped"> <div class="col-sm-3">
<h4>{{ port_profile.name }}</h4>
</div>
<div class="col-sm-9 text-right">
{% can_edit port_profile %}
{% include 'buttons/edit.html' with href='topologie:edit-port-profile' id=port_profile.id %}
{% acl_end %}
{% history_button port_profile %}
{% can_delete port_profile %}
{% include 'buttons/suppr.html' with href='topologie:del-port-profile' id=port_profile.id %}
{% acl_end %}
</div>
</div>
</div>
</div>
<div class="panel-body">
<div class="table-repsonsive">
<table class="table">
<thead> <thead>
<tr> <tr>
<th>{% trans "Name" %}</th>
<th>{% trans "Default for" %}</th> <th>{% trans "Default for" %}</th>
<th>{% trans "VLANs" %}</th>
<th>{% trans "RADIUS settings" %}</th> <th>{% trans "RADIUS settings" %}</th>
<th>{% trans "Speed limit" %}</th> <th>{% trans "Speed limit" %}</th>
<th>{% trans "MAC address limit" %}</th> <th>{% trans "MAC address limit" %}</th>
<th>{% trans "Security" %}</th> <th>{% trans "Security" %}</th>
<th></th>
</tr> </tr>
</thead> </thead>
{% for port_profile in port_profile_list %}
<tr> <tr>
<td>{{ port_profile.name }}</td>
<td>{{ port_profile.profil_default }} {% if port_profile.profil_default%}<b> - {% if port_profile.on_dormitory %}{% blocktrans with dorm=port_profile.on_dormitory %} on {{ dorm }}{% endblocktrans %}{% else %}{% trans "Everywhere" %}{% endif %}</b>{% endif %}</td>
<td> <td>
{% if port_profile.vlan_untagged %} {{ port_profile.profil_default }}
<b>{% trans "Untagged: " %}</b>{{ port_profile.vlan_untagged }} {% if port_profile.profil_default%}
<br> <b> - {% if port_profile.on_dormitory %}{% blocktrans with dorm=port_profile.on_dormitory %} on {{ dorm }}{% endblocktrans %}{% else %}{% trans "Everywhere" %}{% endif %}</b>
{% endif %}
{% if port_profile.vlan_tagged.all %}
<b>{% trans "Tagged: " %}</b>{{ port_profile.vlan_tagged.all|join:", " }}
{% endif %} {% endif %}
</td> </td>
<td> <td>
@ -66,22 +73,46 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<td>{{ port_profile.speed }}</td> <td>{{ port_profile.speed }}</td>
<td>{{ port_profile.mac_limit }}</td> <td>{{ port_profile.mac_limit }}</td>
<td>{{ port_profile.security_parameters_enabled|join:"<br>" }}</td> <td>{{ port_profile.security_parameters_enabled|join:"<br>" }}</td>
<td class="text-right">
{% can_edit port_profile %}
{% include 'buttons/edit.html' with href='topologie:edit-port-profile' id=port_profile.id %}
{% acl_end %}
{% history_button port_profile %}
{% can_delete port_profile %}
{% include 'buttons/suppr.html' with href='topologie:del-port-profile' id=port_profile.id %}
{% acl_end %}
</td>
</tr> </tr>
{% endfor %}
</table> </table>
</div>
{% if port_profile_list.paginator %} </div>
{% include 'pagination.html' with list=port_profile_list %} <div class="panel-footer">
<div class="container-fluid">
<div class="row">
<div class="col-sm-2">
<h4>{% trans "VLANs" %}</h4>
</div>
<div class="col-sm-10">
<div class="container-fluid">
<div class="row">
<div class="col-sm-3 text-left">
<b>{% trans "Untagged: " %}</b>
</div>
<div class="col-sm-9 text-rit">
{%if port_profile.vlan_untagged %}
{{ port_profile.vlan_untagged }}
{% else %}
{% trans "None" %}
{% endif %} {% endif %}
</div>
</div>
<div class="row">
<div class="col-sm-3 text-left">
<b>{% trans "Tagged: " %}</b>
</div>
<div class="col-sm-9 text-left">
{%if port_profile.vlan_tagged.all %}
{{ port_profile.vlan_tagged.all|join:", " }}
{% else %}
{% trans "None" %}
{% endif %}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div> </div>
{% endfor %}

2
topologie/templates/topologie/aff_switch.html
View file

@ -39,7 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div class="col-sm-3"> <div class="col-sm-3">
{% trans "Switch bay" as tr_bay %} {{switch.switchbay}} {% trans "Switch bay" as tr_bay %} {{switch.switchbay}}
</div> </div>
<div class="col-sm-26 text-right"> <div class="col-sm-6 text-right">
{% can_edit switch %} {% can_edit switch %}
{% include 'buttons/edit.html' with href='topologie:edit-switch' id=switch.id %} {% include 'buttons/edit.html' with href='topologie:edit-switch' id=switch.id %}
{% acl_end %} {% acl_end %}