Revision ee1de5e9

b/snf-astakos-app/astakos/im/settings.py
56 56
# Set recaptcha keys
57 57
RECAPTCHA_PUBLIC_KEY = getattr(settings, 'ASTAKOS_RECAPTCHA_PUBLIC_KEY', '')
58 58
RECAPTCHA_PRIVATE_KEY = getattr(settings, 'ASTAKOS_RECAPTCHA_PRIVATE_KEY', '')
59
RECAPTCHA_OPTIONS = getattr(settings, 'ASTAKOS_RECAPTCHA_OPTIONS', {'theme': 'white'})
60

  
b/snf-astakos-app/astakos/im/widgets.py
1 1
# Copyright 2011-2012 GRNET S.A. All rights reserved.
2
# 
2
#
3 3
# Redistribution and use in source and binary forms, with or
4 4
# without modification, are permitted provided that the following
5 5
# conditions are met:
6
# 
6
#
7 7
#   1. Redistributions of source code must retain the above
8 8
#      copyright notice, this list of conditions and the following
9 9
#      disclaimer.
10
# 
10
#
11 11
#   2. Redistributions in binary form must reproduce the above
12 12
#      copyright notice, this list of conditions and the following
13 13
#      disclaimer in the documentation and/or other materials
14 14
#      provided with the distribution.
15
# 
15
#
16 16
# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
17 17
# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 18
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
......
25 25
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
26 26
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27 27
# POSSIBILITY OF SUCH DAMAGE.
28
# 
28
#
29 29
# The views and conclusions contained in the software and
30 30
# documentation are those of the authors and should not be
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34 34
import recaptcha.client.captcha as captcha
35

  
35 36
from django import forms
37
from django.utils.safestring import mark_safe
38
from django.utils import simplejson as json
36 39

  
37
from astakos.im.settings import RECAPTCHA_PUBLIC_KEY
40
from astakos.im.settings import RECAPTCHA_PUBLIC_KEY, RECAPTCHA_OPTIONS
38 41

  
39 42
class RecaptchaWidget(forms.Widget):
40 43
    """ A Widget which "renders" the output of captcha.displayhtml """
41 44
    def render(self, *args, **kwargs):
42
        return captcha.displayhtml(RECAPTCHA_PUBLIC_KEY)
45
        conf = RECAPTCHA_OPTIONS
46
        recaptcha_conf = ('<script type="text/javascript">'
47
                         'var RecaptchaOptions = %s'
48
                         '</script>') % json.dumps(conf)
49
        return mark_safe(recaptcha_conf + \
50
                    captcha.displayhtml(RECAPTCHA_PUBLIC_KEY))
43 51

  
44 52
class DummyWidget(forms.Widget):
45 53
    """
......
50 58
    # make sure that labels are not displayed either
51 59
    is_hidden=True
52 60
    def render(self, *args, **kwargs):
53
        return ''
61
        return ''
b/snf-astakos-app/conf/20-snf-astakos-app-settings.conf
56 56
# http://www.google.com/recaptcha/whyrecaptcha 
57 57
#ASTAKOS_RECAPTCHA_PUBLIC_KEY = ''
58 58
#ASTAKOS_RECAPTCHA_PRIVATE_KEY = ''
59
#ASTAKOS_RECAPTCHA_OPTIONS = {'theme':'white'}
59 60

  
60 61

  

Also available in: Unified diff