From 75749c7c77f3df53e859f3eabba9e6db3c0764e1 Mon Sep 17 00:00:00 2001
From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 20 Jan 2014 18:29:55 +0100
Subject: [PATCH] slicestat plugin show function called on click on tabs

---
 plugins/slicestat/static/js/slicestat.js |  1 +
 plugins/tabs/static/js/tabs.js           |  1 +
 portal/sliceview.py                      | 13 +++++++------
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/plugins/slicestat/static/js/slicestat.js b/plugins/slicestat/static/js/slicestat.js
index a55a7973..22277a54 100644
--- a/plugins/slicestat/static/js/slicestat.js
+++ b/plugins/slicestat/static/js/slicestat.js
@@ -75,6 +75,7 @@
 		
 		on_show: function(ev) 
 		{
+            console.log('slicestat show triggered');
 			$('iframe#' + ev.target.id + '-iframe').attr('src','http://plestats.planet-lab.eu/nodes.php?slice='+ev.data.slicename+'&order='+ev.data.o);
 		},
         /* TEMPLATES */
diff --git a/plugins/tabs/static/js/tabs.js b/plugins/tabs/static/js/tabs.js
index 0452b9f9..8cf9f6a6 100644
--- a/plugins/tabs/static/js/tabs.js
+++ b/plugins/tabs/static/js/tabs.js
@@ -67,6 +67,7 @@
             $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
 		// find the plugin object inside the tab content referenced by the current tabs
 		$('.plugin', $($(e.target).attr('href'))).trigger('shown.bs.tab');
+		$('.plugin', $($(e.target).attr('href'))).trigger('show');
             });
 	},
 
diff --git a/portal/sliceview.py b/portal/sliceview.py
index 5a47c749..0e56cce7 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -361,13 +361,14 @@ class SliceView (LoginRequiredAutoLogoutView):
         )
 
         tab_measurements = Tabs ( page=page,
-                                domid="measurements",
-                                togglable=True,
-                                toggled  = False,
-                                title="Measurements",
+                                domid = "measurements",
+                                togglable = True,
+                                toggled = 'persistent',
+                                title = "Measurements",
                                 outline_complete=True,
-                                sons=[ measurements_stats_cpu, measurements_stats_mem, measurements_stats_asb, measurements_stats_arb ],
-                                active_domid = 'measurements_stats_cpu',
+                                sons = [ measurements_stats_cpu, measurements_stats_mem, measurements_stats_asb, measurements_stats_arb ],
+                                active_domid = 'resources-stats-cpu',
+                                persistent_active = True,
                                 )
         main_stack.insert (tab_measurements)
         
-- 
2.43.0