From 2b4a463fafb949a6d811f73fc3da5b2c9de30075 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 4 May 2011 14:57:01 -0700
Subject: [PATCH] bug 9534: CloudStack UI - Add Service Offering Dialog - add
 "CPU cap: (yes/no)"

---
 client/WEB-INF/classes/resources/messages.properties |  1 +
 ui/jsp/serviceoffering.jsp                           | 12 ++++++++++--
 ui/scripts/cloud.core.serviceoffering.js             |  4 ++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 8ff2e76c47f..33ed8962170 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -9,6 +9,7 @@ label.PING.dir=PING Directory
 label.TFTP.dir=TFTP Directory
 label.PING.CIFS.username=PING CIFS username
 label.PING.CIFS.password=PING CIFS password
+label.CPU.cap=CPU Cap
 
 #Labels
 label.PreSetup=PreSetup
diff --git a/ui/jsp/serviceoffering.jsp b/ui/jsp/serviceoffering.jsp
index d50f7c2261f..80d95f8e987 100644
--- a/ui/jsp/serviceoffering.jsp
+++ b/ui/jsp/serviceoffering.jsp
@@ -242,8 +242,16 @@ dictionary = {
                     <input class="text" type="text" id="add_service_tags" />
                     <div id="add_service_tags_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                     </div>
-                </li>	
-                <li>
+                </li>	               
+ 				<li>
+				    <label>
+				        <fmt:message key="label.CPU.cap"/>?:</label>
+				    <select class="select" id="cpu_cap_dropdown">				        
+				        <option value="false"><fmt:message key="label.no"/></option>
+				        <option value="true"><fmt:message key="label.yes"/></option>
+				    </select>
+				</li>
+				<li>
 				    <label>
 				        <fmt:message key="label.public"/>?:</label>
 				    <select class="select" id="public_dropdown">
diff --git a/ui/scripts/cloud.core.serviceoffering.js b/ui/scripts/cloud.core.serviceoffering.js
index 6ea55f34ad9..5422c4dc086 100644
--- a/ui/scripts/cloud.core.serviceoffering.js
+++ b/ui/scripts/cloud.core.serviceoffering.js
@@ -150,6 +150,10 @@ function initAddServiceOfferingDialog() {
 				if(tags != null && tags.length > 0)
 				    array1.push("&tags="+todb(tags));	
 				
+				if($thisDialog.find("#cpu_cap_dropdown_container").css("display") != "none") {                
+	                array1.push("&limitcpuuse="+$thisDialog.find("#cpu_cap_dropdown").val());		
+	            }   
+							
 				if($thisDialog.find("#domain_container").css("display") != "none") {                
 	                array1.push("&domainid="+domainId);		
 	            }