X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fhomeview.py;h=efdf71e1e97a6f8ba4d513017c2c056eef273f88;hb=73136626a3010dac4fe3c42041a1c324aa659b1d;hp=f5735ab471bf41c01d7d682ee8dc0631fc2abb61;hpb=e11594d82379b519df0968cc3c6a21628b270b27;p=unfold.git

diff --git a/portal/homeview.py b/portal/homeview.py
index f5735ab4..efdf71e1 100644
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -1,19 +1,22 @@
 # this somehow is not used anymore - should it not be ?
-from django.views.generic import View
 from django.core.context_processors import csrf
 from django.http import HttpResponseRedirect
 from django.contrib.auth import authenticate, login, logout
 from django.template import RequestContext
 from django.shortcuts import render_to_response
 
-from myslice.viewutils import topmenu_items, the_user
-from myslice.config import Config
+from unfold.loginrequired import FreeAccessView
 
-class HomeView (View):
+from manifold.manifoldresult import ManifoldResult
+from ui.topmenu import topmenu_items, the_user
+from myslice.configengine import ConfigEngine
 
+class HomeView (FreeAccessView):
+
+    # expose this so we can mention the backend URL on the welcome page
     def default_env (self):
         return { 
-                 'manifold_url':Config.manifold_url,
+                 'MANIFOLD_URL':ConfigEngine().manifold_url(),
                  }
 
     def post (self,request):
@@ -24,25 +27,44 @@ class HomeView (View):
         # pass request within the token, so manifold session key can be attached to the request session.
         token = {'username': username, 'password': password, 'request': request}    
 
-        user = authenticate(token=token)
-        if user is not None:
+        # our authenticate function returns either
+        # . a ManifoldResult - when something has gone wrong, like e.g. backend is unreachable
+        # . a django User in case of success
+        # . or None if the backend could be reached but the authentication failed
+        auth_result = authenticate(token=token)
+        # use one or two columns for the layout - not logged in users will see the login prompt
+        # high-level errors, like connection refused or the like
+        if isinstance (auth_result, ManifoldResult):
+            manifoldresult = auth_result
+            # let's use ManifoldResult.__repr__
+            env['state']="%s"%manifoldresult
+            env['layout_1_or_2']="layout-unfold2.html"
+            return render_to_response('home-view.html',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)
                 return HttpResponseRedirect ('/login-ok')
             else:
                 env['state'] = "Your account is not active, please contact the site admin."
+                env['layout_1_or_2']="layout-unfold2.html"
                 return render_to_response('home-view.html',env, context_instance=RequestContext(request))
+        # otherwise
         else:
             env['state'] = "Your username and/or password were incorrect."
+            env['layout_1_or_2']="layout-unfold2.html"
             return render_to_response('home-view.html',env, context_instance=RequestContext(request))
 
     # login-ok sets state="Welcome to MySlice" in urls.py
     def get (self, request, state=None):
         env = self.default_env()
         env['username']=the_user(request)
-        env['topmenu_items'] = topmenu_items('', request)
+        env['topmenu_items'] = topmenu_items(None, request)
         if state: env['state'] = state
-        elif not env['username']: env['state'] = "Please log in below..."
+        elif not env['username']: env['state'] = None
+        # use one or two columns for the layout - not logged in users will see the login prompt
+        env['layout_1_or_2']="layout-unfold2.html" if not env['username'] else "layout-unfold1.html"
         return render_to_response('home-view.html',env, context_instance=RequestContext(request))