From 6abc0ba9a970c0720c193be00835cc0b0b9ebf88 Mon Sep 17 00:00:00 2001 From: Stefano Brentegani Date: Mon, 21 Jul 2014 20:02:50 +0200 Subject: [PATCH 1/9] replace row_tablehead with caption --- helpdesk/static/helpdesk/helpdesk-extend.css | 4 +++- helpdesk/templates/helpdesk/dashboard.html | 18 +++++++++--------- .../templates/helpdesk/email_ignore_list.html | 2 +- helpdesk/templates/helpdesk/kb_category.html | 2 +- helpdesk/templates/helpdesk/kb_index.html | 2 +- helpdesk/templates/helpdesk/kb_item.html | 4 +--- .../templates/helpdesk/public_homepage.html | 4 ++-- .../templates/helpdesk/public_view_ticket.html | 2 +- helpdesk/templates/helpdesk/report_output.html | 8 ++++---- helpdesk/templates/helpdesk/rss_list.html | 2 +- .../templates/helpdesk/ticket_cc_list.html | 2 +- helpdesk/templates/helpdesk/ticket_list.html | 8 ++++---- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/helpdesk/static/helpdesk/helpdesk-extend.css b/helpdesk/static/helpdesk/helpdesk-extend.css index b1085b8d..9edf415c 100644 --- a/helpdesk/static/helpdesk/helpdesk-extend.css +++ b/helpdesk/static/helpdesk/helpdesk-extend.css @@ -29,7 +29,9 @@ Bootstrap overrides #searchtabs {margin-bottom: 20px;} -.row_tablehead {background-color: #dbd5d9;} +.row_tablehead, table.table caption {background-color: #dbd5d9;} +table.table caption {height: 2em; line-height: 2em; font-weight: bold;} +table.ticket-stats caption {color: #fbff00; font-style: italic;} .errorlist {list-style: none; } .errorlist {padding: 0;} diff --git a/helpdesk/templates/helpdesk/dashboard.html b/helpdesk/templates/helpdesk/dashboard.html index ab97bc6c..86553e5f 100644 --- a/helpdesk/templates/helpdesk/dashboard.html +++ b/helpdesk/templates/helpdesk/dashboard.html @@ -10,8 +10,8 @@ + - @@ -31,11 +31,11 @@
-
{% trans "Helpdesk Summary" %}
{% trans "Helpdesk Summary" %}
{% trans "Queue" %}{% trans "Open" %}{% trans "Resolved" %}{% trans "Closed" %}
+
+ - - - + @@ -53,8 +53,8 @@ {% if all_tickets_reported_by_current_user %}
{% trans "Current Ticket Stats" %}
{% trans "Current Ticket Stats" %}
- {% trans "Average number of days until ticket is closed (all tickets): " %}{{ basic_ticket_stats.average_nbr_days_until_ticket_closed }}.
- {% trans "Average number of days until ticket is closed (tickets opened in last 60 days): " %}{{ basic_ticket_stats.average_nbr_days_until_ticket_closed_last_60_days }}. +
- {% trans "Average number of days until ticket is closed (all tickets): " %}{{ basic_ticket_stats.average_nbr_days_until_ticket_closed }}.
- {% trans "Average number of days until ticket is closed (tickets opened in last 60 days): " %}{{ basic_ticket_stats.average_nbr_days_until_ticket_closed_last_60_days }}. {% trans "Click" %} here {% trans "for detailed average by month." %}
- {% trans "Distribution of open tickets, grouped by time period:" %}
{% trans "Days since opened" %}{% trans "Number of open tickets" %}
+ - @@ -73,8 +73,8 @@ {% endif %}
{% trans "All Tickets submitted by you" %}
{% trans "All Tickets submitted by you" %}
#{% trans "Pr" %}{% trans "Title" %}{% trans "Queue" %}{% trans "Status" %}{% trans "Last Update" %}
+ - @@ -95,8 +95,8 @@
{% trans "Open Tickets assigned to you (you are working on this ticket)" %}
{% trans "Open Tickets assigned to you (you are working on this ticket)" %}
#{% trans "Pr" %}{% trans "Title" %}{% trans "Queue" %}{% trans "Status" %}{% trans "Last Update" %}
+ - @@ -119,8 +119,8 @@ {% if user_tickets_closed_resolved %}
{% trans "Unassigned Tickets" %} {% trans "(pick up a ticket if you start to work on it)" %}
{% trans "Unassigned Tickets" %} {% trans "(pick up a ticket if you start to work on it)" %}
#{% trans "Pr" %}{% trans "Title" %}{% trans "Queue" %}{% trans "Created" %} 
+ - diff --git a/helpdesk/templates/helpdesk/email_ignore_list.html b/helpdesk/templates/helpdesk/email_ignore_list.html index 2451e082..b2ba0b5c 100644 --- a/helpdesk/templates/helpdesk/email_ignore_list.html +++ b/helpdesk/templates/helpdesk/email_ignore_list.html @@ -8,8 +8,8 @@

The following e-mail addresses are currently being ignored by the incoming e-mail processor. You can add a new e-mail address to the list or delete any of the items below as required.

{% endblocktrans %}
{% trans "Closed & resolved Tickets you used to work on" %}
{% trans "Closed & resolved Tickets you used to work on" %}
#{% trans "Pr" %}{% trans "Title" %}{% trans "Queue" %}{% trans "Status" %}{% trans "Last Update" %}
+ - diff --git a/helpdesk/templates/helpdesk/kb_category.html b/helpdesk/templates/helpdesk/kb_category.html index 6a4a8bed..8821d36a 100644 --- a/helpdesk/templates/helpdesk/kb_category.html +++ b/helpdesk/templates/helpdesk/kb_category.html @@ -8,8 +8,8 @@

{{ category.description }}

{% trans "Ignored E-Mail Addresses" %}
{% trans "Ignored E-Mail Addresses" %}
{% trans "Name" %}{% trans "E-Mail Address" %}{% trans "Date Added" %}{% trans "Queues" %}{% trans "Keep in mailbox?" %}{% trans "Delete" %}
+ - diff --git a/helpdesk/templates/helpdesk/kb_index.html b/helpdesk/templates/helpdesk/kb_index.html index 30f1143b..e7abcb22 100644 --- a/helpdesk/templates/helpdesk/kb_index.html +++ b/helpdesk/templates/helpdesk/kb_index.html @@ -6,8 +6,8 @@

{% 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." %}

{% blocktrans with category.title as kbcat %}Knowledgebase Category: {{ kbcat }}{% endblocktrans %}
{% blocktrans with category.title as kbcat %}Knowledgebase Category: {{ kbcat }}{% endblocktrans %}
{% trans "Article" %}
+ - diff --git a/helpdesk/templates/helpdesk/kb_item.html b/helpdesk/templates/helpdesk/kb_item.html index b44c3169..f2db73e3 100644 --- a/helpdesk/templates/helpdesk/kb_item.html +++ b/helpdesk/templates/helpdesk/kb_item.html @@ -4,9 +4,7 @@

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

{% trans "Knowledgebase Categories" %}
{% trans "Knowledgebase Categories" %}
{% trans "Category" %}
- - - + diff --git a/helpdesk/templates/helpdesk/public_homepage.html b/helpdesk/templates/helpdesk/public_homepage.html index 4af8a6c8..11cfb16f 100644 --- a/helpdesk/templates/helpdesk/public_homepage.html +++ b/helpdesk/templates/helpdesk/public_homepage.html @@ -6,8 +6,8 @@

{% trans "Knowledgebase Articles" %}

{{ item.title }}
{{ item.title }}
{{ item.question }}
{{ item.answer|markdown }}
+ - @@ -49,7 +49,7 @@ {% endfor %} {% endcomment %} - +
diff --git a/helpdesk/templates/helpdesk/public_view_ticket.html b/helpdesk/templates/helpdesk/public_view_ticket.html index d77028bc..2cf8b76f 100644 --- a/helpdesk/templates/helpdesk/public_view_ticket.html +++ b/helpdesk/templates/helpdesk/public_view_ticket.html @@ -4,8 +4,8 @@ {% block helpdesk_body %}
{% trans "Knowledgebase Categories" %}
{% trans "Knowledgebase Categories" %}
{% trans "Category" %}
+ - diff --git a/helpdesk/templates/helpdesk/report_output.html b/helpdesk/templates/helpdesk/report_output.html index cda3ded4..5ddf6073 100644 --- a/helpdesk/templates/helpdesk/report_output.html +++ b/helpdesk/templates/helpdesk/report_output.html @@ -3,7 +3,7 @@ {% block helpdesk_title %}{% trans "Reports & Statistics" %}{% endblock %} {% block helpdesk_head %} - + @@ -30,8 +30,8 @@ {% endif %}
{{ ticket.ticket }} . {{ ticket.title }} [{{ ticket.get_status }}]
{{ ticket.ticket }} . {{ ticket.title }} [{{ ticket.get_status }}]
{% blocktrans with ticket.queue as queue_name %}Queue: {{ queue_name }}{% endblocktrans %}
+ -{% for h in headings %}{% endfor %} @@ -68,7 +68,7 @@ } } }); - + {% endifequal %} {% ifequal charttype "bar" %} @@ -99,7 +99,7 @@ } } }); - + {% endifequal %} diff --git a/helpdesk/templates/helpdesk/rss_list.html b/helpdesk/templates/helpdesk/rss_list.html index bdf5ea14..d4ead596 100644 --- a/helpdesk/templates/helpdesk/rss_list.html +++ b/helpdesk/templates/helpdesk/rss_list.html @@ -19,8 +19,8 @@

{% trans "These RSS feeds allow you to view a summary of either your own tickets, or all tickets, for each of the queues in your helpdesk. For example, if you manage the staff who utilise a particular queue, this may be used to view new tickets coming into that queue." %}

{{ title }}
{{ title }}
{% if forloop.first %}{{ h|title }}{% else %}{{ h }}{% endif %}
+ - diff --git a/helpdesk/templates/helpdesk/ticket_cc_list.html b/helpdesk/templates/helpdesk/ticket_cc_list.html index e857d569..905b2e94 100644 --- a/helpdesk/templates/helpdesk/ticket_cc_list.html +++ b/helpdesk/templates/helpdesk/ticket_cc_list.html @@ -10,8 +10,8 @@

You can add a new e-mail address to the list or delete any of the items below as required.

{% endblocktrans %}
{% trans "Per-Queue Feeds" %}
{% trans "Per-Queue Feeds" %}
{% trans "Queue" %}{% trans "All Open Tickets" %}{% trans "My Open Tickets" %}
+ - diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html index 159b28a2..060a2b15 100644 --- a/helpdesk/templates/helpdesk/ticket_list.html +++ b/helpdesk/templates/helpdesk/ticket_list.html @@ -7,7 +7,7 @@ -{% endblock %} + {% block helpdesk_body %}

{% trans "Welcome to your Helpdesk Dashboard! From here you can quickly see tickets submitted by you, tickets you are working on, and those tickets that have no owner." %}

-
{% trans "Ticket CC List" %}
{% trans "Ticket CC List" %}
{% trans "E-Mail Address" %}{% trans "View?" %}{% trans "Update?" %}{% trans "Delete" %}
+
{% for queue in dash_tickets %} - + @@ -31,7 +29,7 @@
-
{% trans "Helpdesk Summary" %}
{% trans "Queue" %}{% trans "Open" %}{% trans "Resolved" %}{% trans "Closed" %}
{{ queue.name }} {% if queue.open %}{% endif %}{{ queue.open }}{% if queue.open %}{% endif %} {% if queue.resolved %}{% endif %}{{ queue.resolved }}{% if queue.resolved %}{% endif %}
+
@@ -42,7 +40,7 @@ {% for entry in basic_ticket_stats.open_ticket_stats %} - + @@ -52,14 +50,14 @@ {% if all_tickets_reported_by_current_user %} -
{% trans "Current Ticket Stats" %}
- {% trans "Average number of days until ticket is closed (all tickets): " %}{{ basic_ticket_stats.average_nbr_days_until_ticket_closed }}.
{{ entry.0 }} {% if entry.1 > 0 %}{{ entry.1 }}{% else %}{{ entry.1 }}{% endif %}
+
{% for ticket in all_tickets_reported_by_current_user %} - + @@ -72,14 +70,14 @@
{% trans "All Tickets submitted by you" %}
#{% trans "Pr" %}{% trans "Title" %}{% trans "Queue" %}{% trans "Status" %}{% trans "Last Update" %}
{{ ticket.ticket }} {{ ticket.get_priority_span }} {{ ticket.title }}
{% endif %} - +
{% for ticket in user_tickets %} - + @@ -89,19 +87,19 @@ {% endfor %} {% if not user_tickets %} - + {% endif %}
{% trans "Open Tickets assigned to you (you are working on this ticket)" %}
#{% trans "Pr" %}{% trans "Title" %}{% trans "Queue" %}{% trans "Status" %}{% trans "Last Update" %}
{{ ticket.ticket }} {{ ticket.get_priority_span }} {{ ticket.title }}
{% trans "You have no tickets assigned to you." %}
{% trans "You have no tickets assigned to you." %}
- +
{% for ticket in unassigned_tickets %} - + @@ -111,21 +109,21 @@ {% endfor %} {% if not unassigned_tickets %} - + {% endif %}
{% trans "Unassigned Tickets" %} {% trans "(pick up a ticket if you start to work on it)" %}
#{% trans "Pr" %}{% trans "Title" %}{% trans "Queue" %}{% trans "Created" %} 
{{ ticket.ticket }} {{ ticket.get_priority_span }} {{ ticket.title }}
{% trans "There are no unassigned tickets." %}
{% trans "There are no unassigned tickets." %}
{% if user_tickets_closed_resolved %} - +
{% for ticket in user_tickets_closed_resolved %} - + diff --git a/helpdesk/templates/helpdesk/kb_category.html b/helpdesk/templates/helpdesk/kb_category.html index 8821d36a..33a60aa6 100644 --- a/helpdesk/templates/helpdesk/kb_category.html +++ b/helpdesk/templates/helpdesk/kb_category.html @@ -7,15 +7,15 @@

{{ category.description }}

-
{% trans "Closed & resolved Tickets you used to work on" %}
#{% trans "Pr" %}{% trans "Title" %}{% trans "Queue" %}{% trans "Status" %}{% trans "Last Update" %}
{{ ticket.ticket }} {{ ticket.get_priority_span }} {{ ticket.title }}
+
{% for item in items %} - - + + {% endfor %}
{% blocktrans with category.title as kbcat %}Knowledgebase Category: {{ kbcat }}{% endblocktrans %}
{% trans "Article" %}
{{ item.title }}Rating: {{ item.score }}Last Update: {{ item.last_updated|timesince }} ago
{{ item.question }}
{{ item.title }}Rating: {{ item.score }}Last Update: {{ item.last_updated|timesince }} ago
{{ item.question }}
diff --git a/helpdesk/templates/helpdesk/kb_index.html b/helpdesk/templates/helpdesk/kb_index.html index e7abcb22..5d65c9f0 100644 --- a/helpdesk/templates/helpdesk/kb_index.html +++ b/helpdesk/templates/helpdesk/kb_index.html @@ -5,15 +5,15 @@

{% 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 %} - - + + {% endfor %}
{% trans "Knowledgebase Categories" %}
{% trans "Category" %}
{{ category.title }}
{{ category.description }}
{{ category.title }}
{{ category.description }}
diff --git a/helpdesk/templates/helpdesk/kb_item.html b/helpdesk/templates/helpdesk/kb_item.html index f2db73e3..57552bcf 100644 --- a/helpdesk/templates/helpdesk/kb_item.html +++ b/helpdesk/templates/helpdesk/kb_item.html @@ -3,11 +3,11 @@ {% block helpdesk_body %}

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

- +
- - + +
{{ item.title }}
{{ item.question }}
{{ item.answer|markdown }}
{{ item.question }}
{{ item.answer|markdown }}
diff --git a/helpdesk/templates/helpdesk/public_homepage.html b/helpdesk/templates/helpdesk/public_homepage.html index 11cfb16f..79a652f5 100644 --- a/helpdesk/templates/helpdesk/public_homepage.html +++ b/helpdesk/templates/helpdesk/public_homepage.html @@ -5,15 +5,15 @@ {% if kb_categories %}

{% trans "Knowledgebase Articles" %}

- +
{% for category in kb_categories %} - - + + {% endfor %}
{% trans "Knowledgebase Categories" %}
{% trans "Category" %}
{{ category.title }}
{{ category.description }}
{{ category.title }}
{{ category.description }}
diff --git a/helpdesk/templates/helpdesk/public_view_ticket.html b/helpdesk/templates/helpdesk/public_view_ticket.html index 2cf8b76f..c304cdb5 100644 --- a/helpdesk/templates/helpdesk/public_view_ticket.html +++ b/helpdesk/templates/helpdesk/public_view_ticket.html @@ -3,51 +3,51 @@ {% block helpdesk_body %} - +
- + - + - + {% for customfield in ticket.ticketcustomfieldvalue_set.all %} - +{% endfor %} {% if tags_enabled %} - + {% endif %} - + - + -{% if ticket.resolution %} +{% if ticket.resolution %} - +{% endif %} diff --git a/helpdesk/templates/helpdesk/ticket_desc_table.html b/helpdesk/templates/helpdesk/ticket_desc_table.html index 685f9a30..c5b9fb54 100644 --- a/helpdesk/templates/helpdesk/ticket_desc_table.html +++ b/helpdesk/templates/helpdesk/ticket_desc_table.html @@ -1,5 +1,5 @@ {% load i18n %}{% load url from future %} -
{{ ticket.ticket }} . {{ ticket.title }} [{{ ticket.get_status }}]
{% blocktrans with ticket.queue as queue_name %}Queue: {{ queue_name }}{% endblocktrans %}
{% trans "Submitted On" %} {{ ticket.created|date:"r" }} ({{ ticket.created|timesince }} ago)
{% trans "Submitter E-Mail" %} {{ ticket.submitter_email }}
{% trans "Priority" %} {{ ticket.get_priority_display }}
{{ customfield.field.label }} {{ customfield.value }}
{% trans "Tags" %} {{ ticket.tags }}
{% trans "Description" %}
{{ ticket.description|force_escape|urlizetrunc:50|linebreaksbr }}
{% trans "Resolution" %}{% ifequal ticket.get_status_display "Resolved" %} {% trans "Accept" %}{% endifequal %}
{{ ticket.resolution|urlizetrunc:50|linebreaksbr }}
+
{% for customfield in ticket.ticketcustomfieldvalue_set.all %} - +{% endfor %} - + - + -{% if ticket.resolution %} +{% if ticket.resolution %} - +{% endif %} - + - + - + - + - + - +

{{ ticket.id }}. {{ ticket.title }} [{{ ticket.get_status }}]

Edit @@ -10,50 +10,50 @@
{{ customfield.field.label }} {% ifequal customfield.field.data_type "url" %}{{ customfield.value }}{% else %}{{ customfield.value }}{% endifequal %}
{% trans "Description" %}
{{ ticket.description|force_escape|urlizetrunc:50|linebreaksbr }}
{% trans "Resolution" %}{% ifequal ticket.get_status_display "Resolved" %} {% trans "Accept" %}{% endifequal %}
{{ ticket.resolution|force_escape|urlizetrunc:50|linebreaksbr }}
{% trans "Submitted On" %} {{ ticket.created|date:"r" }} ({{ ticket.created|timesince }} ago)
{% trans "Assigned To" %} {{ ticket.get_assigned_to }}{% ifequal ticket.get_assigned_to _('Unassigned') %} {% trans "Take" %}{% endifequal %}
{% trans "Submitter E-Mail" %} {{ ticket.submitter_email }}{% if user.is_superuser %} {% trans "Ignore" %}{% endif %}
{% trans "Priority" %} {{ ticket.get_priority_display }}
{% trans "Copies To" %} {{ ticketcc_string }} {% trans "Manage" %}{% trans "Click here to add / remove people who should receive an e-mail whenever this ticket is updated." %}{% if SHOW_SUBSCRIBE %}, {% trans "Subscribe" %}{% trans "Click here to subscribe yourself to this ticket, if you want to receive an e-mail whenever this ticket is updated." %}{% endif %}
{% trans "Dependencies" %} {% for dep in ticket.ticketdependency.all %} {% if forloop.first %}

{% trans "This ticket cannot be resolved until the following ticket(s) are resolved" %}

    {% endif %} diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html index 060a2b15..3fba020e 100644 --- a/helpdesk/templates/helpdesk/ticket_list.html +++ b/helpdesk/templates/helpdesk/ticket_list.html @@ -3,7 +3,6 @@ {% block helpdesk_head %} -