From e21b393563169f334708f8fac6344766e273d619 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Tue, 30 Jan 2018 00:07:46 +0000
Subject: [PATCH] Volet js pour affichage ipv6 fonctionnel
---
machines/templates/machines/aff_machines.html | 29 +++++++++++--------
.../migrations/0041_merge_20180130_0052.py | 16 ++++++++++
2 files changed, 33 insertions(+), 12 deletions(-)
create mode 100644 preferences/migrations/0041_merge_20180130_0052.py
diff --git a/machines/templates/machines/aff_machines.html b/machines/templates/machines/aff_machines.html
index e8132c47..dbb3e40d 100644
--- a/machines/templates/machines/aff_machines.html
+++ b/machines/templates/machines/aff_machines.html
@@ -84,9 +84,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<br>
{% if ipv6_enabled and interface.ipv6 != 'None'%}
<b>IPv6</b>
- <button class="btn btn-default btn-xs" type="button" data-toggle="collapse" data-target="#collapseDomain_{{interface.id}}" aria-expanded="true" aria-controls="collapseDomain_{{interface.id}}">
+ <button class="btn btn-default btn-xs" type="button" data-toggle="collapse" data-target="#collapseIpv6_{{interface.id}}" aria-expanded="true" aria-controls="collapseIpv6_{{interface.id}}">
Afficher l'IPV6
- </button>
+ </button>
{% endif %}
</td>
<td class="text-right">
@@ -132,22 +132,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</td>
</tr>
- {% if ipv6_enabled and interface.ipv6 != 'None'%}
- <tr>
+ {% if ipv6_enabled and interface.ipv6 != 'None'%}
+ <tr>
<td colspan=5 style="border-top: none; padding: 1px;">
- <div class="collapse in" id="collapseDomain_IPV6">
+ <div class="collapse in" id="collapseIpv6_{{interface.id}}">
<ul class="list-group" style="margin-bottom: 0px;">
- {{interface.ipv6}}
- </ul>
+ {% for ipv6 in interface.ipv6.all %}
+ <li class="list-group-item col-xs-6 col-sm-6 col-md-6" style="border: none;">
+ {{ipv6}}
+ </li>
+ {% endfor %}
+ </ul>
</div>
</td>
<tr>
{% endif %}
- {% endfor %}
- <tr>
- <td colspan="8"></td>
- </tr>
- {% endif %}
{% if interface.domain.related_domain.all %}
@@ -183,6 +182,12 @@ $("#machines_table").ready( function() {
alias_div[i].collapse('hide');
}
} );
+$("#machines_table").ready( function() {
+ var ipv6_div = [{% for machine in machines_list %}{% for interface in machine.interface_set.all %}{% if interface.ipv6.all %}$("#collapseIpv6_{{interface.id}}"), {% endif %}{% endfor %}{% endfor %}];
+ for (var i=0 ; i<ipv6_div.length ; i++) {
+ ipv6_div[i].collapse('hide');
+ }
+} );
</script>
{% if machines_list.paginator %}
diff --git a/preferences/migrations/0041_merge_20180130_0052.py b/preferences/migrations/0041_merge_20180130_0052.py
new file mode 100644
index 00000000..ce2a1e5c
--- /dev/null
+++ b/preferences/migrations/0041_merge_20180130_0052.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-01-29 23:52
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('preferences', '0028_auto_20180128_2203'),
+ ('preferences', '0040_auto_20180129_1745'),
+ ]
+
+ operations = [
+ ]