Merge pull request #4 from a-iv/master

django 1.4 compatible

Author: a-iv

MANIFEST.in

@@ -1,4 +1,4 @@
-recursive-include feedback/media *.js *.css
+recursive-include feedback/static *.js *.css
 recursive-include feedback/templates *.html *.txt
 recursive-include feedback/locale *.po *.mo
 include README README.rst DESCRIPTION INSTALL.txt

feedback/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-__version__ = '0.3.7'
+__version__ = '0.3.8'
 

feedback/media/feedback/js/feedback.js feedback/static/feedback/js/feedback.jsfeedback/media/feedback/js/feedback.js renamed to feedback/static/feedback/js/feedback.js

@@ -1,11 +1,6 @@
-{% load i18n feedback_tags %}
-{{ subject }}
+{% load i18n feedback_tags %}{{ subject }}
 ==============
 
-{% for field in form %}
-{% ifnotequal field.name 'form_settings_key' %}
-{{ field.label }}: {{ field|get_choice_value }}
-{% endifnotequal %}
-{% endfor %}
-
+{% for field in form %}{% ifnotequal field.name 'form_settings_key' %}{{ field.label }}: {{ field|get_choice_value }}
+{% endifnotequal %}{% endfor %}
 {% trans "Form type" %}: {{ form.subject }}

feedback/templates/feedback/feedback_message.txt

@@ -1,21 +1,25 @@
 # -*- coding: utf-8 -*-
+
 from django import template
-from django.template import loader, Context
 from django.forms import BooleanField
-from feedback.utils import get_feedback_form
 from django.utils.translation import ugettext_lazy as _
+from django.template import loader
+from django.template.context import RequestContext
+
+from feedback.utils import get_feedback_form
 
 register = template.Library()
 
 
-@register.simple_tag
-def show_feedback(key='default'):
+@register.simple_tag(takes_context=True)
+def show_feedback(context, key='default'):
     form = get_feedback_form(key)()
     t = loader.select_template([
         'feedback/%s/feedback.html' % key,
         'feedback/feedback.html',
     ])
-    output = t.render(Context(locals()))
+    request_context = RequestContext(context['request'], locals())
+    output = t.render(request_context)
     return output
 
 

feedback/templatetags/feedback_tags.py

@@ -1,12 +1,25 @@
 # -*- coding: utf-8 -*-
+
 from django.conf.urls.defaults import *
+
 from feedback.settings import DIRECT_TO_TEMPLATE
 
+
 if DIRECT_TO_TEMPLATE:
-    urlpatterns = patterns('django.views.generic.simple',
-        url(r'^$', 'direct_to_template',
-            {'template': 'feedback/feedback_page.html'}, name='feedback_page')
-    )
+    try:
+        from django.views.generic import TemplateView
+    except ImportError:
+        urlpatterns = patterns('django.views.generic.simple',
+                url(r'^/$', 'direct_to_template',
+                    {'template': 'feedback/feedback_page.html'},
+                    name='feedback_page'))
+    else:
+        urlpatterns = patterns('',
+            url(r'^/$',
+                TemplateView.as_view(
+                    template_name='feedback/feedback_page.html'),
+                name='feedback_page')
+        )
 else:
     urlpatterns = patterns('')