diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 3998b885a5..a9bcf61d8b 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -92,20 +92,14 @@ var create_template_tmpl = '
'+ ''+ '
'+ capacity_tab + '
'+ - '
'+ - '

Mauris eleifend est et turpis. Duis id erat. Suspendisse potenti. Aliquam vulputate, pede vel vehicula accumsan, mi neque rutrum erat, eu congue orci lorem eget lorem. Vestibulum non ante. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Fusce sodales. Quisque eu urna vel enim commodo pellentesque. Praesent eu risus hendrerit ligula tempus pretium. Curabitur lorem enim, pretium nec, feugiat nec, luctus a, lacus.

'+ - '
'+ - '
'+ - ''+ - '
'+ - '
'+ - '
'+ '
'+ '
'+ '
'+ @@ -1237,7 +1231,7 @@ function setupCreateTemplateDialog(){ //values to the template JSON. var addSectionJSON = function(template_json,context){ var params= $('.vm_param',context); - var inputs= $('input:enabled',params); + var inputs= $('input',params); var selects = $('select:enabled',params); var fields = $.merge(inputs,selects); @@ -1327,102 +1321,18 @@ function setupCreateTemplateDialog(){ }); }; - var number_of_disks = 0; - var disks_index = 1; + /************************************************************************** + CAPACITY TAB - function updateTemplateImages(request, images_list){ - var image_list_array = []; - - $.each(images_list,function(){ - image_list_array.push(imageElementArray(this)); - }); - - updateView(image_list_array, dataTable_template_images); - } - - var add_disk_tab = function(){ - number_of_disks++; - disks_index++; - create_disk_tab(number_of_disks, disks_index); - } - - var create_disk_tab = function(disk_id, disk_tab_index) { - var disk_tab_id = 'disk' + disk_id; - var datatable_id = 'datatable_template_images' + disk_id; - var button_id = 'tf_btn_adddisk' + disk_id; - - var tab_content = '
'+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - '
'+tr("All")+''+tr("ID")+''+tr("Owner")+''+tr("Group")+''+tr("Name")+''+tr("Datastore")+''+tr("Size")+''+tr("Type")+''+tr("Registration time")+''+tr("Persistent")+''+tr("Status")+''+tr("#VMS")+''+tr("Target")+'
'+ - '
'+ - '
'+ - ''+ - '
'+ - '
'+ - '
' - - tabs.append(tab_content).tabs('add', '#'+disk_tab_id, disk_tab_id, disk_tab_index); - tabs.tabs( "select", disk_tab_index); - - dataTable_template_images = $('#'+datatable_id, dialog).dataTable({ - "bJQueryUI": true, - "bSortClasses": false, - "bAutoWidth":false, - "sDom" : '<"H"lfrC>t<"F"ip>', - "oColVis": { - "aiExclude": [ 0 ] - }, - "sPaginationType": "full_numbers", - "aoColumnDefs": [ - { "bSortable": false, "aTargets": ["check"] }, - { "sWidth": "60px", "aTargets": [0,2,3,9,10] }, - { "sWidth": "35px", "aTargets": [1,6,11,12] }, - { "sWidth": "100px", "aTargets": [5,7] }, - { "sWidth": "150px", "aTargets": [8] }, - { "bVisible": false, "aTargets": [2,3,6,7,9,8,12]} - ], - "oLanguage": (datatable_lang != "") ? - { - sUrl: "locale/"+lang+"/"+datatable_lang - } : "" - }); - - dataTable_template_images.fnClearTable(); - addElement([spinner,'','','','','','','','','','','',''],dataTable_template_images); - - OpenNebula.Image.list({ - timeout: true, - success: updateTemplateImages, - error: onError - }); - - $('#'+button_id, dialog).click(add_disk_tab); - } + **************************************************************************/ // Set ups the capacity section var capacity_setup = function(){ $(function() { // Change tab if the DISKs button is clicked $("#tf_btn_disks", dialog).click(add_disk_tab); + $(".tf_btn_nics", dialog).click(add_nic_tab); + $(".tf_btn_nics").live('click', add_nic_tab); // Hide advanced options $('fieldset.advanced',section_capacity).hide(); @@ -1501,6 +1411,270 @@ function setupCreateTemplateDialog(){ }); } + /************************************************************************** + DISK TAB + + **************************************************************************/ + + var number_of_disks = 0; + var disks_index = 1; + + var add_disk_tab = function() { + number_of_disks++; + disks_index++; + + var str_disk_tab_id = 'disk' + number_of_disks; + var str_datatable_id = 'datatable_template_images' + number_of_disks; + + var html_tab_content = '
'+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + '
'+tr("All")+''+tr("ID")+''+tr("Owner")+''+tr("Group")+''+tr("Name")+''+tr("Datastore")+''+tr("Size")+''+tr("Type")+''+tr("Registration time")+''+tr("Persistent")+''+tr("Status")+''+tr("#VMS")+''+tr("Target")+'
'+ + '
'+ + '
'+ + '

You selected the following image: '+ + ''+ + '

'+ + ''+ + '
'+ + '
'+ + '
'+ + '

'+tr("Advanced options")+'

'+ + '
'+ + '
'+ + '
'+ + ''+ + ''+ + '
'+tr("Device to map image disk. If set, it will overwrite the default device mapping")+'
'+ + '
'+ + '
'+ + '
'+ + ''+ + '
'+ + '
' + + // Append the new div containing the tab and add the tab to the list + tabs.append(html_tab_content).tabs('add', '#'+str_disk_tab_id, str_disk_tab_id, disks_index); + tabs.tabs( "select", disks_index); + + var dataTable_template_images = $('#'+str_datatable_id, dialog).dataTable({ + "bJQueryUI": true, + "bSortClasses": false, + "bAutoWidth":false, + "sDom" : '<"H"lfrC>t<"F"ip>', + "oColVis": { + "aiExclude": [ 0 ] + }, + "sPaginationType": "full_numbers", + "aoColumnDefs": [ + { "bSortable": false, "aTargets": ["check"] }, + { "sWidth": "60px", "aTargets": [0,2,3,9,10] }, + { "sWidth": "35px", "aTargets": [1,6,11,12] }, + { "sWidth": "100px", "aTargets": [5,7] }, + { "sWidth": "150px", "aTargets": [8] }, + { "bVisible": false, "aTargets": [0,2,3,6,7,9,8,12]} + ], + "oLanguage": (datatable_lang != "") ? + { + sUrl: "locale/"+lang+"/"+datatable_lang + } : "" + }); + + dataTable_template_images.fnClearTable(); + addElement([spinner,'','','','','','','','','','','',''],dataTable_template_images); + + // Retrieve the images to fill the datatable + OpenNebula.Image.list({ + timeout: true, + success: function (request, images_list){ + var image_list_array = []; + + $.each(images_list,function(){ + image_list_array.push(imageElementArray(this)); + }); + + updateView(image_list_array, dataTable_template_images); + }, + error: onError + }); + + // TBD Add refresh button for the datatable + + // When a row is selected the background color is updated. If a previous row + // was selected (previous_row) the background color is removed. + // #IMAGE and #IMAGE_ID inputs are updated using the row information + if (typeof previous_row === 'undefined') { + var previous_row = 0; + } + + $('#'+str_datatable_id + ' tbody', dialog).delegate("tr", "click", function(e){ + if ($(e.target).is('input') || + $(e.target).is('select') || + $(e.target).is('option')) return true; + + var aData = dataTable_template_images.fnGetData(this); + + if (previous_row) + $("td:first", previous_row).parent().children().each(function(){$(this).removeClass('markrow');}); + previous_row = this; + $("td:first", this).parent().children().each(function(){$(this).addClass('markrow');}); + + $('#IMAGE', $('div#' + str_disk_tab_id)).text(aData[4]); + $('#IMAGE_ID', $('div#' + str_disk_tab_id)).val(aData[1]); + return false; + }); + + // Hide advanced options + $('fieldset.advanced', $('div#' + str_disk_tab_id)).hide(); + + $('#advanced_capacity', $('div#' + str_disk_tab_id)).click(function(){ + $('fieldset.advanced', $('div#' + str_disk_tab_id)).toggle(); + return false; + }); + + setupTips($('div#' + str_disk_tab_id)); + $('button',$('div#' + str_disk_tab_id)).button(); + } + + /************************************************************************** + NETWORK TAB + + **************************************************************************/ + + var number_of_nics = 0; + var nics_index = 2; + + var add_nic_tab = function() { + number_of_nics++; + nics_index++; + console.log('a'+number_of_nics); + console.log('b'+nics_index); + var temp_index = disks_index+nics_index; + + var str_nic_tab_id = 'nic' + number_of_nics; + var str_datatable_id = 'datatable_template_networks' + number_of_nics; + + var html_tab_content = '
'+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + '
'+tr("All")+''+tr("ID")+''+tr("Owner")+''+tr("Group")+''+tr("Name")+''+tr("Cluster")+''+tr("Type")+''+tr("Bridge")+''+tr("Total Leases")+'
'+ + '
'+ + '
'+ + '

You selected the following image: '+ + ''+ + '

'+ + ''+ + '
'+ + '
'+ + ''+ + '
'+ + '
'+ + '
' + + // Append the new div containing the tab and add the tab to the list + tabs.append(html_tab_content).tabs('add', '#'+str_nic_tab_id, str_nic_tab_id, temp_index); + tabs.tabs( "select", temp_index); + + var dataTable_template_networks = $('#'+str_datatable_id, dialog).dataTable({ + "bJQueryUI": true, + "bSortClasses": false, + "bAutoWidth":false, + "sDom" : '<"H"lfrC>t<"F"ip>', + "oColVis": { + "aiExclude": [ 0 ] + }, + "sPaginationType": "full_numbers", + "aoColumnDefs": [ + { "bSortable": false, "aTargets": ["check"] }, + { "sWidth": "60px", "aTargets": [0,6,7,8] }, + { "sWidth": "35px", "aTargets": [1] }, + { "sWidth": "100px", "aTargets": [2,3,5] }, + { "bVisible": false, "aTargets": [7]} + ], + "oLanguage": (datatable_lang != "") ? + { + sUrl: "locale/"+lang+"/"+datatable_lang + } : "" + }); + + dataTable_template_networks.fnClearTable(); + addElement([spinner,'','','','','','','',''],dataTable_template_networks); + + // Retrieve the networks to fill the datatable + OpenNebula.Network.list({ + timeout: true, + success: function (request, networks_list){ + var network_list_array = []; + + $.each(networks_list,function(){ + network_list_array.push(vNetworkElementArray(this)); + }); + + updateView(network_list_array, dataTable_template_networks); + }, + error: onError + }); + + // TBD Add refresh button for the datatable + + // When a row is selected the background color is updated. If a previous row + // was selected (previous_row) the background color is removed. + // #IMAGE and #IMAGE_ID inputs are updated using the row information + if (typeof previous_row === 'undefined') { + var previous_row = 0; + } + + $('#'+str_datatable_id + ' tbody', dialog).delegate("tr", "click", function(e){ + if ($(e.target).is('input') || + $(e.target).is('select') || + $(e.target).is('option')) return true; + + var aData = dataTable_template_networks.fnGetData(this); + + if (previous_row) + $("td:first", previous_row).parent().children().each(function(){$(this).removeClass('markrow');}); + previous_row = this; + $("td:first", this).parent().children().each(function(){$(this).addClass('markrow');}); + + $('#NETWORK', $('div#' + str_nic_tab_id)).text(aData[4]); + $('#NETWORK_ID', $('div#' + str_nic_tab_id)).val(aData[1]); + return false; + }); + } + + //Sets up the OS_BOOT section var os_boot_setup = function(){ $('fieldset',section_os_boot).hide(); @@ -1969,11 +2143,7 @@ function setupCreateTemplateDialog(){ //Insert HTML in place dialog.html(create_template_tmpl); - //Enable tabs - $('#template_create_tabs',dialog).tabs({ - //select:vmTabChange - }); - $('#template_create_tabs',dialog).tabs().addClass( "ui-tabs-vertical ui-helper-clearfix" ); + //Prepare jquery dialog var height = Math.floor($(window).height()*0.8); //set height to a percentage of the window @@ -1987,49 +2157,29 @@ function setupCreateTemplateDialog(){ // Enhace buttons $('button',dialog).button(); - $("#tf_btn_adddisk", dialog).click( function(){ - addDiskTab(); - }); - - $("#tf_btn_addnic", dialog).click( function(){ - addNicTab(); - }); - - - - var number_of_nics = 0; - var nics_index = 0; - - var tabs = $( "#template_create_tabs").tabs({ + var tabs = $( "#template_create_tabs", dialog).tabs({ tabTemplate: "
  • #{label} Remove Tab
  • " - }); + }).addClass( "ui-tabs-vertical ui-helper-clearfix" ); // close icon: removing the tab on click // note: closable tabs gonna be an option in the future - see http://dev.jqueryui.com/ticket/3924 $( "#template_create_tabs span.ui-icon-close" ).live( "click", function() { - var index = $( "li.temp_tab", tabs ).index( $( this ).parent() ); - tabs.tabs( "remove", index ); - if (index > disks_index+1 ) { + var parent = $( this ).parent(); + var index = $( "li.temp_tab", tabs ).index( parent ); + + $('div#'+$('a', parent).text()).remove(); + + if (index > disks_index ) { nics_index--; + tabs.tabs( "select", (disks_index+nics_index)); } else { disks_index--; + tabs.tabs( "select", disks_index); } + tabs.tabs( "remove", index ); }); - // actual addTab function: adds new tab using the input from the form above - function addDiskTab() { - - }; - - function addNicTab() { - index = tabs.tabs('option', 'selected'); - number_of_nics++; - nics_index++; - - tabs.tabs('add', '#nic'+number_of_nics, 'nic'+number_of_nics, index+nics_index); - }; - // Re-Setup tips setupTips(dialog); @@ -2041,7 +2191,7 @@ function setupCreateTemplateDialog(){ var section_capacity = $('div#tab-capacity',dialog); var section_os_boot = $('div#os_boot_opts',dialog); var section_features = $('div#features',dialog); - var section_disks = $('div#disks',dialog); + var section_disks = $('div#disk1',dialog); var section_networks = $('div#networks',dialog); var section_inputs = $('div#inputs',dialog); var section_graphics = $('div#graphics',dialog); @@ -2123,9 +2273,23 @@ function setupCreateTemplateDialog(){ //addSectionJSON(vm_json["FEATURES"],scope); // ////process disks -> fetch from box - //scope = section_disks; - //vm_json["DISK"] = addBoxJSON(scope,'#disks_box'); -// + vm_json["DISK"] = []; + + $('div.disk',dialog).each(function(){ + var hash = {}; + addSectionJSON(hash, this); + vm_json["DISK"].push(hash); + }); + + vm_json["NIC"] = []; + + $('div.nic',dialog).each(function(){ + var hash = {}; + addSectionJSON(hash, this); + vm_json["NIC"].push(hash); + }); + + console.log(vm_json) ////process nics -> fetch from box //scope = section_networks; //vm_json["NIC"] = addBoxJSON(scope,'#nics_box'); diff --git a/src/sunstone/views/index.erb b/src/sunstone/views/index.erb index d942367f9e..103b8a8a1f 100644 --- a/src/sunstone/views/index.erb +++ b/src/sunstone/views/index.erb @@ -35,7 +35,7 @@ .ui-tabs-vertical .ui-tabs-nav li a { display:block; } .ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active { padding-bottom: 0; padding-right: .1em; border-right-width: 1px; border-right-width: 1px; } .ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: right; width: 40em;} - + .markrow { background-color:#ffbba9 !important; }