diff --git a/helpdesk/templates/helpdesk/kb_category.html b/helpdesk/templates/helpdesk/kb_category.html index 4d0c1ea4..f47d0f9f 100644 --- a/helpdesk/templates/helpdesk/kb_category.html +++ b/helpdesk/templates/helpdesk/kb_category.html @@ -10,35 +10,34 @@ {% block helpdesk_body %}

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

-
-
-

{% blocktrans with category.title as kbcat %}You are viewing all items in the {{ kbcat }} category.{% endblocktrans %}

+
+
+ + {% blocktrans with category.title as kbcat %}You are viewing all items in the {{ kbcat }} category.{% endblocktrans %} +
+

{{ category.description }}

{% for item in items %} {% cycle 'one' 'two' 'three' as itemnumperrow silent %} -{% ifequal itemnumperrow 'one' %}
{% endifequal %} -
-
-
-

{{ item.title }}

+{% ifequal itemnumperrow 'one' %}
{% endifequal %} +
+
+
{{ item.title }}
+

{{ item.question }}

+

+

+ {% blocktrans with item.get_absolute_url as url %}View Answer {% endblocktrans %} +

+
+

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

+

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

-
-

{{ item.question }}

-
-
-

- {% blocktrans with item.get_absolute_url as url %}View Answer {% endblocktrans %} -

-
-

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

-

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

-
-
-
+

+
{% ifequal itemnumperrow 'three' %}
{% endifequal %} {% endfor %} diff --git a/helpdesk/templates/helpdesk/kb_index.html b/helpdesk/templates/helpdesk/kb_index.html index 556c3054..7fb96f03 100644 --- a/helpdesk/templates/helpdesk/kb_index.html +++ b/helpdesk/templates/helpdesk/kb_index.html @@ -16,20 +16,14 @@ {% for category in kb_categories %} {% cycle 'one' 'two' 'three' as catnumperrow silent %} -{% if catnumperrow == 'one' %}
{% endif %} -
-
-
-

{{ category.title }}

-
-
-

{{ category.description }}

-
-
- {% trans 'View articles' %} -
-
+{% if catnumperrow == 'one' %}
{% endif %} +
+
+
{{ category.title }}
+

{{ category.description }}

+

{% trans 'View articles' %}

+
{% if catnumperrow == 'three' %}
{% endif %} {% endfor %} diff --git a/helpdesk/templates/helpdesk/kb_item.html b/helpdesk/templates/helpdesk/kb_item.html index 7e446f3b..cfefaa1d 100644 --- a/helpdesk/templates/helpdesk/kb_item.html +++ b/helpdesk/templates/helpdesk/kb_item.html @@ -13,35 +13,34 @@ {% block helpdesk_body %}

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

-
-
-
-

{{ item.question }}

-
-
-

{{ item.answer|markdown }}

-
-
-
-
-

{% trans "Did you find this article useful?" %}

-
-
- -
-
- -
+
+
+ + {{ item.question }} +
+
+

{{ item.answer|markdown }}

+
+
+
+
+

{% trans "Did you find this article useful?" %}

+
+
+ +
+
+
-
-

{% trans "The results of voting by other readers of this article are below:" %}

-
    +
+
+

{% trans "The results of voting by other readers of this article are below:" %}

+
  • {% blocktrans with item.recommendations as recommendations %}Recommendations: {{ recommendations }}{% endblocktrans %}
  • {% blocktrans with item.votes as votes %}Votes: {{ votes }}{% endblocktrans %}
  • {% blocktrans with item.score as score %}Overall Rating: {{ score }}{% endblocktrans %}
    • -
-
+