etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 7553: cloudStack - System Service Offering - implement Add System Service Offering action.

This commit is contained in:
Jessica Wang 2011-05-31 15:59:17 -07:00
parent a690d6169d
commit 997ef3768f
5 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/WEB-INF/classes/resources/messages.properties
View File

@ -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

12
ui/jsp/systemserviceoffering.jsp
View File

@ -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">

2
ui/scripts/cloud.core.init.js
View File

@ -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);
}

2
ui/scripts/cloud.core.serviceoffering.js
View File

@ -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;

28
ui/scripts/cloud.core.systemserviceoffering.js
View File

@ -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;