shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-13 12:58:17 +03:00
Code Releases Wiki Activity

Merge branch 'master' of git.opennebula.org:one

Browse Source
This commit is contained in:
Ruben S. Montero 2013-05-17 01:11:32 +02:00
commit 7a7ddeec80
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli/onevm
View File

@ -827,5 +827,5 @@ cmd=CommandParser::CmdParser.new(ARGV) do
deprecated_command(:cancel, 'shutdown --hard')
deprecated_command(:reset, 'reboot --hard')
deprecated_command(:restart, 'boot')
deprecated_command(:resubmit, 'destroy --recreate')
deprecated_command(:resubmit, 'delete --recreate')
end

30
src/sunstone/public/js/plugins/templates-tab.js
View File

@ -887,14 +887,17 @@ function generate_disk_tab_content(str_disk_tab_id, str_datatable_id){
'</div>'+
'</div>'+
'</div>'+
'<div class="vm_param">'+
'<input type="hidden" id="SIZE" name="size" />'+
'</div>'+
'<div class="row">'+
'<div class="two columns">'+
'<label class="inline right" for="SIZE">'+tr("SIZE")+':</label>'+
'<label class="inline right" for="SIZE_TMP">'+tr("SIZE")+':</label>'+
'</div>'+
'<div id="size_slider" class="five columns">'+
'</div>'+
'<div class="two columns vm_param">'+
'<input type="text" id="SIZE" name="size"/>'+
'<div class="two columns">'+
'<input type="text" id="SIZE_TMP" name="size_tmp"/>'+
'</div>'+
'<div class="two columns">'+
'<select id="size_unit" name="SIZE_UNIT">'+
@ -985,17 +988,29 @@ function setup_disk_tab_content(disk_section, str_disk_tab_id, str_datatable_id)
// Define the size slider
var size_input = $( "#SIZE", disk_section );
var final_size_input = $( "#SIZE", disk_section );
var size_input = $( "#SIZE_TMP", disk_section );
var size_unit = $( "#size_unit", disk_section );
var current_size_unit = size_unit.val();
var update_final_size_input = function() {
if (current_size_unit == 'MB') {
final_size_input.val( Math.floor(size_input.val()) );
}
else {
final_size_input.val( Math.floor(size_input.val() * 1024) );
}
}
var size_slider_change = function(type) {
if ( type != "move")
{
var values = $(this).val();
size_input.val(values / 100);
update_final_size_input();
}
};
@ -1012,15 +1027,18 @@ function setup_disk_tab_content(disk_section, str_disk_tab_id, str_datatable_id)
size_input.change(function() {
size_slider.val(this.value * 100)
update_final_size_input();
});
size_input.val(10);
update_final_size_input();
// init::start is ignored for some reason
size_slider.val(1000);
size_unit.change(function() {
var size_unit_val = $('#size_unit :selected').val();
var size_unit_val = $('#size_unit :selected', disk_section).val();
if (current_size_unit != size_unit_val)
{
@ -1058,6 +1076,8 @@ function setup_disk_tab_content(disk_section, str_disk_tab_id, str_datatable_id)
size_input.val( new_val );
size_slider.val(new_val * 100);
}
update_final_size_input();
}
});