From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 12 Mar 2014 15:50:15 +0000 (+0100)
Subject: GoogleMap : refresh triggered by show
X-Git-Tag: myslice-1.1~200^2~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1053f701968bcab8050a4758ad3c0e3818764bd6;p=unfold.git

GoogleMap : refresh triggered by show
---

diff --git a/plugins/googlemap/static/js/googlemap.js b/plugins/googlemap/static/js/googlemap.js
index 9cde18ce..6db222d4 100644
--- a/plugins/googlemap/static/js/googlemap.js
+++ b/plugins/googlemap/static/js/googlemap.js
@@ -76,7 +76,7 @@
         /* PLUGIN EVENTS */
 
         on_show: function(e) {
-	    if (debug) messages.debug("googlemap.on_show");
+	        if (debug) messages.debug("googlemap.on_show");
             var googlemap = e.data;
             google.maps.event.trigger(googlemap.map, 'resize');
         }, 
diff --git a/portal/templates/onelab/onelab_slice-resource-view.html b/portal/templates/onelab/onelab_slice-resource-view.html
index e9bee5cf..8206fdfb 100644
--- a/portal/templates/onelab/onelab_slice-resource-view.html
+++ b/portal/templates/onelab/onelab_slice-resource-view.html
@@ -48,7 +48,7 @@
 		<div class="row">
 			<ul class="nav nav-tabs nav-resources">
 			  <li class="active"><a data-panel="resources" href="#">Resources</a></li>
-			  <li><a data-panel="map" href="#">Map</a></li>
+			  <li id="GoogleMap"><a data-panel="map" href="#">Map</a></li>
 			  <li><a data-panel="pending" href="#">Pending</a></li>
 			  <li><a href="#"></a></li>
 			</ul>
@@ -56,7 +56,6 @@
 		<div class="row" style="height:100%;">
 			<div id="resources" class="panel">
                 {{list_resources}}
-				<table cellpadding="0" cellspacing="0" border="0" class="table" id="objectList"></table>
 			</div>
 			<div id="map" class="panel" style="height:370px;display:none;">
                 {{map_resources}}