From 03e442f67806ced35e9946674f6976e1354f52b8 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Wed, 13 Jul 2011 01:16:18 +0200 Subject: [PATCH] Sunstone fixes related to VMs *Fix typo causing Chrome not to show VM log. *Increase size of info table key_td column *Disable deploy,migrate,live-migrate for users not belonging to gid=0, as hosts_select is not available. --- src/sunstone/public/css/application.css | 8 ++++++-- src/sunstone/public/js/plugins/vms-tab.js | 8 ++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/sunstone/public/css/application.css b/src/sunstone/public/css/application.css index 6e170d9f4d..8c42dae392 100644 --- a/src/sunstone/public/css/application.css +++ b/src/sunstone/public/css/application.css @@ -362,7 +362,7 @@ tr.even:hover{ display: inline-block; width:43%; vertical-align:top; - overflow:hidden; + overflow:auto; } .info_table > thead th,h3 { @@ -383,9 +383,12 @@ tr.even:hover{ padding-right: 8px; } +/*.info_table > tbody, .info_table > thead, info_table > tbody > tr { + width: 100%; +}*/ .info_table td.key_td{ - width: 100%; + min-width: 150px; text-align:left; font-weight:bold; } @@ -398,6 +401,7 @@ tr.even:hover{ .info_table td.value_td{ text-align:left; + width:100%; } #dialog > div > div { diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 5575ddd2bd..76592e1fff 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -333,7 +333,7 @@ var vm_actions = { colored_log += line + "\n"; } - $('#vm_log_tab#').html('
'+colored_log+'
') + $('#vm_log_tab').html('
'+colored_log+'
') }, error: function(request,error_json){ $("#vm_log pre").html(''); @@ -450,7 +450,7 @@ var vm_buttons = { if (hosts_select){return hosts_select} else {return ""} }, - condition: True + condition: function() { return gid == 0; } }, "VM.migrate" : { type: "confirm_with_select", @@ -460,7 +460,7 @@ var vm_buttons = { if (hosts_select){return hosts_select} else {return ""} }, - condition: True + condition: function() { return gid == 0; } }, "VM.livemigrate" : { @@ -471,7 +471,7 @@ var vm_buttons = { if (hosts_select){return hosts_select} else {return ""} }, - condition: True + condition: function() { return gid == 0; } }, "VM.hold" : { type: "confirm",