Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
A prog2-höz tartozó friss repo anyagok itt elérhetőek:
https://git.iit.bme.hu/
Commit
bfe7a9b3
authored
Jun 05, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: ipv6 and handling no open ports
parent
1d7255f3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
6 deletions
+23
-6
circle/dashboard/static/dashboard/dashboard.css
+2
-3
circle/dashboard/templates/dashboard/vm-detail.html
+18
-3
circle/dashboard/views.py
+3
-0
No files found.
circle/dashboard/static/dashboard/dashboard.css
View file @
bfe7a9b3
...
...
@@ -335,13 +335,12 @@ a.hover-black {
/* vm details connection */
.vm-details-connection
dd
{
padding
-top
:
8px
;
padding
:
4px
0
4px
0
;
}
.vm-details-connection
dt
{
text-align
:
left
;
padding-top
:
8px
;
padding-left
:
15px
;
padding
:
4px
0
4px
15px
;
}
#vm-details-pw-confirm
{
...
...
circle/dashboard/templates/dashboard/vm-detail.html
View file @
bfe7a9b3
...
...
@@ -71,8 +71,20 @@
<dl
class=
"dl-horizontal vm-details-connection"
>
<dt>
{% trans "Protocol" %}
</dt>
<dd>
{{ instance.access_method|upper }}
</dd>
<dt>
{% trans "Host" %}
</dt>
<dd>
{{ instance.get_connect_host }}:
<strong>
{{ instance.get_connect_port }}
</strong></dd>
<dt>
{% trans "Host" %}
</dt>
<dd>
{% if instance.get_connect_port %}
{{ instance.get_connect_host }}:
<strong>
{{ instance.get_connect_port }}
</strong>
{% else %}
<strong>
{% trans "The required port for this protocol is not forwarded." %}
</strong>
{% endif %}
</dd>
{% if instance.ipv6 %}
<dt>
{% trans "Host (IPv6)" %}
</dt>
<dd>
{{ ipv6_host }}:
<strong>
{{ instance.ipv6_port }}
</strong></dd>
{% endif %}
<dt>
{% trans "Username" %}
</dt>
<dd>
cloud
</dd>
<dt>
{% trans "Password" %}
</dt>
...
...
@@ -100,7 +112,10 @@
<div
class=
"input-group"
>
<span
class=
"input-group-addon input-tags"
>
{% trans "Command" %}
</span>
<input
type=
"text"
value=
"{{ instance.get_connect_command }}"
id=
"vm-details-connection-string"
class=
"form-control input-tags"
/>
<input
type=
"text"
value=
"{% if instance.get_connect_command %}{{ instance.get_connect_command }}
{% else %}{% trans "
Connection
is
not
possible
."
%}{%
endif
%}"
id=
"vm-details-connection-string"
class=
"form-control input-tags"
/>
<span
class=
"input-group-addon input-tags"
id=
"vm-details-connection-string-copy"
>
<i
class=
"icon-copy"
title=
"{% trans "
Select
all
"
%}"
></i>
</span>
...
...
circle/dashboard/views.py
View file @
bfe7a9b3
...
...
@@ -249,6 +249,9 @@ class VmDetailView(CheckedDetailView):
}
context
[
'os_type_icon'
]
=
instance
.
os_type
.
replace
(
"unknown"
,
"question"
)
# ipv6 infos
context
[
'ipv6_host'
]
=
instance
.
get_connect_host
(
use_ipv6
=
True
)
context
[
'ipv6_port'
]
=
instance
.
get_connect_port
(
use_ipv6
=
True
)
return
context
def
post
(
self
,
request
,
*
args
,
**
kwargs
):
...
...
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