Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

diff --git a/plugins/googlemap/static/js/googlemap.js b/plugins/googlemap/static/js/googlemap.js
index 9cde18c..6db222d 100644 (file)
--- 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/plugins/querytable/templates/querytable.html b/plugins/querytable/templates/querytable.html
index 902c55c..bc9cc03 100644 (file)
--- a/plugins/querytable/templates/querytable.html
+++ b/plugins/querytable/templates/querytable.html
@@ -1,5 +1,5 @@
 <div id='main-{{ domid }}' class='querytable-spacer'>
-  <table class='table table-striped table-bordered dataTable' id='{{domid}}__table'>
+  <table class='table table-striped table-bordered dataTable' id='{{domid}}__table' width='100%'>
     <thead>
       <tr>
         {% for column in columns %} <th>{{ column }}</th> {% endfor %} 

diff --git a/portal/static/js/myslice.js b/portal/static/js/myslice.js
index fa115be..7038e53 100644 (file)
--- a/portal/static/js/myslice.js
+++ b/portal/static/js/myslice.js
@@ -216,5 +216,5 @@ $(document).ready(function() {
 /* EXEMPLES */
 // add a resource to pending
 
-myslice.user.slice('ple.upmc.myslicedemo').resources.pending.add(resource);
+//myslice.user.slice('ple.upmc.myslicedemo').resources.pending.add(resource);
 

diff --git a/portal/static/js/onelab_slice-resource-view.js b/portal/static/js/onelab_slice-resource-view.js
index 45b8395..a418093 100644 (file)
--- a/portal/static/js/onelab_slice-resource-view.js
+++ b/portal/static/js/onelab_slice-resource-view.js
@@ -1,4 +1,8 @@
 $(document).ready(function() {
+    $('li#GoogleMap').click(function (e) {
+        $('.'+this.id).trigger('show');
+    });
+
        $('ul.nav-resources a').click(function() {
         $('ul.nav-resources li').removeClass('active');
         $(this).parent().addClass('active');

diff --git a/portal/templates/onelab/onelab_slice-resource-view.html b/portal/templates/onelab/onelab_slice-resource-view.html
index e9bee5c..8206fdf 100644 (file)
--- 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}}