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
83eb4d12
authored
Feb 12, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: indicate failed activites
parent
2f7a430d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
9 deletions
+26
-9
circle/dashboard/static/dashboard/dashboard.css
+19
-0
circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
+6
-2
circle/dashboard/templates/dashboard/vm-detail/activity.html
+1
-7
No files found.
circle/dashboard/static/dashboard/dashboard.css
View file @
83eb4d12
...
@@ -84,6 +84,25 @@ body {
...
@@ -84,6 +84,25 @@ body {
.timeline
.timeline-icon.timeline-nobg
{
.timeline
.timeline-icon.timeline-nobg
{
background-color
:
transparent
;
background-color
:
transparent
;
}
}
.sub-timeline
{
}
.sub-activity
{
margin-left
:
30px
;
padding-left
:
10px
;
border-left
:
3px
solid
green
;
}
.sub-activity-failed
{
border-left
:
3px
solid
#d9534f
;
}
.timeline-icon-failed
{
background-color
:
#d9534f
!important
;
}
.table-with-form-fields
tbody
tr
td
{
.table-with-form-fields
tbody
tr
td
{
line-height
:
34px
;
line-height
:
34px
;
}
}
...
...
circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
View file @
83eb4d12
{% load i18n %}
{% for a in activities %}
{% for a in activities %}
<div
class=
"activity"
data-activity-id=
"{{ a.pk }}"
>
<div
class=
"activity"
data-activity-id=
"{{ a.pk }}"
>
<span
class=
"timeline-icon
"
>
<span
class=
"timeline-icon{% if a.has_failed %} timeline-icon-failed{% endif %}
"
>
<i
class=
"{% if not a.finished %} icon-refresh icon-spin {% else %}icon-plus{% endif %}"
></i>
<i
class=
"{% if not a.finished %} icon-refresh icon-spin {% else %}icon-plus{% endif %}"
></i>
</span>
</span>
<strong>
{{ a.get_readable_name }}
</strong>
<strong>
{{ a.get_readable_name }}
</strong>
...
@@ -8,13 +9,16 @@
...
@@ -8,13 +9,16 @@
{% if a.children.count > 0 %}
{% if a.children.count > 0 %}
<div
class=
"sub-timeline"
>
<div
class=
"sub-timeline"
>
{% for s in a.children.all %}
{% for s in a.children.all %}
<div
data-activity-id=
"{{ s.pk }}"
class=
"sub-activity
"
>
<div
data-activity-id=
"{{ s.pk }}"
class=
"sub-activity{% if s.has_failed %} sub-activity-failed{% endif %}
"
>
{{ s.get_readable_name }} -
{{ s.get_readable_name }} -
{% if s.finished %}
{% if s.finished %}
{{ s.finished|time:"H:i:s" }}
{{ s.finished|time:"H:i:s" }}
{% else %}
{% else %}
<i
class=
"icon-refresh icon-spin"
class=
"sub-activity-loading-icon"
></i>
<i
class=
"icon-refresh icon-spin"
class=
"sub-activity-loading-icon"
></i>
{% endif %}
{% endif %}
{% if s.has_failed %}
<div
class=
"label label-danger"
>
{% trans "failed" %}
</div>
{% endif %}
</div>
</div>
{% endfor %}
{% endfor %}
</div>
</div>
...
...
circle/dashboard/templates/dashboard/vm-detail/activity.html
View file @
83eb4d12
{% load i18n %}
{% load i18n %}
<h3>
{% trans "Activity" %}
</h3>
<h3>
{% trans "Activity" %}
</h3>
<style>
.sub-timeline
{
border-left
:
3px
solid
green
;
margin-left
:
30px
;
padding-left
:
10px
;
}
</style>
<div
id=
"activity-timeline"
class=
"timeline"
>
<div
id=
"activity-timeline"
class=
"timeline"
>
{% include "dashboard/vm-detail/_activity-timeline.html" %}
{% include "dashboard/vm-detail/_activity-timeline.html" %}
...
...
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