From f5921c7d10bfef9596d98a98ef93bb25411a9877 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 22 Feb 2013 18:14:28 +0100 Subject: [PATCH] featur #1664: Fix datatable filter and update image-tab extended info and wizard css --- src/sunstone/public/css/app.css | 10 + src/sunstone/public/js/plugins/acls-tab.js | 2 +- .../public/js/plugins/clusters-tab.js | 2 +- .../public/js/plugins/datastores-tab.js | 3 +- src/sunstone/public/js/plugins/groups-tab.js | 7 +- src/sunstone/public/js/plugins/hosts-tab.js | 2 +- src/sunstone/public/js/plugins/images-tab.js | 356 +++++++++++------- .../public/js/plugins/templates-tab.js | 3 +- src/sunstone/public/js/plugins/users-tab.js | 3 +- src/sunstone/public/js/plugins/vms-tab.js | 3 +- src/sunstone/public/js/plugins/vnets-tab.js | 3 +- src/sunstone/public/js/sunstone-util.js | 4 +- src/sunstone/public/sass/app.scss | 10 + 13 files changed, 253 insertions(+), 155 deletions(-) diff --git a/src/sunstone/public/css/app.css b/src/sunstone/public/css/app.css index 0203b3b35e..9327071f6f 100644 --- a/src/sunstone/public/css/app.css +++ b/src/sunstone/public/css/app.css @@ -6453,3 +6453,13 @@ span.plusIcon { span.plusIcon:hover { color: #555; } + +/* line 488, ../sass/app.scss */ +table.extended_table tbody tr td { + padding: 3px 10px; +} + +/* line 492, ../sass/app.scss */ +.reveal-modal .row { + margin-bottom: 0px; +} diff --git a/src/sunstone/public/js/plugins/acls-tab.js b/src/sunstone/public/js/plugins/acls-tab.js index 508c0776d2..fdf6bf43b4 100644 --- a/src/sunstone/public/js/plugins/acls-tab.js +++ b/src/sunstone/public/js/plugins/acls-tab.js @@ -530,7 +530,7 @@ function popUpCreateAclDialog(){ function setAclAutorefresh(){ setInterval(function(){ var checked = $('input.check_item:checked',dataTable_acls); - var filter = $("#datatable_acls_filter input",dataTable_acls.parents("#datatable_acls_wrapper")).attr('value'); + var filter = $('#acl_search').attr('value'); if (!checked.length && !filter.length){ Sunstone.runAction("Acl.autorefresh"); } diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js index 3a4909b40a..4412ebfa63 100644 --- a/src/sunstone/public/js/plugins/clusters-tab.js +++ b/src/sunstone/public/js/plugins/clusters-tab.js @@ -1808,7 +1808,7 @@ function setClusterAutorefresh() { var inSubMenu = selected_menu.attr('id').indexOf('cluster') > 0; var checked = $('input.check_item:checked',dataTable_clusters); - var filter = $("#datatable_clusters_filter input",dataTable_clusters.parents('#datatable_clusters_wrapper')).attr('value'); + var filter = $("#cluster_search").attr('value'); if (!checked.length && !filter.length && !inSubMenu){ Sunstone.runAction("Cluster.autorefresh"); } diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index 87884028f3..f69175abfd 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -873,8 +873,7 @@ function popUpCreateDatastoreDialog(){ function setDatastoreAutorefresh(){ setInterval(function(){ var checked = $('input.check_item:checked',dataTable_datastores); - var filter = $("#datatable_datastores_filter input", - dataTable_datastores.parents('#datatable_datastores_wrapper')).attr('value'); + var filter = $("#datastore_search").attr('value'); if (!checked.length && !filter.length){ Sunstone.runAction("Datastore.autorefresh"); }; diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index 551a38a586..9b3202602b 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -52,7 +52,7 @@ var groups_tab_content = '\ \ \
\ - \ + \
\
\
\ @@ -625,7 +625,7 @@ function popUpGroupQuotasDialog(){ function setGroupAutorefresh(){ setInterval(function(){ var checked = $('input.check_item:checked',dataTable_groups); - var filter = $("#datatable_groups_filter input",dataTable_groups.parents("#datatable_groups_wrapper")).attr('value'); + var filter = $("#group_search").attr('value'); if (!checked.length && !filter.length){ Sunstone.runAction("Group.autorefresh"); } @@ -649,6 +649,9 @@ $(document).ready(function(){ //addElement([ // spinner, // '','','','','',''],dataTable_groups); + $('#group_search').keyup(function(){ + dataTable_groups.fnFilter( $(this).val() ); + }) Sunstone.runAction("Group.list"); setupCreateGroupDialog(); diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index d8aa190df0..67f742df5e 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -865,7 +865,7 @@ function popUpCreateHostDialog(){ function setHostAutorefresh() { setInterval(function(){ var checked = $('input.check_item:checked',dataTable_hosts); - var filter = $("#datatable_hosts_filter input",dataTable_hosts.parents('#datatable_hosts_wrapper')).attr('value'); + var filter = $("#hosts_search").attr('value'); if (!checked.length && !filter.length){ Sunstone.runAction("Host.autorefresh"); } diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index 4c62e03474..6b878211ba 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -68,142 +68,221 @@ var images_tab_content = '\ var create_image_tmpl = '
\
\ -
'+tr("Wizard")+'
\ +
'+tr("Wizard")+'
\
'+tr("Advanced mode")+'
\
\
\ + \ +
\ +
\ + \ + \ +
\ \ \
  • \ -
    \ -
    \ + \

    '+tr("Write the image template here")+'

    \ \ \ \ -
    \ -
    \
    \ - \ - \ + \ + \
    \ -
    \
    \
  • \ \ @@ -552,7 +631,7 @@ function updateImageInfo(request,img){ content: '
    \
    \ - \ +
    \ \ \ @@ -607,7 +686,7 @@ function updateImageInfo(request,img){ \ \ \ - \ + \ \ \ \ @@ -617,27 +696,23 @@ function updateImageInfo(request,img){ \ \ \ - \ + \ \ \ \
    '+tr("Image")+' "'+img_info.NAME+'" '+ tr("information")+'
    '+tr("Size (Mb)")+''+tr("Size (MB)")+''+img_info.SIZE+'
    '+tr("Running #VMS")+''+tr("Running VMS")+''+img_info.RUNNING_VMS+'
    \
    \ -
    \ -
    ' +
    ' + insert_permissions_table("Image", img_info.ID, img_info.UNAME, img_info.GNAME, img_info.UID, img_info.GID) + - '
    \ -
    ' - + insert_extended_template_table(img_info.TEMPLATE, + insert_extended_template_table(img_info.TEMPLATE, "Image", img_info.ID) + - '
    \ -
    \ + '
    \
    ' } @@ -738,7 +813,14 @@ function setupCreateImageDialog(){ // width: 520, // height: height //}); - dialog.addClass("reveal-modal"); + dialog.addClass("reveal-modal xlarge"); + + $('.advanced',dialog).hide(); + + $('#advanced_image_create',dialog).click(function(){ + $('.advanced',dialog).toggle(); + return false; + }); //$('#img_tabs',dialog).tabs(); //$('button',dialog).button(); @@ -755,29 +837,28 @@ function setupCreateImageDialog(){ break; default: $('#datablock_img',context).attr('disabled','disabled'); - $('#path_img',context).attr('checked','checked'); - $('#img_fstype,#img_size,#file-uploader',context).parent().hide(); - $('#img_path',context).parent().show(); + $('#path_img',context).click(); + } }); - $('#img_path,#img_fstype,#img_size,#file-uploader',dialog).parent().hide(); + $('#img_path,#img_fstype,#img_size,#file-uploader',dialog).closest('.row').hide(); $('#src_path_select input').click(function(){ var context = $create_image_dialog; var value = $(this).val(); switch (value){ case "path": - $('#img_fstype,#img_size,#file-uploader',context).parent().hide(); - $('#img_path',context).parent().show(); + $('#img_fstype,#img_size,#file-uploader',context).closest('.row').hide(); + $('#img_path',context).closest('.row').show(); break; case "datablock": - $('#img_path,#file-uploader',context).parent().hide(); - $('#img_fstype,#img_size',context).parent().show(); + $('#img_path,#file-uploader',context).closest('.row').hide(); + $('#img_fstype,#img_size',context).closest('.row').show(); break; case "upload": - $('#img_path,#img_fstype,#img_size',context).parent().hide(); - $('#file-uploader',context).parent().show(); + $('#img_path,#img_fstype,#img_size',context).closest('.row').hide(); + $('#file-uploader',context).closest('.row').show(); break; }; }); @@ -858,11 +939,11 @@ function setupCreateImageDialog(){ '
    '+ '').addClass("reveal-modal"); - $('#upload-progress',pb_dialog).progressbar({value:0}); + //$('#upload-progress',pb_dialog).progressbar({value:0}); }, onProgress: function(id, fileName, loaded, total){ //update upload dialog with current progress - $('div#pb_dialog #upload-progress').progressbar("option","value",Math.floor(loaded*100/total)); + //$('div#pb_dialog #upload-progress').progressbar("option","value",Math.floor(loaded*100/total)); }, onComplete: function(id, fileName, responseJSON){ //Inform complete upload, destroy upload dialog, refresh img list @@ -1044,8 +1125,7 @@ function popUpCreateImageDialog(){ function setImageAutorefresh() { setInterval(function(){ var checked = $('input.check_item:checked',dataTable_images); - var filter = $("#datatable_images_filter input", - dataTable_images.parents("#datatable_images_wrapper")).attr('value'); + var filter = $("#image_search").attr('value'); if (!checked.length && !filter.length){ Sunstone.runAction("Image.autorefresh"); } diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 4b6318ca79..fd1bdab62e 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -3823,8 +3823,7 @@ function popUpTemplateCloneDialog(){ function setTemplateAutorefresh() { setInterval(function(){ var checked = $('input.check_item:checked',dataTable_templates); - var filter = $("#datatable_templates_filter input", - dataTable_templates.parents('#datatable_templates_wrapper')).attr('value'); + var filter = $("#template_search").attr('value'); if (!checked.length && !filter.length){ Sunstone.runAction("Template.autorefresh"); } diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js index 7b146b376f..2bbe46cae2 100644 --- a/src/sunstone/public/js/plugins/users-tab.js +++ b/src/sunstone/public/js/plugins/users-tab.js @@ -896,8 +896,7 @@ function popUpUpdatePasswordDialog(){ function setUserAutorefresh(){ setInterval(function(){ var checked = $('input.check_item:checked',dataTable_users); - var filter = $("#datatable_users_filter input", - dataTable_users.parents("#datatable_users_wrapper")).attr('value'); + var filter = $("#user_search").attr('value'); if (!checked.length && !filter.length){ Sunstone.runAction("User.autorefresh"); } diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 667efe87f4..233e85d3c2 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -1394,8 +1394,7 @@ function popUpCreateVMDialog(){ function setVMAutorefresh(){ setInterval(function(){ var checked = $('input.check_item:checked',dataTable_vMachines); - var filter = $("#datatable_vmachines_filter input", - dataTable_vMachines.parents('#datatable_vmachines_wrapper')).attr('value'); + var filter = $("#vms_search").attr('value'); if (!checked.length && !filter.length){ Sunstone.runAction("VM.autorefresh"); }; diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index 0d059c5865..f1388fe46d 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -1101,8 +1101,7 @@ function setupLeasesOps(){ function setVNetAutorefresh() { setInterval(function(){ var checked = $('input.check_item:checked',dataTable_vNetworks); - var filter = $("#datatable_vnetworks_filter input", - dataTable_vNetworks.parents("#datatable_vnetworks_wrapper")).attr('value'); + var filter = $("#vnet_search").attr('value'); if (!checked.length && !filter.length){ Sunstone.runAction("Network.autorefresh"); } diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js index 8c76b6afc4..7e69c39d33 100644 --- a/src/sunstone/public/js/sunstone-util.js +++ b/src/sunstone/public/js/sunstone-util.js @@ -1327,7 +1327,7 @@ function convert_template_to_string(template_json,unshown_values) // Create the extended template table (with listeners) function insert_extended_template_table(template_json,resource_type,resource_id,unshown_values) { - var str = '\ + var str = '
    \ \ \
    ' + @@ -1780,7 +1780,7 @@ function buildOctet(permTable){ // Returns HTML with listeners to control permissions function insert_permissions_table(resource_type,resource_id, owner, group, vm_uid, vm_gid){ - var str ='\ + var str ='
    \ \ \ \ diff --git a/src/sunstone/public/sass/app.scss b/src/sunstone/public/sass/app.scss index 1f07040d4c..84f40b4aca 100644 --- a/src/sunstone/public/sass/app.scss +++ b/src/sunstone/public/sass/app.scss @@ -482,3 +482,13 @@ span.plusIcon:hover { color: #555; } + + + +table.extended_table tbody tr td { + padding: 3px 10px; +} + +.reveal-modal .row { + margin-bottom: 0px; +} \ No newline at end of file
    '+tr("Permissions")+':'+tr("Use")+'