diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index 332971326a..e42254b685 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -28,6 +28,7 @@ var images_tab_content = Owner\ Group\ Name\ + Size\ Type\ Registration time\ Public\ @@ -508,6 +509,7 @@ function imageElementArray(image_json){ image.UNAME, image.GNAME, image.NAME, + image.SIZE, '', pretty_time(image.REGTIME), parseInt(image.PUBLIC) ? '' @@ -628,12 +630,28 @@ function updateImageInfo(request,img){ \ \ Source\ - '+img_info.SOURCE+'\ + '+(typeof img_info.SOURCE === "string" ? img_info.SOURCE : "--")+'\ + \ + \ + Path\ + '+(typeof img_info.PATH === "string" ? img_info.PATH : "--")+'\ + \ + \ + Filesystem type\ + '+(typeof img_info.FSTYPE === "string" ? img_info.FSTYPE : "--")+'\ + \ + \ + Size (Mb)\ + '+img_info.SIZE+'\ \ \ State\ '+OpenNebula.Helper.resource_state("image",img_info.STATE)+'\ \ + \ + Running #VMS\ + '+img_info.RUNNING_VMS+'\ + \ ' } @@ -1028,17 +1046,17 @@ $(document).ready(function(){ "sPaginationType": "full_numbers", "aoColumnDefs": [ { "bSortable": false, "aTargets": ["check"] }, - { "sWidth": "60px", "aTargets": [0,2,3,7,8,9] }, - { "sWidth": "35px", "aTargets": [1,10] }, - { "sWidth": "100px", "aTargets": [5,9] }, - { "sWidth": "150px", "aTargets": [6] } + { "sWidth": "60px", "aTargets": [0,2,3,8,9,10] }, + { "sWidth": "35px", "aTargets": [1,5,11] }, + { "sWidth": "100px", "aTargets": [6] }, + { "sWidth": "150px", "aTargets": [7] } ] }); dataTable_images.fnClearTable(); addElement([ spinner, - '','','','','','','','','',''],dataTable_images); + '','','','','','','','','','',''],dataTable_images); Sunstone.runAction("Image.list"); setupCreateImageDialog(); diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index 208e4ce200..8523a961f5 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -526,6 +526,10 @@ function updateVNetworkInfo(request,vn){ Public\ '+(parseInt(vn_info.PUBLIC) ? "yes" : "no" )+'\ \ + \ + Physical device\ + '+(vn_info.PHYDEV ? vn_info.PHYDEV : "--" )+'\ + \ \ \ \