From ff29e4f02fc10ed4604978bc26ca19c5a6e411be Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Tue, 7 Aug 2012 15:43:52 -0700
Subject: [PATCH] CS-15891: Add view console action to VPC instances list view

---
 ui/css/cloudstack3.css | 15 ++++++++++++---
 ui/scripts/vpc.js      | 15 +++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 45d9ba4debf..b8fc215d3f7 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -9647,7 +9647,7 @@ div.panel.ui-dialog div.list-view div.fixed-header {
   float: left;
 }
 
-/*Configure ACL dialog*/
+/*Configure ACL dialog / VM tier list view dialog*/
 .ui-dialog.configure-acl .multi-edit {
   width: 866px;
 }
@@ -9657,12 +9657,16 @@ div.panel.ui-dialog div.list-view div.fixed-header {
 }
 
 .ui-dialog.configure-acl .ui-dialog-buttonpane {
-  /*+placement:shift 798px -2px;*/
+  /*+placement:shift 722px -2px;*/
   position: relative;
-  left: 798px;
+  left: 722px;
   top: -2px;
 }
 
+.ui-dialog.configure-acl div.view.list-view {
+  max-height: 474px;
+}
+
 .ui-dialog.configure-acl .multi-edit .data {
   width: 901px;
   padding: 0;
@@ -9677,6 +9681,11 @@ div.panel.ui-dialog div.list-view div.fixed-header {
   max-width: none !important;
 }
 
+.ui-dialog.configure-acl .view.list-view table.body tr td.actions {
+  width: 184px !important;
+  max-width: 184px !important;
+}
+
 /*Autoscaler*/
 .ui-dialog div.autoscaler {
   overflow: auto;
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 4354b282dc5..77fb4c199f0 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -369,6 +369,21 @@
                 }
               });
             }
+          },
+          viewConsole: {
+            label: 'label.view.console',
+            action: {
+              externalLink: {
+                url: function(args) {
+                  return clientConsoleUrl + '?cmd=access&vm=' + args.context.vpcTierInstances[0].id;
+                },
+                title: function(args) {						
+                  return args.context.vpcTierInstances[0].id.substr(0,8);  //title in window.open() can't have space nor longer than 8 characters. Otherwise, IE browser will have error.
+                },
+                width: 820,
+                height: 640
+              }
+            }
           }
         },
         dataProvider: function(args) {