From 722d8faf171b5ea8a6697142e5dca2d212dfd20a Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Tue, 10 Jul 2012 16:23:40 -0700
Subject: [PATCH] VPC: Add tier detail view

On click of tier name, show a detail view of the specific tier.

This implemented as follows:

    tiers: {
      detailView: {
        name: 'Tier details',
        tabs: {
          details: {
            title: 'Details',
            fields: [
              { id: { label: 'ID' }},
              {
                name: { label: 'Name' },
                cidr: { label: 'CIDR' }
              }
            ],
            dataProvider: function(args) {
              args.response.success({
                data: args.context.networks[0]
              });
            }
          }
        }
      },
      ...
---
 ui/css/cloudstack3.css      | 13 +++++++++----
 ui/scripts/ui-custom/vpc.js | 29 +++++++++++++++++++++++++++++
 ui/scripts/vpc.js           | 22 +++++++++++++++++++++-
 3 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 6ed58329de3..4be401138a8 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -9013,11 +9013,13 @@ div.panel.ui-dialog div.list-view div.fixed-header {
 
 .vpc-chart li.tier span.title {
   color: #FFFFFF;
-  /*+placement:shift 11px 13px;*/
+  /*+placement:shift 8px 7px;*/
   position: relative;
-  left: 11px;
-  top: 13px;
+  left: 8px;
+  top: 7px;
   position: absolute;
+  cursor: pointer;
+  padding: 3px;
   font-size: 24px;
   /*+text-shadow:1px 2px 2px #000000;*/
   -moz-text-shadow: 1px 2px 2px #000000;
@@ -9175,7 +9177,8 @@ div.panel.ui-dialog div.list-view div.fixed-header {
   margin: 4px;
 }
 
-.vpc-chart li.tier .vm-count:hover {
+.vpc-chart li.tier .vm-count:hover,
+.vpc-chart li.tier .title:hover {
   border-radius: 4px;
   border: 1px solid #4C545E;
   background: url(../images/bg-gradients.png) 0px -2751px;
@@ -9229,6 +9232,8 @@ div.panel.ui-dialog div.list-view div.fixed-header {
   -webkit-text-shadow: 0px 0px 7px #FFFFFF;
   -o-text-shadow: 0px 0px 7px #FFFFFF;
   text-shadow: 0px 0px 7px #FFFFFF;
+  background: none;
+  border: none;
 }
 
 .vpc-chart li.tier.virtual-router {
diff --git a/ui/scripts/ui-custom/vpc.js b/ui/scripts/ui-custom/vpc.js
index 767e089b710..8d900c54313 100644
--- a/ui/scripts/ui-custom/vpc.js
+++ b/ui/scripts/ui-custom/vpc.js
@@ -134,6 +134,8 @@
           };
         }
       );
+      var detailView = args.detailView;
+      var $browser = args.$browser;
       var isPlaceholder = args.isPlaceholder;
       var virtualMachines = args.virtualMachines;
       var $tier = $('<li>').addClass('tier');
@@ -170,6 +172,19 @@
         }).closest('.ui-dialog').overlay();
       });
 
+      // Title shows tier details
+      $title.click(function() {
+        $browser.cloudBrowser('addPanel', {
+          title: name,
+          maximizeIfSelected: true,
+          complete: function($panel) {
+            $panel.detailView($.extend(true, {}, detailView, {
+              context: context
+            }));
+          }
+        });
+      });
+
       if (isPlaceholder) {
         $tier.addClass('placeholder');
         $title.html('Create Tier');
@@ -248,6 +263,7 @@
       var actionPreFilter = args.actionPreFilter;
       var vpcName = args.vpcName;
       var context = args.context;
+      var tierDetailView = args.tierDetailView;
       var $tiers = $('<ul>').addClass('tiers');
       var $router = elems.router();
       var $chart = $('<div>').addClass('vpc-chart');
@@ -270,6 +286,8 @@
         }
 
         addTierDialog({
+          $browser: $browser,
+          tierDetailView: tierDetailView,
           $tiers: $tiers,
           context: context,
           actions: actions,
@@ -283,6 +301,8 @@
       if (tiers != null && tiers.length > 0) {
         $(tiers).map(function(index, tier) {
           var $tier = elems.tier({
+            $browser: $browser,
+            detailView: tierDetailView,
             name: tier.name,
             cidr: tier.cidr,
             virtualMachines: tier.virtualMachines,
@@ -458,7 +478,11 @@
     var vmListView = args.vmListView;
     var actionPreFilter = args.actionPreFilter;
     var context = args.context;
+    var $browser = args.$browser;
+    var tierDetailView = args.tierDetailView;
     var tier = $.extend(args.tier, {
+      $browser: $browser,
+      detailView: tierDetailView,
       context: context,
       vmListView: vmListView,
       actions: actions,
@@ -482,6 +506,8 @@
     var vmListView = args.vmListView;
     var actionPreFilter = args.actionPreFilter;
     var $tiers = args.$tiers;
+    var $browser = args.$browser;
+    var tierDetailView = args.tierDetailView;
 
     cloudStack.dialog.createForm({
       form: actions.add.createForm,
@@ -504,6 +530,8 @@
                 function(args) {
                   $loading.remove();
                   addNewTier({
+                    $browser: $browser,
+                    tierDetailView: tierDetailView,
                     context: $.extend(true, {}, context, {
                       networks: [tier]
                     }),
@@ -564,6 +592,7 @@
                   $browser: $browser,
 									ipAddresses: ipAddresses,
 									gateways: gateways,
+                  tierDetailView: tierArgs.detailView,
                   siteToSiteVPN: siteToSiteVPN,
                   vmListView: vmListView,
                   context: context,
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 9ec248532ad..c9ab7d1c799 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -857,6 +857,26 @@
     },
 		
     tiers: {
+      detailView: {
+        name: 'Tier details',
+        tabs: {
+          details: {
+            title: 'Details',
+            fields: [
+              { id: { label: 'ID' }},
+              {
+                name: { label: 'Name' },
+                cidr: { label: 'CIDR' }
+              }
+            ],
+            dataProvider: function(args) {
+              args.response.success({
+                data: args.context.networks[0]
+              });
+            }
+          }
+        }
+      },
       actionPreFilter: function(args) {
         var tier = args.context.networks[0];
         var state = tier.state;
@@ -908,7 +928,7 @@
 							netmask: { 
 								label: 'label.netmask', 
 								validation: { required: true } 
-							},        
+							}
 						}
 					},
 					action: function(args) {