From 20b0790753962a492b9388615d40692265bc2ce9 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Fri, 3 Aug 2012 11:12:31 -0700
Subject: [PATCH] CS-15809: Show account/domain fields on VPC detail view

Conflicts:
	ui/scripts/network.js
---
 ui/scripts/network.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 4f1b41d8d28..02317dcf830 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -3833,13 +3833,15 @@
                   {				
                     name: { label: 'label.name', isEditable: true }
                   },
-                  {	
-										displaytext: { label: 'label.description', isEditable: true },										
-										zonename: { label: 'label.zone' },
-										cidr: { label: 'label.cidr' },
-										networkdomain: { label: 'label.network.domain' },
-										state: { label: 'label.state' },
-                    id: { label: 'label.id' }										
+                  {
+                    displaytext: { label: 'label.description', isEditable: true },
+                    account: { label: 'label.account' },
+                    domain: { label: 'label.domain' },
+                    zonename: { label: 'label.zone' },
+                    cidr: { label: 'label.cidr' },
+                    networkdomain: { label: 'label.network.domain' },
+                    state: { label: 'label.state' },
+                    id: { label: 'label.id' }
                   }
                 ],