Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
	portal/homeview.py

diff --git a/portal/actions.py b/portal/actions.py
index 7cda649..79538bd 100644 (file)
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -762,7 +762,7 @@ def manifold_add_reference_user_accounts(wsgi_request, request):
         }
         manifold_add_account(wsgi_request, manifold_account_params)
 
-def sfa_create_user(wsgi_request, request, namespace = None, as_admin = False):
+def sfa_create_user(wsgi_request, request, namespace = None, as_admin = True):
     """
     Arguments:
         wsgi_request (~ WSGIRequest) : 
@@ -793,6 +793,13 @@ def sfa_create_user(wsgi_request, request, namespace = None, as_admin = False):
     #query = Query.create('user').set(sfa_user_params).select('user_hrn')
     #results = execute_query(wsgi_request, query)
 
+    ###### Guilherme 08-07-2015
+    ##subject = 'Teste das chaves publicas'
+    ##message = 'Um novo usuario SFA esta sendo criado\n'
+    ##message += "request['public_key']: " + request['public_key'] + '\n'
+    ##message += "sfa_user_params['keys']: " + sfa_user_params['keys'] + '\n'
+    ##send_mail(subject, message, 'support@fibre.org.br', [request['email']], fail_silently=False)
+
     if namespace is not None:
         query = Query.create('%s:user' % namespace).set(sfa_user_params).select('user_hrn')
     else:

diff --git a/portal/homeview.py b/portal/homeview.py
index 90b134d..718ba60 100644 (file)
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -64,7 +64,7 @@ class HomeView (FreeAccessView, ThemeView):
        #################################################
        ## first you must open a connection to the server
        try:
-               # Connect to NOC
+               # Connect to UFRJ
                 l = ldap.initialize("ldap://200.130.15.186:389")
                # Bind/authenticate with a root user to search all objects
                l.simple_bind_s("cn=Manager,dc=br,dc=fibre","fibre2013")
@@ -316,8 +316,9 @@ class HomeView (FreeAccessView, ThemeView):
         else:
             # log user activity
             #activity.user.login(self.request, "error")
-            env['state'] = "Your username and/or password were incorrect."
-            
+
+           env['state'] = "Your username and/or password were incorrect."
+
             return render_to_response(self.template, env, context_instance=RequestContext(request))
 
     def get (self, request, state=None):

diff --git a/portal/templates/fibre/fibre_institution.html b/portal/templates/fibre/fibre_institution.html
index 87b6dab..3e3d415 100644 (file)
--- a/portal/templates/fibre/fibre_institution.html
+++ b/portal/templates/fibre/fibre_institution.html
@@ -6,32 +6,29 @@
 
 {% block content %}
 <div class="container">
-       <div class="row">
-               <div class="col-md-12">
-                        <div class="breadcrumbs">
-                                Management &nbsp;>&nbsp; Institution: <span id="authority_name"></span>
-                        </div>
-               </div>
-       </div>
+  <div class="row">
+    <div class="col-md-12">
+      <div class="breadcrumbs">
+        Management &nbsp;>&nbsp; Institution: <span id="authority_name"></span>
+      </div>
+    </div>
+  </div>
 </div>
+
 <div class="container">
-       <div class="row">
-               <div class="col-md-12">
-                       <ul class="nav nav-tabs nav-section">
-                               <!-- <li class="active"><a href="#about">About</a></li>-->
-                               <li class="active"><a href="#users">Users</a></li>
-                               <li><a href="#slices">Slices</a></li>
-                               <li><a href="#requests">Requests</a></li>
-                       </ul>
-           </div>
-       </div>
+  <div class="row">
+    <div class="col-md-12">
+      <ul class="nav nav-tabs nav-section">
+       <li class="active"><a href="#users">Users</a></li>
+       <li><a href="#slices">Slices</a></li>
+       <li><a href="#requests">Requests</a></li>
+      </ul>
+    </div>
+  </div>
 </div>
+
 <div class="container tab-content">
-<!--
-       <div class="tab-pane active row" id="about">
-       </div>
--->
-       <div class="tab-pane row" id="users" data-authority="{{user_details.parent_authority}}">
+       <div class="tab-pane active row" id="users" data-authority="{{user_details.parent_authority}}">
                <div class="col-md-12 el">
                        <div id="user-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
                                <div id="user-tab-loaded" style="display:none;">