Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
re2o
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nounous
re2o
Commits
e21b3935
Commit
e21b3935
authored
Jan 30, 2018
by
Gabriel Detraz
Committed by
Gabriel Detraz
Jan 30, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Volet js pour affichage ipv6 fonctionnel
parent
c3ecbe4e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
12 deletions
+33
-12
machines/templates/machines/aff_machines.html
machines/templates/machines/aff_machines.html
+17
-12
preferences/migrations/0041_merge_20180130_0052.py
preferences/migrations/0041_merge_20180130_0052.py
+16
-0
No files found.
machines/templates/machines/aff_machines.html
View file @
e21b3935
...
...
@@ -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=
"#collapse
Domain_{{interface.id}}"
aria-expanded=
"true"
aria-controls=
"collapseDomain
_{{interface.id}}"
>
<button
class=
"btn btn-default btn-xs"
type=
"button"
data-toggle=
"collapse"
data-target=
"#collapse
Ipv6_{{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 %}
...
...
preferences/migrations/0041_merge_20180130_0052.py
0 → 100644
View file @
e21b3935
# -*- 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
=
[
]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment