X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=a48b846fd8c863dd513ecbd2b4808a2c044c4d0d;hb=3d16aa36af64e8e0e5ce3a48c34df158fbfaae29;hp=0e56cce75c3317d345440ee6b341d6acf553bc79;hpb=2870580fcaad4c3f1a2b9fa75499dcd4f7297449;p=myslice.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 0e56cce7..a48b846f 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -29,7 +29,9 @@ from plugins.quickfilter             import QuickFilter
 from plugins.messages                import Messages
 from plugins.slicestat               import SliceStat
 
-from myslice.config                  import Config
+from myslice.configengine            import ConfigEngine
+
+from theme import ThemeView
 
 tmp_default_slice='ple.upmc.myslicedemo'
 
@@ -46,7 +48,7 @@ insert_grid=False
 insert_messages=False
 #insert_messages=True
 
-class SliceView (LoginRequiredAutoLogoutView):
+class SliceView (LoginRequiredAutoLogoutView, ThemeView):
 
     def get (self,request, slicename=tmp_default_slice):
     
@@ -56,8 +58,7 @@ class SliceView (LoginRequiredAutoLogoutView):
         page.add_js_chunks ('$(function() { messages.debug("sliceview: jQuery version " + $.fn.jquery); });')
         page.add_js_chunks ('$(function() { messages.debug("sliceview: users turned %s"); });'%("on" if do_query_users else "off"))
         page.add_js_chunks ('$(function() { messages.debug("sliceview: leases turned %s"); });'%("on" if do_query_leases else "off"))
-        config=Config()
-        page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(config.manifold_url()))
+        page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(ConfigEngine().manifold_url()))
 
         metadata = page.get_metadata()
         resource_md = metadata.details_by_object('resource')
@@ -199,7 +200,7 @@ class SliceView (LoginRequiredAutoLogoutView):
             query      = sq_resource,
             query_all  = query_resource_all,
             # this key is the one issued by google
-            googlemap_api_key = Config().googlemap_api_key(),
+            googlemap_api_key = ConfigEngine().googlemap_api_key(),
             # the key to use at init-time
             init_key   = main_query_init_key,
             checkboxes = True,
@@ -428,7 +429,9 @@ class SliceView (LoginRequiredAutoLogoutView):
         template_env [ 'topmenu_items' ] = topmenu_items_live('Slice', page) 
         # so we can sho who is logged
         template_env [ 'username' ] = the_user (request) 
-    
+        
+        template_env ['theme'] = self.theme
+        
         # don't forget to run the requests
         page.expose_js_metadata()
         # the prelude object in page contains a summary of the requirements() for all plugins