Merge branch 'master' of https://code.grnet.gr/git/astakos

[astakos] / snf-astakos-app / astakos / im / widgets.py

diff --git a/snf-astakos-app/astakos/im/widgets.py b/snf-astakos-app/astakos/im/widgets.py
index 9d24a82..502d9a3 100644 (file)
--- a/snf-astakos-app/astakos/im/widgets.py
+++ b/snf-astakos-app/astakos/im/widgets.py
@@ -37,6 +37,7 @@ from django import forms
 from django.utils.safestring import mark_safe
 from django.utils import simplejson as json
 from django.utils.translation import ugettext as _
+from django.template.loader import render_to_string
 
 from astakos.im.settings import RECAPTCHA_PUBLIC_KEY, RECAPTCHA_OPTIONS, \
         RECAPTCHA_USE_SSL
@@ -48,7 +49,10 @@ class RecaptchaWidget(forms.Widget):
         recaptcha_conf = ('<script type="text/javascript">'
                          'var RecaptchaOptions = %s'
                          '</script>') % json.dumps(conf)
+        custom_widget_html = render_to_string("im/captcha.html", 
+ {'conf': 'Bob'})
         return mark_safe(recaptcha_conf + \
+                         custom_widget_html + \
                     captcha.displayhtml(RECAPTCHA_PUBLIC_KEY,
                         use_ssl=RECAPTCHA_USE_SSL))
 
@@ -62,16 +66,3 @@ class DummyWidget(forms.Widget):
     is_hidden=True
     def render(self, *args, **kwargs):
         return ''
-
-class ApprovalTermsWidget(forms.CheckboxInput):
-    """
-    A CheckboxInput class with a link to the approval terms.
-    """
-    def __init__(self, attrs=None, check_test=bool, terms_uri='', terms_label=_('Read the terms')):
-        super(ApprovalTermsWidget, self).__init__(attrs, check_test)
-        self.uri = terms_uri
-        self.label = terms_label
-
-    def render(self, name, value, attrs=None):
-        html = super(ApprovalTermsWidget, self).render(name, value, attrs)
-        return html