merge

diff --cc portal/homeview.py
index a261bc3,9b98e2b..b722b29
--- 1/portal/homeview.py
--- 2/portal/homeview.py
+++ b/portal/homeview.py
@@@ -26,10 -28,10 +28,10 @@@ import activity.use
  
  class HomeView (FreeAccessView, ThemeView):
      template_name = 'home-view.html'
--        
++
      # expose this so we can mention the backend URL on the welcome page
      def default_env (self):
--        return { 
++        return {
                   'MANIFOLD_URL':ConfigEngine().manifold_url(),
                   }
  
@@@ -37,12 -39,12 +39,12 @@@
          env = self.default_env()
          env['theme'] = self.theme
          env['section'] = "Dashboard"
--        
++
          username = request.POST.get('username')
          password = request.POST.get('password')
--        
++
          # pass request within the token, so manifold session key can be attached to the request session.
--        token = {'username': username, 'password': password, 'request': request}    
++        token = {'username': username, 'password': password, 'request': request}
  
          # our authenticate function returns either
          # . a ManifoldResult - when something has gone wrong, like e.g. backend is unreachable
@@@ -55,21 -57,22 +57,21 @@@
              manifoldresult = auth_result
              # let's use ManifoldResult.__repr__
              env['state']="%s"%manifoldresult
--            
++
              return render_to_response(self.template,env, context_instance=RequestContext(request))
          # user was authenticated at the backend
          elif auth_result is not None:
              user=auth_result
              if user.is_active:
 -                print("LOGGING IN")
                  login(request, user)
--                
--                if request.user.is_authenticated(): 
++
++                if request.user.is_authenticated():
                      env['person'] = self.request.user
                      env['username'] = self.request.user
--                    
++
                      # log user activity
                      activity.user.login(self.request)
--                    
++
                      ## check user is pi or not
                      platform_details = {}
                      account_details = {}
@@@ -93,7 -96,7 +95,7 @@@
                      #    pi = "is_not_pi"
                      #else:
                      #    pi = "is_pi"
--                    user_email = str(self.request.user)                   
++                    user_email = str(self.request.user)
                      pi = authority_check_pis(self.request, user_email)
  
                      # check if the user has creds or not
@@@ -113,8 -116,8 +115,8 @@@
  
                      env['pending_slices'] = pending_slices
                      env['pi'] = pi
--                    env['user_cred'] = user_cred                
--                else: 
++                    env['user_cred'] = user_cred
++                else:
                      env['person'] = None
                  return render_to_response(self.template,env, context_instance=RequestContext(request))
              else:
@@@ -122,21 -125,21 +124,21 @@@
                  activity.user.login(self.request, "notactive")
                  env['state'] = "Your account is not active, please contact the site admin."
                  env['layout_1_or_2']="layout-unfold2.html"
--                
++
                  return render_to_response(self.template,env, context_instance=RequestContext(request))
          # otherwise
          else:
              # log user activity
              activity.user.login(self.request, "error")
              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):
          env = self.default_env()
          acc_auth_cred={}
          if request.user.is_authenticated():
--           
++
              ## check user is pi or not
              platform_details = {}
              account_details = {}
@@@ -162,7 -165,7 +164,7 @@@
              #    pi = "is_not_pi"
              #else:
              #    pi = "is_pi"
--            user_email = str(self.request.user) 
++            user_email = str(self.request.user)
              pi = authority_check_pis(self.request, user_email)
              # check if the user has creds or not
              if acc_user_cred == {} or acc_user_cred == 'N/A':
@@@ -178,12 -181,12 +180,12 @@@
              pending_slices = []
              for slices in PendingSlice.objects.filter(type_of_nodes__iexact=self.request.user).all():
                  pending_slices.append(slices.slice_name)
--        
++
              env['pending_slices'] = pending_slices
              env['pi'] = pi
--            env['user_cred'] = user_cred                
++            env['user_cred'] = user_cred
              env['person'] = self.request.user
--        else: 
++        else:
              env['person'] = None
  
          env['theme'] = self.theme
@@@ -195,7 -198,7 +197,7 @@@
          if state: env['state'] = state
          elif not env['username']: env['state'] = None
          # use one or two columns for the layout - not logged in users will see the login prompt
--        
++
  #         account_query  = Query().get('local:account').select('user_id','platform_id','auth_type','config')
  #         account_details = execute_query(self.request, account_query)
  #         for account_detail in account_details:
@@@ -205,17 -208,17 +207,17 @@@
  #                 acc_user_cred = account_config.get('delegated_user_credential','N/A')
  #                 acc_slice_cred = account_config.get('delegated_slice_credentials','N/A')
  #                 acc_auth_cred = account_config.get('delegated_authority_credentials','N/A')
--# 
++#
  #                 if 'N/A' not in acc_user_cred:
  #                     exp_date = re.search('<expires>(.*)</expires>', acc_user_cred)
  #                     if exp_date:
  #                         user_exp_date = exp_date.group(1)
  #                         user_cred_exp_list.append(user_exp_date)
--# 
++#
  #                     my_users = [{'cred_exp': t[0]}
  #                         for t in zip(user_cred_exp_list)]
--#                
--# 
++#
++#
  #                 if 'N/A' not in acc_slice_cred:
  #                     for key, value in acc_slice_cred.iteritems():
  #                         slice_list.append(key)
@@@ -224,10 -227,10 +226,10 @@@
  #                         if exp_date:
  #                             exp_date = exp_date.group(1)
  #                             slice_cred_exp_list.append(exp_date)
--# 
++#
  #                     my_slices = [{'slice_name': t[0], 'cred_exp': t[1]}
  #                         for t in zip(slice_list, slice_cred_exp_list)]
--# 
++#
  #                 if 'N/A' not in acc_auth_cred:
  #                     for key, value in acc_auth_cred.iteritems():
  #                         auth_list.append(key)
@@@ -237,6 -240,6 +239,6 @@@
  #                             exp_date = exp_date.group(1)
  #                             auth_cred_exp_list.append(exp_date)
  
--        
++
          return render_to_response(self.template, env, context_instance=RequestContext(request))