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
f5902b8f
authored
May 12, 2016
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'nicer-connection-msg' into 'master'
dashboard: nicer connection msg See merge request !373
parents
52026bc1
d21ccfe5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
5 deletions
+12
-5
circle/dashboard/static/dashboard/activity.js
+1
-1
circle/dashboard/static/dashboard/dashboard.less
+8
-1
circle/dashboard/templates/dashboard/vm-detail.html
+3
-3
No files found.
circle/dashboard/static/dashboard/activity.js
View file @
f5902b8f
...
...
@@ -222,7 +222,7 @@ function addConnectText() {
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-successful
l
-boot"
).
slideDown
(
500
);
$
(
"#vm-detail-successful-boot"
).
slideDown
(
500
);
}
}
}
...
...
circle/dashboard/static/dashboard/dashboard.less
View file @
f5902b8f
...
...
@@ -1285,9 +1285,16 @@ textarea[name="new_members"] {
}
}
#vm-detail-successful
l
-boot {
#vm-detail-successful-boot {
margin-bottom: 20px;
display: none;
.label {
width: 100%;
display: block;
overflow: hidden;
text-overflow: ellipsis;
}
}
#vm-detail-access-help {
...
...
circle/dashboard/templates/dashboard/vm-detail.html
View file @
f5902b8f
...
...
@@ -192,11 +192,11 @@
{% endif %}
</div>
<div
class=
"col-md-8"
id=
"vm-detail-pane"
>
<div
class=
"big"
id=
"vm-detail-successful
l
-boot"
>
<
span
class=
"label label-info"
data-status=
"{{ instance.status }}"
>
<div
class=
"big"
id=
"vm-detail-successful-boot"
>
<
div
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>
<div
class=
"panel panel-default"
id=
"vm-detail-panel"
>
<ul
class=
"nav nav-pills panel-heading"
>
...
...
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