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
e8de471b
authored
Oct 06, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: fix vm tour in different vm states
parent
df7e52cf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
circle/dashboard/static/dashboard/vm-details.js
+1
-0
circle/dashboard/static/dashboard/vm-tour.js
+8
-5
circle/dashboard/templates/dashboard/vm-detail.html
+1
-1
No files found.
circle/dashboard/static/dashboard/vm-details.js
View file @
e8de471b
...
@@ -392,6 +392,7 @@ function checkNewActivity(runs) {
...
@@ -392,6 +392,7 @@ function checkNewActivity(runs) {
}
else
{
}
else
{
icon
.
prop
(
"class"
,
"fa "
+
data
[
'icon'
]);
icon
.
prop
(
"class"
,
"fa "
+
data
[
'icon'
]);
}
}
$
(
"#vm-details-state"
).
data
(
"status"
,
data
[
'status'
]);
$
(
"#vm-details-state span"
).
html
(
data
[
'human_readable_status'
].
toUpperCase
());
$
(
"#vm-details-state span"
).
html
(
data
[
'human_readable_status'
].
toUpperCase
());
if
(
data
[
'status'
]
==
"RUNNING"
)
{
if
(
data
[
'status'
]
==
"RUNNING"
)
{
if
(
data
[
'connect_uri'
])
{
if
(
data
[
'connect_uri'
])
{
...
...
circle/dashboard/static/dashboard/vm-tour.js
View file @
e8de471b
...
@@ -37,8 +37,11 @@ function get_steps() {
...
@@ -37,8 +37,11 @@ function get_steps() {
deploy_selector
=
"#ops"
;
deploy_selector
=
"#ops"
;
save_as_selector
=
"#ops"
;
save_as_selector
=
"#ops"
;
if
(
!
$
(
'.timeline .activity i'
).
hasClass
(
'fa-spin'
))
{
if
(
!
$
(
'.timeline .activity i'
).
hasClass
(
'fa-spin'
))
{
deploy_selector
+=
' a[class*="operation-deploy"]'
;
vm_status
=
$
(
"#vm-details-state"
).
data
(
"status"
);
save_as_selector
+=
' a[class*="operation-save_as"]'
;
if
(
vm_status
===
"PENDING"
)
deploy_selector
+=
' a[class*="operation-deploy"]'
;
if
(
vm_status
===
"RUNNING"
||
vm_status
===
"STOPPED"
)
save_as_selector
+=
' a[class*="operation-save_as_template"]'
;
}
}
steps
=
[
steps
=
[
...
@@ -55,7 +58,7 @@ function get_steps() {
...
@@ -55,7 +58,7 @@ function get_steps() {
},
},
{
{
element
:
document
.
querySelector
(
'a[href="#resources"]'
),
element
:
document
.
querySelector
(
'a[href="#resources"]'
),
intro
:
gettext
(
"On the resources tab you can edit the CPU/RAM options and add/remove disks
!
"
),
intro
:
gettext
(
"On the resources tab you can edit the CPU/RAM options and add/remove disks
.
"
),
},
},
{
{
element
:
document
.
querySelector
(
'#vm-details-resources-form'
),
element
:
document
.
querySelector
(
'#vm-details-resources-form'
),
...
@@ -82,7 +85,7 @@ function get_steps() {
...
@@ -82,7 +85,7 @@ function get_steps() {
},
},
{
{
element
:
document
.
querySelector
(
"#vm-info-pane"
),
element
:
document
.
querySelector
(
"#vm-info-pane"
),
intro
:
gettext
(
"Use the
connection string or connect with your choice of client!
"
),
intro
:
gettext
(
"Use the
CIRCLE client or the connection string to connect to the virtual machine.
"
),
},
},
{
{
element
:
document
.
querySelector
(
"#vm-info-pane"
),
element
:
document
.
querySelector
(
"#vm-info-pane"
),
...
@@ -94,7 +97,7 @@ function get_steps() {
...
@@ -94,7 +97,7 @@ function get_steps() {
},
},
{
{
element
:
document
.
querySelector
(
".alert-new-template"
),
element
:
document
.
querySelector
(
".alert-new-template"
),
intro
:
gettext
(
"This is the last message, if something is not clear you can do the the tour again
!
"
),
intro
:
gettext
(
"This is the last message, if something is not clear you can do the the tour again
.
"
),
},
},
];
];
return
steps
;
return
steps
;
...
...
circle/dashboard/templates/dashboard/vm-detail.html
View file @
e8de471b
...
@@ -76,7 +76,7 @@
...
@@ -76,7 +76,7 @@
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-md-4"
id=
"vm-info-pane"
>
<div
class=
"col-md-4"
id=
"vm-info-pane"
>
<div
class=
"big"
>
<div
class=
"big"
>
<span
id=
"vm-details-state"
class=
"label label-success"
>
<span
id=
"vm-details-state"
class=
"label label-success"
data-status=
"{{ instance.status }}"
>
<i
class=
"fa
<i
class=
"fa
{% if is_new_state %}
{% if is_new_state %}
fa-spinner fa-spin
fa-spinner fa-spin
...
...
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