slice page: info about the slice - description, number of users, number of resources...

diff --git a/devel/server-loop.sh b/devel/server-loop.sh
index 49d433e..c77258f 100755 (executable)
--- a/devel/server-loop.sh
+++ b/devel/server-loop.sh
@@ -3,8 +3,8 @@ DIRNAME=$(dirname $0)
 cd $DIRNAME/..
 
 # default port : if hostname starts with z -> use 8080 ; otherwise take 80
-hostname | grep -q '^z' && port=8080 || port=8080
-#hostname | grep -q '^z' && port=8080 || port=80
+#hostname | grep -q '^z' && port=8080 || port=8080
+hostname | grep -q '^z' && port=8080 || port=80
 [[ -n "$@" ]] && port=$1
 
 while true; do 

diff --git a/portal/templates/onelab/onelab_slice-view.html b/portal/templates/onelab/onelab_slice-view.html
index 85ae5a8..90c9ca2 100644 (file)
--- a/portal/templates/onelab/onelab_slice-view.html
+++ b/portal/templates/onelab/onelab_slice-view.html
@@ -13,37 +13,51 @@
        <div class="col-md-10">
         <br>
         <br>
-        <table>
-            <tr>
-                <td><b>Description:</b></td>
-                <td>this slice is dedicated to debug the myslice software...</td>
-            </tr>
-            <tr>
-                <td><b>url:</b></td>
-                <td><a href="http://myslice.info" target="_blank">http://myslice.info</a></td>
-            </tr>
-            <tr>
-                <td><b>users:</b></td>
-                <td>3</td>
-            </tr>
-            <tr>
-                <td><b>resources:</b></td>
-                <td>8</td>
-            </tr>
-            <tr>
-                <td><b>created:</b></td>
-                <td>2012-06-21 10:00</td>
-            </tr>
-            <tr>
-                <td><b>last update:</b></td>
-                <td>2014-02-25 14:00</td>
-            </tr>
-            <tr>
-                <td><b>expires:</b></td>
-                <td>2014-04-01 12:00</td>
-            </tr>
-        </table>
+        <div id="slice-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
+        <div id="slice-tab-loaded" style="display:none;">
+            <table id="slice-tab">
+            </table>
+        </div>
        </div>
     
 </div>
+<script>
+    $(document).ready(function() {
+        $.post("/rest/slice/",{'filters':{'slice_hrn':'{{slice}}'}}, function( data ) {
+            var table_slices = [];
+            /* "slice_hrn", "slice_description", "slice_type", "parent_authority", "created", "nodes", "slice_url", "slice_last_updated", "user", "slice_urn", "slice_expires" */
+            $.each( data, function( key, val ) {
+                if(val.nodes=="undefined" || val.nodes==null){
+                    nodes_length=0;
+                }else{
+                    nodes_length=val.nodes.length;
+                }
+
+                if(val.user=="undefined" || val.user==null){
+                    user_length=0;
+                }else{
+                    user_length=val.user.length;
+                }
+
+                if(val.slice_url=="undefined" || val.slice_url==null){
+                    slice_url="";
+                }else{
+                    slice_url="<a href='"+val.slice_url+"' target='_blank'>"+val.slice_url+"</a>";
+                }
+                
+                slice_row = "<tr><td><b>Description:</b></td><td>"+val.slice_description+"</td></tr>";
+                slice_row += "<tr><td><b>url:</b></td><td><a href='"+val.slice_url+" target='_blank'>"+val.slice_url+"</a></td></tr>";
+                slice_row += "<tr><td><b>users:</b></td><td>"+user_length+"</td></tr>";
+                slice_row += "<tr><td><b>resources:</b></td><td>"+nodes_length+"</td></tr>";
+                slice_row += "<tr><td><b>created:</b></td><td>"+val.created+"</td></tr>";
+                slice_row += "<tr><td><b>last update:</b></td><td>"+val.last_updated+"</td></tr>";
+                slice_row += "<tr><td><b>expires:</b></td><td>"+val.slice_expires+"</td></tr>";
+                table_slices.push(slice_row);
+            });
+           $("table#slice-tab").html(table_slices.join( "" ));
+           $("div#slice-tab-loaded").css("display","block");
+           $("div#slice-tab-loading").css("display","none");
+        });
+    });
+</script>
 {% endblock unfold_main %}