From 589dfe511f6057e32a0377088b9f32f94a44584b Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 27 Jan 2012 13:27:48 -0800
Subject: [PATCH] bug 12869: (1) create Network Offering dialog - add new
 checkbox "Sepcify IP Ranges". (2) network offering detail view - add "Sepcify
 IP Ranges" row.

---
 ui/scripts/configuration.js | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index ebd97f53e98..4af43a33602 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -1058,7 +1058,7 @@
 										} 
                     else if ((key == 'service.Lb.elasticLbCheckbox') && ("Lb" in serviceProviderMap)) {	//if checkbox is unchecked, it won't be included in formData in the first place. i.e. it won't fall into this section								
 											inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] = 'lb';
-											inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'ElasticLb'; //??? waiting for Alena's response
+											inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'ElasticLb'; 
 											inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = true; //because this checkbox's value == "on"
 											serviceCapabilityIndex++;
 										} 										
@@ -1070,7 +1070,7 @@
 										} 
                     else if ((key == 'service.StaticNat.elasticIpCheckbox') && ("StaticNat" in serviceProviderMap)) {	//if checkbox is unchecked, it won't be included in formData in the first place. i.e. it won't fall into this section								
 											inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] = 'StaticNat';
-											inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'ElasticIp'; //??? waiting for Alena's response
+											inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'ElasticIp'; 
 											inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = true; //because this checkbox's value == "on"
 											serviceCapabilityIndex++;
 										} 										
@@ -1090,7 +1090,13 @@
                 } else {
                   inputData['specifyVlan'] = false;
                 }
-
+								
+								if (inputData['specifyIpRanges'] == 'on') {
+                  inputData['specifyIpRanges'] = true;
+                } else {
+                  inputData['specifyIpRanges'] = false;
+                }
+																
 								if (inputData['conservemode'] == 'on') {
                   inputData['conservemode'] = true;
                 } else {
@@ -1202,7 +1208,9 @@
                   },
 
                   specifyVlan: { label: 'Specify VLAN', isBoolean: true },
-
+								
+									specifyIpRanges: { label: 'Specify IP ranges', isBoolean: true },
+								
                   supportedServices: {
                     label: 'Supported Services',
 
@@ -1551,15 +1559,19 @@
                     },
                     isdefault: {
                       label: 'Default',
-                      converter:cloudStack.converters.toBooleanText
+                      converter: cloudStack.converters.toBooleanText
                     },
                     specifyvlan: {
                       label: 'Specify VLAN',
-                      converter:cloudStack.converters.toBooleanText
+                      converter: cloudStack.converters.toBooleanText
                     },
+										specifyipranges: { 
+										  label: 'Specify IP ranges', 
+											converter: cloudStack.converters.toBooleanText
+										},
 										conservemode: {
                       label: 'Conserve mode',
-                      converter:cloudStack.converters.toBooleanText
+                      converter: cloudStack.converters.toBooleanText
                     },
                     networkrate: {
                       label: 'Network rate',