Merge branch 'old'

Conflicts:
	feedback/__init__.py
	feedback/templatetags/feedback_tags.py

Author: Dmitry Sobolev

feedback/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-__version__ = '0.3.9.1'
+__version__ = '0.3.10'
 

feedback/templatetags/feedback_tags.py

@@ -1,27 +1,32 @@
-# -*- coding: utf-8 -*-
+#-*- coding: utf-8 -*-
 
+from classytags.arguments import Argument
+from classytags.core import Tag, Options
 from django import template
-from django.forms import BooleanField
-from django.utils.translation import ugettext_lazy as _
-from django.template import loader
+from django.template.loader import render_to_string
 from django.template.context import RequestContext
-
+from django.utils.translation import gettext_lazy as _
 from feedback.utils import get_feedback_form
+from feedback.settings import DEFAULT_FORM_KEY
+from django.forms.fields import BooleanField
 
 register = template.Library()
 
-
-@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',
-    ])
-    request_context = RequestContext(context['request'], locals())
-    output = t.render(request_context)
-    return output
-
+class ShowFeedback(Tag):
+    name = 'show_feedback'
+    
+    options = Options(Argument('form_key', required=False, resolve=False))
+    
+    def render_tag(self, context, form_key):
+        form_key = form_key if form_key else DEFAULT_FORM_KEY
+        form = get_feedback_form(form_key)()
+        
+        return render_to_string([
+            'feedback/%s/feedback.html' % form_key,
+            'feedback/feedback.html',
+            ], {'form':form}, context_instance=RequestContext(context['request']))
+
+register.tag(ShowFeedback)
 
 @register.filter
 def get_choice_value(bound_field):

setup.py

@@ -38,7 +38,7 @@ def read(fname):
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],
     packages=find_packages(),
-    install_requires=[],
+    install_requires=['django-classy-tags >=0.3,<0.4'],
     include_package_data=True,
     zip_safe=False,
     long_description=read('README'),