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

diff --combined portal/static/js/myslice-ui.js
index 2990f05,0003057..2ee57ea
--- 1/portal/static/js/myslice-ui.js
--- 2/portal/static/js/myslice-ui.js
+++ b/portal/static/js/myslice-ui.js
@@@ -8,34 -8,10 +8,34 @@@ $(document).ready(function() 
        
        
        /* Testbeds list */
 -      $("div#testbed-list").ready(function() {
 -              $("table#testbedList").load("/table/network/", { "fields" : ["network_hrn","description"], "options": ["checkbox"] }, function() {
 -                      
 +      $.post("/rest/network/", { "fields" : ["network_hrn", "network_longname", "description"]}, function(data) {
 +              var testbed_data = [];
 +              var testbed_row = "<thead>";
 +              testbed_row += "<tr>";
 +              testbed_row += "<th id=testbed_check><input type=\"checkbox\" name=\"network_hrn\" value=\"all\"/></th>";
 +              testbed_row += "<th id=testbed_icon></th>";
 +              testbed_row += "<th>network_hrn</th>";
 +              testbed_row += "<th>Full name</th>";
 +              testbed_row += "<th>Description</th>";
 +              testbed_row += "</tr>";
 +              testbed_row += "</thead>";
 +              testbed_data.push(testbed_row);
 +              $.each( data, function(key, val) {
 +                      testbed_row = "<tr data-keys=\""+val.network_hrn+"\">"
 +                      testbed_row += "<td><input type=\"checkbox\" name=\"network_hrn\" value=\""+val.network_hrn+"\"/></td>";
 +                      testbed_row += "<td><img src='/static/img/testbeds/"+val.network_hrn+".png' alt='' /></td>";
 +                      testbed_row += "<td>"+val.network_hrn+"</td>";
 +                      testbed_row += "<td>"+val.network_longname+"</td>";
 +                      testbed_row += "<td>"+val.description+"</td>";
 +                      testbed_row += "</thead>";
 +
 +                      testbed_data.push(testbed_row);
                });
 +      $("table#testbedList").html(testbed_data.join(''));
 +      $("div#testbed-list-loaded").css("display","block");
 +      $("div#testbed-list-loading").css("display","none");
 +
 +                      
        });
        
        $("#objectList").load("/table/resource/", {"fields" : ["hostname","hrn","country","type"], "options": ["checkbox"] }, function(data) {
@@@ -53,7 -29,9 +53,9 @@@
                "bAutoHeight": false,
                "fnInitComplete": function(oSettings, json) {
                                for(var i = 0; i < myslice.pending.length; i++) {
-                                       $('*[data-key="'+myslice.pending[i]+'"]').addClass("active");
+                                       var el = $('*[data-key="'+myslice.pending[i]+'"]');
+                                       el.addClass("active");
+                                       el.find('input[type=checkbox]').prop('checked', true);
                                }
                    }
                } );