From dd31d33f7ce94be71f85549eea380dea4d66a1c3 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Tue, 3 Jul 2012 16:59:18 -0700
Subject: [PATCH] cloudstack 3.0 UI: VPC feature - implement listView and
 detailView.

---
 ui/scripts/network.js | 50 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 7 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index d461475fa63..0037eebff28 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -3110,9 +3110,10 @@
           id: 'vpc',
           label: 'VPC',
           fields: {
-            name: { label: 'Name' },
-            zone: { label: 'Zone' },
-            cidr: { label: 'CIDR' }
+            name: { label: 'label.name' },                  
+						displaytext: { label: 'label.description' },										
+						zonename: { label: 'label.zone' },
+						cidr: { label: 'label.cidr' }						
           },
           dataProvider: function(args) {            
 						var array1 = [];  
@@ -3209,9 +3210,8 @@
 									vpcofferingid: defaultvpcofferingid
 								};
 								
-								if(args.data.networkdomain != null)
-								  $.extend(dataObj, { networkdomain: args.data.networkdomain });
-								
+								if(args.data.networkdomain != null && args.data.networkdomain.length > 0)
+								  $.extend(dataObj, { networkdomain: args.data.networkdomain });								
 								
 								$.ajax({
                   url: createURL("createVPC"),
@@ -3242,7 +3242,43 @@
                 custom: cloudStack.uiCustom.vpc(cloudStack.vpc)
               }
             }
-          }
+          },									
+					
+					detailView: {
+            name: 'label.details',
+            tabs: {
+              details: {
+                title: 'label.details',
+                fields: [
+                  {				
+                    name: { label: 'label.name' }
+                  },
+                  {	
+										displaytext: { label: 'label.description' },										
+										zonename: { label: 'label.zone' },
+										cidr: { label: 'label.cidr' },
+										networkdomain: { label: 'label.network.domain' },
+										state: { label: 'label.state' },
+                    id: { label: 'label.id' }										
+                  }
+                ],
+                dataProvider: function(args) {		
+									$.ajax({
+										url: createURL("listVPCs"),
+										dataType: "json",
+										data: {
+										  id: args.context.vpc[0].id
+										},
+										async: true,
+										success: function(json) {
+											var item = json.listvpcsresponse.vpc[0];
+											args.response.success({data: item});
+										}
+									});									
+								}
+              }
+            }
+          }								
         }
       },