X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Fhomeview.py;h=c71481ad46390011e78ff7f0f5935e1c166f191f;hp=b5e47fe63965885bd14225c2dfbb26ba599a6502;hb=20e712f9703d8b2eaf226fdf8807315edcea6a9a;hpb=e662708d2f2f1ba05daefe1db50ee08c5439aadc

diff --git a/portal/homeview.py b/portal/homeview.py
index b5e47fe6..c71481ad 100644
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -1,21 +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 unfold.loginrequired import FreeAccessView
+
 from manifold.manifoldresult import ManifoldResult
 from ui.topmenu import topmenu_items, the_user
-from myslice.config import Config
+from myslice.configengine import ConfigEngine
 
-class HomeView (View):
+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):
@@ -31,11 +32,13 @@ class HomeView (View):
         # . 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:
@@ -46,18 +49,22 @@ class HomeView (View):
                 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 sign in"
+        # 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))