[Ovirt-devel] [PATCH] replace gtk-vnc with virt-viewer plugin

[Alan Pevec]

open issue:
- console.rhtml opens as new window, it was displaying gtk-vnc plugin.
  virt-viewer plugin doesn't display anything, it just launches an external
  virt-viewer program. We could embedd the plugin in show.rhtml, if it were
  possible to control the plugin when to launch virt-viewer.
---
 wui-appliance/common-pkgs.ks       |    3 +--
 wui/src/app/views/vm/console.rhtml |   11 +++++++----
 wui/src/app/views/vm/show.rhtml    |    2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/wui-appliance/common-pkgs.ks b/wui-appliance/common-pkgs.ks
index 62f688f..15d3178 100644
--- a/wui-appliance/common-pkgs.ks
+++ b/wui-appliance/common-pkgs.ks
@@ -17,9 +17,8 @@ iscsi-initiator-utils
 ovirt-wui.noarch
 ovirt-host-image-pxe
 firefox
-gtk-vnc-plugin
 xorg-x11-xauth
-virt-viewer
+virt-viewer-plugin
 rhpl
 cobbler
 rubygem-cobbler
diff --git a/wui/src/app/views/vm/console.rhtml b/wui/src/app/views/vm/console.rhtml
index 06e2068..5a853de 100644
--- a/wui/src/app/views/vm/console.rhtml
+++ b/wui/src/app/views/vm/console.rhtml
@@ -26,10 +26,13 @@
 </div>
     </body>
 <%else -%>
-<embed type="application/x-gtk-vnc"
-    width="800"
-    height="600"
-    host="<%= @vm.host.hostname%>" port="<%= @vm.vnc_port%>">
+<embed type="application/x-virt-viewer"
+    hidden="1"
+    uri="qemu+tcp://<%= @vm.host.hostname%>/system"
+    name="<%= @vm.uuid%>">
 </embed>
+virt-viewer started<br/>
+hypervisor qemu+tcp://<%= @vm.host.hostname%>/system<br/>
+virtual machine <%= @vm.uuid%> <br/>
 <%end -%>
   </html>
diff --git a/wui/src/app/views/vm/show.rhtml b/wui/src/app/views/vm/show.rhtml
index 03395f7..4e9eab1 100644
--- a/wui/src/app/views/vm/show.rhtml
+++ b/wui/src/app/views/vm/show.rhtml
@@ -9,7 +9,7 @@
                           :id=>"vnc_console_link" %>
     <script type="text/javascript">
       $('#vnc_console_link').bind('click', function(){
-              window.open($(this).attr('href'),'_blank','toolbar=no,height=600,width=800, resizable=yes,status=no');
+              window.open($(this).attr('href'),'console','toolbar=no,height=300,width=400,resizable=no,status=no,scrollbars=no,menubar=no,location=no');
               return false;})
     </script>
   <% end -%>
-- 
1.5.5.1