From 71dcfb6f37adbc5fa1d7fddfdf98b39e8cc32296 Mon Sep 17 00:00:00 2001 From: Stefano Brentegani Date: Fri, 20 Apr 2012 00:02:28 +0200 Subject: [PATCH 01/88] Replacing undocumented ADMIN_URL setting --- helpdesk/templates/helpdesk/system_settings.html | 14 +++++++------- helpdesk/urls.py | 13 ++++--------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/helpdesk/templates/helpdesk/system_settings.html b/helpdesk/templates/helpdesk/system_settings.html index 44d52f74..22f8f47a 100644 --- a/helpdesk/templates/helpdesk/system_settings.html +++ b/helpdesk/templates/helpdesk/system_settings.html @@ -8,12 +8,12 @@

The following items can be maintained by you or other superusers:

{% endblocktrans %} {% endblock %} diff --git a/helpdesk/urls.py b/helpdesk/urls.py index 7c059be4..c61774e4 100644 --- a/helpdesk/urls.py +++ b/helpdesk/urls.py @@ -80,7 +80,7 @@ urlpatterns = patterns('helpdesk.views.staff', url(r'^tickets/(?P[0-9]+)/dependency/delete/(?P[0-9]+)/$', 'ticket_dependency_del', name='helpdesk_ticket_dependency_del'), - + url(r'^tickets/(?P[0-9]+)/attachment_delete/(?P[0-9]+)/$', 'attachment_del', name='helpdesk_attachment_del'), @@ -137,7 +137,7 @@ urlpatterns += patterns('helpdesk.views.public', url(r'^change_language/$', 'change_language', - name='helpdesk_public_change_language'), + name='helpdesk_public_change_language'), ) urlpatterns += patterns('', @@ -165,7 +165,7 @@ if helpdesk_settings.HELPDESK_KB_ENABLED: urlpatterns += patterns('helpdesk.views.kb', url(r'^kb/$', 'index', name='helpdesk_kb_index'), - + url(r'^kb/(?P[0-9]+)/$', 'item', name='helpdesk_kb_item'), @@ -189,11 +189,6 @@ urlpatterns += patterns('', url(r'^system_settings/$', 'django.views.generic.simple.direct_to_template', - { - 'template': 'helpdesk/system_settings.html', - 'extra_context': { - 'ADMIN_URL': getattr(settings, 'ADMIN_URL', '/admin/'), - }, - }, + {'template': 'helpdesk/system_settings.html',}, name='helpdesk_system_settings'), ) From 20d5a24eab2b7c79ed8be5d2ec06a620eea94414 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 6 Mar 2013 10:58:25 +0100 Subject: [PATCH 02/88] Caption and sorting of tickets in dropdown menus should use ID, e. g. when adding a dependency. --- helpdesk/models.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helpdesk/models.py b/helpdesk/models.py index 42a61754..b376e450 100644 --- a/helpdesk/models.py +++ b/helpdesk/models.py @@ -444,9 +444,10 @@ class Ticket(models.Model): class Meta: get_latest_by = "created" + ordering = ('id',) def __unicode__(self): - return u'%s' % self.title + return u'%s %s' % (self.id, self.title) def get_absolute_url(self): return ('helpdesk_view', (self.id,)) From eb3becb9a95b982a376f76b84d631aee16739701 Mon Sep 17 00:00:00 2001 From: Stefano Brentegani Date: Thu, 7 Nov 2013 13:22:04 +0100 Subject: [PATCH 03/88] fixes = vs == in template --- helpdesk/templates/helpdesk/ticket_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html index f8fb055a..2638dcb4 100644 --- a/helpdesk/templates/helpdesk/ticket_list.html +++ b/helpdesk/templates/helpdesk/ticket_list.html @@ -140,7 +140,7 @@ $(document).ready(function() {
- {% if from_saved_query and saved_query.user = user %} + {% if from_saved_query and saved_query.user == user %}

{% blocktrans with saved_query.title as query_name %}You are currently viewing saved query {{ query_name }}.{% endblocktrans %} {% trans "Delete Saved Query" %}

{% endif %} {% if from_saved_query %} From 8a5ddc6d6be1ecfa4d1a138f53ceff3dda470027 Mon Sep 17 00:00:00 2001 From: Ross Poulton Date: Tue, 12 Nov 2013 15:28:28 +1100 Subject: [PATCH 04/88] Update README.rst Add travis-ci badge --- README.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.rst b/README.rst index 6afb2b84..59661e06 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,9 @@ django-helpdesk - A Django powered ticket tracker for small enterprise. ======================================================================= +.. image:: https://travis-ci.org/rossp/django-helpdesk.png?branch=master + + Copyright 2009-11 Jutda and Ross Poulton. All Rights Reserved. See LICENSE for details. django-helpdesk was formerly known as Jutda Helpdesk, named after the From 7fcb829e5468e65c3c941ebbc40495a4555ad8fe Mon Sep 17 00:00:00 2001 From: Leon Harris Date: Mon, 25 Nov 2013 15:51:14 +0000 Subject: [PATCH 05/88] updated templated to use CDN bootstrap3, CDN jquery, added logo to navigation, minor layout changes requires http://github.com/tzangms/django-bootstrap-form --- helpdesk/settings.py | 2 + helpdesk/static/helpdesk/helpdesk-extend.css | 51 ++++++++++ helpdesk/templates/helpdesk/attribution.html | 2 +- helpdesk/templates/helpdesk/base.html | 36 +++---- .../helpdesk/confirm_delete_saved_query.html | 2 +- .../templates/helpdesk/create_ticket.html | 20 ++-- helpdesk/templates/helpdesk/dashboard.html | 70 ++++++++------ .../templates/helpdesk/delete_ticket.html | 2 +- helpdesk/templates/helpdesk/edit_ticket.html | 19 ++-- .../templates/helpdesk/email_ignore_add.html | 2 +- .../templates/helpdesk/email_ignore_del.html | 2 +- .../templates/helpdesk/email_ignore_list.html | 2 +- .../templates/helpdesk/followup_edit.html | 2 +- helpdesk/templates/helpdesk/kb_category.html | 7 +- helpdesk/templates/helpdesk/kb_index.html | 7 +- helpdesk/templates/helpdesk/kb_item.html | 7 +- helpdesk/templates/helpdesk/navigation.html | 38 +++++--- helpdesk/templates/helpdesk/public_base.html | 14 +-- .../helpdesk/public_change_language.html | 2 +- .../templates/helpdesk/public_homepage.html | 87 ++++++++++------- .../templates/helpdesk/public_view_form.html | 2 +- .../helpdesk/public_view_ticket.html | 14 +-- .../helpdesk/registration/login.html | 25 +++-- .../templates/helpdesk/report_output.html | 8 +- helpdesk/templates/helpdesk/rss_list.html | 6 +- helpdesk/templates/helpdesk/ticket.html | 14 +-- .../templates/helpdesk/ticket_cc_add.html | 2 +- .../templates/helpdesk/ticket_cc_del.html | 2 +- .../templates/helpdesk/ticket_cc_list.html | 2 +- .../helpdesk/ticket_dependency_add.html | 2 +- .../helpdesk/ticket_dependency_del.html | 2 +- .../templates/helpdesk/ticket_desc_table.html | 16 ++-- helpdesk/templates/helpdesk/ticket_list.html | 96 +++++++++++++------ .../templates/helpdesk/user_settings.html | 2 +- 34 files changed, 379 insertions(+), 188 deletions(-) create mode 100644 helpdesk/static/helpdesk/helpdesk-extend.css diff --git a/helpdesk/settings.py b/helpdesk/settings.py index 1645d5c8..aebcbd58 100644 --- a/helpdesk/settings.py +++ b/helpdesk/settings.py @@ -37,6 +37,8 @@ HELPDESK_REDIRECT_TO_LOGIN_BY_DEFAULT = getattr(settings, 'HELPDESK_REDIRECT_TO_ # customize helpdesk name on a few pages, i.e., your organization. HELPDESK_PREPEND_ORG_NAME = getattr(settings, 'HELPDESK_PREPEND_ORG_NAME', False) +HELPDESK_ORG_LOGO = getattr(settings, 'HELPDESK_ORG_LOGO', False) + # show knowledgebase links? HELPDESK_KB_ENABLED = getattr(settings, 'HELPDESK_KB_ENABLED', True) diff --git a/helpdesk/static/helpdesk/helpdesk-extend.css b/helpdesk/static/helpdesk/helpdesk-extend.css new file mode 100644 index 00000000..77826631 --- /dev/null +++ b/helpdesk/static/helpdesk/helpdesk-extend.css @@ -0,0 +1,51 @@ +/* +Bootstrap overrides +*/ + +.thumbnail.filterBox { + display: none; + float: left; + border: solid #ccc 1px; + padding: 10px; + margin: 4px; + max-width: 24%; + min-height: 200px; +} + +.thumbnail.filterBoxShow { + display: block; +} + +.filterBox label { + clear: both; + display: block; +} + +.filterBox .filterHelp { + color: #aaa; + font-size: 0.8em; + clear: both; +} + +#searchtabs {margin-bottom: 20px;} + +.row_tablehead {background-color: #dbd5d9;} + +.errorlist {list-style: none; } +.errorlist {padding: 0;} +.has-error .input-group input, .has-error .input-group select, .has-error .input-group textarea {border-color: #b94a48} + + + +/* +Add your custom styles here +*/ +#footer { + border-top: 2px solid #AAAAAA; + margin-top: 20px; + padding: 10px 0; +} +#helpdesk-body {padding-top: 100px;} +#header .navbar-nav { + padding-top: 25px; +} \ No newline at end of file diff --git a/helpdesk/templates/helpdesk/attribution.html b/helpdesk/templates/helpdesk/attribution.html index 461621e3..1e4a1c64 100644 --- a/helpdesk/templates/helpdesk/attribution.html +++ b/helpdesk/templates/helpdesk/attribution.html @@ -1,5 +1,5 @@ {% load i18n %} -{% trans "Powered by django-helpdesk." %} +{% trans "django-helpdesk." %} {% if helpdesk_settings.HELPDESK_SUPPORT_PERSON %}

{% trans "For technical support please contact:" %} {{ helpdesk_settings.HELPDESK_SUPPORT_PERSON }}

{% endif %} diff --git a/helpdesk/templates/helpdesk/base.html b/helpdesk/templates/helpdesk/base.html index c4732afd..e385059b 100644 --- a/helpdesk/templates/helpdesk/base.html +++ b/helpdesk/templates/helpdesk/base.html @@ -8,14 +8,18 @@ {% block helpdesk_title %}Helpdesk{% endblock %} :: {% trans "Powered by django-helpdesk" %} - + + {% comment %} {% endcomment %} - - - + + + + + + @@ -94,26 +98,26 @@ {% block helpdesk_head %}{% endblock %} - -
-