Merge pull request #935 from alligatorbait/include_js

Include base_js.html moved to head of base.html

helpdesk/templates/helpdesk/base.html

@@ -11,6 +11,7 @@
 
     {% include 'helpdesk/base-head.html' %}
     {% block helpdesk_head %}{% endblock %}
+    {% include 'helpdesk/base_js.html' %}
 
 </head>
 
@@ -44,8 +45,6 @@
 
     {% include "helpdesk/debug.html" %}
 
-
-    {% include 'helpdesk/base_js.html' %}
     {% block helpdesk_js %}{% endblock %}
 
 </body>

helpdesk/templates/helpdesk/include/tickets.html

@@ -25,7 +25,7 @@
                     <td>{{ ticket.priority }}</td>
                     <td>{{ ticket.queue }}</td>
                     <td>{{ ticket.get_status }}</td>
-                    <td><span title='{{ ticket.modified|date:"r" }}'>{{ ticket.modified|naturaltime }}</span></td>
+                    <td><span title='{{ ticket.modified|date }}'>{{ ticket.modified|naturaltime }}</span></td>
                 </tr>
                 {% empty %}
                 <tr>{% if ticket_list_empty_message %}<td colspan='6'>{{ ticket_list_empty_message }}</td>{% else %}<td colspan='6'>{% trans "You do not have any pending tickets." %}</td>{% endif %}</tr>

helpdesk/templates/helpdesk/include/unassigned.html

@@ -63,7 +63,7 @@
                         <td class="tickettitle"><a href='{{ ticket.get_absolute_url }}'>{{ ticket.id }}. {{ ticket.title }} </a></td>
                         <td>{{ ticket.priority }}</td>
                         <td>{{ ticket.queue }}</td>
-                        <td><span title='{{ ticket.created|date:"r" }}'>{{ ticket.created|naturaltime }}</span></td>
+                        <td><span title='{{ ticket.created|date }}'>{{ ticket.created|naturaltime }}</span></td>
                         <td class="text-center">
                           <a href='{{ ticket.get_absolute_url }}?take'><button class='btn btn-primary btn-sm'><i class="fas fa-hand-paper"></i>&nbsp;{% trans "Take" %}</button></a>
                           <a href='{% url 'helpdesk:delete' ticket.id %}?next=dashboard'><button class='btn btn-danger btn-sm'><i class="fas fa-trash"></i>&nbsp;{% trans "Delete" %}</button></a>

helpdesk/templates/helpdesk/public_view_ticket.html

@@ -12,13 +12,13 @@
 <tbody>
 <tr>
     <th>{% trans "Submitted On" %}</th>
-    <td>{{ ticket.created|date:"r" }} ({{ ticket.created|naturaltime }})</td>
+    <td>{{ ticket.created|date }} ({{ ticket.created|naturaltime }})</td>
 </tr>
 
 {% if ticket.due_date %}
     <tr>
         <th>{% trans "Due On" %}</th>
-        <td>{{ ticket.due_date|date:"r" }} ({{ ticket.due_date|naturaltime }})</td>
+        <td>{{ ticket.due_date|date }} ({{ ticket.due_date|naturaltime }})</td>
     </tr>
 {% endif %}
 
@@ -67,7 +67,7 @@ <h3>{% trans "Follow-Ups" %}</h3>
 {% load ticket_to_link %}
 {% for followup in ticket.followup_set.public_followups %}
 <div class='followup well'>
-<div class='title'>{{ followup.title }} <span class='byline text-info'>{% if followup.user %}by {{ followup.user }}{% endif %} <span title='{{ followup.date|date:"r" }}'>{{ followup.date|naturaltime }}</span></span></div>
+<div class='title'>{{ followup.title }} <span class='byline text-info'>{% if followup.user %}by {{ followup.user }}{% endif %} <span title='{{ followup.date|date }}'>{{ followup.date|naturaltime }}</span></span></div>
 {{ followup.comment|force_escape|urlizetrunc:50|num_to_link|linebreaksbr }}
 {% if followup.ticketchange_set.all %}<div class='changes'><ul>
 {% for change in followup.ticketchange_set.all %}

helpdesk/templates/helpdesk/ticket.html

@@ -46,7 +46,7 @@ <h3 class="text-center">
                         <div class="list-group-item list-group-item-action">
                             <div class="d-flex w-100 justify-content-between">
                                 <h5 class="mb-1">{{ followup.title|num_to_link }}</h5>
-                                <small><i class="fas fa-clock"></i>&nbsp;<span class='byline text-info'>{% if followup.user %}by {{ followup.user }},{% endif %} <span title='{{ followup.date|date:"r" }}'>{{ followup.date|naturaltime }}</span>{% if followup.time_spent %}, <span>{% trans "time spent" %}: {{ followup.time_spent_formated }}</span>{% endif %} {% if not followup.public %} <span class='private'>({% trans "Private" %})</span>{% endif %}</span></small>
+                                <small><i class="fas fa-clock"></i>&nbsp;<span class='byline text-info'>{% if followup.user %}by {{ followup.user }},{% endif %} <span title='{{ followup.date|date }}'>{{ followup.date|naturaltime }}</span>{% if followup.time_spent %}, <span>{% trans "time spent" %}: {{ followup.time_spent_formated }}</span>{% endif %} {% if not followup.public %} <span class='private'>({% trans "Private" %})</span>{% endif %}</span></small>
                             </div>
                             <p class="mb-1">
                                 {% if followup.comment %}

helpdesk/templates/helpdesk/ticket_desc_table.html

@@ -25,10 +25,10 @@
                     </tr>{% endfor %}
                     <tr>
                         <th class="table-active">{% trans "Due Date" %}</th>
-                        <td>{{ ticket.due_date|date:"d. E Y" }} {% if ticket.due_date %}({{ ticket.due_date|naturaltime }}){% endif %}
+                        <td>{{ ticket.due_date|date }} {% if ticket.due_date %}({{ ticket.due_date|naturaltime }}){% endif %}
                         </td>
                         <th class="table-active">{% trans "Submitted On" %}</th>
-                        <td>{{ ticket.created|date:"d. E Y" }} ({{ ticket.created|naturaltime }})</td>
+                        <td>{{ ticket.created|date }} ({{ ticket.created|naturaltime }})</td>
                     </tr>
                     <tr>
                         <th class="table-active">{% trans "Assigned To" %}</th>