Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
efdebdff
authored
Sep 10, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
network: enhance host edit page
- fix some bugs - add vlans to vlan groups - add proto
parent
8b236652
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
10 deletions
+17
-10
circle/network/templates/network/columns/host-rule.html
+15
-8
circle/network/templates/network/host-edit.html
+2
-2
No files found.
circle/network/templates/network/columns/host-rule.html
View file @
efdebdff
{% load i18n %}
{% load l10n %}
{#
<span
style=
"color: #FF0000;"
>
[{{ record.r_type }}]
</span>
#}
{% if record.direction == "1" %}
{% if record.direction == "in" %}
{{ record.foreign_network }}
[{% for v in record.foreign_network.vlans.all %}
{{ v.name }}{% if not forloop.last %},{% endif %}
{% endfor %}]
{% else %}
{% if record.r_type == "host" %}
{{ record.host.get_fqdn }}
...
...
@@ -11,10 +13,10 @@
{{ record.r_type }}
{% endif %}
{% endif %}
{#
<span
style=
"color: #0000FF;"
>
▸
</span>
#}
<i
class=
"fa fa-arrow-right"
></i>
{% if record.direction == "0" %}
{% if record.direction == "out" %}
{{ record.foreign_network }}
{% else %}
{% if record.r_type == "host" %}
...
...
@@ -28,11 +30,16 @@
{% endif %}
{% if record.extra %}
<span
class=
"label label-default"
>
{{ record.extra }}
</span>
<span
class=
"label label-default"
>
{{ record.extra }}
</span>
{% endif %}
{% if record.nat %}
<span
class=
"label label-success"
>
NAT
[ {{ record.dport }}
<i
class=
"fa fa-arrow-right"
></i>
{{record.nat_external_port}} ]
</span>
<span
class=
"label label-success"
>
NAT
[
{{record.nat_external_port}}
<i
class=
"fa fa-arrow-right"
></i>
{{ record.dport }}
]
{{ record.proto|upper }}
</span>
{% endif %}
circle/network/templates/network/host-edit.html
View file @
efdebdff
...
...
@@ -12,10 +12,10 @@
</div>
<div
class=
"row"
>
<div
class=
"col-
sm-7
"
>
<div
class=
"col-
md-6
"
>
{% crispy form %}
</div>
<div
class=
"col-
sm-5
"
>
<div
class=
"col-
md-6
"
>
<div
class=
"page-header"
>
<a
href=
"{% url "
network
.
rule_create
"
%}?
host=
{{
host_pk
}}"
class=
"btn btn-success pull-right btn-xs"
><i
class=
"fa fa-plus-circle"
></i>
{% trans "Add new rule" %}
</a>
<h3>
{% trans "Rules" %}
</h3>
...
...
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