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

Merge pull request #320 from tony-zhu/master

Browse Source 
Remove deprecated load url from future
This commit is contained in:
Ross Poulton 2015-04-17 08:42:52 +10:00
commit ffb6243af0
22 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,4 +1,4 @@
{% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
{% extends "helpdesk/base.html" %}{% load i18n %}
{% 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" %}{% load url from future %}
{% extends "helpdesk/help_base.html" %}
{% block title %}django-helpdesk API Documentation{% endblock %}
{% block heading %}django-helpdesk API Documentation{% endblock %}

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

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

2
helpdesk/templates/helpdesk/include/stats.html
View File

@ -1,4 +1,4 @@
{% load i18n %}{% load url from future %}
{% load i18n %}
<table class="table table-hover table-bordered table-striped ticket-stats">
<caption>{% trans "Current Ticket Stats" %}</caption>
<thead>

2
helpdesk/templates/helpdesk/include/tickets.html
View File

@ -1,4 +1,4 @@
{% load i18n humanize %}{% load url from future %}
{% load i18n humanize %}
<table class="table table-hover table-bordered table-striped">{% if ticket_list_caption %}
<caption>{{ ticket_list_caption }}</caption>{% endif %}
<thead>

2
helpdesk/templates/helpdesk/include/unassigned.html
View File

@ -1,4 +1,4 @@
{% load i18n humanize %}{% load url from future %}
{% load i18n humanize %}
<table class="table table-hover table-bordered table-striped">
<caption>{% trans "Unassigned Tickets" %} {% trans "(pick up a ticket if you start to work on it)" %}</caption>
<thead>

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

@ -1,4 +1,4 @@
{% load i18n %}{% load url from future %}
{% load i18n %}
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="navbar-header">

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,4 +1,4 @@
{% load i18n humanize %}{% load url from future %}
{% load i18n humanize %}
<table class="table table-hover table-bordered table-striped">
<thead>
<tr class='row_tablehead'><td colspan='2'><h3>{{ ticket.id }}. {{ ticket.title }} [{{ ticket.get_status }}]</h3> <span class='ticket_toolbar'>

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

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

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

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