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

added url tag compatibility fix for django <1.5

Browse Source 
added django 1.5 to travis
This commit is contained in:
Darrell Enns 2013-03-18 11:41:43 -07:00
parent ca1c6a270c
commit 8f0a80d322
22 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -5,6 +5,7 @@ python:
env: env:
- DJANGO=1.4.3 - DJANGO=1.4.3
- DJANGO=1.3.5 - DJANGO=1.3.5
- DJANGO=1.5.0
install: install:
- pip install argparse --use-mirrors - pip install argparse --use-mirrors
- pip install -q Django==$DJANGO --use-mirrors - pip install -q Django==$DJANGO --use-mirrors

1
helpdesk/templates/helpdesk/base.html
View File

@ -1,4 +1,5 @@
{% load i18n %} {% load i18n %}
{% load url from future %}
{% load saved_queries %} {% load saved_queries %}
{% load load_helpdesk_settings %} {% load load_helpdesk_settings %}
{% with request|load_helpdesk_settings as helpdesk_settings %} {% with request|load_helpdesk_settings as helpdesk_settings %}

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

@ -1,4 +1,4 @@
{% extends "helpdesk/base.html" %}{% load i18n %} {% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
{% block helpdesk_title %}{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk Dashboard" %}{% endblock %} {% block helpdesk_title %}{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk Dashboard" %}{% endblock %}
{% block helpdesk_head %} {% block helpdesk_head %}
<script type='text/javascript' language='javascript' src='{{ STATIC_URL }}helpdesk/hover.js'></script> <script type='text/javascript' language='javascript' src='{{ STATIC_URL }}helpdesk/hover.js'></script>

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

@ -1,4 +1,4 @@
{% extends "helpdesk/base.html" %}{% load i18n %} {% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
{% block helpdesk_title %}{% trans "Ignored E-Mail Addresses" %}{% endblock %} {% block helpdesk_title %}{% trans "Ignored E-Mail Addresses" %}{% endblock %}

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

@ -1,4 +1,4 @@
{% extends "helpdesk/help_base.html" %} {% extends "helpdesk/help_base.html" %}{% load url from future %}
{% block title %}django-helpdesk API Documentation{% endblock %} {% block title %}django-helpdesk API Documentation{% endblock %}
{% block heading %}django-helpdesk API Documentation{% endblock %} {% block heading %}django-helpdesk API Documentation{% endblock %}

1
helpdesk/templates/helpdesk/help_base.html
View File

@ -1,3 +1,4 @@
{% load url from future %}
<html> <html>
<head> <head>
<style type='text/css'> <style type='text/css'>

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

@ -1,4 +1,4 @@
{% load i18n %} {% load i18n %}{% load url from future %}
{% if helpdesk_settings.HELPDESK_NAVIGATION_ENABLED and user.is_authenticated or user.is_staff %} {% if helpdesk_settings.HELPDESK_NAVIGATION_ENABLED and user.is_authenticated or user.is_staff %}
<ul id="dropdown"> <ul id="dropdown">
<li><a href='{% url 'helpdesk_dashboard' %}'>{% trans "Dashboard" %}</a></li> <li><a href='{% url 'helpdesk_dashboard' %}'>{% trans "Dashboard" %}</a></li>

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

@ -1,4 +1,4 @@
{% load i18n %} {% load i18n %}{% load url from future %}
{% load load_helpdesk_settings %} {% load load_helpdesk_settings %}
{% with request|load_helpdesk_settings as helpdesk_settings %} {% with request|load_helpdesk_settings as helpdesk_settings %}
<html> <html>

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

@ -1,4 +1,4 @@
{% extends "helpdesk/public_base.html" %}{% load i18n %} {% extends "helpdesk/public_base.html" %}{% load i18n %}{% load url from future %}
{% block helpdesk_body %} {% block helpdesk_body %}

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

@ -1,4 +1,4 @@
{% extends "helpdesk/public_base.html" %}{% load i18n %} {% extends "helpdesk/public_base.html" %}{% load i18n %}{% load url from future %}
{% block helpdesk_body %} {% block helpdesk_body %}
<h2>{% trans "View a Ticket" %}</h2> <h2>{% trans "View a Ticket" %}</h2>

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

@ -1,4 +1,4 @@
{% extends "helpdesk/public_base.html" %}{% load i18n %} {% extends "helpdesk/public_base.html" %}{% load i18n %}{% load url from future %}
{% block helpdesk_title %}{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk Login" %}{% endblock %} {% block helpdesk_title %}{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk Login" %}{% endblock %}
{% block helpdesk_body %} {% block helpdesk_body %}

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

@ -1,4 +1,4 @@
{% extends "helpdesk/base.html" %}{% load i18n %} {% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
{% block helpdesk_title %}{% trans "RSS Feeds" %}{% endblock %} {% block helpdesk_title %}{% trans "RSS Feeds" %}{% endblock %}
{% block helpdesk_body %} {% block helpdesk_body %}
<h2>{% trans "RSS Feeds" %}</h2> <h2>{% trans "RSS Feeds" %}</h2>

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

@ -1,4 +1,4 @@
{% extends "helpdesk/base.html" %}{% load i18n %} {% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
{% block helpdesk_title %}{% trans "Change System Settings" %}{% endblock %} {% block helpdesk_title %}{% trans "Change System Settings" %}{% endblock %}

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

@ -1,4 +1,4 @@
{% extends "helpdesk/base.html" %}{% load i18n %} {% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
{% block helpdesk_title %}{% trans "View Ticket Details" %}{% endblock %} {% block helpdesk_title %}{% trans "View Ticket Details" %}{% endblock %}
{% block helpdesk_head %} {% block helpdesk_head %}
<script type="text/javascript"> <script type="text/javascript">

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

@ -1,4 +1,4 @@
{% extends "helpdesk/base.html" %}{% load i18n %} {% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
{% block helpdesk_title %}{% trans "Add Ticket CC" %}{% endblock %} {% block helpdesk_title %}{% trans "Add Ticket CC" %}{% endblock %}

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

@ -1,4 +1,4 @@
{% extends "helpdesk/base.html" %}{% load i18n %} {% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
{% block helpdesk_title %}{% trans "Delete Ticket CC" %}{% endblock %} {% block helpdesk_title %}{% trans "Delete Ticket CC" %}{% endblock %}

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

@ -1,4 +1,4 @@
{% extends "helpdesk/base.html" %}{% load i18n %} {% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
{% block helpdesk_title %}{% trans "Ticket CC Settings" %}{% endblock %} {% block helpdesk_title %}{% trans "Ticket CC Settings" %}{% endblock %}

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

@ -1,4 +1,4 @@
{% extends "helpdesk/base.html" %}{% load i18n %} {% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
{% block helpdesk_title %}{% trans "Add Ticket Dependency" %}{% endblock %} {% block helpdesk_title %}{% trans "Add Ticket Dependency" %}{% endblock %}

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

@ -1,4 +1,4 @@
{% extends "helpdesk/base.html" %}{% load i18n %} {% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
{% block helpdesk_title %}{% trans "Delete Ticket Dependency" %}{% endblock %} {% block helpdesk_title %}{% trans "Delete Ticket Dependency" %}{% endblock %}

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

@ -1,4 +1,4 @@
{% load i18n %} {% load i18n %}{% load url from future %}
<table width='100%'> <table width='100%'>
<tr class='row_tablehead'><td colspan='2'>{{ ticket.id }}. {{ ticket.title }} [{{ ticket.get_status }}] <span class='ticket_toolbar'> <tr class='row_tablehead'><td colspan='2'>{{ ticket.id }}. {{ ticket.title }} [{{ ticket.get_status }}] <span class='ticket_toolbar'>
{% if helpdesk_settings.HELPDESK_SHOW_EDIT_BUTTON_TICKET_TOP %} {% if helpdesk_settings.HELPDESK_SHOW_EDIT_BUTTON_TICKET_TOP %}

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

@ -1,4 +1,4 @@
{% extends "helpdesk/base.html" %}{% load i18n %} {% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
{% block helpdesk_title %}{% trans "Ticket Listing" %}{% endblock %} {% block helpdesk_title %}{% trans "Ticket Listing" %}{% endblock %}
{% block helpdesk_head %} {% block helpdesk_head %}
<script type='text/javascript' language='javascript' src='{{ STATIC_URL }}helpdesk/filter.js'></script> <script type='text/javascript' language='javascript' src='{{ STATIC_URL }}helpdesk/filter.js'></script>

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

@ -1,4 +1,4 @@
{% extends "helpdesk/base.html" %}{% load i18n %} {% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
{% block helpdesk_title %}{% trans "Change User Settings" %}{% endblock %} {% block helpdesk_title %}{% trans "Change User Settings" %}{% endblock %}