From e7ad415233ba1eba42c050782351670ff4d6cded Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Mon, 8 Apr 2013 18:40:32 +0200 Subject: [PATCH] bug #1824: Show correct types in files tab --- src/sunstone/public/js/plugins/files-tab.js | 133 +++---------------- src/sunstone/public/js/plugins/images-tab.js | 6 - 2 files changed, 21 insertions(+), 118 deletions(-) diff --git a/src/sunstone/public/js/plugins/files-tab.js b/src/sunstone/public/js/plugins/files-tab.js index d8042f1a6c..251e29315e 100644 --- a/src/sunstone/public/js/plugins/files-tab.js +++ b/src/sunstone/public/js/plugins/files-tab.js @@ -530,7 +530,7 @@ function updateFileInfo(request,img){ '+tr("Name")+'\ '+img_info.NAME+'\
\ - \ + \
\ \ \ @@ -542,8 +542,8 @@ function updateFileInfo(request,img){ \ '+tr("Type")+'\ '+OpenNebula.Helper.image_type(img_info.TYPE)+'\ -
\ - \ +
\ + \
\ \ \ @@ -555,7 +555,7 @@ function updateFileInfo(request,img){ \ '+tr("Persistent")+'\ '+(parseInt(img_info.PERSISTENT) ? tr("yes") : tr("no"))+'\ -
\ +
\ \
\ \ @@ -597,22 +597,22 @@ function updateFileInfo(request,img){
' } - $("#div_edit_rename_link").die(); - $(".input_edit_value_rename").die(); - $("#div_edit_chg_type_link").die(); - $("#chg_type_select").die(); - $("#div_edit_persistency").die(); - $("#persistency_select").die(); + $("#div_edit_rename_link_files").die(); + $(".input_edit_value_rename_files").die(); + $("#div_edit_chg_type_files_link").die(); + $("#chg_type_select_files").die(); + $("#div_edit_persistency_files").die(); + $("#persistency_select_files").die(); // Listener for edit link for rename - $("#div_edit_rename_link").live("click", function() { + $("#div_edit_rename_link_files").live("click", function() { var value_str = $(".value_td_rename").text(); - $(".value_td_rename").html(''); + $(".value_td_rename").html(''); }); - $(".input_edit_value_rename").live("change", function() { - var value_str = $(".input_edit_value_rename").val(); + $(".input_edit_value_rename_files").live("change", function() { + var value_str = $(".input_edit_value_rename_files").val(); if(value_str!="") { // Let OpenNebula know @@ -622,10 +622,10 @@ function updateFileInfo(request,img){ }); // Listener for edit link for type change - $("#div_edit_chg_type_link").live("click", function() { + $("#div_edit_chg_type_files_link").live("click", function() { var value_str = $(".value_td_type").text(); $(".value_td_type").html( - '\ \ \ \ @@ -633,24 +633,24 @@ function updateFileInfo(request,img){ $('option[value="'+value_str+'"]').replaceWith(''); }); - $("#chg_type_select").live("change", function() { + $("#chg_type_select_files").live("change", function() { var new_value=$("option:selected", this).text(); Sunstone.runAction("File.chtype", img_info.ID, new_value); Sunstone.runAction("File.showinfo", img_info.ID); }); // Listener for edit link for persistency change - $("#div_edit_persistency").live("click", function() { + $("#div_edit_persistency_files").live("click", function() { var value_str = $(".value_td_persistency").text(); $(".value_td_persistency").html( - '\ \ \ '); $('option[value="'+value_str+'"]').replaceWith(''); }); - $("#persistency_select").live("change", function() { + $("#persistency_select_files").live("change", function() { var new_value=$("option:selected", this).text(); if (new_value=="yes") @@ -952,97 +952,6 @@ function is_persistent_file(id){ return $(data).is(':checked'); }; -function setupFileCloneDialog(){ - //Append to DOM - dialogs_context.append('
'); - var dialog = $('#file_clone_dialog',dialogs_context); - - //Put HTML in place - - var html = '
\ -

\ - '+tr("Clone File")+'\ -

\ -
\ -
\ -
\ -
\ -
'+tr("Several file are selected, please choose prefix to name the new copies")+':
\ -
\ -
\ -
\ -
\ - \ - \ -
\ -
\ - \ -
\ -
\ -
\ -
\ - \ - \ -
\ -×\ -
\ -'; - - dialog.html(html); - - //Convert into jQuery - //dialog.dialog({ - // autoOpen:false, - // width:375, - // modal:true, - // resizable:false - //}); - dialog.addClass("reveal-modal"); - - //$('button',dialog).button(); - - $('form',dialog).submit(function(){ - var name = $('input', this).val(); - var sel_elems = fileElements(); - if (!name || !sel_elems.length) - notifyError('A name or prefix is needed!'); - if (sel_elems.length > 1){ - for (var i=0; i< sel_elems.length; i++) - //If we are cloning several files we - //use the name as prefix - Sunstone.runAction('Image.clone', - sel_elems[i], - name+getFileName(sel_elems[i])); - } else { - Sunstone.runAction('Image.clone',sel_elems[0],name) - }; - dialog.trigger("reveal:close") - setTimeout(function(){ - Sunstone.runAction('Image.refresh'); - }, 1500); - return false; - }); -} - -function popUpFileCloneDialog(){ - var dialog = $('#file_clone_dialog'); - var sel_elems = fileElements(); - //show different text depending on how many elements are selected - if (sel_elems.length > 1){ - $('.clone_one',dialog).hide(); - $('.clone_several',dialog).show(); - $('input',dialog).val('Copy of '); - } - else { - $('.clone_one',dialog).show(); - $('.clone_several',dialog).hide(); - $('input',dialog).val('Copy of '+getFileName(sel_elems[0])); - }; - - $(dialog).reveal(); -} //The DOM is ready at this point $(document).ready(function(){ @@ -1082,7 +991,7 @@ $(document).ready(function(){ initCheckAllBoxes(dataTable_files); tableCheckboxesListener(dataTable_files); - infoListener(dataTable_files,'Image.showinfo'); + infoListener(dataTable_files,'File.showinfo'); $('div#files_tab div.legend_div').hide(); }); diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index c370ee252e..94e1cc020b 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -121,9 +121,6 @@ var create_image_tmpl = \ \ \ - \ - \ - \ \
\
\ @@ -768,9 +765,6 @@ function updateImageInfo(request,img){ \ \ \ - \ - \ - \ '); $('option[value="'+value_str+'"]').replaceWith(''); });