From a7c0de3cf269e4942806fdc19f7f93321bc5615b Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 16 Nov 2011 11:24:43 -0800
Subject: [PATCH] cloudStack 3.0 new UI - system - guest - (1) createNetwork -
 remove "tags" field since server-side doesn't support it any more. (2) add
 more fields to details tab of network tab.

---
 ui/scripts/system.js | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index c536a83d8e0..42f236a436f 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -482,8 +482,7 @@
 													netmask: { label: 'Netmask' },
 													startip: { label: 'Start IP' },
 													endip: { label: 'End IP' },
-													networkdomain: { label: 'Network domain' },
-													tags: { label: 'Tags' }
+													networkdomain: { label: 'Network domain' }
 												}
 											},
 
@@ -525,10 +524,7 @@
 
 												if(args.data.networkdomain != null && args.data.networkdomain.length > 0)
 													array1.push("&networkdomain=" + todb(args.data.networkdomain));
-
-												if(args.data.tags != null && args.data.tags.length > 0)
-													array1.push("&tags=" + todb(args.data.tags));
-													
+																								
 												array1.push("&networkOfferingId=" + args.data.networkOfferingId);  
 																								
 												$.ajax({
@@ -570,12 +566,24 @@
 												title: 'Details',
 												fields: [
 													{
-														name: { label: 'Name' },
-														vlan: { label: 'VLAN' },
+														name: { label: 'Name' }
+                          },
+                          {
+                            id: { label: 'ID' },
+                            displaytext: { label: 'Description' },														
 														isdefault: {  
 															label: 'Default',
 															converter: cloudStack.converters.toBooleanText
-														}						
+														},
+                            vlan: { label: 'VLAN ID' },
+                            networkofferingdisplaytext: { label: 'Network offering' },
+                            domain: { label: 'Domain' },
+                            account: { label: 'Account' },                            
+                            gateway: { label: 'Gateway' },
+                            netmask: { label: 'Netmask' },
+                            startip: { label: 'Start IP' },
+                            endip: { label: 'End IP' },
+                            networkdomain: { label: 'Network domain' }                                                 
 													}
 												],
 												dataProvider: function(args) {												
@@ -583,8 +591,7 @@
 												}
 											},
 										}
-									}
-									//???
+									}									
                 }
               }			  
             }