X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fhomeview.py;h=efdf71e1e97a6f8ba4d513017c2c056eef273f88;hb=f0f76a08ca9dc5d208e1521a73ba1ba60a3c0065;hp=a6656772ae9f08458d645953ea1b63a5bc93439b;hpb=3d0d7911139041e45da7fe8a3fdeaf07aa4da007;p=myslice.git diff --git a/portal/homeview.py b/portal/homeview.py index a6656772..efdf71e1 100644 --- a/portal/homeview.py +++ b/portal/homeview.py @@ -9,15 +9,14 @@ 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 (FreeAccessView): # expose this so we can mention the backend URL on the welcome page def default_env (self): - config=Config() return { - 'MANIFOLD_URL':config.manifold_url(), + 'MANIFOLD_URL':ConfigEngine().manifold_url(), } def post (self,request): @@ -64,7 +63,7 @@ class HomeView (FreeAccessView): env['username']=the_user(request) env['topmenu_items'] = topmenu_items(None, request) if state: env['state'] = state - elif not env['username']: env['state'] = "Please sign in" + 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))