From 8b317f4496a60de56bbbbe742824452a9ea2402f Mon Sep 17 00:00:00 2001
From: Kálmán Viktor <kviktor@cloud.bme.hu>
Date: Mon, 16 Mar 2015 12:45:07 +0100
Subject: [PATCH] dashboard: arrow fixes
---
circle/dashboard/arrow_local.py | 4 ++--
circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html | 10 ++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/circle/dashboard/arrow_local.py b/circle/dashboard/arrow_local.py
index 1dd5c02..5472109 100644
--- a/circle/dashboard/arrow_local.py
+++ b/circle/dashboard/arrow_local.py
@@ -37,8 +37,8 @@ class HungarianLocale(locales.Locale):
'hour': {'past': 'egy órával', 'future': 'egy óra'},
'hours': {'past': '{0} órával', 'future': '{0} óra'},
'day': {
- 'past': 'nappal',
- 'future': 'nap'
+ 'past': 'egy nappal',
+ 'future': 'egy nap'
},
'days': {
'past': '{0} nappal',
diff --git a/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html b/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
index 49f99d3..6efbf35 100644
--- a/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
+++ b/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
@@ -19,12 +19,10 @@
- {{ a.percentage }}%
{% endif %}
</strong>
-{% 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>
+{% 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">
--
libgit2 0.26.0