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
Commit
d21ccfe5
authored
May 11, 2016
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: nicer connection msg
parent
cb2d9cff
Pipeline
#84
passed with stage
in 0 seconds
Changes
3
Pipelines
1
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 @
d21ccfe5
...
@@ -187,7 +187,7 @@ function addConnectText() {
...
@@ -187,7 +187,7 @@ function addConnectText() {
if
(
activities
.
length
>
1
)
{
if
(
activities
.
length
>
1
)
{
if
(
activities
.
eq
(
0
).
data
(
"activity-code"
)
==
"vm.Instance.wake_up"
||
if
(
activities
.
eq
(
0
).
data
(
"activity-code"
)
==
"vm.Instance.wake_up"
||
activities
.
eq
(
0
).
data
(
"activity-code"
)
==
"vm.Instance.agent"
)
{
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 @
d21ccfe5
...
@@ -1285,9 +1285,16 @@ textarea[name="new_members"] {
...
@@ -1285,9 +1285,16 @@ textarea[name="new_members"] {
}
}
}
}
#vm-detail-successful
l
-boot {
#vm-detail-successful-boot {
margin-bottom: 20px;
margin-bottom: 20px;
display: none;
display: none;
.label {
width: 100%;
display: block;
overflow: hidden;
text-overflow: ellipsis;
}
}
}
#vm-detail-access-help {
#vm-detail-access-help {
...
...
circle/dashboard/templates/dashboard/vm-detail.html
View file @
d21ccfe5
...
@@ -192,11 +192,11 @@
...
@@ -192,11 +192,11 @@
{% endif %}
{% endif %}
</div>
</div>
<div
class=
"col-md-8"
id=
"vm-detail-pane"
>
<div
class=
"col-md-8"
id=
"vm-detail-pane"
>
<div
class=
"big"
id=
"vm-detail-successful
l
-boot"
>
<div
class=
"big"
id=
"vm-detail-successful-boot"
>
<
span
class=
"label label-info"
data-status=
"{{ instance.status }}"
>
<
div
class=
"label label-info"
data-status=
"{{ instance.status }}"
>
<i
class=
"fa fa-check"
></i>
<i
class=
"fa fa-check"
></i>
{% trans "The virtual machine successfully started, you can connect now." %}
{% trans "The virtual machine successfully started, you can connect now." %}
</
span
>
</
div
>
</div>
</div>
<div
class=
"panel panel-default"
id=
"vm-detail-panel"
>
<div
class=
"panel panel-default"
id=
"vm-detail-panel"
>
<ul
class=
"nav nav-pills panel-heading"
>
<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