bug #1959: Fixed reset button for datastore, host, image and vent tabs

This commit is contained in:
Daniel Molina committed 2013-04-26 17:13:57 +02:00
1 parent 3a1dddffac
commit d32f272f05
4 files changed
+99 -40

No files matched your search

@@ -283,7 +283,7 @@ var create_datastore_tmpl =
<hr>\
<div class="form_buttons">\
<button class="button radius right success" type="submit" id="create_datastore_submit" value="OpenNebula.Datastore.create">' + tr("Create") + '</button>\
<button class="button radius secondary" type="reset" value="reset">' + tr("Reset") + '</button>\
<button id="wizard_ds_reset_button" class="button radius secondary" type="reset" value="reset">' + tr("Reset") + '</button>\
<button class="close-reveal-modal button secondary radius" type="button" value="close">' + tr("Close") + '</button>\
</div>\
</div>\
@@ -300,7 +300,7 @@ var create_datastore_tmpl =
<hr>\
<div class="form_buttons">\
<button class="button success radius right" id="create_datastore_submit_manual" value="datastore/create">'+tr("Create")+'</button>\
<button class="button secondary radius" type="reset" value="reset">'+tr("Reset")+'</button>\
<button id="advanced_ds_reset_button" class="button secondary radius" type="reset" value="reset">'+tr("Reset")+'</button>\
<button class="close-reveal-modal button secondary radius" type="button" value="close">' + tr("Close") + '</button>\
</div>\
</div>\
@@ -961,6 +961,23 @@ function setupCreateDatastoreDialog(){
$create_datastore_dialog.trigger("reveal:close")
return false;
});
$('#wizard_ds_reset_button').click(function(){
$create_datastore_dialog.trigger('reveal:close');
$create_datastore_dialog.remove();
setupCreateDatastoreDialog();
popUpCreateDatastoreDialog();
});
$('#advanced_ds_reset_button').click(function(){
$create_datastore_dialog.trigger('reveal:close');
$create_datastore_dialog.remove();
setupCreateDatastoreDialog();
popUpCreateDatastoreDialog();
$("a[href='#datastore_manual']").click();
});
}
function select_filesystem(){
+17 -9
View File
@@ -81,8 +81,8 @@ var create_host_tmpl =
<small id="create_cluster_header">'+tr("Create Host")+'</small>\
</h3>\
</div>\
<div class="reveal-body">\
<form id="create_host_form" action="" class="">\
<div class="reveal-body">\
<div class="row">\
<div class="four columns">\
<label class="inline right" for="name">' + tr("Hostname") + ':</label>\
@@ -178,17 +178,17 @@ var create_host_tmpl =
<div class="tip"></div>\
</div>\
</div>\
<div class="reveal-footer">\
<hr>\
<div class="form_buttons row">\
<button class="button success right radius" type="submit" id="create_host_submit" value="OpenNebula.Host.create">' + tr("Create") + '</button>\
<button class="button secondary radius" type="reset" value="reset">' + tr("Reset") + '</button>\
<button class="close-reveal-modal button secondary radius" action="" type="button" value="close">' + tr("Close") + '</button>\
</div>\
<div class="reveal-footer">\
<hr>\
<div class="form_buttons row">\
<button class="button success right radius" type="submit" id="create_host_submit" value="OpenNebula.Host.create">' + tr("Create") + '</button>\
<button id="wizard_host_reset_button" class="button secondary radius" type="reset" value="reset">' + tr("Reset") + '</button>\
<button class="close-reveal-modal button secondary radius" action="" type="button" value="close">' + tr("Close") + '</button>\
</div>\
</div>\
<a class="close-reveal-modal">&#215;</a>\
</form>\
</div>';
</form>';
var hosts_select="";
var dataTable_hosts;
@@ -924,6 +924,14 @@ function setupCreateHostDialog(){
$create_host_dialog.trigger("reveal:close")
return false;
});
$('#wizard_host_reset_button').click(function(){
$create_host_dialog.trigger('reveal:close');
$create_host_dialog.remove();
setupCreateHostDialog();
popUpCreateHostDialog();
});
}
//Open creation dialogs
+43 -26
View File
@@ -131,18 +131,29 @@ var create_image_tmpl =
<div class="tip">'+tr("Persistence of the image")+'</div>\
</div>\
</div>\
<div class="row">\
<div class="four columns">\
<label class="right inline" for="img_datastore">'+tr("Datastore")+':</label>\
</div>\
<div class="seven columns">\
<select id="img_datastore" name="img_datastore">\
</select>\
</div>\
<div class="one columns">\
<div class="tip">'+tr("Select the datastore for this image")+'</div>\
</div>\
</div>\
</div>\
</div>\
<div class="row">\
<fieldset>\
<legend>'+tr("Image location")+':</legend>\
<div class="row" id="src_path_select">\
<div class="seven columns centered">\
<div class="row centered" id="src_path_select" style="text-align:center">\
<input type="radio" name="src_path" id="path_img" value="path">'+ tr("Provide a path")+'&emsp;</input> \
<input type="radio" name="src_path" id="upload_img" value="upload"> '+tr("Upload")+'</input> &emsp;\
<input type="radio" name="src_path" id="datablock_img" value="datablock" disabled> '+tr("Empty datablock")+'</input> &emsp;\
</div>\
</div>\
<hr>\
<div class="img_param row">\
<div class="eight columns centered">\
<div class="two columns">\
@@ -201,10 +212,10 @@ var create_image_tmpl =
<div class="row">\
<div class="six columns">\
<div class="row">\
<div class="four columns">\
<div class="six columns">\
<label class="right inline" for="img_dev_prefix">'+tr("Device prefix")+':</label>\
</div>\
<div class="seven columns">\
<div class="five columns">\
<input type="text" name="img_dev_prefix" id="img_dev_prefix" />\
</div>\
<div class="one columns">\
@@ -212,10 +223,10 @@ var create_image_tmpl =
</div>\
</div>\
<div class="row">\
<div class="four columns">\
<div class="six columns">\
<label class="right inline" for="img_driver">'+tr("Driver")+':</label>\
</div>\
<div class="seven columns">\
<div class="five columns">\
<input type="text" name="img_driver" id="img_driver" />\
</div>\
<div class="one columns">\
@@ -225,28 +236,16 @@ var create_image_tmpl =
</div>\
<div class="six columns">\
<div class="row">\
<div class="four columns">\
<div class="six columns">\
<label class="right inline" for="img_target">'+tr("Target")+':</label>\
</div>\
<div class="seven columns">\
<div class="five columns">\
<input type="text" name="img_target" id="img_target" />\
</div>\
<div class="one columns">\
<div class="tip">'+tr("Target on which the image will be mounted at. For example: hda, sdb...")+'</div>\
</div>\
</div>\
<div class="row">\
<div class="four columns">\
<label class="right inline" for="img_datastore">'+tr("Datastore")+':</label>\
</div>\
<div class="seven columns">\
<select id="img_datastore" name="img_datastore">\
</select>\
</div>\
<div class="one columns">\
<div class="tip">'+tr("Select the datastore for this image")+'</div>\
</div>\
</div>\
</div>\
</div>\
</div>\
@@ -254,7 +253,7 @@ var create_image_tmpl =
<hr>\
<div class="form_buttons">\
<button class="button success radius right" id="create_image_submit" value="image/create">'+tr("Create")+'</button>\
<button class="button secondary radius" type="reset" value="reset">'+tr("Reset")+'</button>\
<button id="wizard_image_reset_button" class="button secondary radius" type="reset" value="reset">'+tr("Reset")+'</button>\
<button class="close-reveal-modal button secondary radius" type="button" value="close">' + tr("Close") + '</button>\
</div>\
</div>\
@@ -273,7 +272,7 @@ var create_image_tmpl =
<hr>\
<div class="form_buttons">\
<button class="button success radius right" id="create_image_submit_manual" value="image/create">'+tr("Create")+'</button>\
<button class="button secondary radius" type="reset" value="reset">'+tr("Reset")+'</button>\
<button id="advanced_image_reset_button" class="button secondary radius" type="reset" value="reset">'+tr("Reset")+'</button>\
<button class="close-reveal-modal button secondary radius" type="button" value="close">' + tr("Close") + '</button>\
</div>\
</div>\
@@ -814,12 +813,14 @@ function enable_all_datastores()
// Prepare the image creation dialog
function setupCreateImageDialog(){
dialogs_context.append('<div title="'+tr("Create Image")+'" id="create_image_dialog"></div>');
dialogs_context.append('<div id="create_image_dialog"></div>');
$create_image_dialog = $('#create_image_dialog',dialogs_context);
var dialog = $create_image_dialog;
dialog.html(create_image_tmpl);
setupTips($create_image_dialog);
var height = Math.floor($(window).height()*0.8); //set height to a percentage of the window
//Prepare jquery dialog
@@ -1128,6 +1129,23 @@ function setupCreateImageDialog(){
$create_image_dialog.trigger("reveal:close")
return false;
});
$('#wizard_image_reset_button').click(function(){
$create_image_dialog.trigger('reveal:close');
$create_image_dialog.remove();
setupCreateImageDialog();
popUpCreateImageDialog();
});
$('#advanced_image_reset_button').click(function(){
$create_image_dialog.trigger('reveal:close');
$create_image_dialog.remove();
setupCreateImageDialog();
popUpCreateImageDialog();
$("a[href='#img_manual']").click();
});
}
function popUpCreateImageDialog(){
@@ -1173,7 +1191,7 @@ function is_persistent_image(id){
function setupImageCloneDialog(){
//Append to DOM
dialogs_context.append('<div id="image_clone_dialog" title="'+tr("Clone an image")+'"></div>');
dialogs_context.append('<div id="image_clone_dialog"></div>');
var dialog = $('#image_clone_dialog',dialogs_context);
//Put HTML in place
@@ -1286,7 +1304,6 @@ $(document).ready(function(){
Sunstone.runAction("Image.list");
setupCreateImageDialog();
setupTips($create_image_dialog);
setupImageCloneDialog();
setImageAutorefresh();
+20 -3
View File
@@ -398,7 +398,7 @@ var create_vn_tmpl =
<button class="button success radius right" id="create_vn_submit_easy" value="vn/create">\
'+tr("Create")+'\
</button>\
<button class="button secondary radius" type="reset" value="reset">'+tr("Reset")+'</button>\
<button id="wizard_vnet_reset_button" class="button secondary radius" type="reset" value="reset">'+tr("Reset")+'</button>\
<button class="close-reveal-modal button secondary radius" type="button" value="close">' + tr("Close") + '</button>\
</div>\
</div>\
@@ -414,7 +414,7 @@ var create_vn_tmpl =
<button class="button success right radius" id="create_vn_submit_manual" value="vn/create">\
'+tr("Create")+'\
</button>\
<button class="button secondary radius" type="reset" value="reset">'+tr("Reset")+'</button>\
<button id="advanced_vnet_reset_button" class="button secondary radius" type="reset" value="reset">'+tr("Reset")+'</button>\
<button class="close-reveal-modal button secondary radius" type="button" value="close">' + tr("Close") + '</button>\
</div>\
</div>\
@@ -1101,7 +1101,7 @@ function setupCreateVNetDialog() {
// width: 475,
// height: height
//});
dialog.addClass("reveal-modal large max-height");
dialog.addClass("reveal-modal xlarge max-height");
//Make the tabs look nice for the creation mode
//$('#vn_tabs',dialog).tabs();
@@ -1456,6 +1456,23 @@ function setupCreateVNetDialog() {
$create_vn_dialog.trigger("reveal:close")
return false;
});
$('#wizard_vnet_reset_button').click(function(){
$create_vn_dialog.trigger('reveal:close');
$create_vn_dialog.remove();
setupCreateVNetDialog();
popUpCreateVnetDialog();
});
$('#advanced_vnet_reset_button').click(function(){
$create_vn_dialog.trigger('reveal:close');
$create_vn_dialog.remove();
setupCreateVNetDialog();
popUpCreateVnetDialog();
$("a[href='#vnet_advanced']").click();
});
}
function popUpCreateVnetDialog() {