From: Ciro Scognamiglio Date: Mon, 3 Mar 2014 18:56:38 +0000 (+0100) Subject: selection of resources (pending), localstorage js enabled class X-Git-Tag: myslice-1.1~248 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=d51b8b29076dc24a77385bd5b5f1d74959e6af6d selection of resources (pending), localstorage js enabled class --- diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css index 8147e1c9..300fa933 100644 --- a/portal/static/css/onelab.css +++ b/portal/static/css/onelab.css @@ -387,3 +387,6 @@ a.list-group-item p.list-group-item-text { } .slice-pending button.clear { } +tr.active, tr.active td { + background-color:#FFFFCC !important; +} diff --git a/portal/static/js/myslice-ui.js b/portal/static/js/myslice-ui.js index 9522a94d..7f740d39 100644 --- a/portal/static/js/myslice-ui.js +++ b/portal/static/js/myslice-ui.js @@ -4,7 +4,6 @@ $(document).ready(function() { var platformParameters = {}; - var oTable = $("#objectList"); $.get("/rest/platform", function(data) { var list = '
Testbeds
'; @@ -13,29 +12,17 @@ $(document).ready(function() { } $('#select-platform').html(list); }).done(function() { - // $('a.sl-platfrom').click(function() { - // console.log($(this).data('platform')); - // platformParameters = { "platform" : $(this).data('platform') }; - // $('a.sl-platfrom').removeClass('active'); - // $(this).addClass('active'); -// - // oTable.load("/list/resource", platformParameters, function(data) { - // oTable.fnDraw(); - // }); -// - // $('body').data('filters',platformParameters); - // }); + }); /* Testbeds list */ - $('div#testbed-list').ready(function() { - $('table#testbedList').load("/table/network/",{'fields' : ['platform'], 'options': ['checkbox']}, function() { + $("div#testbed-list").ready(function() { + $("table#testbedList").load("/table/network/", { "fields" : ["platform"], "options": ["checkbox"] }, function() { }); }); - //{'columns' : ['hostname','country','type'], 'filters' : { 'country' : 'France' } } - oTable.load("/table/resource/", {'fields' : ['hostname','hrn','country','type'], 'options': ['checkbox'] }, function(data) { + $("#objectList").load("/table/resource/", {"fields" : ["hostname","hrn","country","type"], "options": ["checkbox"] }, function(data) { $(this).dataTable( { "sScrollY": window.innerHeight - 275, "sDom": "frtiS", @@ -47,14 +34,41 @@ $(document).ready(function() { "bSort": true, "bInfo": false, "bAutoWidth": true, - "bAutoHeight": false + "bAutoHeight": false, + "fnInitComplete": function(oSettings, json) { + for(var i = 0; i < myslice.pending.length; i++) { + $('*[data-key="'+myslice.pending[i]+'"]').addClass("active"); + } + } } ); + + + $("input[type=checkbox]").live('click',function() { + var cnt = 0; + var id = $(this).val(); + var row = $(this).parent().parent() + if (row.hasClass("active")) { + row.removeClass("active"); + myslice.del(id); + cnt = myslice.count(); + $('#badge-pending').text(cnt); + if (cnt <= 0) { + $('#badge-pending').hide(); + } + } else { + row.addClass("active"); + myslice.add(id); + cnt = myslice.count(); + $('#badge-pending').text(cnt); + if (cnt > 0) { + $('#badge-pending').show(); + } + } + }); }); -} ); - -function drawTable(data) { -} + +}); //http://stackoverflow.com/questions/5100539/django-csrf-check-failing-with-an-ajax-post-request //make sure to expose csrf in our outcoming ajax/post requests diff --git a/portal/templates/onelab/onelab_slice-resource-view.html b/portal/templates/onelab/onelab_slice-resource-view.html index a2971d18..2483b050 100644 --- a/portal/templates/onelab/onelab_slice-resource-view.html +++ b/portal/templates/onelab/onelab_slice-resource-view.html @@ -26,7 +26,7 @@