From 2a7d82413b6f55403559d8fb0a45528149d80144 Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Mon, 31 Oct 2016 02:57:08 -0400 Subject: [PATCH] Miscellaneous improvements from review of #419 --- helpdesk/templates/helpdesk/include/tickets.html | 2 +- helpdesk/templates/helpdesk/include/unassigned.html | 2 +- helpdesk/templates/helpdesk/kb_category.html | 8 ++++---- helpdesk/templates/helpdesk/kb_index.html | 8 ++++---- helpdesk/templates/helpdesk/kb_item.html | 2 +- helpdesk/templates/helpdesk/navigation.html | 6 +++--- helpdesk/templates/helpdesk/public_base.html | 4 ++-- helpdesk/templates/helpdesk/public_view_ticket.html | 2 +- helpdesk/templates/helpdesk/registration/login.html | 4 ++-- helpdesk/templates/helpdesk/report_index.html | 6 +++--- helpdesk/templates/helpdesk/report_output.html | 10 +++++----- helpdesk/templates/helpdesk/rss_list.html | 4 ++-- helpdesk/templates/helpdesk/ticket.html | 2 +- helpdesk/templates/helpdesk/ticket_cc_add.html | 4 ++-- helpdesk/templates/helpdesk/ticket_list.html | 4 ++-- 15 files changed, 34 insertions(+), 34 deletions(-) diff --git a/helpdesk/templates/helpdesk/include/tickets.html b/helpdesk/templates/helpdesk/include/tickets.html index 7b12ce28..6d5097b3 100644 --- a/helpdesk/templates/helpdesk/include/tickets.html +++ b/helpdesk/templates/helpdesk/include/tickets.html @@ -23,7 +23,7 @@ {% for ticket in ticket_list %} - {{ ticket.ticket }} + {{ ticket.ticket }} {{ ticket.priority }} {{ ticket.title }} {{ ticket.queue }} diff --git a/helpdesk/templates/helpdesk/include/unassigned.html b/helpdesk/templates/helpdesk/include/unassigned.html index db5b1715..4bdb4aaf 100644 --- a/helpdesk/templates/helpdesk/include/unassigned.html +++ b/helpdesk/templates/helpdesk/include/unassigned.html @@ -23,7 +23,7 @@ {% for ticket in unassigned_tickets %} - {{ ticket.ticket }} + {{ ticket.ticket }} {{ ticket.priority }} {{ ticket.title }} {{ ticket.queue }} diff --git a/helpdesk/templates/helpdesk/kb_category.html b/helpdesk/templates/helpdesk/kb_category.html index 8842205a..f508aecd 100644 --- a/helpdesk/templates/helpdesk/kb_category.html +++ b/helpdesk/templates/helpdesk/kb_category.html @@ -1,7 +1,7 @@ {% extends "helpdesk/public_base.html" %}{% load i18n humanize %} {% block helpdesk_body %} -

{% blocktrans with category.title as kbcat %}Knowledgebase Category: {{ kbcat }}{% endblocktrans %}

+

{% trans 'Knowledgebase Category' %}:{% blocktrans with category.title as kbcat %}{{ kbcat }}{% endblocktrans %}

@@ -22,10 +22,10 @@

{{ item.question }}

-

View Answer

+

{% blocktrans %}View Answer {% endblocktrans %}

-

Rating: {{ item.score }}

-

Last Update: {{ item.last_updated|naturaltime }}

+

{% trans 'Rating' %}: {{ item.score }}

+

{% trans 'Last Update' %}: {{ item.last_updated|naturaltime }}

diff --git a/helpdesk/templates/helpdesk/kb_index.html b/helpdesk/templates/helpdesk/kb_index.html index 27213c5c..810d0caf 100644 --- a/helpdesk/templates/helpdesk/kb_index.html +++ b/helpdesk/templates/helpdesk/kb_index.html @@ -3,11 +3,11 @@ {% block helpdesk_body %}

{% trans "Knowledgebase" %}

-

{% trans "We have listed a number of knowledgebase articles for your perusal in the following categories. Please check to see if any of these articles address your problem prior to opening a support ticket." %}

+

{% trans "We have listed a number of Knowledgebase articles for your perusal in the following categories. Please check to see if any of these articles address your problem prior to opening a support ticket." %}

{% for category in kb_categories %} {% cycle 'one' 'two' 'three' as catnumperrow silent %} -{% ifequal catnumperrow 'one' %}
{% endifequal %} +{% if catnumperrow == 'one' %}
{% endif %}
@@ -17,11 +17,11 @@

{{ category.description }}

- View {{ category.title }} articles + {% trans 'View articles' %}
-{% ifequal catnumperrow 'three' %}
{% endifequal %} +{% if catnumperrow == 'three' %}
{% endif %} {% endfor %} {% endblock %} diff --git a/helpdesk/templates/helpdesk/kb_item.html b/helpdesk/templates/helpdesk/kb_item.html index 1ddf1b85..e48007fa 100644 --- a/helpdesk/templates/helpdesk/kb_item.html +++ b/helpdesk/templates/helpdesk/kb_item.html @@ -1,7 +1,7 @@ {% extends "helpdesk/public_base.html" %}{% load i18n %}{% load markdown_deux_tags %} {% block helpdesk_body %} -

{% blocktrans with item.title as item %}Knowledgebase: {{ item }}{% endblocktrans %}

+

{% trans 'Knowledgebase' %}:{% blocktrans with item.title as item %}{{ item }}{% endblocktrans %}

diff --git a/helpdesk/templates/helpdesk/navigation.html b/helpdesk/templates/helpdesk/navigation.html index 729919d9..8c6ef395 100644 --- a/helpdesk/templates/helpdesk/navigation.html +++ b/helpdesk/templates/helpdesk/navigation.html @@ -4,12 +4,12 @@
diff --git a/helpdesk/templates/helpdesk/public_base.html b/helpdesk/templates/helpdesk/public_base.html index 4171b010..669bc2e0 100644 --- a/helpdesk/templates/helpdesk/public_base.html +++ b/helpdesk/templates/helpdesk/public_base.html @@ -13,7 +13,7 @@ - {% block helpdesk_title %}Helpdesk{% endblock %} + {% block helpdesk_title %}{% trans 'Helpdesk' %}{% endblock %} {% if helpdesk_settings.HELPDESK_USE_CDN %} @@ -67,7 +67,7 @@ {% else %} {% endif %} - + {% if helpdesk_settings.HELPDESK_USE_CDN %} diff --git a/helpdesk/templates/helpdesk/public_view_ticket.html b/helpdesk/templates/helpdesk/public_view_ticket.html index c107f560..ccf9ae25 100644 --- a/helpdesk/templates/helpdesk/public_view_ticket.html +++ b/helpdesk/templates/helpdesk/public_view_ticket.html @@ -46,7 +46,7 @@ {% if ticket.resolution %} - {% trans "Resolution" %}{% ifequal ticket.get_status_display "Resolved" %} {% endifequal %} + {% trans "Resolution" %}{% if ticket.get_status_display == "Resolved" %} {% endif %} {{ ticket.resolution|urlizetrunc:50|linebreaksbr }} diff --git a/helpdesk/templates/helpdesk/registration/login.html b/helpdesk/templates/helpdesk/registration/login.html index 9f3fbc86..15b09701 100644 --- a/helpdesk/templates/helpdesk/registration/login.html +++ b/helpdesk/templates/helpdesk/registration/login.html @@ -10,7 +10,7 @@
-{% endifequal %}{% endblock %} +{% endif %}{% endblock %} diff --git a/helpdesk/templates/helpdesk/report_output.html b/helpdesk/templates/helpdesk/report_output.html index 88f34f9e..c25597db 100644 --- a/helpdesk/templates/helpdesk/report_output.html +++ b/helpdesk/templates/helpdesk/report_output.html @@ -32,7 +32,7 @@
- Saved Queries + {% trans 'Saved Queries' %}
@@ -89,7 +89,7 @@
-{% ifequal charttype "date" %} +{% if charttype == "date" %} -{% endifequal %} -{% ifequal charttype "bar" %} +{% endif %} +{% if charttype == "bar" %} -{% endifequal %} +{% endif %} diff --git a/helpdesk/templates/helpdesk/rss_list.html b/helpdesk/templates/helpdesk/rss_list.html index f0fa19c3..53d23608 100644 --- a/helpdesk/templates/helpdesk/rss_list.html +++ b/helpdesk/templates/helpdesk/rss_list.html @@ -22,9 +22,9 @@
-
+
{% trans "Per-Queue Feeds" %} -
+
diff --git a/helpdesk/templates/helpdesk/ticket.html b/helpdesk/templates/helpdesk/ticket.html index 01c8b718..09bdbe67 100644 --- a/helpdesk/templates/helpdesk/ticket.html +++ b/helpdesk/templates/helpdesk/ticket.html @@ -191,7 +191,7 @@ $(document).on('change', ':file', function() {
{% trans "(Optional)" %}
-
  Yes, make this update public.
+
  {% trans 'Yes, make this update public.' %}
{% trans "If this is public, the submitter will be e-mailed your comment or resolution." %}
{% endif %} diff --git a/helpdesk/templates/helpdesk/ticket_cc_add.html b/helpdesk/templates/helpdesk/ticket_cc_add.html index edd724f9..b041e749 100644 --- a/helpdesk/templates/helpdesk/ticket_cc_add.html +++ b/helpdesk/templates/helpdesk/ticket_cc_add.html @@ -15,9 +15,9 @@
diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html index faad9f14..0b04b5d2 100644 --- a/helpdesk/templates/helpdesk/ticket_list.html +++ b/helpdesk/templates/helpdesk/ticket_list.html @@ -4,8 +4,8 @@ {% block helpdesk_title %}{% trans "Tickets" %}{% endblock %} {% block helpdesk_head %} - - +