From 2137aea5dfd102f1b211ec3138d8d5f639f3c28b Mon Sep 17 00:00:00 2001 From: Loic Baron Date: Wed, 2 Jul 2014 14:34:51 -0300 Subject: [PATCH] Adicionando as ultimas modificacoes feitas pelo Edelberto --- portal/actions.py | 3 +- portal/registrationview.py | 3 ++ portal/templates/base.html | 2 +- .../.fibre__widget-login-fed-manager.html.swp | Bin 12288 -> 0 bytes .../fibre__widget-login-fed-manager.html | 6 +-- .../fibre/fibre__widget-topmenu.html | 47 +++++++++++++----- portal/templates/fibre/fibre_home-view.html | 5 +- .../fibre/onelab__widget-topmenu.html | 6 +-- portal/templates/onelab/onelab_base.html | 2 +- 9 files changed, 50 insertions(+), 24 deletions(-) delete mode 100644 portal/templates/fibre/.fibre__widget-login-fed-manager.html.swp diff --git a/portal/actions.py b/portal/actions.py index 17265c6e..888d2062 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -657,6 +657,7 @@ def create_user(wsgi_request, request): # Add the user to the SFA registry sfa_create_user(wsgi_request, request) + ''' # LDAP update user userEnabled = True try: mail = request['email'] @@ -669,7 +670,7 @@ def create_user(wsgi_request, request): ldap_modify_user(wsgi_request, request) except Exception, e: "LDAP create user failed" - + ''' def create_pending_user(wsgi_request, request, user_detail): """ """ diff --git a/portal/registrationview.py b/portal/registrationview.py index 4f8ab90a..12a720dc 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -133,6 +133,7 @@ class RegistrationView (FreeAccessView, ThemeView): user_request['public_key'] = file_content if not errors: + ''' try: # verify if is a LDAP mail = user_detail['email'] @@ -144,8 +145,10 @@ class RegistrationView (FreeAccessView, ThemeView): if dc == 'br' or 'eu': # LDAP insert directly - but with userEnable = FALSE ldap_create_user(wsgi_request, user_request, user_detail) + except Exception, e: print "LDAP: problem em access the LDAP with this credentail" + ''' create_pending_user(wsgi_request, user_request, user_detail) self.template_name = 'user_register_complete.html' diff --git a/portal/templates/base.html b/portal/templates/base.html index decd041e..839c9550 100644 --- a/portal/templates/base.html +++ b/portal/templates/base.html @@ -72,7 +72,7 @@ $(document).ready(function() { {% block container %} {% block topmenu %} - {% widget "_widget-topmenu.html" %} + {% widget "__widget-topmenu.html" %} {% endblock topmenu %} {% include 'messages-transient.html' %} {% block base_content %} diff --git a/portal/templates/fibre/.fibre__widget-login-fed-manager.html.swp b/portal/templates/fibre/.fibre__widget-login-fed-manager.html.swp deleted file mode 100644 index bdd90af10549f5c6541c1b9efe7b2fed7e2ccfed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2zi%T&6vw}J1(Fjx=7)qtf%F&@kPyy>3kVS2MaL;ZfkQ$hz6vQC@6N7=?9Qxa zXJc~40*Q_aIvNT@0~PeNG$(3GdYbzm(0FafCedAV9jEyeyR$QI=6&D1wr&u;<0cYtp? zz*ik0?Er6gfWO+npKajRHt=;Dc%==nHt<9n_+t|YH-R@cf#)`XUp9arH-PUq8cp9i zT^^6eu9~rxfSBszTO$gIdW<)g@cgRFzzvTUEAK@~RqZ zld$L|HLS{aRIJ~ZtMg5CUMBPwA77Tx0NWlKDcMOD$6u8nK!TG@A<#(vL#uj;NO_%GM)s@}A*Zqsxsi){W)wWxPWl`-PE4cUHe zbSY?{q*jbZLS`cyvb`IO#xk*^rWq_^Y-+1X`I;nAyYiTexRQ#YSyAzx;dfn9F7f~R z?yM}`((5I+=6`4y#Ul})h-9I4rHWFKu;>aIXc0}eNvK4ov^{l?YY~rRk_ffPf)byf zzd@4;xo4VAo0n*|kW8D-W~s?G#g$2qtv(TI*4KA6OFXtxtB?h=lOl%oK?5m;Wc?{C(cOZWp9}4_=H81300O`LDT8-V3=$>Jx%xa6st$tSmZg2@GliI B{wM$d diff --git a/portal/templates/fibre/fibre__widget-login-fed-manager.html b/portal/templates/fibre/fibre__widget-login-fed-manager.html index 5754b355..8114d9ec 100644 --- a/portal/templates/fibre/fibre__widget-login-fed-manager.html +++ b/portal/templates/fibre/fibre__widget-login-fed-manager.html @@ -9,11 +9,11 @@ {% endif %}
- + Brazil - + Europe Union - Local User + Local User
diff --git a/portal/templates/fibre/fibre__widget-topmenu.html b/portal/templates/fibre/fibre__widget-topmenu.html index b9163949..b05d887d 100644 --- a/portal/templates/fibre/fibre__widget-topmenu.html +++ b/portal/templates/fibre/fibre__widget-topmenu.html @@ -1,19 +1,16 @@ -{% insert_str prelude "js/bootstrap.js" %} -{% insert_str prelude "css/bootstrap.css" %} -{% insert_str prelude "css/topmenu.css" %} -{% insert_str prelude "js/logout.js" %} +