Revision 53bf2659

b/snf-astakos-app/README
64 64 
ASTAKOS_CLOUD_SERVICES              ({'icon': 'home-icon.png', 'id': 'cloud', 'name': 'grnet cloud', 'url': '/'},   Cloud services appear in the horizontal bar
65 65 
                                    {'id': 'okeanos', 'name': 'cyclades', 'url': '/okeanos.html'},
66 66 
                                    {'id': 'pithos', 'name': 'pithos+', 'url': '/ui/'})
67 
ASTAKOS_RECAPTCHA_ENABLED           True                                                                            Enable recaptcha
67 68 
ASTAKOS_RECAPTCHA_PUBLIC_KEY                                                                                        Recaptcha public key obtained after registration here: http://recaptcha.net
68 69 
ASTAKOS_RECAPTCHA_PRIVATE_KEY                                                                                       Recaptcha private key obtained after registration here: http://recaptcha.net
69 70 
ASTAKOS_RECAPTCHA_OPTIONS           {'theme': 'white'}                                                              Options for customizing reCAPTCHA look and feel
b/snf-astakos-app/astakos/im/forms.py
44 44 
from django.utils.functional import lazy
45 45 

  		





  46
  46
  
    
from astakos.im.models import AstakosUser


  		





  47
  
  
    
from astakos.im.settings import INVITATIONS_PER_LEVEL, DEFAULT_FROM_EMAIL, BASEURL, SITENAME, RECAPTCHA_PRIVATE_KEY, DEFAULT_CONTACT_EMAIL


  		





  
  47
  
    
from astakos.im.settings import INVITATIONS_PER_LEVEL, DEFAULT_FROM_EMAIL, BASEURL, SITENAME, RECAPTCHA_PRIVATE_KEY, DEFAULT_CONTACT_EMAIL, RECAPTCHA_ENABLED


  		





  48
  48
  
    
from astakos.im.widgets import DummyWidget, RecaptchaWidget, ApprovalTermsWidget


  		





  49
  49
  
    

  		





  50
  50
  
    
# since Django 1.4 use django.core.urlresolvers.reverse_lazy instead


  		





  ......




  81
  81
  
    
        super(LocalUserCreationForm, self).__init__(*args, **kwargs)


  		





  82
  82
  
    
        self.fields.keyOrder = ['email', 'first_name', 'last_name',


  		





  83
  83
  
    
                                'password1', 'password2',


  		





  84
  
  
    
                                'has_signed_terms',


  		





  85
  
  
    
                                'recaptcha_challenge_field',


  		





  86
  
  
    
                                'recaptcha_response_field',]


  		





  
  84
  
    
                                'has_signed_terms']


  		





  
  85
  
    
        if RECAPTCHA_ENABLED:


  		





  
  86
  
    
            self.fields.keyOrder.extend(['recaptcha_challenge_field',


  		





  
  87
  
    
                                         'recaptcha_response_field',])


  		





  87
  88
  
    
    


  		





  88
  89
  
    
    def clean_email(self):


  		





  89
  90
  
    
        email = self.cleaned_data['email']


  		





  ......




  150
  151
  
    
        super(InvitedLocalUserCreationForm, self).__init__(*args, **kwargs)


  		





  151
  152
  
    
        self.fields.keyOrder = ['email', 'inviter', 'first_name',


  		





  152
  153
  
    
                                'last_name', 'password1', 'password2',


  		





  153
  
  
    
                                'has_signed_terms',


  		





  154
  
  
    
                                'recaptcha_challenge_field',


  		





  155
  
  
    
                                'recaptcha_response_field']


  		





  
  154
  
    
                                'has_signed_terms']


  		





  
  155
  
    
        if RECAPTCHA_ENABLED:


  		





  
  156
  
    
            self.fields.keyOrder.extend(['recaptcha_challenge_field',


  		





  
  157
  
    
                                         'recaptcha_response_field',])


  		





  
  158
  
    
        


  		





  156
  159
  
    
        #set readonly form fields


  		





  157
  160
  
    
        self.fields['inviter'].widget.attrs['readonly'] = True


  		





  158
  161
  
    
        self.fields['email'].widget.attrs['readonly'] = True


  		












  

    
      b/snf-astakos-app/astakos/im/settings.py
    
  






  58
  58
  
    
RECAPTCHA_PRIVATE_KEY = getattr(settings, 'ASTAKOS_RECAPTCHA_PRIVATE_KEY', '')


  		





  59
  59
  
    
RECAPTCHA_OPTIONS = getattr(settings, 'ASTAKOS_RECAPTCHA_OPTIONS', {'theme': 'white'})


  		





  60
  60
  
    
RECAPTCHA_USE_SSL = getattr(settings, 'ASTAKOS_RECAPTCHA_USE_SSL', True)


  		





  
  61
  
    
RECAPTCHA_ENABLED = getattr(settings, 'ASTAKOS_RECAPTCHA_ENABLED', True)


  		





  61
  62
  
    

  		





  62
  63
  
    
# set AstakosUser fields to propagate in the billing system


  		





  63
  64
  
    
BILLING_FIELDS = getattr(settings, 'ASTAKOS_BILLING_FIELDS', ['is_active'])


  		





  ......




  75
  76
  
    
LOGIN_MESSAGES = getattr(settings, 'ASTAKOS_LOGIN_MESSAGES', {})


  		





  76
  77
  
    

  		





  77
  78
  
    
# messages to display on login page header


  		





  78
  
  
    
PROFILE_EXTRA_LINKS = getattr(settings, 'ASTAKOS_PROFILE_EXTRA_LINKS', {})


  		





  79
  
  
    

  		





  
  79
  
    
PROFILE_EXTRA_LINKS = getattr(settings, 'ASTAKOS_PROFILE_EXTRA_LINKS', {})


  		












Also available in:
  Unified diff