holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Miscellaneous improvements from review of #419

Browse Source
This commit is contained in:
Garret Wassermann 2016-10-31 02:57:08 -04:00
parent 37b9d332de
commit 2a7d82413b
15 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helpdesk/templates/helpdesk/include/tickets.html
View File

@ -23,7 +23,7 @@
<tbody> <tbody>
{% for ticket in ticket_list %} {% for ticket in ticket_list %}
<tr class="{{ ticket.get_priority_css_class }}"> <tr class="{{ ticket.get_priority_css_class }}">
<td><a href='{{ ticket.get_absolute_url }}'>{{ ticket.ticket }}</td> <td><a href='{{ ticket.get_absolute_url }}'>{{ ticket.ticket }}</a></td>
<td>{{ ticket.priority }}</td> <td>{{ ticket.priority }}</td>
<td><a href='{{ ticket.get_absolute_url }}'>{{ ticket.title }}</a></td> <td><a href='{{ ticket.get_absolute_url }}'>{{ ticket.title }}</a></td>
<td>{{ ticket.queue }}</td> <td>{{ ticket.queue }}</td>

2
helpdesk/templates/helpdesk/include/unassigned.html
View File

@ -23,7 +23,7 @@
<tbody> <tbody>
{% for ticket in unassigned_tickets %} {% for ticket in unassigned_tickets %}
<tr class="{{ ticket.get_priority_css_class }}"> <tr class="{{ ticket.get_priority_css_class }}">
<td><a href='{{ ticket.get_absolute_url }}'>{{ ticket.ticket }}</td> <td><a href='{{ ticket.get_absolute_url }}'>{{ ticket.ticket }}</a></td>
<td>{{ ticket.priority }}</td> <td>{{ ticket.priority }}</td>
<td><a href='{{ ticket.get_absolute_url }}'>{{ ticket.title }}</a></td> <td><a href='{{ ticket.get_absolute_url }}'>{{ ticket.title }}</a></td>
<td>{{ ticket.queue }}</td> <td>{{ ticket.queue }}</td>

8
helpdesk/templates/helpdesk/kb_category.html
View File

@ -1,7 +1,7 @@
{% extends "helpdesk/public_base.html" %}{% load i18n humanize %} {% extends "helpdesk/public_base.html" %}{% load i18n humanize %}
{% block helpdesk_body %} {% block helpdesk_body %}
<h2>{% blocktrans with category.title as kbcat %}Knowledgebase Category: {{ kbcat }}{% endblocktrans %}</h2> <h2>{% trans 'Knowledgebase Category' %}:{% blocktrans with category.title as kbcat %}{{ kbcat }}{% endblocktrans %}</h2>
<div class="col-lg-12"> <div class="col-lg-12">
<div class="well well-sm"> <div class="well well-sm">
@ -22,10 +22,10 @@
<p>{{ item.question }}</p> <p>{{ item.question }}</p>
</div> </div>
<div class="panel-footer"> <div class="panel-footer">
<p>View <a href='{{ item.get_absolute_url }}'>Answer <i class="fa fa-arrow-right"></i></a></p> <p>{% blocktrans %}View <a href='{{ item.get_absolute_url }}'>Answer <i class="fa fa-arrow-right"></i></a>{% endblocktrans %}</p>
<div class="well well-sm"> <div class="well well-sm">
<p>Rating: {{ item.score }}</p> <p>{% trans 'Rating' %}: {{ item.score }}</p>
<p>Last Update: {{ item.last_updated|naturaltime }}</p> <p>{% trans 'Last Update' %}: {{ item.last_updated|naturaltime }}</p>
</div> </div>
</div> </div>
</div> </div>

8
helpdesk/templates/helpdesk/kb_index.html
View File

@ -3,11 +3,11 @@
{% block helpdesk_body %} {% block helpdesk_body %}
<h2>{% trans "Knowledgebase" %}</h2> <h2>{% trans "Knowledgebase" %}</h2>
<p>{% 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." %}</p> <p>{% 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." %}</p>
{% for category in kb_categories %} {% for category in kb_categories %}
{% cycle 'one' 'two' 'three' as catnumperrow silent %} {% cycle 'one' 'two' 'three' as catnumperrow silent %}
{% ifequal catnumperrow 'one' %}<div class="row">{% endifequal %} {% if catnumperrow == 'one' %}<div class="row">{% endif %}
<div class="col-lg-4"> <div class="col-lg-4">
<div class="panel panel-primary"> <div class="panel panel-primary">
<div class="panel-heading"> <div class="panel-heading">
@ -17,11 +17,11 @@
<p>{{ category.description }}</p> <p>{{ category.description }}</p>
</div> </div>
<div class="panel-footer"> <div class="panel-footer">
View <a href='{{ category.get_absolute_url }}'>{{ category.title }} articles <i class="fa fa-arrow-right"></i></a> <a href='{{ category.get_absolute_url }}'>{% trans 'View articles' %}<i class="fa fa-arrow-right"></i></a>
</div> </div>
</div> </div>
</div> </div>
{% ifequal catnumperrow 'three' %}</div>{% endifequal %} {% if catnumperrow == 'three' %}</div>{% endif %}
{% endfor %} {% endfor %}
{% endblock %} {% endblock %}

2
helpdesk/templates/helpdesk/kb_item.html
View File

@ -1,7 +1,7 @@
{% extends "helpdesk/public_base.html" %}{% load i18n %}{% load markdown_deux_tags %} {% extends "helpdesk/public_base.html" %}{% load i18n %}{% load markdown_deux_tags %}
{% block helpdesk_body %} {% block helpdesk_body %}
<h2>{% blocktrans with item.title as item %}Knowledgebase: {{ item }}{% endblocktrans %}</h2> <h2>{% trans 'Knowledgebase' %}:{% blocktrans with item.title as item %}{{ item }}{% endblocktrans %}</h2>
<div class="col-lg-12"> <div class="col-lg-12">
<div class="panel panel-primary"> <div class="panel panel-primary">

6
helpdesk/templates/helpdesk/navigation.html
View File

@ -4,12 +4,12 @@
<nav class="navbar navbar-default navbar-fixed-top" role="navigation" style="margin-bottom: 0"> <nav class="navbar navbar-default navbar-fixed-top" role="navigation" style="margin-bottom: 0">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#helpdesk-nav-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#helpdesk-nav-collapse">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">{% trans 'Toggle navigation' %}</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="{% url 'helpdesk:home' %}">Helpdesk</a> <a class="navbar-brand" href="{% url 'helpdesk:home' %}">{% trans 'Helpdesk' %}</a>
</div> </div>
<!-- /.navbar-header --> <!-- /.navbar-header -->
@ -54,7 +54,7 @@
<input type='hidden' name='status' value='1' /><input type='hidden' name='status' value='2' /><input type='hidden' name='status' value='3' /><input type='hidden' name='search_type' value='header' /> <input type='hidden' name='status' value='1' /><input type='hidden' name='status' value='2' /><input type='hidden' name='status' value='3' /><input type='hidden' name='search_type' value='header' />
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-default" type="submit"> <button class="btn btn-default" type="submit">
<i class="fa fa-search"></i> Go <i class="fa fa-search"></i> {% trans 'Go' %}
</button> </button>
</span> </span>
</div> </div>

4
helpdesk/templates/helpdesk/public_base.html
View File

@ -13,7 +13,7 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
<title>{% block helpdesk_title %}Helpdesk{% endblock %}</title> <title>{% block helpdesk_title %}{% trans 'Helpdesk' %}{% endblock %}</title>
<!-- Bootstrap Core CSS --> <!-- Bootstrap Core CSS -->
{% if helpdesk_settings.HELPDESK_USE_CDN %} {% if helpdesk_settings.HELPDESK_USE_CDN %}
@ -67,7 +67,7 @@
{% else %} {% else %}
<script src="{% static 'helpdesk/vendor/jquery/jquery.min.js' %}"></script> <script src="{% static 'helpdesk/vendor/jquery/jquery.min.js' %}"></script>
{% endif %} {% endif %}
<script src='{% static "helpdesk/jquery-ui-1.12.0.min.js" %}' type='text/javascript' language='javascript'></script> <script src='{% static "helpdesk/jquery-ui-1.12.0.min.js" %}'></script>
<!-- Bootstrap Core JavaScript --> <!-- Bootstrap Core JavaScript -->
{% if helpdesk_settings.HELPDESK_USE_CDN %} {% if helpdesk_settings.HELPDESK_USE_CDN %}

2
helpdesk/templates/helpdesk/public_view_ticket.html
View File

@ -46,7 +46,7 @@
</tr> </tr>
{% if ticket.resolution %}<tr> {% if ticket.resolution %}<tr>
<th colspan='2'>{% trans "Resolution" %}{% ifequal ticket.get_status_display "Resolved" %} <a href='{{ ticket.ticket_url }}&close'><button type="button" class="btn btn-primary btn-xs">{% trans "Accept and Close" %}</button></a>{% endifequal %}</th> <th colspan='2'>{% trans "Resolution" %}{% if ticket.get_status_display == "Resolved" %} <a href='{{ ticket.ticket_url }}&close'><button type="button" class="btn btn-primary btn-xs">{% trans "Accept and Close" %}</button></a>{% endif %}</th>
</tr> </tr>
<tr> <tr>
<td colspan='2'>{{ ticket.resolution|urlizetrunc:50|linebreaksbr }}</td> <td colspan='2'>{{ ticket.resolution|urlizetrunc:50|linebreaksbr }}</td>

4
helpdesk/templates/helpdesk/registration/login.html
View File

@ -10,7 +10,7 @@
<div class="col-md-4 col-md-offset-4"> <div class="col-md-4 col-md-offset-4">
<div class="login-panel panel panel-default"> <div class="login-panel panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">Please Sign In</h3> <h3 class="panel-title">{% trans 'Please Sign In' %}</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<form role="form" method='post' action='./'> <form role="form" method='post' action='./'>
@ -26,7 +26,7 @@
</div> </div>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input name="remember" type="checkbox" value="Remember Me">Remember Me <input name="remember" type="checkbox" value="Remember Me">{% trans 'Remember Me' %}
</label> </label>
</div> </div>
<input class="btn btn-lg btn-success btn-block" type='submit' value='{% trans "Login" %}' /> <input class="btn btn-lg btn-success btn-block" type='submit' value='{% trans "Login" %}' />

6
helpdesk/templates/helpdesk/report_index.html
View File

@ -5,7 +5,7 @@
{% block helpdesk_body %} {% block helpdesk_body %}
<h2>{% trans "Reports &amp; Statistics" %}</h2> <h2>{% trans "Reports &amp; Statistics" %}</h2>
{% ifequal number_tickets 0 %} {% if number_tickets == 0 %}
<p>{% trans "You haven't created any tickets yet, so you cannot run any reports." %}</p> <p>{% trans "You haven't created any tickets yet, so you cannot run any reports." %}</p>
{% else %} {% else %}
@ -44,7 +44,7 @@
</thead> </thead>
<tbody> <tbody>
{% for queue in dash_tickets %} {% for queue in dash_tickets %}
<tr>{% url 'helpdesk_list' as hdlist %} <tr>{% url 'helpdesk:list' as hdlist %}
<td><a href='{{ hdlist }}?queue={{ queue.queue }}&status=1&status=2'>{{ queue.name }}</a></td> <td><a href='{{ hdlist }}?queue={{ queue.queue }}&status=1&status=2'>{{ queue.name }}</a></td>
<td>{% if queue.open %}<a href='{{ hdlist }}?queue={{ queue.queue }}&status=1&status=2'>{% endif %}{{ queue.open }}{% if queue.open %}</a>{% endif %}</td> <td>{% if queue.open %}<a href='{{ hdlist }}?queue={{ queue.queue }}&status=1&status=2'>{% endif %}{{ queue.open }}{% if queue.open %}</a>{% endif %}</td>
<td>{% if queue.resolved %}<a href='{{ hdlist }}?queue={{ queue.queue }}&status=3'>{% endif %}{{ queue.resolved }}{% if queue.resolved %}</a>{% endif %}</td> <td>{% if queue.resolved %}<a href='{{ hdlist }}?queue={{ queue.queue }}&status=3'>{% endif %}{{ queue.resolved }}{% if queue.resolved %}</a>{% endif %}</td>
@ -97,4 +97,4 @@
</div> </div>
</div> </div>
{% endifequal %}{% endblock %} {% endif %}{% endblock %}

10
helpdesk/templates/helpdesk/report_output.html
View File

@ -32,7 +32,7 @@
<div class="col-lg-12"> <div class="col-lg-12">
<div class="panel panel-primary"> <div class="panel panel-primary">
<div class="panel-heading"> <div class="panel-heading">
Saved Queries {% trans 'Saved Queries' %}
</div> </div>
<!-- /.panel-heading --> <!-- /.panel-heading -->
<div class="panel-body"> <div class="panel-body">
@ -89,7 +89,7 @@
</div> </div>
</div> </div>
{% ifequal charttype "date" %} {% if charttype == "date" %}
<script type='text/javascript'> <script type='text/javascript'>
Morris.Line({ Morris.Line({
@ -128,8 +128,8 @@ Morris.Line({
});*/ });*/
</script> </script>
{% endifequal %} {% endif %}
{% ifequal charttype "bar" %} {% if charttype == "bar" %}
<script type='text/javascript'> <script type='text/javascript'>
Morris.Bar({ Morris.Bar({
@ -141,7 +141,7 @@ Morris.Bar({
}); });
</script> </script>
{% endifequal %} {% endif %}

4
helpdesk/templates/helpdesk/rss_list.html
View File

@ -22,9 +22,9 @@
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="panel panel-primary"> <div class="panel panel-primary">
<div class="panel-heading"> <header class="panel-heading">
{% trans "Per-Queue Feeds" %} {% trans "Per-Queue Feeds" %}
</div> </header>
<!-- /.panel-heading --> <!-- /.panel-heading -->
<div class="panel-body"> <div class="panel-body">
<div class="table-responsive"> <div class="table-responsive">

2
helpdesk/templates/helpdesk/ticket.html
View File

@ -191,7 +191,7 @@ $(document).on('change', ':file', function() {
<dt> <dt>
<label for='id_public'>{% trans "Is this update public?" %}</label> <span class='form_optional'>{% trans "(Optional)" %}</span> <label for='id_public'>{% trans "Is this update public?" %}</label> <span class='form_optional'>{% trans "(Optional)" %}</span>
</dt> </dt>
<dd><input type='checkbox' name='public' value='1' checked='checked' />&nbsp; Yes, make this update public.</dd> <dd><input type='checkbox' name='public' value='1' checked='checked' />&nbsp; {% trans 'Yes, make this update public.' %}</dd>
<dd class='form_help_text'>{% trans "If this is public, the submitter will be e-mailed your comment or resolution." %}</dd> <dd class='form_help_text'>{% trans "If this is public, the submitter will be e-mailed your comment or resolution." %}</dd>
{% endif %} {% endif %}
</dl> </dl>

4
helpdesk/templates/helpdesk/ticket_cc_add.html
View File

@ -15,9 +15,9 @@
<div class="panel-body"> <div class="panel-body">
<!-- Nav tabs --> <!-- Nav tabs -->
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#EmailCC" data-toggle="tab">Email</a> <li class="active"><a href="#EmailCC" data-toggle="tab">{% trans 'Email' %}</a>
</li> </li>
<li><a href="#UserCC" data-toggle="tab">User</a> <li><a href="#UserCC" data-toggle="tab">{% trans 'User' %}</a>
</li> </li>
</ul> </ul>

4
helpdesk/templates/helpdesk/ticket_list.html
View File

@ -4,8 +4,8 @@
{% block helpdesk_title %}{% trans "Tickets" %}{% endblock %} {% block helpdesk_title %}{% trans "Tickets" %}{% endblock %}
{% block helpdesk_head %} {% block helpdesk_head %}
<script type='text/javascript' language='javascript' src='{% static "helpdesk/filter.js" %}'></script> <script src='{% static "helpdesk/filter.js" %}'></script>
<script type='text/javascript' language='javascript'> <script>
$(document).ready(function() { $(document).ready(function() {
$('#ticketTable').DataTable({ $('#ticketTable').DataTable({