layout and style changes

[unfold.git] / portal / homeview.py

diff --git a/portal/homeview.py b/portal/homeview.py
index 5704164..14487c9 100644 (file)
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -8,7 +8,7 @@ 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
 
@@ -43,7 +43,7 @@ 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
         elif auth_result is not None:
@@ -51,18 +51,24 @@ class HomeView (FreeAccessView, ThemeView):
             if user.is_active:
                 print "LOGGING IN"
                 login(request, user)
-                return HttpResponseRedirect ('/login-ok')
+                
+                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))
             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(self.template,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(self.template, 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()
 
@@ -79,7 +85,6 @@ class HomeView (FreeAccessView, ThemeView):
         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))