Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
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
Commit
7a5a3104
authored
Mar 11, 2015
by
Oláh István Gergely
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: use arrowfilter in templates
parent
35881b87
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
12 deletions
+23
-12
circle/dashboard/templates/dashboard/node-detail/_activity-timeline.html
+6
-2
circle/dashboard/templates/dashboard/template-list/column-template-created.html
+4
-3
circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
+10
-5
circle/dashboard/templates/dashboard/vm-detail/home.html
+3
-2
No files found.
circle/dashboard/templates/dashboard/node-detail/_activity-timeline.html
View file @
7a5a3104
{% load i18n %}
{% load hro %}
{% load arrowfilter %}
<div
id=
"activity-timeline"
class=
"timeline"
>
{% for a in activities %}
<div
class=
"activity"
data-activity-id=
"{{ a.pk }}"
>
...
...
@@ -10,7 +11,8 @@
{{ a.readable_name.get_admin_text|capfirst }}
</strong>
{{ a.started|date:"Y-m-d H:i" }}{% if a.user %}, {{ a.user }}{% endif %}
<span
title=
"{{ a.started }}"
>
{{ a.started|arrowfilter:LANGUAGE_CODE }}
</span>
{% if a.user %}, {{ a.user }}{% endif %}
{% if a.children.count > 0 %}
<div
class=
"sub-timeline"
>
{% for s in a.children.all %}
...
...
@@ -21,7 +23,9 @@
</span>
–
{% if s.finished %}
{{ s.finished|time:"H:i:s" }}
<span
title=
"{{ s.finished }}"
>
{{ s.finished|arrowfilter:LANGUAGE_CODE }}
</span>
{% else %}
<i
class=
"fa fa-refresh fa-spin"
class=
"sub-activity-loading-icon"
></i>
{% endif %}
...
...
circle/dashboard/templates/dashboard/template-list/column-template-created.html
View file @
7a5a3104
{{ record.created|date }}
<br
/>
{{ record.created|time }}
{% load arrowfilter %}
<span
title=
"{{ record.created }}"
>
{{ record.created|arrowfilter:LANGUAGE_CODE }}
</span>
circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
View file @
7a5a3104
{% load i18n %}
{% load hro %}
{% load arrowfilter %}
<div
id=
"activity-timeline"
class=
"timeline"
>
{% for a in activities %}
...
...
@@ -18,10 +19,12 @@
- {{ a.percentage }}%
{% endif %}
</strong>
{% endspaceless %}{% if a.times
<
2
%}
{{
a
.
started
|
date:
"
Y-m-d
H:i
"
}}{%
endif
%}{%
if
a
.
user
%},
<
a
class=
"no-style-link"
href=
"{% url "
dashboard
.
views
.
profile
"
username=
a.user.username
%}"
>
{% include "dashboard/_display-name.html" with user=a.user show_org=True %}
</a>
{% endspaceless %}
{% if a.times
<
2
%}
<
span
title=
"{{ a.started }}"
>
{{ a.started|arrowfilter:LANGUAGE_CODE }}
</span>
{% endif %}{% if a.user %},
<a
class=
"no-style-link"
href=
"{% url "
dashboard
.
views
.
profile
"
username=
a.user.username
%}"
>
{% include "dashboard/_display-name.html" with user=a.user show_org=True %}
</a>
{% endif %}
{% if a.is_abortable_for_user %}
<form
action=
"{{ a.instance.get_absolute_url }}"
method=
"POST"
class=
"pull-right"
>
...
...
@@ -40,7 +43,9 @@
<a
href=
"{{ s.get_absolute_url }}"
>
{{ s.readable_name|get_text:user|capfirst }}
</a></span>
–
{% if s.finished %}
{{ s.finished|time:"H:i:s" }}
<span
title=
"{{ s.finished }}"
>
{{ s.finished|arrowfilter:LANGUAGE_CODE }}
</span>
{% else %}
<i
class=
"fa fa-refresh fa-spin"
class=
"sub-activity-loading-icon"
></i>
{% endif %}
...
...
circle/dashboard/templates/dashboard/vm-detail/home.html
View file @
7a5a3104
{% load i18n %}
{% load arrowfilter %}
<div
class=
"row"
>
<div
class=
"col-md-4"
>
<dl
id=
"home_name_and_description"
>
...
...
@@ -69,13 +70,13 @@
<dt>
{% trans "Suspended at:" %}
</dt>
<dd>
<span
title=
"{{ instance.time_of_suspend }}"
>
<i
class=
"fa fa-moon-o"
></i>
{{ instance.time_of_suspend|
timeuntil
}}
<i
class=
"fa fa-moon-o"
></i>
{{ instance.time_of_suspend|
arrowfilter:LANGUAGE_CODE
}}
</span>
</dd>
<dt>
{% trans "Destroyed at:" %}
</dt>
<dd>
<span
title=
"{{ instance.time_of_delete }}"
>
<i
class=
"fa fa-times"
></i>
{{ instance.time_of_delete|
timeuntil
}}
<i
class=
"fa fa-times"
></i>
{{ instance.time_of_delete|
arrowfilter:LANGUAGE_CODE
}}
</span>
</dd>
</dl>
...
...
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