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

bug 7553: cloudStack - Router page - add Service Offering gridrow.

This commit is contained in:
Jessica Wang 2011-05-31 17:00:53 -07:00
parent 5abe9a3e79
commit c6a0c62fb6
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/jsp/router.jsp
View File

@ -157,6 +157,16 @@ dictionary = {
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.service.offering"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="serviceOfferingName">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.network.domain"/>:</div>
@ -167,7 +177,7 @@ dictionary = {
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.domain"/>:</div>
@ -178,7 +188,7 @@ dictionary = {
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.account"/>:</div>
@ -188,7 +198,7 @@ dictionary = {
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.created"/>:</div>

11
ui/scripts/cloud.core.router.js
View File

@ -75,7 +75,8 @@ function routerGetSearchParams() {
}
function afterLoadRouterJSP() {
// dialogs
initDialog("dialog_change_system_service_offering", 600);
}
function routerToMidmenu(jsonObj, $midmenuItem1) {
@ -176,7 +177,8 @@ function routerJsonToDetailsTab() {
$thisTab.find("#publicip").text(fromdb(jsonObj.publicip));
$thisTab.find("#privateip").text(fromdb(jsonObj.linklocalip));
$thisTab.find("#guestipaddress").text(fromdb(jsonObj.guestipaddress));
$thisTab.find("#hostname").text(fromdb(jsonObj.hostname));
$thisTab.find("#hostname").text(fromdb(jsonObj.hostname));
$thisTab.find("#serviceOfferingName").text(fromdb(jsonObj.serviceofferingname));
$thisTab.find("#networkdomain").text(fromdb(jsonObj.networkdomain));
$thisTab.find("#domain").text(fromdb(jsonObj.domain));
$thisTab.find("#account").text(fromdb(jsonObj.account));
@ -224,7 +226,8 @@ function routerClearDetailsTab() {
$thisTab.find("#publicip").text("");
$thisTab.find("#privateip").text("");
$thisTab.find("#guestipaddress").text("");
$thisTab.find("#hostname").text("");
$thisTab.find("#hostname").text("");
$thisTab.find("#serviceOfferingName").text("");
$thisTab.find("#networkdomain").text("");
$thisTab.find("#domain").text("");
$thisTab.find("#account").text("");
@ -309,7 +312,7 @@ function doChangeSystemServiceOffering($actionLink, $detailsTab, $midmenuItem1)
}
$.ajax({
data: createURL("command=listServiceOfferings&VirtualMachineId="+id),
data: createURL("command=listServiceOfferings&issystem=true"),
dataType: "json",
async: false,
success: function(json) {