Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:rossp/django-helpdesk

  • Loading branch information...
commit 3c567bf6fb121013ed0e53b2ca525a487f5b2a3b 2 parents 5a64c1b + 3b43cec
@rossp authored
View
BIN  helpdesk/locale/de/LC_MESSAGES/django.mo
Binary file not shown
View
5 helpdesk/locale/de/LC_MESSAGES/django.po
@@ -1,8 +1,9 @@
# django-helpdesk English language translation
# Copyright (C) 2011 Ross Poulton
# This file is distributed under the same license as the django-helpdesk package.
-# Ross Poulton <ross@rossp.org>, 2011.
#
+# Ross Poulton <ross@rossp.org>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: django-helpdesk\n"
@@ -2325,3 +2326,5 @@ msgstr ""
#: views/staff.py:857
msgid "Queue by Month"
msgstr ""
+
+
View
BIN  helpdesk/locale/es/LC_MESSAGES/django.mo
Binary file not shown
View
102 helpdesk/locale/es/LC_MESSAGES/django.po
@@ -1,14 +1,16 @@
# django-helpdesk English language translation
# Copyright (C) 2011 Ross Poulton
# This file is distributed under the same license as the django-helpdesk package.
-# Ross Poulton <ross@rossp.org>, 2011.
#
+# Alberto Gaona <gaona_consulting@yahoo.com>, 2011.
+# Erik Rivera <erik.river@gmail.com>, 2011.
+# Ross Poulton <ross@rossp.org>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: django-helpdesk\n"
"Report-Msgid-Bugs-To: http://github.com/RossP/django-helpdesk/issues\n"
"POT-Creation-Date: 2011-05-11 15:05+1000\n"
-"PO-Revision-Date: 2011-05-12 00:22+0000\n"
+"PO-Revision-Date: 2011-06-09 17:17+0000\n"
"Last-Translator: albertogaona <gaona_consulting@yahoo.com>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/django-helpdesk/team/es/)\n"
"MIME-Version: 1.0\n"
@@ -294,6 +296,9 @@ msgid ""
"all new tickets created for this queue. Enter a comma between multiple "
"e-mail addresses."
msgstr ""
+"Si introduce una dirección de e-mail aquí, entonces esta recibirá "
+"notificaciones de nuevos tickets creados para esta cola. Introduzca una coma"
+" entre múltiples direcciones de e-mail"
#: models.py:94
msgid "Updated Ticket CC Address"
@@ -305,6 +310,10 @@ msgid ""
"all activity (new tickets, closed tickets, updates, reassignments, etc) for "
"this queue. Separate multiple addresses with a comma."
msgstr ""
+"Si introduce una dirección de e-mail aquí, entonces esta recibirá "
+"notificaciones de toda la actividad (tickets nuevos, cerrados, actualizados,"
+" reasignados, etc.) para esta cola. Introduzca una coma entre múltiples "
+"direcciones de e-mail"
#: models.py:105
msgid "E-Mail Box Type"
@@ -725,7 +734,7 @@ msgstr "El mismo contexto está disponible aquí como texto plano, arriba."
#: models.py:764
msgid "Locale of this template."
-msgstr ""
+msgstr "Locale de esta plantilla"
#: models.py:811 templates/helpdesk/kb_index.html:10
msgid "Category"
@@ -979,7 +988,7 @@ msgstr ""
#: models.py:1238
msgid "Depends On Ticket"
-msgstr ""
+msgstr "Dependencias del ticket"
#: management/commands/create_usersettings.py:21
msgid ""
@@ -987,6 +996,9 @@ msgid ""
"required. Uses settings.DEFAULT_USER_SETTINGS which can be overridden to "
"suit your situation."
msgstr ""
+"Busca al usuario sin UserSettings en django-helpdesk y crea los UserSettings"
+" en caso necesario. Utiliza settings.DEFAULT_USER_SETTINGS, que puede ser "
+"modificado de acuerdo a las circunstancias."
#: management/commands/escalate_tickets.py:146
#, python-format
@@ -1578,34 +1590,34 @@ msgstr "Reportes y Estadísticas"
#: templates/helpdesk/report_index.html:9
msgid "You haven't created any tickets yet, so you cannot run any reports."
-msgstr ""
+msgstr "No ha creado tickets, por lo que no puede generar reportes."
#: templates/helpdesk/report_index.html:13
msgid "Reports By User"
-msgstr ""
+msgstr "Reportes por Usuario"
#: templates/helpdesk/report_index.html:15
#: templates/helpdesk/report_index.html:24
msgid "by Priority"
-msgstr ""
+msgstr "por Prioridad"
#: templates/helpdesk/report_index.html:16
msgid "by Queue"
-msgstr ""
+msgstr "por Cola"
#: templates/helpdesk/report_index.html:17
#: templates/helpdesk/report_index.html:25
msgid "by Status"
-msgstr ""
+msgstr "por Estatus"
#: templates/helpdesk/report_index.html:18
#: templates/helpdesk/report_index.html:26
msgid "by Month"
-msgstr ""
+msgstr "por Mes"
#: templates/helpdesk/report_index.html:22
msgid "Reports By Queue"
-msgstr ""
+msgstr "Reportes por Cola"
#: templates/helpdesk/rss_list.html:6
msgid ""
@@ -1767,6 +1779,8 @@ msgid ""
"This ticket cannot be resolved or closed until the tickets it depends on are"
" resolved."
msgstr ""
+"Este ticket no puede marcarse como resuelto ni cerrarse hasta que el ticket "
+"del que depende sea resuelto."
#: templates/helpdesk/ticket.html:112
msgid "Is this update public?"
@@ -1892,7 +1906,7 @@ msgstr "Regresar a <em>%(ticket_title)s</em>"
#: templates/helpdesk/ticket_dependency_add.html:3
msgid "Add Ticket Dependency"
-msgstr ""
+msgstr "Añadir dependencia de tickets"
#: templates/helpdesk/ticket_dependency_add.html:5
msgid ""
@@ -1901,14 +1915,18 @@ msgid ""
"\n"
"<p>Adding a dependency will stop you resolving this ticket until the dependent ticket has been resolved or closed.</p>"
msgstr ""
+"\n"
+"<h2>Añadir dependencia de tickets</h2>\n"
+"\n"
+"<p>Al añadir dependencia evitará que este ticket sea marcado como resuelto mientras el ticket del que depende no sea resuelto o cerrado.</p>"
#: templates/helpdesk/ticket_dependency_add.html:21
msgid "Save Ticket Dependency"
-msgstr ""
+msgstr "Guardar dependencia de tickets"
#: templates/helpdesk/ticket_dependency_del.html:3
msgid "Delete Ticket Dependency"
-msgstr ""
+msgstr "Eliminar dependencia de tickets"
#: templates/helpdesk/ticket_dependency_del.html:5
msgid ""
@@ -1917,6 +1935,10 @@ msgid ""
"\n"
"<p>Are you sure you wish to remove the dependency on this ticket?</p>\n"
msgstr ""
+"\n"
+"<h2>Eliminar dependencia de tickets</h2>\n"
+"\n"
+"<p>¿Está seguro de que quiere remover la dependencia para este ticket?</p>\n"
#: templates/helpdesk/ticket_desc_table.html:3
msgid "Unhold"
@@ -1949,24 +1971,26 @@ msgstr "Gestionar"
#: templates/helpdesk/ticket_desc_table.html:39
msgid "Dependencies"
-msgstr ""
+msgstr "Dependencias"
#: templates/helpdesk/ticket_desc_table.html:41
msgid ""
"This ticket cannot be resolved until the following ticket(s) are resolved"
msgstr ""
+"Este ticket no puede ser marcado como resuelto hasta que el (los) "
+"siguiente(s) ticket(s) no sean resuelto(s)"
#: templates/helpdesk/ticket_desc_table.html:42
msgid "Remove Dependency"
-msgstr ""
+msgstr "Remover dependencia"
#: templates/helpdesk/ticket_desc_table.html:45
msgid "This ticket has no dependencies."
-msgstr ""
+msgstr "Este ticket no depende de otro"
#: templates/helpdesk/ticket_desc_table.html:47
msgid "Add Dependency"
-msgstr ""
+msgstr "Añadir dependencia"
#: templates/helpdesk/ticket_list.html:2
msgid "Ticket Listing"
@@ -2009,6 +2033,8 @@ msgstr "Aplicar filtro"
#, python-format
msgid "You are currently viewing saved query <em>%(query_name)s</em>."
msgstr ""
+"Actualmente está visualizando la consulta pre-guardada "
+"<em>%(query_name)s</em>."
#: templates/helpdesk/ticket_list.html:141
#: templates/helpdesk/ticket_list.html:156
@@ -2252,76 +2278,78 @@ msgstr "Ticket puesto en espera"
#: views/staff.py:784
msgid "Jan"
-msgstr ""
+msgstr "Ene"
#: views/staff.py:785
msgid "Feb"
-msgstr ""
+msgstr "Feb"
#: views/staff.py:786
msgid "Mar"
-msgstr ""
+msgstr "Mar"
#: views/staff.py:787
msgid "Apr"
-msgstr ""
+msgstr "Abr"
#: views/staff.py:788
msgid "May"
-msgstr ""
+msgstr "May"
#: views/staff.py:789
msgid "Jun"
-msgstr ""
+msgstr "Jun"
#: views/staff.py:790
msgid "Jul"
-msgstr ""
+msgstr "Jul"
#: views/staff.py:791
msgid "Aug"
-msgstr ""
+msgstr "Ago"
#: views/staff.py:792
msgid "Sep"
-msgstr ""
+msgstr "Sep"
#: views/staff.py:793
msgid "Oct"
-msgstr ""
+msgstr "Oct"
#: views/staff.py:794
msgid "Nov"
-msgstr ""
+msgstr "Nov"
#: views/staff.py:795
msgid "Dec"
-msgstr ""
+msgstr "Dic"
#: views/staff.py:821
msgid "User by Priority"
-msgstr ""
+msgstr "Usuario por Prioridad"
#: views/staff.py:827
msgid "User by Queue"
-msgstr ""
+msgstr "Usuario por Cola"
#: views/staff.py:833
msgid "User by Status"
-msgstr ""
+msgstr "Usuario por Estatus"
#: views/staff.py:839
msgid "User by Month"
-msgstr ""
+msgstr "Usuario por Mes"
#: views/staff.py:845
msgid "Queue by Priority"
-msgstr ""
+msgstr "Cola por Prioridad"
#: views/staff.py:851
msgid "Queue by Status"
-msgstr ""
+msgstr "Cola por Estatus"
#: views/staff.py:857
msgid "Queue by Month"
-msgstr ""
+msgstr "Cola por Mes"
+
+
View
BIN  helpdesk/locale/es_MX/LC_MESSAGES/django.mo
Binary file not shown
View
100 helpdesk/locale/es_MX/LC_MESSAGES/django.po
@@ -1,14 +1,16 @@
# django-helpdesk English language translation
# Copyright (C) 2011 Ross Poulton
# This file is distributed under the same license as the django-helpdesk package.
-# Ross Poulton <ross@rossp.org>, 2011.
#
+# Alberto Gaona <gaona_consulting@yahoo.com>, 2011.
+# Erik Rivera <erik.river@gmail.com>, 2011.
+# Ross Poulton <ross@rossp.org>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: django-helpdesk\n"
"Report-Msgid-Bugs-To: http://github.com/RossP/django-helpdesk/issues\n"
"POT-Creation-Date: 2011-05-11 15:05+1000\n"
-"PO-Revision-Date: 2011-05-12 00:22+0000\n"
+"PO-Revision-Date: 2011-06-09 17:38+0000\n"
"Last-Translator: albertogaona <gaona_consulting@yahoo.com>\n"
"Language-Team: Spanish (Mexican) (http://www.transifex.net/projects/p/django-helpdesk/team/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -291,6 +293,9 @@ msgid ""
"all new tickets created for this queue. Enter a comma between multiple "
"e-mail addresses."
msgstr ""
+"Si introduce una dirección de e-mail aquí dicha dirección recibirá "
+"notificaciones de los nuevos tickets creados para esta cola. Introduzca una "
+"coma entre múltiples direcciones de e-mail."
#: models.py:94
msgid "Updated Ticket CC Address"
@@ -302,6 +307,9 @@ msgid ""
"all activity (new tickets, closed tickets, updates, reassignments, etc) for "
"this queue. Separate multiple addresses with a comma."
msgstr ""
+"Si introduce una dirección de e-mail aquí dicha dirección recibirá "
+"notificaciones de los nuevos tickets creados para esta cola. Introduzca una "
+"coma entre múltiples direcciones de e-mail."
#: models.py:105
msgid "E-Mail Box Type"
@@ -722,7 +730,7 @@ msgstr "El mismo contexto está disponible aquí como texto plano, arriba."
#: models.py:764
msgid "Locale of this template."
-msgstr ""
+msgstr "Locale de esta plantilla"
#: models.py:811 templates/helpdesk/kb_index.html:10
msgid "Category"
@@ -976,7 +984,7 @@ msgstr ""
#: models.py:1238
msgid "Depends On Ticket"
-msgstr ""
+msgstr "Depende del ticket"
#: management/commands/create_usersettings.py:21
msgid ""
@@ -984,6 +992,9 @@ msgid ""
"required. Uses settings.DEFAULT_USER_SETTINGS which can be overridden to "
"suit your situation."
msgstr ""
+"Busca al usuario sin django-helpdesk UserSettings y crea los UserSettings si"
+" es necesario. Utiliza settings.DEFAULT_USER_SETTINGS , que puede ser "
+"sobreescrito para su situación particular."
#: management/commands/escalate_tickets.py:146
#, python-format
@@ -1576,34 +1587,34 @@ msgstr "Reportes &amp; Estadísticas"
#: templates/helpdesk/report_index.html:9
msgid "You haven't created any tickets yet, so you cannot run any reports."
-msgstr ""
+msgstr "No ha creado tickets, por lo que no puede generar reportes."
#: templates/helpdesk/report_index.html:13
msgid "Reports By User"
-msgstr ""
+msgstr "Reportes por Usuario"
#: templates/helpdesk/report_index.html:15
#: templates/helpdesk/report_index.html:24
msgid "by Priority"
-msgstr ""
+msgstr "por Prioridad"
#: templates/helpdesk/report_index.html:16
msgid "by Queue"
-msgstr ""
+msgstr "por Cola"
#: templates/helpdesk/report_index.html:17
#: templates/helpdesk/report_index.html:25
msgid "by Status"
-msgstr ""
+msgstr "por Estatus"
#: templates/helpdesk/report_index.html:18
#: templates/helpdesk/report_index.html:26
msgid "by Month"
-msgstr ""
+msgstr "por Mes"
#: templates/helpdesk/report_index.html:22
msgid "Reports By Queue"
-msgstr ""
+msgstr "Reportes por Cola"
#: templates/helpdesk/rss_list.html:6
msgid ""
@@ -1765,6 +1776,8 @@ msgid ""
"This ticket cannot be resolved or closed until the tickets it depends on are"
" resolved."
msgstr ""
+"Este ticket no puede ser marcado como resuelto ni cerrado mientras no se "
+"resuelva el ticket del que depende."
#: templates/helpdesk/ticket.html:112
msgid "Is this update public?"
@@ -1891,7 +1904,7 @@ msgstr "Regresar a <em>%(ticket_title)s</em>"
#: templates/helpdesk/ticket_dependency_add.html:3
msgid "Add Ticket Dependency"
-msgstr ""
+msgstr "Añadir dependencia de tickets"
#: templates/helpdesk/ticket_dependency_add.html:5
msgid ""
@@ -1900,14 +1913,18 @@ msgid ""
"\n"
"<p>Adding a dependency will stop you resolving this ticket until the dependent ticket has been resolved or closed.</p>"
msgstr ""
+"\n"
+"<h2>Añadir Dependencia de Tickets</h2>\n"
+"\n"
+"<p>Al añadir dependencia evitará que este ticket pueda ser marcado como resuelto muentras el ticket del que depende no se resuelva a su vez.</p>"
#: templates/helpdesk/ticket_dependency_add.html:21
msgid "Save Ticket Dependency"
-msgstr ""
+msgstr "Guardar dependencia de tickets"
#: templates/helpdesk/ticket_dependency_del.html:3
msgid "Delete Ticket Dependency"
-msgstr ""
+msgstr "Eliminar dependencia de tickets"
#: templates/helpdesk/ticket_dependency_del.html:5
msgid ""
@@ -1916,6 +1933,10 @@ msgid ""
"\n"
"<p>Are you sure you wish to remove the dependency on this ticket?</p>\n"
msgstr ""
+"\n"
+"<h2>Eliminar Dependencia de Tickets</h2>\n"
+"\n"
+"<p>¿Está seguro de que quiere remover la dependencia de este ticket?</p>\n"
#: templates/helpdesk/ticket_desc_table.html:3
msgid "Unhold"
@@ -1948,24 +1969,26 @@ msgstr "Administrar"
#: templates/helpdesk/ticket_desc_table.html:39
msgid "Dependencies"
-msgstr ""
+msgstr "Dependencias"
#: templates/helpdesk/ticket_desc_table.html:41
msgid ""
"This ticket cannot be resolved until the following ticket(s) are resolved"
msgstr ""
+"Este ticket no puede ser marcado como resuelto hasta que el(los) "
+"siguiente(s) ticket(s) sea(n) resuelto(s)"
#: templates/helpdesk/ticket_desc_table.html:42
msgid "Remove Dependency"
-msgstr ""
+msgstr "Remover Dependencia"
#: templates/helpdesk/ticket_desc_table.html:45
msgid "This ticket has no dependencies."
-msgstr ""
+msgstr "El ticket no tiene dependencia"
#: templates/helpdesk/ticket_desc_table.html:47
msgid "Add Dependency"
-msgstr ""
+msgstr "Añadir Dependencia"
#: templates/helpdesk/ticket_list.html:2
msgid "Ticket Listing"
@@ -2008,6 +2031,7 @@ msgstr "Aplicar filtro"
#, python-format
msgid "You are currently viewing saved query <em>%(query_name)s</em>."
msgstr ""
+"Actualmente visualiza la consulta pre-grabada <em>%(query_name)s</em>."
#: templates/helpdesk/ticket_list.html:141
#: templates/helpdesk/ticket_list.html:156
@@ -2253,76 +2277,78 @@ msgstr "Ticket puesto en espera"
#: views/staff.py:784
msgid "Jan"
-msgstr ""
+msgstr "Ene"
#: views/staff.py:785
msgid "Feb"
-msgstr ""
+msgstr "Feb"
#: views/staff.py:786
msgid "Mar"
-msgstr ""
+msgstr "Mar"
#: views/staff.py:787
msgid "Apr"
-msgstr ""
+msgstr "Abr"
#: views/staff.py:788
msgid "May"
-msgstr ""
+msgstr "May"
#: views/staff.py:789
msgid "Jun"
-msgstr ""
+msgstr "Jun"
#: views/staff.py:790
msgid "Jul"
-msgstr ""
+msgstr "Jul"
#: views/staff.py:791
msgid "Aug"
-msgstr ""
+msgstr "Ago"
#: views/staff.py:792
msgid "Sep"
-msgstr ""
+msgstr "Sep"
#: views/staff.py:793
msgid "Oct"
-msgstr ""
+msgstr "Oct"
#: views/staff.py:794
msgid "Nov"
-msgstr ""
+msgstr "Nov"
#: views/staff.py:795
msgid "Dec"
-msgstr ""
+msgstr "Dic"
#: views/staff.py:821
msgid "User by Priority"
-msgstr ""
+msgstr "Usuario por Prioridad"
#: views/staff.py:827
msgid "User by Queue"
-msgstr ""
+msgstr "Usuario por Cola"
#: views/staff.py:833
msgid "User by Status"
-msgstr ""
+msgstr "Usuario por Estatus"
#: views/staff.py:839
msgid "User by Month"
-msgstr ""
+msgstr "Usuario por Mes"
#: views/staff.py:845
msgid "Queue by Priority"
-msgstr ""
+msgstr "Cola por Prioridad"
#: views/staff.py:851
msgid "Queue by Status"
-msgstr ""
+msgstr "Cola por Estatus"
#: views/staff.py:857
msgid "Queue by Month"
-msgstr ""
+msgstr "Cola por Mes"
+
+
View
BIN  helpdesk/locale/fr/LC_MESSAGES/django.mo
Binary file not shown
View
5 helpdesk/locale/fr/LC_MESSAGES/django.po
@@ -1,8 +1,9 @@
# django-helpdesk English language translation
# Copyright (C) 2011 Ross Poulton
# This file is distributed under the same license as the django-helpdesk package.
-# Ross Poulton <ross@rossp.org>, 2011.
#
+# kolin22 <kolin22@gmail.com>, 2011.
+# Ross Poulton <ross@rossp.org>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: django-helpdesk\n"
@@ -2336,3 +2337,5 @@ msgstr ""
#: views/staff.py:857
msgid "Queue by Month"
msgstr ""
+
+
View
BIN  helpdesk/locale/pl/LC_MESSAGES/django.mo
Binary file not shown
View
5 helpdesk/locale/pl/LC_MESSAGES/django.po
@@ -1,8 +1,9 @@
# django-helpdesk English language translation
# Copyright (C) 2011 Ross Poulton
# This file is distributed under the same license as the django-helpdesk package.
-# Ross Poulton <ross@rossp.org>, 2011.
#
+# mpasternak <michal.dtz@gmail.com>, 2011.
+# Ross Poulton <ross@rossp.org>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: django-helpdesk\n"
@@ -2333,3 +2334,5 @@ msgstr ""
#: views/staff.py:857
msgid "Queue by Month"
msgstr ""
+
+
View
BIN  helpdesk/locale/ru/LC_MESSAGES/django.mo
Binary file not shown
View
5 helpdesk/locale/ru/LC_MESSAGES/django.po
@@ -1,8 +1,9 @@
# django-helpdesk English language translation
# Copyright (C) 2011 Ross Poulton
# This file is distributed under the same license as the django-helpdesk package.
-# Ross Poulton <ross@rossp.org>, 2011.
#
+# gorblnu4 <gorblnu4@gmail.com>, 2011.
+# Ross Poulton <ross@rossp.org>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: django-helpdesk\n"
@@ -2264,3 +2265,5 @@ msgstr ""
#: views/staff.py:857
msgid "Queue by Month"
msgstr ""
+
+
View
3  helpdesk/settings.py
@@ -27,3 +27,6 @@
'email_on_ticket_apichange': True,
'tickets_per_page': 25
}
+
+# show knowledgebase links?
+HELPDESK_KB_ENABLED = getattr(settings, 'HELPDESK_KB_ENABLED', True)
View
2  helpdesk/templates/helpdesk/attribution.html
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% trans "Powered by <a href='https://github.com/rossp/django-helpdesk'>django-helpdesk</a>." %}
View
24 helpdesk/templates/helpdesk/base.html
@@ -12,7 +12,7 @@
<link rel='alternate' href='{% url helpdesk_rss "user" %}{{ user.username }}/' type='application/rss+xml' title='{% trans "My Open Tickets" %}' />
<link rel='alternate' href='{% url helpdesk_rss "recent_activity" %}' type='application/rss+xml' title='{% trans "All Recent Activity" %}' />
<link rel='alternate' href='{% url helpdesk_rss "unassigned" %}' type='application/rss+xml' title='{% trans "Unassigned Tickets" %}' />
-
+
<script type="text/javascript">
$(document).ready(function(){
// replace display while hovering over menu item
@@ -21,22 +21,22 @@
function() { $('ul', this).css('display', 'none'); });
});
</script>
-
- <style type="text/css">
+
+ <style type="text/css">
/* header */
#dropdown li.headerlink { width: auto; float: left; text-align: center; }
-
+
/* query list */
- #dropdown li.headerlink ul { display: none;
- text-align: left;
- position: absolute;
+ #dropdown li.headerlink ul { display: none;
+ text-align: left;
+ position: absolute;
padding: 5px;
z-index: 2; }
/* query entries */
#dropdown li.headerlink:hover ul { display: block; width: auto; }
#dropdown li.headerlink:hover ul li { padding: 5px; margin: 1px; float: none; display: block; }
- </style>
-
+ </style>
+
{% block helpdesk_head %}{% endblock %}
</head>
<body>
@@ -45,13 +45,13 @@
<h1>{% trans "Helpdesk" %}</h1>
{% include "helpdesk/navigation.html" %}
</div>
-
+
<div id='body'>
{% block helpdesk_body %}{% endblock %}
</div>
-
+
<div id='footer'>
- <p>{% trans "Powered by <a href='https://github.com/rossp/django-helpdesk'>django-helpdesk</a>." %} <a href='{% url helpdesk_rss_index %}'><img src='{{ STATIC_URL }}helpdesk/rss_icon.png' width='14' height='14' alt='{% trans "RSS Icon" %}' title='{% trans "RSS Feeds" %}' border='0' />{% trans "RSS Feeds" %}</a> <a href='{% url helpdesk_api_help %}'>{% trans "API" %}</a> <a href='{% url helpdesk_user_settings %}'>{% trans "User Settings" %}</a> {% if user.is_superuser %}<a href='{% url helpdesk_system_settings %}'>{% trans "System Settings" %}</a>{% endif %}</p>
+ <p>{% include "helpdesk/attribution.html" %}<a href='{% url helpdesk_rss_index %}'><img src='{{ STATIC_URL }}helpdesk/rss_icon.png' width='14' height='14' alt='{% trans "RSS Icon" %}' title='{% trans "RSS Feeds" %}' border='0' />{% trans "RSS Feeds" %}</a> <a href='{% url helpdesk_api_help %}'>{% trans "API" %}</a> <a href='{% url helpdesk_user_settings %}'>{% trans "User Settings" %}</a> {% if user.is_superuser %}<a href='{% url helpdesk_system_settings %}'>{% trans "System Settings" %}</a>{% endif %}</p>
</div>
</div>
{% include "helpdesk/debug.html" %}
View
56 helpdesk/templates/helpdesk/navigation.html
@@ -1,29 +1,29 @@
{% load i18n %}
- {% if user.is_staff %}
- <ul id="dropdown">
- <li><a href='{% url helpdesk_dashboard %}'>{% trans "Dashboard" %}</a></li>
- <li><a href='{% url helpdesk_list %}'>{% trans "Tickets" %}</a></li>
- <li><a href='{% url helpdesk_submit %}'>{% trans "New Ticket" %}</a></li>
- <li><a href='{% url helpdesk_report_index %}'>{% trans "Stats" %}</a></li>
- {% if user_saved_queries_ %}
- <li class="headerlink"><a>Load Saved Query</a>
- <ul>
- {% for q in user_saved_queries_ %}
- <li><a href="{% url helpdesk_list %}?saved_query={{ q.id }}">{{ q.title }}
- {% if q.shared %}
- (Shared{% ifnotequal user q.user %} by {{ q.user.username }}{% endifnotequal %})
- {% endif %}</a></li>
- {% endfor %}
- </ul>
- </li>
- {% endif %}
- <li><a href='{% url logout %}'>{% trans "Logout" %}</a></li>
- {% if not query %}<li><form id='searchform' method='get' action='{% url helpdesk_list %}'><input type='text' name='q' size='10' class='input' value='{% trans "Search..." %}' id='search_query' onFocus='s=document.getElementById("search_query");if (s.value == "{% trans "Search..." %}") { s.value = ""; }' title='{% trans "Enter a keyword, or a ticket number to jump straight to that ticket." %}'/><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' />{% csrf_token %}</form></li>{% endif %}
- </ul>
- {% else %}
- <ul>
- <li><a href='{% url helpdesk_home %}'>{% trans "Submit A Ticket" %}</a></li>
- <li><a href='{% url helpdesk_kb_index %}'>{% trans "Knowledgebase" %}</a></li>
- <li><a href='{% url login %}?next={% url helpdesk_dashboard %}'>{% trans "Log In" %}</a></li>
- </ul>
- {% endif %}
+{% if user.is_staff %}
+<ul id="dropdown">
+ <li><a href='{% url helpdesk_dashboard %}'>{% trans "Dashboard" %}</a></li>
+ <li><a href='{% url helpdesk_list %}'>{% trans "Tickets" %}</a></li>
+ <li><a href='{% url helpdesk_submit %}'>{% trans "New Ticket" %}</a></li>
+ <li><a href='{% url helpdesk_report_index %}'>{% trans "Stats" %}</a></li>
+ {% if user_saved_queries_ %}
+ <li class="headerlink"><a>Load Saved Query</a>
+ <ul>
+ {% for q in user_saved_queries_ %}
+ <li><a href="{% url helpdesk_list %}?saved_query={{ q.id }}">{{ q.title }}
+ {% if q.shared %}
+ (Shared{% ifnotequal user q.user %} by {{ q.user.username }}{% endifnotequal %})
+ {% endif %}</a></li>
+ {% endfor %}
+ </ul>
+ </li>
+ {% endif %}
+ <li><a href='{% url logout %}'>{% trans "Logout" %}</a></li>
+ {% if not query %}<li><form id='searchform' method='get' action='{% url helpdesk_list %}'><input type='text' name='q' size='10' class='input' value='{% trans "Search..." %}' id='search_query' onFocus='s=document.getElementById("search_query");if (s.value == "{% trans "Search..." %}") { s.value = ""; }' title='{% trans "Enter a keyword, or a ticket number to jump straight to that ticket." %}'/><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' />{% csrf_token %}</form></li>{% endif %}
+</ul>
+{% else %}
+<ul>
+<li><a href='{% url helpdesk_home %}'>{% trans "Submit A Ticket" %}</a></li>
+{% if helpdesk_settings.HELPDESK_KB_ENABLED %}<li><a href='{% url helpdesk_kb_index %}'>{% trans "Knowledgebase" %}</a></li>{% endif %}
+<li><a href='{% url login %}?next={% url helpdesk_dashboard %}'>{% trans "Log In" %}</a></li>
+</ul>
+{% endif %}
View
4 helpdesk/templates/helpdesk/public_base.html
@@ -15,8 +15,8 @@
{% block helpdesk_body %}{% endblock %}
</div>
<div id='footer'>
- <p>{% trans "Powered by <a href='http://github.com/rossp/django-helpdesk'>django-helpdesk</a>." %}</p>
+ <p>{% include "helpdesk/attribution.html" %}</p>
</div>
</div>{% include "helpdesk/debug.html" %}
</body>
-</html>
+</html>
View
35 helpdesk/urls.py
@@ -12,8 +12,10 @@
from django.contrib.auth.decorators import login_required
from django.contrib.syndication.views import feed as django_feed
+from helpdesk import settings as helpdesk_settings
from helpdesk.views.feeds import feed_setup
+
urlpatterns = patterns('helpdesk.views.staff',
url(r'^dashboard/$',
'dashboard',
@@ -34,7 +36,7 @@
url(r'^tickets/(?P<ticket_id>[0-9]+)/$',
'view_ticket',
name='helpdesk_view'),
-
+
url(r'^tickets/(?P<ticket_id>[0-9]+)/followup_edit/(?P<followup_id>[0-9]+)/$',
'followup_edit',
name='helpdesk_followup_edit'),
@@ -70,7 +72,7 @@
url(r'^tickets/(?P<ticket_id>[0-9]+)/cc/delete/(?P<cc_id>[0-9]+)/$',
'ticket_cc_del',
name='helpdesk_ticket_cc_del'),
-
+
url(r'^tickets/(?P<ticket_id>[0-9]+)/dependency/add/$',
'ticket_dependency_add',
name='helpdesk_ticket_dependency_add'),
@@ -78,7 +80,7 @@
url(r'^tickets/(?P<ticket_id>[0-9]+)/dependency/delete/(?P<dependency_id>[0-9]+)/$',
'ticket_dependency_del',
name='helpdesk_ticket_dependency_del'),
-
+
url(r'^raw/(?P<type>\w+)/$',
'raw_details',
name='helpdesk_raw'),
@@ -98,7 +100,7 @@
url(r'^save_query/$',
'save_query',
name='helpdesk_savequery'),
-
+
url(r'^delete_query/(?P<id>[0-9]+)/$',
'delete_saved_query',
name='helpdesk_delete_query'),
@@ -151,31 +153,32 @@
name='logout'),
)
-urlpatterns += patterns('helpdesk.views.kb',
- url(r'^kb/$',
- 'index', name='helpdesk_kb_index'),
+if helpdesk_settings.HELPDESK_KB_ENABLED:
+ urlpatterns += patterns('helpdesk.views.kb',
+ url(r'^kb/$',
+ 'index', name='helpdesk_kb_index'),
- url(r'^kb/(?P<slug>[A-Za-z_-]+)/$',
- 'category', name='helpdesk_kb_category'),
+ url(r'^kb/(?P<slug>[A-Za-z_-]+)/$',
+ 'category', name='helpdesk_kb_category'),
- url(r'^kb/(?P<item>[0-9]+)/$',
- 'item', name='helpdesk_kb_item'),
+ url(r'^kb/(?P<item>[0-9]+)/$',
+ 'item', name='helpdesk_kb_item'),
- url(r'^kb/(?P<item>[0-9]+)/vote/$',
- 'vote', name='helpdesk_kb_vote'),
-)
+ url(r'^kb/(?P<item>[0-9]+)/vote/$',
+ 'vote', name='helpdesk_kb_vote'),
+ )
urlpatterns += patterns('',
url(r'^api/$',
'django.views.generic.simple.direct_to_template',
{'template': 'helpdesk/help_api.html',},
name='helpdesk_api_help'),
-
+
url(r'^help/context/$',
'django.views.generic.simple.direct_to_template',
{'template': 'helpdesk/help_context.html',},
name='helpdesk_help_context'),
-
+
url(r'^system_settings/$',
'django.views.generic.simple.direct_to_template',
{
View
7 helpdesk/views/public.py
@@ -15,6 +15,7 @@
from django.template import loader, Context, RequestContext
from django.utils.translation import ugettext as _
+from helpdesk import settings as helpdesk_settings
from helpdesk.forms import PublicTicketForm
from helpdesk.lib import send_templated_mail, text_is_spam
from helpdesk.models import Ticket, Queue, UserSettings
@@ -62,6 +63,7 @@ def homepage(request):
return render_to_response('helpdesk/public_homepage.html',
RequestContext(request, {
'form': form,
+ 'helpdesk_settings': helpdesk_settings,
}))
@@ -89,7 +91,7 @@ def view_ticket(request):
if request.GET.has_key('close'):
redirect_url += '?close'
return HttpResponseRedirect(redirect_url)
-
+
if request.GET.has_key('close') and ticket.status == Ticket.RESOLVED_STATUS:
from helpdesk.views.staff import update_ticket
# Trick the update_ticket() view into thinking it's being called with
@@ -105,7 +107,7 @@ def view_ticket(request):
request.GET = {}
return update_ticket(request, ticket_id, public=True)
-
+
return render_to_response('helpdesk/public_view_ticket.html',
RequestContext(request, {
'ticket': ticket,
@@ -116,5 +118,6 @@ def view_ticket(request):
'ticket': ticket,
'email': email,
'error_message': error_message,
+ 'helpdesk_settings': helpdesk_settings,
}))
Please sign in to comment.
Something went wrong with that request. Please try again.