X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fhomeview.py;h=5b822212892597b916a91a675a7c88d219afe456;hb=83f238a32f62a34370f24d69e85823c709d95627;hp=960c8f0d3e2119dcee2d945f90b1e4cff222ecea;hpb=b8285e0fe053a91e94dd6641e5daa3c6dd52c43e;p=myslice.git diff --git a/portal/homeview.py b/portal/homeview.py index 960c8f0d..5b822212 100644 --- a/portal/homeview.py +++ b/portal/homeview.py @@ -1,16 +1,17 @@ # 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 -class HomeView (View): +class HomeView (FreeAccessView): # expose this so we can mention the backend URL on the welcome page def default_env (self): @@ -32,6 +33,8 @@ 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 + env['layout_1_or_2']="layout-unfold2.html" if not username else "layout-unfold1.html" # high-level errors, like connection refused or the like if isinstance (auth_result, ManifoldResult): manifoldresult = auth_result @@ -60,5 +63,7 @@ class HomeView (View): 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))