Commit Graph

333 Commits

Author SHA1 Message Date
Stefano Brentegani
5e1616d83a split blocktrans in templates 2014-07-30 10:40:13 +02:00
Stefano Brentegani
fdd2508e22 missing load url in template 2014-07-27 18:32:56 +02:00
Stefano Brentegani
0c93de8bdb Merge branch 'master' into template-cleanup
Conflicts:
	helpdesk/templates/helpdesk/navigation.html
2014-07-26 14:03:08 +02:00
Ross Poulton
d38240e3cb Merge pull request #237 from brente/user-menu
User menu
2014-07-26 20:30:44 +10:00
Stefano Brentegani
5e9fd86941 Bootstrap version of the user settings form 2014-07-25 20:57:34 +02:00
Stefano Brentegani
9433f34f9b Nav: use full user name, if available, fix icon 2014-07-25 20:14:13 +02:00
Stefano Brentegani
b05c396918 User menu = User settings, Change password, Logout 2014-07-25 18:08:47 +02:00
Stefano Brentegani
47bec43108 fix typo in template condition 2014-07-25 17:23:54 +02:00
Stefano Brentegani
311dfa6dbd missing spaces in navigation menu 2014-07-25 14:08:35 +02:00
Stefano Brentegani
6d86b62673 missing template lib references 2014-07-22 19:27:37 +02:00
Stefano Brentegani
78103c345b separate dashboard elements for easier customisation 2014-07-22 19:20:40 +02:00
Stefano Brentegani
cfd0ca3b7d remove row_columnheads class from table headers 2014-07-22 16:09:06 +02:00
Stefano Brentegani
df32432685 Merge commit 'fd0ab29dfcfc263be686c8351f4dc5880e3e1b9b' into template-cleanup
Conflicts:
	helpdesk/templates/helpdesk/dashboard.html
	helpdesk/templates/helpdesk/kb_category.html
	helpdesk/templates/helpdesk/ticket_desc_table.html
2014-07-22 07:28:04 +02:00
Ross Poulton
1524cb4ca1 Merge pull request #232 from brente/ago-naturaltime
Use naturaltime for elapsed times
2014-07-22 14:59:20 +10:00
Stefano Brentegani
d95aa46b03 Merge branch 'master' into template-cleanup 2014-07-22 06:43:05 +02:00
Ross Poulton
a2a214d33d Merge pull request #231 from brente/no-admin-url
Remove undocumented ADMIN_URL setting
2014-07-22 10:09:45 +10:00
Stefano Brentegani
04112a109d fix unquoted urls in template 2014-07-21 21:43:29 +02:00
Stefano Brentegani
c711a54d8d Merge commit '21e46f010dfecea1562a4d2b308fd78b71fec8a0' into no-admin-url
Conflicts:
	helpdesk/urls.py
2014-07-21 21:38:40 +02:00
Stefano Brentegani
9c97172624 missed for ... empty opportunity 2014-07-21 21:30:32 +02:00
Stefano Brentegani
0f103ea827 use for ... empty in templates 2014-07-21 20:28:37 +02:00
Stefano Brentegani
b530f19d65 templates: removed row_odd, row_even, row_hover classes and hover.js 2014-07-21 20:19:23 +02:00
Stefano Brentegani
6abc0ba9a9 replace row_tablehead with caption 2014-07-21 20:02:50 +02:00
Stefano Brentegani
fe5c7135a6 exclude KB from navigation if HELPDESK_KB_ENABLED is False (fixes #223) 2014-07-21 18:44:54 +02:00
Stefano Brentegani
fd0ab29dfc use naturaltime for elapsed times (resolves #229) 2014-07-21 10:21:33 +02:00
Ross Poulton
fe1bfd1fa4 Replace django.contrib.markup with django-markdown-deux. Closes #219. 2014-07-07 12:10:53 +10:00
s3h10r
fece448308 fixes: attachments in public comments not shown in public_view_ticket
if no followup.ticketchange_set.all is present the attachments
of followups were not shown to a public user.
2014-05-26 17:28:36 +02:00
Ross Poulton
d99df4a43e Merge pull request #206 from gjedeer/patch-1
Protocol-independent CDN links
2014-02-20 08:57:20 +11:00
GDR!
07a3b91b6f Protocol-independent CDN links 2014-02-19 16:17:13 +01:00
GDR!
53640e0b3e Protocol-independent CDN links 2014-02-19 16:16:17 +01:00
Ross Poulton
0e58c99f69 Remove unncessary translate code in base.html; comment translation still functions. 2014-01-29 22:55:06 +11:00
Ross Poulton
fd9881e6e0 Fix display of saved queries for authenticated users when CONTEXT_PROCESORS didn't include request. 2014-01-29 22:48:54 +11:00
Ross Poulton
2b225d6843 settings.py cleanup (#200); remove HELPDESK_KB_ENABLED_STAFF and HELPDESK_NAVIGATION_STATS_ENABLED (now always on); removed HELPDESK_NAVIGATION_CUSTOM_EXTEND - just use custom template! 2014-01-29 22:37:36 +11:00
Ross Poulton
a9c7e3ab72 settings.py cleanup (#200): remove org name / logo. These belong in local templates, not settings. 2014-01-29 22:30:26 +11:00
Ross Poulton
77f0512c76 settings.py cleanup (#200): remove HELPDESK_SUPPORT_PERSON; please add into attribution.html if needed. 2014-01-29 22:27:42 +11:00
Ross Poulton
1066049ccc settings.py cleanup (#200); Remove HELPDESK_SHOW_KB_ON_HOMEPAGE (new default is YES) 2014-01-29 22:26:35 +11:00
Ross Poulton
cd1172b35a settings.py cleanup (#200): Remove HELPDESK_SHOW_DELETE_BUTTON_TICKET_TOP and HELPDESK_SHOW_EDIT_BUTTON_TICKET_TOP; both links now always show. 2014-01-29 22:23:42 +11:00
Ross Poulton
b85b45a14a settings.py cleanup (#200) - Remove HELPDESK_CUSTOM_WELCOME; always show this reworded message. 2014-01-29 22:17:45 +11:00
Ross Poulton
4930579534 settings.py cleanup: remove options for footer links; API link always shows and removed language selector. 2014-01-29 22:15:37 +11:00
Ross Poulton
66da47205e settings.py cleanup (#200) - remove HELPDESK_DASHBOARD_BASIC_TICKET_STATS, always shows now. This resolves #201 to my satisfaction for now. 2014-01-29 22:13:42 +11:00
Ross Poulton
07a9093dae settings.py cleanup (#200): Always show Delete button on dashboard 2014-01-29 22:08:21 +11:00
Ross Poulton
d340446feb Remove django-tagging support, as that library is unmaintained. Closes #194. 2014-01-29 22:00:00 +11:00
Leon Harris
e7e2781d65 added local nav extension via a specified template 2013-12-09 16:48:11 +00:00
Leon Harris
f6a8c80755 added bit of colour on the ticket detail page 2013-11-26 12:09:55 +00:00
Leon Harris
a419956f4c fixed responsive problems with navigation moved logo into body of page altered headings 2013-11-26 10:59:45 +00:00
Leon Harris
7fcb829e54 updated templated to use CDN bootstrap3, CDN jquery, added logo to navigation, minor layout changes requires http://github.com/tzangms/django-bootstrap-form 2013-11-25 15:51:14 +00:00
Stefano Brentegani
eb3becb9a9 fixes = vs == in template 2013-11-07 13:22:04 +01:00
Tony Zhu
7624e77524 Fix the navigation links for NON_STAFF to create new ticket if HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE is enabled 2013-10-14 14:55:44 -04:00
xmacaba
78cc734a12 Update public_view_ticket.html
It returns the id of the post, but this value is not eligible for ticket viewing. Instead, you must provide the [queue]-[ticket_id].
2013-04-01 20:06:37 -03:00
Darrell Enns
8f0a80d322 added url tag compatibility fix for django <1.5
added django 1.5 to travis
2013-03-18 11:41:43 -07:00
Darrell Enns
ca1c6a270c compatibility fixes for django 1.5 2013-03-18 10:57:39 -07:00
Ross Poulton
f45400e26a show time until closed for all tickets and those that were opened in the last 60 days. By @kotowicz in 5252ad9d07 2012-08-07 23:57:34 +10:00
Ross Poulton
a4f1ac9b8b new option 'HELPDESK_DASHBOARD_BASIC_TICKET_STATS', shows quick ticket
stats in dashboard links to detailed 'days until ticket is closed by
month' plot.
New chart for 'days until ticket is closed'.
By @kotowicz in 0a8f4ce6d6.
2012-08-07 23:51:52 +10:00
Ross Poulton
92ab42de32 add 'td.report' to css file and use it in report_output.html so that table entries are centered. By @kotowicz in b4fe8bd91f 2012-08-07 23:45:31 +10:00
Ross Poulton
a21050082a Improve ticket CC handling. By @kotowicz in
4bf79ccf46.
2012-08-07 23:41:43 +10:00
Ross Poulton
2f1b74316f new option 'HELPDESK_SHOW_EDIT_BUTTON_FOLLOW_UP' which allows superusers
to delete individual followups (so you don't have to go to the admin).
(by @kotowicz in a2a5b10b2d)
2012-08-07 23:32:45 +10:00
Ross Poulton
23a85efea7 Make it easier to allow multiple file attachments on update. Closes #90. 2012-08-07 22:55:56 +10:00
Ross Poulton
313f565006 Make login link go to the users preferred dashboard/ticket list. Fixes #97, thanks @emperorcezar 2012-08-07 20:38:15 +10:00
Ross Poulton
e8ee39ddaa Merge pull request #132 from ochagnon/master
other html fixes
2012-05-01 16:34:14 -07:00
Oriane Chagnon
2436cbeca2 close ul BEFORE closing div 2012-04-30 19:31:13 -03:00
Oriane Chagnon
b42e619b7f close ul BEFORE closing div 2012-04-30 19:28:19 -03:00
Oriane Chagnon
88d6b61a2e remove closing </label> tag for unopened <label>. 2012-04-30 18:34:09 -03:00
Oriane Chagnon
77c6008b9a remove closing </dt> tags for unopened <dt>. and close <dl> 2012-04-30 18:08:42 -03:00
Oriane Chagnon
bbdb8f1734 Remove closing </label> tag that do not match any opening <label> 2012-04-30 17:11:25 -03:00
Ross Poulton
89b8267d84 Fix RSS feeds for post-Django 1.2. Closes #129. 2012-04-25 17:55:38 +10:00
Stefano Brentegani
71dcfb6f37 Replacing undocumented ADMIN_URL setting 2012-04-20 00:02:28 +02:00
Ross Poulton
321a9aef2d Add setting HELPDESK_SHOW_KB_ON_HOMEPAGE to show KnowledgeBase
categories on the homepage.
Bumped version number.
2012-03-02 09:28:54 +11:00
Ross Poulton
7e72f3d8ea Merge pull request #106 from yekibud/master
adding global queue email settings for get_mail and HELPDESK_KB_ENABLED_STAFF; added ticket due date
2012-01-23 15:15:44 -08:00
Ross Poulton
b63c480037 Merge alexgarel/django-helpdesk revision e4b4dd5 - Add CSS for printing
of tickets.
Closes GH-91.
2012-01-23 22:49:55 +00:00
tschmidt
1a4c6520a6 added due_date migration and added to edit ticket form 2012-01-20 15:03:07 -08:00
tschmidt
537d403d99 added HELPDESK_KB_ENABLED_STAFF 2012-01-16 16:42:16 -08:00
Ivan Giuliani
efafe8fc2c Added italian translation for email templates 2012-01-11 19:46:48 +01:00
Ross Poulton
533fdc8c2a Merge branch 'kotowicz-master', manually merging conflicts in these files:
helpdesk/lib.py
	helpdesk/templates/helpdesk/ticket_desc_table.html
	helpdesk/views/staff.py
2012-01-11 09:18:05 +00:00
Andreas Kotowicz
885c03c514 don't translate field errors - they should be in correct language by default. 2011-12-09 17:20:32 +01:00
Andreas Kotowicz
1d0ac58391 translate all fiels in /ticket/submit/ 2011-12-09 17:20:14 +01:00
Andreas Kotowicz
50406665c9 jquery translate temporary work arounds:
- google translate api v1 is deprecated, for v2 you need to pay.
- the google translate widget is still available for free.

I left the jquery translate code intact, because maybe we can get
jquery-translate to work with microsoft's translation service.
2011-12-02 17:47:30 +01:00
Andreas Kotowicz
87a5aa88b4 work on German and English translations. 2011-11-29 16:16:09 +01:00
Andreas Kotowicz
b18afe87bd preselect currently active language in 'public_change_language' 2011-11-29 15:15:24 +01:00
Andreas Kotowicz
f823b72db6 css fixes:
- fix space problems between helpdesk lists and welcome text. in languages other then English,
  these two used to overlap.
- make search input field smaller, so that there is no ugly 'out-of-space' artifact, when
  'saved queries' exist and the buttons wrap into the 'helpdesk' h1.
2011-11-29 15:07:44 +01:00
Andreas Kotowicz
505a171b61 working on dashboard:
- clarify what the individual dashboard ticket lists mean.
- add 'tickets submitted by you' list.
- add possiblity for custom welcome message (HELPDESK_CUSTOM_WELCOME).
2011-11-29 14:08:08 +01:00
Andreas Kotowicz
eaf78115d2 send user back to the same page before changing the display language. 2011-11-27 09:43:51 +01:00
Andreas Kotowicz
5a92dafbdc new option: 'HELPDESK_FOOTER_SHOW_CHANGE_LANGUAGE_LINK'
If activated, a 'change language' link will be shown in the footer.
You need to add this line to your 'urlpatterns' variable in your
urls.py file:

(r'^i18n/', include('django.conf.urls.i18n'))
2011-11-27 09:26:56 +01:00
Andreas Kotowicz
ab67f1397a added toolips to 'Copies to' and 'Dependencies' links, explaining what these links are for.
added a.tooltip class to css file.
2011-11-24 14:26:15 +01:00
Andreas Kotowicz
1c3a7a8a7b add option 'HELPDESK_SHOW_CHANGE_PASSWORD' so that local users find a link to change their password.
(needs django-registration https://bitbucket.org/ubernostrum/django-registration/).
2011-11-24 13:30:45 +01:00
Andreas Kotowicz
45620f96d0 new setting: HELPDESK_PREPEND_ORG_NAME
customize helpdesk name on a few pages, i.e., your organization, so that users
know that they came to the right page.
2011-11-23 20:12:27 +01:00
Andreas Kotowicz
1eb0760f32 redirect user to 'helpdesk_home' from /helpdesk/login/ page, if user is already authenticated. 2011-11-23 19:57:11 +01:00
Andreas Kotowicz
4b0b628724 hide "log in" button on '/helpdesk/login/' page.
modify "log in" redirect if possbible, so that user lands on same ticket (instead of dashboard) after login.
2011-11-23 19:56:36 +01:00
Andreas Kotowicz
f897d5bcb4 add option to override default look of followups - this is work in progress. 2011-11-21 20:04:05 +01:00
Andreas Kotowicz
2cee519d1c translate code changes:
- change js code, so that 'click' and not 'change' will trigger the translation.
 - do not assume that English is the source language - the comments might be in a different language.
2011-11-21 19:15:43 +01:00
Andreas Kotowicz
d5164e96c4 add possibility to translate ticket comments using jquery & google translate. 2011-11-21 17:39:13 +01:00
Andreas Kotowicz
cb34b1933a make django-helpdesk more customizable + bug fixes:
- look at settings.py for all new options regarding customization.
- settings can be accessed inside the templates via the new
  templatetag 'load_helpdesk_settings'

- allow editing of personal followups, but only if followup does not
  contain any ticketchanges - otherwise this information is lost after
  the editing.
- add 'delete' link to attachments
- link to list of closed tickets in queue overview
- add 'closed & resolved' section to dashboard
- hide 'pre-set reply' box if no pre-set replies are found.
- use 'SelectDateWidget' for custom DateField

- fix how we update followups so that attachments don't get deleted
- fix bug where resolution emails contained the solution 'None'
- fix stats crashing bug
- fix locale bug
2011-11-19 09:34:07 +01:00
Alex Garel
a6f7bd8a25 added css class on ticket actions in ticket_desc_table 2011-11-10 18:10:17 +01:00
Alex Garel
89cc11cb8e French translations for notifications and headers / footers 2011-11-10 12:18:16 +01:00
maccesch
c8be4b03e2 added german email templates 2011-09-01 17:16:55 +02:00
maccesch
4c47c34b37 translation fixes 2011-09-01 13:29:02 +02:00
maccesch
dcec449939 small fixes and translation 2011-09-01 13:01:03 +02:00
Joshua Jonah
b546b0b879 Added attribution to public_base.html.
Added missing i18n tag to attribution.html.
2011-06-10 08:22:40 -04:00
Joshua Jonah
7daf3a7552 Consolidated attribution in footer to a single file for easier override without having to subclass more than one template. 2011-06-09 11:41:32 -04:00
Joshua Jonah
e73f45e4f6 Added ability to turn of KB (my business doesn't need it) 2011-06-09 11:24:33 -04:00
Ross Poulton
cc4ea9a4f8 Add filtering by Date range. Allow users to filter stats screens by saved queries (closes GH-58) 2011-05-13 08:02:59 +10:00
Ross Poulton
04ad20d42f Remove SVN lookup at bottom of staff pages - not required now we're on Git. 2011-05-12 09:08:32 +10:00
Ross Poulton
ac95f9d893 Overhaul reporting: remove custom SQL commands for compatibility reasons. Code is MUCh simpler now. Also allows user to specify a saved search query via GET paramater - need to add links to this, as it lets them filter charts - very useful\! 2011-05-11 20:07:46 +10:00
Ross Poulton
8b6fbd8965 Add ticket dependency so you can't resolve a ticket until it's dependents are resolved. Addresses GH-43 2011-05-10 19:27:11 +10:00
Ross Poulton
2a7b76661e URL custom fields are now hyperlinked when viewing tickets. 2011-05-10 07:55:06 +10:00
Ross Poulton
3143347543 Change MEDIA_URL to STATIC_URL in report output. 2011-05-06 17:04:39 +10:00
Ross Poulton
c3a4c4c8ba Add capability for users to delete their saved queries. 2011-05-06 16:55:52 +10:00
Ross Poulton
9175203fb1 Migrate charts to jqPlot. Needs a bit of clean-up, especially separating out date & non-date reports. 2011-05-02 22:32:51 +00:00
Ross Poulton
f3bd5da906 Push navigation into a single place, so that the navigation experience is consistent regardless of which views (public vs staff) the user lands on. Closes GH-52, thanks to kotowicz. 2011-04-28 21:00:11 +10:00
Ross Poulton
f8684e7b3f Merged pull request #53 from issackelly/master.
Django 1.3 staticfiles
2011-04-28 03:10:23 -07:00
Ross Poulton
5278634a76 Fixes GH-54: Stats crash without open tickets. This should have already been caught, so this patch fixes it and adds another sanity check at report runtime. 2011-04-19 21:36:20 +00:00
Issac Kelly
021a48c843 Fix the fixture, and update for django 1.3, add dist and egg-info to gitignore 2011-03-25 18:03:18 -04:00
Ross Poulton
eca88be838 Add support for multi-locale email templates. Also added Russian templates (closes GH-1). REQUIRES SCHEMA CHANGE: SEE FILE UPGRADE. 2011-03-11 22:30:59 +00:00
Bruno Clermont
0431865824 Do not close <select> at the begining.
<select/>...</select> is invalid
2011-02-19 14:17:14 -05:00
Ross Poulton
856b6a46aa Make sure 'Close' link on public ticket view always works (Issue #41) 2011-02-12 01:56:56 +00:00
Ross Poulton
8920824a7b Fix link to jQuery in public templates 2011-02-12 01:13:30 +00:00
Bruno Clermont
37de73b2a2 Rename categories to kb_categories 2011-02-06 17:51:25 -05:00
Andreas Kotowicz
b40d4511a3 dropdown menu for saved queries - removes previously used div. 2011-02-05 22:31:12 +01:00
Andreas Kotowicz
2577d3704a introduce status DUPLICATE. This is somethimes useful.
The number of the original bug can written inside the
'comment / resolution' field.
2011-02-03 12:42:51 +01:00
Ross Poulton
99183ce6a5 Merge branch 'kotowicz-master' 2011-02-03 10:19:33 +00:00
Andreas Kotowicz
af3b1f1c75 templatetag for saved queries:
I'm using user_saved_queries_ in base.html so that we can distinguish it
 from 'user_saved_queries' in 'views.staff.ticket_list'
2011-02-03 11:19:46 +01:00
Ross Poulton
f5fc4f2139 Upgraded to jQuery 1.5 and jQuery UI 1.8.9. 2011-02-03 10:10:00 +00:00
Ross Poulton
2b1be97197 Merge branch 'master' of https://github.com/kotowicz/django-helpdesk into kotowicz-master 2011-02-03 09:28:40 +00:00
Andreas Kotowicz
0694fe1e2c first take on bug https://github.com/rossp/django-helpdesk/issues#issue/19:
add div to hold list of queries
 show 'load saved query' in header if 'user_saved_queries' is present
 modified 'dashboard' and 'view_ticket' so that they return 'user_saved_queries'
2011-02-02 13:50:03 +01:00
Ross Poulton
af3bf1889a Ticket display fixes: fix cycling of odd/even rows; float edit/delete to right to allow the ticket name to span across two columns. 2011-02-02 11:54:30 +00:00
Ross Poulton
ebe0382725 Initial shot at custom fields on Ticket model. Manage these fields via Django admin. 2011-02-02 11:22:46 +00:00
Ross Poulton
723b4f1881 Remove further references to Jutda Helpdesk, changing them to django-helpdesk. 2011-02-02 10:25:32 +00:00
Ross Poulton
adfee38439 Push the description, resolution, and followup text through urlizetrunc to turn urls into hyperlinks. 2011-02-02 08:31:51 +00:00
Ross Poulton
107ec742b1 Reword footer to refer to django-helpdesk rather than Jutda Helpdesk 2011-02-02 08:10:29 +00:00
Ross Poulton
1aba9e2475 Moved login/logout templates into templates/helpdesk/registration/ rather than templates/registration/, so the helpdesk templates don't overwrite site-specific ones. Thanks to kotiwicz for the patch to issue #13. 2011-02-02 08:05:33 +00:00
Ross Poulton
341871d963 Show error message if login fails. Thanks to nakagumahissao for the patch which closes Google Code #151 and Github #10. 2011-01-29 06:27:49 +00:00
Ross Poulton
b68bd73d07 Fix IE hang when addint multiple files to a ticket. Fixes Google Code issue #133; Github issue #7. Thanks to Google Code user 'dswoods' for the patch. 2011-01-29 06:12:38 +00:00
Ross Poulton
97886abc76 Add ability for FollowUp records to be edited by staff. Closes Google Code issue #131; Github issue #5. Thanks to Google user 'alecs.box' for the patch. 2011-01-29 06:02:03 +00:00
Ross Poulton
4cb84ed4fb Add Spanish translation. Fixes Google code issue #134 & github issue #4. Thanks to Google user 'rodpin'. 2011-01-29 05:56:21 +00:00
Ross Poulton
53327eb66a Moved all project files under a "helpdesk" directory. Should make it easier to use setup.py / pypi / whatever in the future. 2011-01-25 23:02:00 +00:00