shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00
Code Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ruben S. Montero 2014-03-19 17:13:29 +01:00
commit d992141758
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sunstone/public/js/plugins/groups-tab.js
View File

@ -172,7 +172,7 @@ var create_group_tmpl =
<div class="form_buttons">\
<button class="button radius right success" id="create_group_submit" value="Group.create">'+tr("Create")+'</button>\
<button class="button right radius" type="submit" id="update_group_submit">' + tr("Update") + '</button>\
<button class="button secondary radius" id="create_group_reset_button" type="reset" value="reset">'+tr("Refresh")+'</button>\
<button class="button secondary radius" id="create_group_reset_button" type="reset" value="reset">'+tr("Reset")+'</button>\
</div>\
</div>\
<a class="close-reveal-modal">&#215;</a>\
@ -749,7 +749,7 @@ function setup_add_rp_dialog(group){
<div class="reveal-footer">\
<div class="form_buttons">\
<button class="button radius right success" id="add_rp_submit">'+tr("Add")+'</button>\
<button class="button secondary radius" id="add_rp_reset_button" type="reset" value="reset">'+tr("Refresh")+'</button>\
<button class="button secondary radius" id="add_rp_reset_button" type="reset" value="reset">'+tr("Reset")+'</button>\
</div>\
</div>\
</div>\

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

@ -42,7 +42,6 @@ var create_template_tmpl = '\
'<button class="success button radius" id="create_template_form_easy" value="OpenNebula.Template.create" style="float: right">'+tr("Create")+'</button>'+
'<button class="button hidden radius" id="template_template_update_button" value="Template.update_template" style="float: right">'+tr("Update")+'</button>'+
'<button class="button secondary radius" id="template_template_reset_button" value="reset" type="reset">'+tr("Reset")+'</button>'+
'<button class="button secondary hidden radius" id="template_template_reset_button_update" value="reset" type="reset">'+tr("Reset")+'</button>'+
'</div>'+
'</form>'+
'</div>' +
@ -62,7 +61,6 @@ var create_template_tmpl = '\
'<div class="form_buttons">' +
'<button class="button success right radius" id="create_template_submit_manual" value="template/create">'+tr("Create")+'</button>' +
'<button class="button hidden radius" id="manual_template_update_button" value="Template.update_template" style="float: right">'+tr("Update")+'</button>'+
'<button class="button secondary radius" id="manual_template_reset_button_update" value="reset" type="reset">'+tr("Reset")+'</button>'+
'</div>' +
'</div>' +
'</form>' +
@ -915,7 +913,6 @@ function generate_disk_tab_content(str_disk_tab_id, str_datatable_id){
'<span class="radius label" type="text" id="IMAGE_NAME" name="image"></span>'+
'<div class="alert-box alert" style="display: none;">'+
tr("The image you specified cannot be selected in the table") +
' <a href="" class="close">&times;</a>'+
'</div>'+
'</div>'+
'<div class="show_hide" id="advanced_image">'+
@ -1555,7 +1552,6 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){
'<span class="radius label" type="text" id="NETWORK_NAME" name="network"></span>'+
'<div class="alert-box alert" style="display: none;">'+
tr("The network you specified cannot be selected in the table") +
' <a href="" class="close">&times;</a>'+
'</div>'+
'</div>'+
'</div>'+
@ -3572,13 +3568,6 @@ function initialize_create_template_dialog(dialog) {
popUpCreateTemplateDialog();
});
$('#template_template_reset_button_update', dialog).click(function(){
dialog.html("");
setupCreateTemplateDialog();
popUpUpdateTemplateDialog();
});
if (Config.isTemplateCreationTabEnabled('general')){
var tab = $('#capacityTab', dialog);
setup_capacity_tab_content(tab);
@ -3835,7 +3824,6 @@ function popUpUpdateTemplateDialog(){
$('button#create_template_form_easy', $create_template_dialog).hide();
$('button#template_template_update_button', $create_template_dialog).show();
$('button#template_template_reset_button', $create_template_dialog).hide();
$('button#template_template_reset_button_update', $create_template_dialog).show();
$('button#manual_template_update_button', $create_template_dialog).show();
$('button#create_template_submit_manual', $create_template_dialog).hide();
@ -3863,7 +3851,6 @@ function popUpCreateTemplateDialog(){
$('button#create_template_form_easy', $create_template_dialog).show();
$('button#template_template_update_button', $create_template_dialog).hide();
$('button#template_template_reset_button', $create_template_dialog).show();
$('button#template_template_reset_button_update', $create_template_dialog).hide();
$('button#manual_template_update_button', $create_template_dialog).hide();
$('button#create_template_submit_manual', $create_template_dialog).show();
@ -4131,7 +4118,6 @@ function fillTemplatePopUp(template, dialog){
// } else {
// var alert = '<div class="alert-box alert">'+
// tr("The image you specified cannot be selected in the table") +
// ' <a href="" class="close">&times;</a>'+
// '</div>';
// $("#kernel_ds_inputs", kernel_section).append(alert);
// }
@ -4175,7 +4161,6 @@ function fillTemplatePopUp(template, dialog){
// } else {
// var alert = '<div class="alert-box alert">'+
// tr("The image you specified cannot be selected in the table") +
// ' <a href="" class="close">&times;</a>'+
// '</div>';
// $("#selected_image", initrd_section).append(alert);
// }