AiC and REST login

[myslice.git] / portal / supportview.py

diff --git a/portal/supportview.py b/portal/supportview.py
index c16c89f..23bcf76 100644 (file)
--- a/portal/supportview.py
+++ b/portal/supportview.py
@@ -5,31 +5,29 @@ from django.contrib.auth import authenticate, login, logout
 from django.template import RequestContext
 from django.shortcuts import render_to_response
 from django.shortcuts import render
-
+import json
 from unfold.loginrequired import FreeAccessView
 
-from manifold.manifoldresult import ManifoldResult
+from manifoldapi.manifoldresult import ManifoldResult
+from manifold.core.query                import Query
+from manifoldapi.manifoldapi            import execute_query
 from ui.topmenu import topmenu_items, the_user
 from myslice.configengine import ConfigEngine
 
-from theme import ThemeView
+from myslice.theme import ThemeView
 
 class SupportView (FreeAccessView, ThemeView):
     template_name = 'supportview.html'
         
-    # expose this so we can mention the backend URL on the welcome page
-    def default_env (self):
-        return { 
-                 'MANIFOLD_URL':ConfigEngine().manifold_url(),
-                 }
+    
 
     def post (self,request):
-        env = self.default_env()
+        env = {}
         env['theme'] = self.theme
         return render_to_response(self.template, env, context_instance=RequestContext(request))
 
     def get (self, request, state=None):
-        env = self.default_env()
+        env = {}
 
         if request.user.is_authenticated(): 
             env['person'] = self.request.user
@@ -37,15 +35,13 @@ class SupportView (FreeAccessView, ThemeView):
             env['person'] = None
     
         env['theme'] = self.theme
-    
+        env['section'] = "Support"
 
         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"
-        
-        
+        env['request'] = request
         return render_to_response(self.template, env, context_instance=RequestContext(request))