X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fdashboardview.py;h=3910726c81afc693bffc387803dce15fab020a7f;hb=a7337c66c2c7c3312c4205a8119252f04a1fbd58;hp=2f04a40a6fde093718cb6a513f5f0def3e80dfad;hpb=558ebc92df5b77d9ca546de531a36efb90ae1569;p=myslice.git

diff --git a/portal/dashboardview.py b/portal/dashboardview.py
index 2f04a40a..3910726c 100644
--- a/portal/dashboardview.py
+++ b/portal/dashboardview.py
@@ -11,8 +11,10 @@ from unfold.loginrequired        import LoginRequiredAutoLogoutView
 
 from ui.topmenu                  import topmenu_items_live, the_user
 
+from theme import ThemeView
+
 #This view requires login 
-class DashboardView (LoginRequiredAutoLogoutView):
+class DashboardView (LoginRequiredAutoLogoutView, ThemeView):
 
     template_name = "dashboard.html"
     
@@ -27,7 +29,7 @@ class DashboardView (LoginRequiredAutoLogoutView):
         print "Dashboard page"
         # Slow...
         #slice_query = Query().get('slice').filter_by('user.user_hrn', 'contains', user_hrn).select('slice_hrn')
-        testbed_query  = Query().get('network').select('network_hrn','platform')
+        testbed_query  = Query().get('network').select('network_hrn','platform','version')
         # DEMO GEC18 Query only PLE
 #        user_query  = Query().get('local:user').select('config','email')
 #        user_details = execute_query(self.request, user_query)
@@ -46,13 +48,14 @@ class DashboardView (LoginRequiredAutoLogoutView):
 #            root_authority = sub_authority[0]
 #            slice_query = Query().get(root_authority+':user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
 #        else:
-        slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
+        slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('slice.slice_hrn')
         page.enqueue_query(slice_query)
         page.enqueue_query(testbed_query)
 
         slicelist = SliceList(
             page  = page,
             title = "slices",
+            warning_msg = "<a href='../slice_request'>Request Slice</a>",
             query = slice_query,
         )
         testbedlist = TestbedList(
@@ -74,6 +77,8 @@ class DashboardView (LoginRequiredAutoLogoutView):
         # so we can sho who is logged
         context['username'] = the_user(self.request) 
 
+        context['theme'] = self.theme
+        
         page.expose_js_metadata()
 
         # the page header and other stuff