diff --git a/helpdesk/static/helpdesk/hover.js b/helpdesk/static/helpdesk/hover.js
deleted file mode 100644
index 7b5b412a..00000000
--- a/helpdesk/static/helpdesk/hover.js
+++ /dev/null
@@ -1,7 +0,0 @@
-$(document).ready(function() {
- $("tr.row_hover").mouseover(function() {
- $(this).addClass("hover");
- }).mouseout(function() {
- $(this).removeClass("hover");
- });
-});
diff --git a/helpdesk/templates/helpdesk/dashboard.html b/helpdesk/templates/helpdesk/dashboard.html
index 86553e5f..1c340952 100644
--- a/helpdesk/templates/helpdesk/dashboard.html
+++ b/helpdesk/templates/helpdesk/dashboard.html
@@ -1,22 +1,20 @@
{% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
{% block helpdesk_title %}{% trans "Helpdesk Dashboard" %}{% endblock %}
-{% block helpdesk_head %}
-
-{% 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 "Helpdesk Summary" %}
{% trans "Queue" %} | {% trans "Open" %} | {% trans "Resolved" %} | {% trans "Closed" %} |
{% for queue in dash_tickets %}
-
+
{{ queue.name }} |
{% if queue.open %}{% endif %}{{ queue.open }}{% if queue.open %}{% endif %} |
{% if queue.resolved %}{% endif %}{{ queue.resolved }}{% if queue.resolved %}{% endif %} |
@@ -31,7 +29,7 @@
-
+
{% trans "Current Ticket Stats" %}
- {% trans "Average number of days until ticket is closed (all tickets): " %}{{ basic_ticket_stats.average_nbr_days_until_ticket_closed }}. |
@@ -42,7 +40,7 @@
{% for entry in basic_ticket_stats.open_ticket_stats %}
-
+
{{ entry.0 }} |
{% if entry.1 > 0 %}{{ entry.1 }}{% else %}{{ entry.1 }}{% endif %} |
@@ -52,14 +50,14 @@
{% if all_tickets_reported_by_current_user %}
-
+
{% trans "All Tickets submitted by you" %}
# | {% trans "Pr" %} | {% trans "Title" %} | {% trans "Queue" %} | {% trans "Status" %} | {% trans "Last Update" %} |
{% for ticket in all_tickets_reported_by_current_user %}
-
+
{{ ticket.ticket }} |
{{ ticket.get_priority_span }} |
{{ ticket.title }} |
@@ -72,14 +70,14 @@
{% endif %}
-
+
{% trans "Open Tickets assigned to you (you are working on this ticket)" %}
# | {% trans "Pr" %} | {% trans "Title" %} | {% trans "Queue" %} | {% trans "Status" %} | {% trans "Last Update" %} |
{% for ticket in user_tickets %}
-
+
{{ ticket.ticket }} |
{{ ticket.get_priority_span }} |
{{ ticket.title }} |
@@ -89,19 +87,19 @@
{% endfor %}
{% if not user_tickets %}
-{% trans "You have no tickets assigned to you." %} |
+{% trans "You have no tickets assigned to you." %} |
{% endif %}
-
+
{% trans "Unassigned Tickets" %} {% trans "(pick up a ticket if you start to work on it)" %}
# | {% trans "Pr" %} | {% trans "Title" %} | {% trans "Queue" %} | {% trans "Created" %} | |
{% for ticket in unassigned_tickets %}
-
+
{{ ticket.ticket }} |
{{ ticket.get_priority_span }} |
{{ ticket.title }} |
@@ -111,21 +109,21 @@
{% endfor %}
{% if not unassigned_tickets %}
-{% trans "There are no unassigned tickets." %} |
+{% trans "There are no unassigned tickets." %} |
{% endif %}
{% if user_tickets_closed_resolved %}
-
+
{% trans "Closed & resolved Tickets you used to work on" %}
# | {% trans "Pr" %} | {% trans "Title" %} | {% trans "Queue" %} | {% trans "Status" %} | {% trans "Last Update" %} |
{% for ticket in user_tickets_closed_resolved %}
-
+
{{ ticket.ticket }} |
{{ ticket.get_priority_span }} |
{{ ticket.title }} |
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 }}
-
+
{% blocktrans with category.title as kbcat %}Knowledgebase Category: {{ kbcat }}{% endblocktrans %}
{% trans "Article" %} |
{% for item in items %}
-{{ 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 }} |
{% endfor %}
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." %}
-
+
{% trans "Knowledgebase Categories" %}
{% trans "Category" %} |
{% for category in kb_categories %}
-{{ category.title }} |
-{{ category.description }} |
+{{ category.title }} |
+{{ category.description }} |
{% endfor %}
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" %}
-
+
{% trans "Knowledgebase Categories" %}
{% trans "Category" %} |
{% for category in kb_categories %}
-{{ category.title }} |
-{{ category.description }} |
+{{ category.title }} |
+{{ category.description }} |
{% endfor %}
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 %}
-
+
{{ 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 }} |
{% for customfield in ticket.ticketcustomfieldvalue_set.all %}
-
+
{{ customfield.field.label }} |
{{ customfield.value }} |
{% endfor %}
{% if tags_enabled %}
-
+
{% trans "Tags" %} |
{{ ticket.tags }} |
{% endif %}
-
+
{% trans "Description" %} |
-
+
{{ ticket.description|force_escape|urlizetrunc:50|linebreaksbr }} |
-{% if ticket.resolution %}
+{% if ticket.resolution %}
{% trans "Resolution" %}{% ifequal ticket.get_status_display "Resolved" %} {% endifequal %} |
-
+
{{ ticket.resolution|urlizetrunc:50|linebreaksbr }} |
{% 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.id }}. {{ ticket.title }} [{{ ticket.get_status }}]
Edit
@@ -10,50 +10,50 @@
|
{% for customfield in ticket.ticketcustomfieldvalue_set.all %}
-
+
{{ customfield.field.label }} |
{% ifequal customfield.field.data_type "url" %}{{ customfield.value }}{% else %}{{ customfield.value }}{% endifequal %} |
{% endfor %}
-
+
{% trans "Description" %} |
-
+
{{ ticket.description|force_escape|urlizetrunc:50|linebreaksbr }} |
-{% if ticket.resolution %}
+{% if ticket.resolution %}
{% trans "Resolution" %}{% ifequal ticket.get_status_display "Resolved" %} {% endifequal %} |
-
+
{{ ticket.resolution|force_escape|urlizetrunc:50|linebreaksbr }} |
{% endif %}
-
+
{% 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 %}
-
|