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

bug 7430: Instance page - add OS Type in details tab.

This commit is contained in:
Jessica Wang 2011-01-04 12:04:06 -08:00
parent c3cbe982d9
commit 05afca54f2
4 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ui/jsp/instance.jsp
View File

@ -139,8 +139,20 @@
<div class="row_celltitles" id="templateName">
</div>
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("OS.Type")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="ostypename">
</div>
<select class="select" id="ostypename_edit" style="width: 202px; display: none;">
</select>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Service")%>:</div>
@ -150,7 +162,7 @@
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("HA.Enabled")%>:</div>
@ -164,7 +176,7 @@
</select>
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Created")%>:</div>
@ -174,7 +186,7 @@
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Account")%>:</div>
@ -184,7 +196,7 @@
</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">
<%=t.t("Domain")%>:</div>
@ -194,7 +206,7 @@
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Host")%>:</div>
@ -204,7 +216,7 @@
</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">
<%=t.t("ISO.attached")%>:</div>
@ -214,7 +226,7 @@
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Group")%>:</div>

19
ui/scripts/cloud.core.instance.js
View File

@ -88,6 +88,7 @@ function instanceBuildSubMenu2(label, commandString) {
var $doTemplateNo, $doTemplateCustom,$doTemplateExisting, $soTemplate;
var init = false;
var $selectedVmWizardTemplate;
var osTypeMap = {};
function afterLoadInstanceJSP() {
if (!init) {
//initialize VM Wizard
@ -132,6 +133,20 @@ function afterLoadInstanceJSP() {
initDialog("dialog_confirmation_start_router");
initDialog("dialog_confirmation_stop_router");
initDialog("dialog_confirmation_reboot_router");
$.ajax({
data: createURL("command=listOsTypes"),
dataType: "json",
async: false,
success: function(json) {
types = json.listostypesresponse.ostype;
if (types != null && types.length > 0) {
for (var i = 0; i < types.length; i++) {
osTypeMap[types[i].id] = fromdb(types[i].description);
}
}
}
});
}
function bindStartVMButton() {
@ -1536,6 +1551,10 @@ function vmJsonToDetailsTab(){
$thisTab.find("#ipaddress").text(fromdb(jsonObj.ipaddress));
$thisTab.find("#templateName").text(fromdb(jsonObj.templatename));
$thisTab.find("#ostypename").text(osTypeMap[fromdb(jsonObj.guestosid)]);
$thisTab.find("#ostypename_edit").val(fromdb(jsonObj.guestosid));
$thisTab.find("#serviceOfferingName").text(fromdb(jsonObj.serviceofferingname));
$thisTab.find("#account").text(fromdb(jsonObj.account));
$thisTab.find("#domain").text(fromdb(jsonObj.domain));

1
ui/scripts/cloud.core.iso.js
View File

@ -94,6 +94,7 @@ function initAddIsoDialog() {
$.ajax({
data: createURL("command=listOsTypes"),
dataType: "json",
async: false,
success: function(json) {
types = json.listostypesresponse.ostype;
if (types != null && types.length > 0) {

1
ui/scripts/cloud.core.template.js
View File

@ -166,6 +166,7 @@ function afterLoadTemplateJSP() {
$.ajax({
data: createURL("command=listOsTypes&response=json"),
dataType: "json",
async: false,
success: function(json) {
types = json.listostypesresponse.ostype;
if (types != null && types.length > 0) {