Commit Graph

148 Commits

Author SHA1 Message Date
Alex Seeholzer
e732b511e1 deprecated tags replaced in django 1.9 (ssi and url template tags are removed from the future template tag library) 2015-11-16 16:09:47 +01:00
Scott Sadler
2663a5e5ba use staticfiles app instead of STATIC_URL 2015-11-13 16:58:28 +01:00
Jonathan Barratt
9c60350193 Fix issue 286: Header cuts off body by replacing {{ STATIC_URL }}x with {% static "x" %} in {public_,}base.html 2015-06-03 14:37:21 +07:00
Ross Poulton
70c57f9096 Merge 2015-04-28 09:13:54 +10:00
Tony Zhu
ed9581e5de Remove deprecated load url from future 2015-04-16 11:58:24 -04:00
Ross Poulton
bb2c240ef8 Use proper URL names for hold/unhold rather than manually building URL. Fixes #299 2015-02-14 11:13:19 +11:00
Tom Graham
d966172fb7 Fix user changelist for custom user models
Fixed the user_admin_changelist url for custom user models.
2014-10-22 17:23:56 +11:00
Tom Graham
d2ac8af6c0 Improved support for custom user models
Support for custom user models with a non-standard username field
2014-10-22 16:18:04 +11:00
Ross Poulton
b0756497dc Merge pull request #262 from AGASS007/master
fixed tooltip (again)
2014-09-24 08:17:20 +10:00
Guillaume Andreu Sabater
d5dd2c3423 actually enable tooltip 2014-09-22 14:04:14 +02:00
Guillaume Andreu Sabater
45eda26e7c swapped <a> and <strong> tags 2014-09-22 14:03:37 +02:00
Guillaume Andreu Sabater
05350ba37c fixed typo 2014-09-22 14:00:33 +02:00
Antoine Nguyen
ad47087c8f Assign a bootstrap row color to tickets based on priority. 2014-09-19 16:01:15 +02:00
Guillaume Andreu Sabater
85b90d0030 Enable bs3 tooltips with html markup 2014-09-18 14:42:06 +02:00
Stefano Brentegani
94fa283f2d mark new translatable strings and reduce redundancy 2014-07-30 10:41:10 +02:00
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