'+
- '
'+
+ '
'+
'
'+
'
'+
'
'+
@@ -81,8 +81,7 @@ var create_template_tmpl = '
'+
''+
'
'+
'
'+
- '
'+
- '
'+
+ '';
var update_template_tmpl =
@@ -554,7 +554,7 @@ function generate_capacity_tab_content() {
'
'+
'
'+
'
'+
- '
'+tr("Advanced options")+'
'+
+ '
'+tr("Advanced options")+'
'+
'
'+
'
'+
'
'+
@@ -789,7 +789,7 @@ function generate_disk_tab_content(str_disk_tab_id, str_datatable_id){
'
'+
'
'+
'
'+
- '
'+tr("Advanced options")+'
'+
+ '
'+tr("Advanced options")+'
'+
'
'+
'
'+
'
'+
@@ -873,7 +873,7 @@ function generate_disk_tab_content(str_disk_tab_id, str_datatable_id){
'
'+
'
'+
'
'+
- '
'+tr("Advanced options")+''+
+ ' '+tr("Advanced options")+''+
'
'+
'
'+
'
'+
@@ -1141,7 +1141,7 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){
'
'+
'
'+
'
'+
- '
'+tr("Advanced options")+'
'+
+ '
'+tr("Advanced options")+'
'+
'
'+
'
'+
'
'+
@@ -1150,7 +1150,7 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){
'
'+
''+
'
'+
- '
'+
+ '
'+
''+
'
'+
'
'+
@@ -1163,7 +1163,7 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){
'
'+
''+
'
'+
- '
'+
+ '
'+
''+
'
'+
'
'+
@@ -1193,7 +1193,7 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){
''+
'
'+
'
'+
- '
'+tr("A list of ports separated by commas or a ranges separated by semilocolons, e.g.: 22,80,5900:6000")+'
'+
+ '
'+tr("A list of ports separated by commas or a ranges separated by semicolons, e.g.: 22,80,5900:6000")+'
'+
'
'+
'
'+
''+
@@ -1218,7 +1218,7 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){
'
'+
'
'+
'
'+
- '
'+tr("A list of ports separated by commas or a ranges separated by semilocolons, e.g.: 22,80,5900:6000")+'
'+
+ '
'+tr("A list of ports separated by commas or a ranges separated by semicolons, e.g.: 22,80,5900:6000")+'
'+
'
'+
'
'+
''+
@@ -2997,7 +2997,7 @@ function setupCreateTemplateDialog(){
// width: 'auto',
// height: height
//});
- dialog.addClass("reveal-modal xlarge")
+ dialog.addClass("reveal-modal xlarge max-height")
var tabs = $( "#template_create_tabs", dialog)//.tabs().addClass("ui-tabs-vertical");
@@ -4153,12 +4153,9 @@ $(document).ready(function(){
"oColVis": {
"aiExclude": [ 0 ]
},
- "sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>",
"aoColumnDefs": [
{ "bSortable": false, "aTargets": ["check"] },
{ "sWidth": "35px", "aTargets": [0,1] },
- { "sWidth": "150px", "aTargets": [5] },
- { "sWidth": "100px", "aTargets": [2,3] }
]
});
diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js
index f60d01c634..b5eb0a3b6a 100644
--- a/src/sunstone/public/js/plugins/users-tab.js
+++ b/src/sunstone/public/js/plugins/users-tab.js
@@ -339,14 +339,16 @@ var user_quotas_tmpl = '
\
\
\
\
-
\
+ \
×\
-';
+\
+
';
var user_actions = {
@@ -1166,7 +1168,6 @@ function setUserAutorefresh(){
$(document).ready(function(){
//if we are not oneadmin, our tab will not even be in the DOM.
dataTable_users = $("#datatable_users",main_tabs_context).dataTable({
- "sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>",
"oColVis": {
"aiExclude": [ 0 ]
},
@@ -1174,11 +1175,7 @@ $(document).ready(function(){
{ "bSortable": false, "aTargets": ["check"] },
{ "sWidth": "35px", "aTargets": [0,1] },
{ "bVisible": false, "aTargets": [8]}
- ],
- "oLanguage": (datatable_lang != "") ?
- {
- sUrl: "locale/"+lang+"/"+datatable_lang
- } : ""
+ ]
});
$('#user_search').keyup(function(){
diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js
index 9cba9de762..d61b859df9 100644
--- a/src/sunstone/public/js/plugins/vms-tab.js
+++ b/src/sunstone/public/js/plugins/vms-tab.js
@@ -371,6 +371,33 @@ var vm_actions = {
notify: true
},
+ "VM.poweroff_hard" : {
+ type: "multiple",
+ call: OpenNebula.VM.poweroff_hard,
+ callback: vmShow,
+ elements: vmElements,
+ error: onError,
+ notify: true
+ },
+
+ "VM.undeploy" : {
+ type: "multiple",
+ call: OpenNebula.VM.undeploy,
+ callback: vmShow,
+ elements: vmElements,
+ error: onError,
+ notify: true
+ },
+
+ "VM.undeploy_hard" : {
+ type: "multiple",
+ call: OpenNebula.VM.undeploy_hard,
+ callback: vmShow,
+ elements: vmElements,
+ error: onError,
+ notify: true
+ },
+
"VM.saveas" : {
type: "single",
call: OpenNebula.VM.saveas,
@@ -754,45 +781,63 @@ var vm_buttons = {
"VM.suspend" : {
type: "confirm",
text: tr("Suspend"),
- layout: "vmsstopresume_buttons",
+ layout: "vmspause_buttons",
tip: tr("This will suspend selected machines")
},
"VM.resume" : {
type: "confirm",
- text: tr("Resume"),
- layout: "vmsstopresume_buttons",
+ text: '
',
+ layout: "vmsplay_buttons",
tip: tr("This will resume selected stopped or suspended VMs")
},
"VM.stop" : {
type: "confirm",
text: tr("Stop"),
- layout: "vmsstopresume_buttons",
+ layout: "vmsstop_buttons",
tip: tr("This will stop selected VMs")
},
"VM.restart" : {
type: "confirm",
text: tr("Boot"),
- layout: "vmsoneoff_buttons",
+ layout: "vmsplanification_buttons",
tip: tr("This will redeploy selected VMs (in UNKNOWN or BOOT state)")
},
"VM.reboot" : {
type : "confirm",
text: tr("Reboot"),
- layout: "vmsoneoff_buttons",
+ layout: "vmsrepeat_buttons",
tip: tr("This will send a reboot action to running VMs")
},
"VM.reset" : {
type: "confirm",
text: tr("Reboot") + '
hard',
- layout: "vmsoneoff_buttons",
+ layout: "vmsrepeat_buttons",
tip: tr("This will perform a hard reboot on selected VMs")
},
"VM.poweroff" : {
type : "confirm",
text: tr("Power Off"),
- layout: "vmsoneoff_buttons",
+ layout: "vmspause_buttons",
tip: tr("This will send a power off signal to running VMs. They can be restarted later.")
},
+ "VM.poweroff_hard" : {
+ type : "confirm",
+ text: tr("Power Off") + '
hard',
+ layout: "vmspause_buttons",
+ tip: tr("This will send a power off signal to running VMs. They can be restarted later.")
+ },
+ "VM.undeploy" : {
+ type : "confirm",
+ text: tr("Undeploy"),
+ layout: "vmsstop_buttons",
+ tip: tr("Shuts down the given VM. The VM is saved in the system Datastore.")
+ },
+ "VM.undeploy_hard" : {
+ type : "confirm",
+ text: tr("Undeploy") + '
hard',
+ layout: "vmsstop_buttons",
+ tip: tr("Shuts down the given VM. The VM is saved in the system Datastore.")
+ },
"VM.shutdown" : {
type: "confirm",
text: tr("Shutdown"),
@@ -815,7 +860,7 @@ var vm_buttons = {
"VM.resubmit" : {
type: "confirm",
text: tr("Destroy") + '
recreate',
- layout: "vmsdelete_buttons",
+ layout: "vmsrepeat_buttons",
tip: tr("This will resubmits VMs to PENDING state")
},
@@ -1138,6 +1183,7 @@ function generatePlacementTable(vm){
\
| '+tr("#")+' | \
'+tr("Host")+' | \
+ '+tr("Action")+' | \
'+tr("Reason")+' | \
'+tr("Chg time")+' | \
'+tr("Total time")+' | \
@@ -1180,9 +1226,10 @@ function generatePlacementTable(vm){
html += '
\
- | '+history[i].SEQ+' | \
+ '+history[i].SEQ+' | \
'+history[i].HOSTNAME+' | \
- '+OpenNebula.Helper.resource_state("VM_MIGRATE_REASON",parseInt(history[i].REASON, 10))+' | \
+ '+OpenNebula.Helper.resource_state("VM_MIGRATE_ACTION",parseInt(history[i].ACTION, 10))+' | \
+ '+OpenNebula.Helper.resource_state("VM_MIGRATE_REASON",parseInt(history[i].REASON, 10))+' | \
'+pretty_time(history[i].STIME)+' | \
'+pretty_time_runtime(dtime)+' | \
'+pretty_time_runtime(dtime2)+' | \
@@ -1313,8 +1360,7 @@ function updateVMInfo(request,vm){
var template_tab = {
title: tr("Template"),
content:
- '\
- | '+tr("VM template")+' |
'+
+ ''+
prettyPrintJSON(vm_info.TEMPLATE)+
'
'
};
@@ -1459,6 +1505,9 @@ function printActionsTable(vm_info)
\
\
\
+ \
+ \
+ \
\
\
\
@@ -1969,8 +2018,8 @@ function setupAttachDiskDialog(){
'+tr("Attach new disk")+'\
\
\
- ')
+ ')
- dialog.addClass("reveal-modal large");
+ dialog.addClass("reveal-modal large max-height");
setupTips(dialog);
setup_disk_tab_content(dialog, "attach_disk", "attach_disk")
@@ -2232,8 +2282,8 @@ function setupAttachNicDialog(){
'+tr("Attach new nic")+'\
\
\
- ')
+ ')
- dialog.addClass("reveal-modal large");
+ dialog.addClass("reveal-modal large max-height");
setupTips(dialog);
setup_nic_tab_content(dialog, "attach_nic", "attach_nic")
@@ -2405,6 +2456,7 @@ function setupResizeCapacityDialog(){
'+tr("Resize VM capacity")+'\
\
\
+ \
\
\
\
@@ -2432,15 +2484,17 @@ function setupResizeCapacityDialog(){
\
' +
generate_capacity_tab_content() +
- '
\
+ '\
×\
- ')
+
')
- dialog.addClass("reveal-modal large");
+ dialog.addClass("reveal-modal large max-height");
setupTips(dialog);
$("#template_name_form", dialog).hide();
@@ -2844,9 +2898,11 @@ function setupVNC(){
\
\
\
+ \
\
+
\
×\
\
');
@@ -2859,7 +2915,7 @@ function setupVNC(){
// resizable:true,
// closeOnEscape: false
//});
- dialog.addClass("reveal-modal large");
+ dialog.addClass("reveal-modal large max-height");
$('#sendCtrlAltDelButton',dialog).click(function(){
rfb.sendCtrlAltDel();
@@ -2902,11 +2958,13 @@ function vncIcon(vm){
if (graphics && graphics.TYPE.toLowerCase() == "vnc" && $.inArray(state, VNCstates)!=-1){
gr_icon = '';
- gr_icon += '
';
+ gr_icon += '';
}
else {
- gr_icon = '
';
+ gr_icon = '';
}
+
+ gr_icon += ''
return gr_icon;
}
@@ -2925,7 +2983,6 @@ function vmMonitorError(req,error_json){
$(document).ready(function(){
dataTable_vMachines = $("#datatable_vmachines",main_tabs_context).dataTable({
- "sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>",
"oColVis": {
"aiExclude": [ 0 ]
},
@@ -2933,17 +2990,15 @@ $(document).ready(function(){
{ "bSortable": false, "aTargets": ["check"] },
{ "sWidth": "35px", "aTargets": [0,1] },
{ "bVisible": false, "aTargets": [6,7,10]}
- ],
- "oLanguage": (datatable_lang != "") ?
- {
- sUrl: "locale/"+lang+"/"+datatable_lang
- } : ""
+ ]
});
$('#vms_search').keyup(function(){
- dataTable_templates.fnFilter( $(this).val() );
+ dataTable_vMachines.fnFilter( $(this).val() );
})
+
+
//addElement([
// spinner,
// '','','','','','','','','','',''],dataTable_vMachines);
diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js
index b53a3d2d1a..d60ca2e962 100644
--- a/src/sunstone/public/js/plugins/vnets-tab.js
+++ b/src/sunstone/public/js/plugins/vnets-tab.js
@@ -27,7 +27,7 @@ var vnets_tab_content = '\
\
\
\
\
@@ -66,12 +66,12 @@ var vnets_tab_content = '\
';
var create_vn_tmpl =
-'\
-
\
+'
\
\
\
\
\
+
\
\
- '+tr("Wizard")+'
\
- '+tr("Advanced mode")+'
\
@@ -79,7 +79,6 @@ var create_vn_tmpl =
\
- \
\
-
\
\
\
\
@@ -317,7 +316,7 @@ var create_vn_tmpl =
\
\
\
-
\
+ \
\
\
- \
\
-
\
'+tr("Write the Virtual Network template here")+'
\
\
- \
+ \
\
\
\
- ×\
-
';
+
\
+
×';
var update_vnet_tmpl =
'
\
@@ -972,7 +972,7 @@ function setupCreateVNetDialog() {
// width: 475,
// height: height
//});
- dialog.addClass("reveal-modal large");
+ dialog.addClass("reveal-modal large max-height");
//Make the tabs look nice for the creation mode
//$('#vn_tabs',dialog).tabs();
@@ -1320,18 +1320,13 @@ function setVNetAutorefresh() {
$(document).ready(function(){
dataTable_vNetworks = $("#datatable_vnetworks",main_tabs_context).dataTable({
- "sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>",
"oColVis": {
"aiExclude": [ 0 ]
},
"aoColumnDefs": [
{ "sWidth": "35px", "aTargets": [0,1] },
{ "bVisible": false, "aTargets": [7]}
- ],
- "oLanguage": (datatable_lang != "") ?
- {
- sUrl: "locale/"+lang+"/"+datatable_lang
- } : ""
+ ]
});
$('#vnet_search').keyup(function(){
diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js
index 364daf2c12..d47df2fa5d 100644
--- a/src/sunstone/public/js/sunstone-util.js
+++ b/src/sunstone/public/js/sunstone-util.js
@@ -341,9 +341,9 @@ function prettyPrintRowJSON(field,value,padding,weight, border_bottom,padding_to
function initCheckAllBoxes(datatable){
//small css hack
- $('input.check_all',datatable).css({"border":"2px"});
- $('input.check_all',datatable).live("change",function(){
- var table = $(this).parents('table');
+ $('input.check_all').css({"border":"2px"});
+ $('input.check_all').live("change",function(){
+ var table = $(this).closest('.dataTables_wrapper');
var checked = $(this).attr('checked');
if (checked) { //check all
$('tbody input.check_item',table).attr('checked','checked');
@@ -443,7 +443,7 @@ function onError(request,error_json) {
//Used when refreshing elements of a datatable.
function waitingNodes(dataTable){
$('tr input.check_item:visible',dataTable).replaceWith(spinner);
- recountCheckboxes(dataTable);
+ //recountCheckboxes(dataTable);
}
@@ -1112,7 +1112,7 @@ function setupQuotasDialog(dialog){
// width: 740,
// height: height
//});
- dialog.addClass("reveal-modal xlarge")
+ dialog.addClass("reveal-modal xlarge max-height")
//$('button',dialog).button();
$('#vm_quota,#datastore_quota,#image_quota,#network_quota',dialog).hide();
diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js
index 0069a7c118..5f55039387 100644
--- a/src/sunstone/public/js/sunstone.js
+++ b/src/sunstone/public/js/sunstone.js
@@ -582,19 +582,21 @@ function insertButtonsInTab(tab_name){
""+
'
"+
''+
- '
'+
+ ''+
+ ''+
+ '
diff --git a/src/sunstone/views/_login_x509.erb b/src/sunstone/views/_login_x509.erb
index 96150cd191..1e19ba1582 100644
--- a/src/sunstone/views/_login_x509.erb
+++ b/src/sunstone/views/_login_x509.erb
@@ -2,13 +2,6 @@
-
- Invalid username or password
-
-
- OpenNebula is not running
-
-
@@ -17,6 +10,10 @@
+
+
+
+
diff --git a/src/sunstone/views/index.erb b/src/sunstone/views/index.erb
index 51eb7d924c..ccd1eac86c 100644
--- a/src/sunstone/views/index.erb
+++ b/src/sunstone/views/index.erb
@@ -86,7 +86,9 @@