X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fhomeview.py;h=62b413668c1202fb5a0bf4c1728d24a2a930c84a;hb=d04f3fd85686bee03a961494bdb4a68d6fb07ad4;hp=395cd965b04ef04230ab3ab01a03fa33b9f0f2d1;hpb=73c56c22ad3fad69695018c4dea8a0d22cd5727c;p=unfold.git

diff --git a/portal/homeview.py b/portal/homeview.py
index 395cd965..62b41366 100644
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -8,11 +8,11 @@ from django.shortcuts import render
 
 from unfold.loginrequired import FreeAccessView
 
-from manifold.manifoldresult import ManifoldResult
+from manifoldapi.manifoldresult import ManifoldResult
 from ui.topmenu import topmenu_items, the_user
 from myslice.configengine import ConfigEngine
 
-from theme import ThemeView
+from myslice.theme import ThemeView
 
 class HomeView (FreeAccessView, ThemeView):
     template_name = 'home-view.html'
@@ -26,6 +26,8 @@ class HomeView (FreeAccessView, ThemeView):
     def post (self,request):
         env = self.default_env()
         env['theme'] = self.theme
+        env['section'] = "Dashboard"
+        
         username = request.POST.get('username')
         password = request.POST.get('password')
         
@@ -43,7 +45,6 @@ class HomeView (FreeAccessView, ThemeView):
             manifoldresult = auth_result
             # let's use ManifoldResult.__repr__
             env['state']="%s"%manifoldresult
-            env['layout_1_or_2']="layout-unfold2.html"
             
             return render_to_response(self.template,env, context_instance=RequestContext(request))
         # user was authenticated at the backend
@@ -55,6 +56,7 @@ class HomeView (FreeAccessView, ThemeView):
                 
                 if request.user.is_authenticated(): 
                     env['person'] = self.request.user
+                    env['username'] = self.request.user
                 else: 
                     env['person'] = None
                 return render_to_response(self.template,env, context_instance=RequestContext(request))
@@ -66,7 +68,6 @@ class HomeView (FreeAccessView, ThemeView):
         # otherwise
         else:
             env['state'] = "Your username and/or password were incorrect."
-            env['layout_1_or_2']="layout-unfold2.html"
             
             return render_to_response(self.template, env, context_instance=RequestContext(request))
 
@@ -79,14 +80,13 @@ class HomeView (FreeAccessView, ThemeView):
             env['person'] = None
     
         env['theme'] = self.theme
-    
+        env['section'] = "Dashboard"
 
         env['username']=the_user(request)
         env['topmenu_items'] = topmenu_items(None, request)
         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
-        env['layout_1_or_2']="layout-unfold2.html" if not env['username'] else "layout-unfold1.html"
         
         
         return render_to_response(self.template, env, context_instance=RequestContext(request))