Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
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
47b46b44
authored
Feb 19, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: fix console in vm details
parent
07c3c9b8
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
circle/dashboard/static/dashboard/vm-details.js
+2
-2
circle/dashboard/templates/dashboard/vm-detail.html
+1
-1
circle/dashboard/templates/dashboard/vm-detail/console.html
+1
-1
No files found.
circle/dashboard/static/dashboard/vm-details.js
View file @
47b46b44
...
...
@@ -202,9 +202,9 @@ function checkNewActivity(only_state, runs) {
$
(
"#vm-details-state"
).
html
(
data
[
'state'
]);
if
(
data
[
'state'
]
==
"RUNNING"
)
{
$
(
"[data-target=#_console]"
).
attr
(
"data-toggle"
,
"pill"
).
parent
(
"li"
).
removeClass
(
"disabled"
);
$
(
"[data-target=#_console]"
).
attr
(
"data-toggle"
,
"pill"
).
attr
(
"href"
,
"#console"
).
parent
(
"li"
).
removeClass
(
"disabled"
);
}
else
{
$
(
"[data-target=#_console]"
).
attr
(
"data-toggle"
,
"_pill"
).
parent
(
"li"
).
addClass
(
"disabled"
);
$
(
"[data-target=#_console]"
).
attr
(
"data-toggle"
,
"_pill"
).
attr
(
"href"
,
"#"
).
parent
(
"li"
).
addClass
(
"disabled"
);
}
if
(
decideActivityRefresh
())
{
...
...
circle/dashboard/templates/dashboard/vm-detail.html
View file @
47b46b44
...
...
@@ -103,7 +103,7 @@
{% trans "Resources" %}
</a>
</li>
<li
{%
if
instance
.
state
!=
"
RUNNING
"
%}
class=
"disabled"
{%
endif
%}
>
<a
href=
"#
"
{%
if
instance
.
state =
=
"
RUNNING
"
%}
data-toggle=
"pill"
{%
endif
%}
data-target=
"#_console"
class=
"text-center"
>
<a
href=
"#
{% if instance.state == "
RUNNING
"
%}
console
"
data-toggle=
"pill{% endif %}"
data-target=
"#_console"
class=
"text-center"
>
<i
class=
"icon-desktop icon-2x"
></i><br>
{% trans "Console" %}
</a></li>
<li>
...
...
circle/dashboard/templates/dashboard/vm-detail/console.html
View file @
47b46b44
...
...
@@ -49,7 +49,7 @@
}
return
false
;});
$
(
'a[href$="console"]'
).
click
(
function
()
{
$
(
"body"
).
on
(
"click"
,
'a[href$="console"]'
,
function
()
{
var
host
,
port
,
password
,
path
;
$
(
"#vm-info-pane"
).
hide
();
...
...
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