Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Fukász Rómeó Ervin
/
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
84e2a209
authored
Feb 26, 2015
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: add you can connect now text to vm details
parent
e1084ff6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
0 deletions
+24
-0
circle/dashboard/static/dashboard/activity.js
+12
-0
circle/dashboard/static/dashboard/dashboard.less
+5
-0
circle/dashboard/templates/dashboard/vm-detail.html
+7
-0
No files found.
circle/dashboard/static/dashboard/activity.js
View file @
84e2a209
...
...
@@ -168,6 +168,7 @@ $(function() {
}
else
{
in_progress
=
false
;
if
(
reload_vm_detail
)
location
.
reload
();
if
(
runs
>
1
)
addConnectText
();
}
$
(
'a[href="#activity"] i'
).
removeClass
(
'fa-spin'
);
},
...
...
@@ -179,6 +180,17 @@ $(function() {
});
function
addConnectText
()
{
var
activities
=
$
(
".timeline .activity"
);
if
(
activities
.
length
>
1
)
{
if
(
activities
.
eq
(
0
).
data
(
"activity-code"
)
==
"vm.Instance.wake_up"
||
activities
.
eq
(
0
).
data
(
"activity-code"
)
==
"vm.Instance.agent"
)
{
$
(
"#vm-detail-successfull-boot"
).
slideDown
(
500
);
}
}
}
String
.
prototype
.
hashCode
=
function
()
{
var
hash
=
0
,
i
,
chr
,
len
;
if
(
this
.
length
===
0
)
return
hash
;
...
...
circle/dashboard/static/dashboard/dashboard.less
View file @
84e2a209
...
...
@@ -1255,3 +1255,8 @@ textarea[name="new_members"] {
z-index: 99999;
color: #101010;
}
#vm-detail-successfull-boot {
margin-bottom: 20px;
display: none;
}
circle/dashboard/templates/dashboard/vm-detail.html
View file @
84e2a209
...
...
@@ -94,6 +94,7 @@
<span>
{{ instance.get_status_display|upper }}
</span>
</span>
</div>
<h3>
{% trans "Connection details" %}
</h3>
<dl
class=
"dl-horizontal vm-details-connection"
>
<dt>
{% trans "Protocol" %}
</dt>
...
...
@@ -180,6 +181,12 @@
{% endif %}
</div>
<div
class=
"col-md-8"
id=
"vm-detail-pane"
>
<div
class=
"big"
id=
"vm-detail-successfull-boot"
>
<span
class=
"label label-info"
data-status=
"{{ instance.status }}"
>
<i
class=
"fa fa-check"
></i>
{% trans "The virtual machine successfully started, you can connect now." %}
</span>
</div>
<div
class=
"panel panel-default"
id=
"vm-detail-panel"
>
<ul
class=
"nav nav-pills panel-heading"
>
<li
class=
"active"
>
...
...
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