[Ovirt-devel] [PATCH server] changed vm details pane vnc uri, removed 'Remote Desktop' virt-viewer-plugin link

[Mohammed Morsi]

virt-viewer-plugin is deprecated and will be replaced w/ ovirt-viewer-plugin,
vm details pane uri indicates ovirt-viewer should be used with the
 specified hostname
---
 src/app/views/vm/show.rhtml |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/app/views/vm/show.rhtml b/src/app/views/vm/show.rhtml
index ffe5055..30b17cb 100644
--- a/src/app/views/vm/show.rhtml
+++ b/src/app/views/vm/show.rhtml
@@ -4,16 +4,7 @@
 
 <%- content_for :action_links do -%>
   <%if @can_control_vms -%>
-    <%if @vm.has_console -%>
-      <%= link_to image_tag("icon_machine_11px.png") + " Remote Desktop",
-                            {:controller => 'vm', :action => 'console', :id => @vm},
-                            :id=>"vnc_console_link" %>
-      <script type="text/javascript">
-        $('#vnc_console_link').bind('click', function(){
-                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 -%>
+    <%# FIXME removed the vnc-viewer-plugin link, replace with ovirt-viewer-plugin link when it exists %>
 
     <%= link_to image_tag("icon_terminal_11px.png") + " Open Terminal",
                          {:controller => 'vm', :action => 'terminal', :id => @vm},
@@ -101,7 +92,7 @@
     <div id="vms_selection_id" style="display:none"><%= @vm.id %></div>
     <div class="selection_key">
         Uuid:<br/>
-        <%= @vm.forward_vnc ? "VNC uri:<br/>" : "" %>
+        VNC uri:<br/>
 	Num vcpus allocated:<br/>
 	Num vcpus used:<br/>
 	Memory allocated:<br/>
@@ -115,9 +106,8 @@
     </div>
     <div class="selection_value">
        <%=h @vm.uuid %><br/>
-       <%= url = request.url
-           url = request.url[0..(url.index('/', 8) - 1)] + ":" + @vm.forward_vnc_port.to_s
-           @vm.forward_vnc ? (url + "<br/>") : "" %>
+       ovirt-viewer@<span id="vnc_uri"/><br/>
+       <script type="text/javascript">$('#vnc_uri').html(get_server_from_url());</script>
        <%=h @vm.num_vcpus_allocated %><br/>
        <%=h @vm.num_vcpus_used %><br/>
        <%=h @vm.memory_allocated_in_mb %> MB<br/>
-- 
1.6.0.6