From 997ef3768f8d1c36e8b5ff675695a2ec20048fa0 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 31 May 2011 15:59:17 -0700
Subject: [PATCH] bug 7553: cloudStack - System Service Offering - implement
 Add System Service Offering action.

---
 .../classes/resources/messages.properties     |  1 +
 ui/jsp/systemserviceoffering.jsp              | 12 ++++----
 ui/scripts/cloud.core.init.js                 |  2 +-
 ui/scripts/cloud.core.serviceoffering.js      |  2 +-
 .../cloud.core.systemserviceoffering.js       | 28 +++++++++----------
 5 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 5de1b1b07fe..2fed7b1c504 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -210,6 +210,7 @@ label.add.primary.storage=Add Primary Storage
 label.add.secondary.storage=Add Secondary Storage
 label.add.security.group=Add Security Group
 label.add.service.offering=Add Service Offering
+label.add.system.service.offering=Add System Service Offering
 label.add.template=Add Template
 label.add.user=Add User
 label.add.vlan=Add VLAN
diff --git a/ui/jsp/systemserviceoffering.jsp b/ui/jsp/systemserviceoffering.jsp
index 1f36cfdc9c2..3521e55dd46 100644
--- a/ui/jsp/systemserviceoffering.jsp
+++ b/ui/jsp/systemserviceoffering.jsp
@@ -20,7 +20,7 @@ dictionary = {
         <img src="images/title_serviceofferingicon.gif"/></div>
     
     <h1>
-        <fmt:message key="label.service.offering"/>
+        <fmt:message key="label.system.service.offering"/>
     </h1>
 </div>
 <div class="contentbox" id="right_panel_content">
@@ -191,20 +191,20 @@ dictionary = {
 
 <!--  top buttons (begin) -->
 <div id="top_buttons">
-    <div class="actionpanel_button_wrapper" id="add_serviceoffering_button">
+    <div class="actionpanel_button_wrapper" id="add_systemserviceoffering_button">
         <div class="actionpanel_button">
             <div class="actionpanel_button_icons">
-                <img src="images/addvm_actionicon.png" alt="Add Service Offering" /></div>
+                <img src="images/addvm_actionicon.png" alt="Add System Service Offering" /></div>
             <div class="actionpanel_button_links">
-                <fmt:message key="label.add.service.offering"/>
+                <fmt:message key="label.add.system.service.offering"/>
             </div>
         </div>
     </div>
 </div>
 <!--  top buttons (end) -->
 
-<!-- Add Service Offering Dialog -->
-<div id="dialog_add_service" title='<fmt:message key="label.add.service.offering"/>' style="display:none">
+<!-- Add System Service Offering Dialog -->
+<div id="dialog_add_systemserviceoffering" title='<fmt:message key="label.add.system.service.offering"/>' style="display:none">
 	<p><fmt:message key="message.add.service.offering"/></p>
 	<div class="dialog_formcontent">
 		<form action="#" method="post" id="form_acquire">
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index 03f38ce2e43..b40a5285e05 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -236,7 +236,7 @@ $(document).ready(function() {
 		
 			//configuration	
 			bindAndListMidMenuItems($("#leftmenu_service_offering"), "listServiceOfferings&issystem=false", serviceOfferingGetSearchParams, "listserviceofferingsresponse", "serviceoffering", "jsp/serviceoffering.jsp", afterLoadServiceOfferingJSP, serviceOfferingToMidmenu, serviceOfferingToRightPanel, getMidmenuId, false); 
-			bindAndListMidMenuItems($("#leftmenu_system_service_offering"), "listServiceOfferings&issystem=true", systemServiceOfferingGetSearchParams, "listserviceofferingsresponse", "serviceoffering", "jsp/serviceoffering.jsp", afterLoadServiceOfferingJSP, serviceOfferingToMidmenu, serviceOfferingToRightPanel, getMidmenuId, false); 
+			bindAndListMidMenuItems($("#leftmenu_system_service_offering"), "listServiceOfferings&issystem=true", systemServiceOfferingGetSearchParams, "listserviceofferingsresponse", "serviceoffering", "jsp/systemserviceoffering.jsp", afterLoadSystemServiceOfferingJSP, systemServiceOfferingToMidmenu, systemServiceOfferingToRightPanel, getMidmenuId, false); 
 			bindAndListMidMenuItems($("#leftmenu_disk_offering"), "listDiskOfferings", diskOfferingGetSearchParams, "listdiskofferingsresponse", "diskoffering", "jsp/diskoffering.jsp", afterLoadDiskOfferingJSP, diskOfferingToMidmenu, diskOfferingToRightPanel, getMidmenuId, false); 
 			bindAndListMidMenuItems($("#leftmenu_network_offering"), "listNetworkOfferings&guestiptype=Virtual", networkOfferingGetSearchParams, "listnetworkofferingsresponse", "networkoffering", "jsp/networkoffering.jsp", afterLoadNetworkOfferingJSP, networkOfferingToMidmenu, networkOfferingToRightPanel, getMidmenuId, false);  
 		}
diff --git a/ui/scripts/cloud.core.serviceoffering.js b/ui/scripts/cloud.core.serviceoffering.js
index f3f7241ccb7..e05d58e8f31 100644
--- a/ui/scripts/cloud.core.serviceoffering.js
+++ b/ui/scripts/cloud.core.serviceoffering.js
@@ -159,7 +159,7 @@ function initAddServiceOfferingDialog() {
 	            }            
 								
 				$.ajax({
-				  data: createURL("command=createServiceOffering"+array1.join("")),
+				  data: createURL("command=createServiceOffering&issystem=false"+array1.join("")),
 					dataType: "json",
 					success: function(json) {					    				
 						var item = json.createserviceofferingresponse.serviceoffering;							
diff --git a/ui/scripts/cloud.core.systemserviceoffering.js b/ui/scripts/cloud.core.systemserviceoffering.js
index 8969bd7febd..0e61edbb300 100644
--- a/ui/scripts/cloud.core.systemserviceoffering.js
+++ b/ui/scripts/cloud.core.systemserviceoffering.js
@@ -61,30 +61,30 @@ function afterLoadSystemServiceOfferingJSP() {
 }
 
 function initAddSystemServiceOfferingDialog() {
-    initDialog("dialog_add_service");
+    initDialog("dialog_add_systemserviceoffering");
     
-    var $dialogAddService = $("#dialog_add_service");
-    $dialogAddService.find("#public_dropdown").unbind("change").bind("change", function(event) {        
+    var $dialogAddSystemServiceOffering = $("#dialog_add_systemserviceoffering");
+    $dialogAddSystemServiceOffering.find("#public_dropdown").unbind("change").bind("change", function(event) {        
         if($(this).val() == "true") {  //public zone
-            $dialogAddService.find("#domain_container").hide();  
+            $dialogAddSystemServiceOffering.find("#domain_container").hide();  
         }
         else {  //private zone
-            $dialogAddService.find("#domain_container").show();  
+            $dialogAddSystemServiceOffering.find("#domain_container").show();  
         }
         return false;
     });
     
-    applyAutoCompleteToDomainField($dialogAddService.find("#domain"));   
+    applyAutoCompleteToDomainField($dialogAddSystemServiceOffering.find("#domain"));   
    		         
     $("#add_systemserviceoffering_button").unbind("click").bind("click", function(event) {    
-		$dialogAddService.find("#add_service_name").val("");
-		$dialogAddService.find("#add_service_display").val("");
-		$dialogAddService.find("#add_service_cpucore").val("");
-		$dialogAddService.find("#add_service_cpu").val("");
-		$dialogAddService.find("#add_service_memory").val("");
-		$dialogAddService.find("#add_service_offerha").val("false");
+		$dialogAddSystemServiceOffering.find("#add_service_name").val("");
+		$dialogAddSystemServiceOffering.find("#add_service_display").val("");
+		$dialogAddSystemServiceOffering.find("#add_service_cpucore").val("");
+		$dialogAddSystemServiceOffering.find("#add_service_cpu").val("");
+		$dialogAddSystemServiceOffering.find("#add_service_memory").val("");
+		$dialogAddSystemServiceOffering.find("#add_service_offerha").val("false");
 			
-		$dialogAddService
+		$dialogAddSystemServiceOffering
 		.dialog('option', 'buttons', { 				
 			"Add": function() { 	
 			    var $thisDialog = $(this);
@@ -159,7 +159,7 @@ function initAddSystemServiceOfferingDialog() {
 	            }            
 								
 				$.ajax({
-				  data: createURL("command=createServiceOffering"+array1.join("")),
+				  data: createURL("command=createServiceOffering&issystem=true"+array1.join("")),
 					dataType: "json",
 					success: function(json) {					    				
 						var item = json.createserviceofferingresponse.serviceoffering;