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

bug 10631: cloudStack - Instance page - details tab - add hypervisor gridrow.

This commit is contained in:
Jessica Wang 2011-07-26 17:12:26 -07:00
parent 5724a016c6
commit 8e54d17bd5
2 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
ui/jsp/instance.jsp
View File

@ -158,8 +158,18 @@ dictionary = {
<input class="text" id="vmname_edit" style="width: 200px; display: none;" type="text" />
<div id="vmname_edit_errormsg" style="display:none"></div>
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.hypervisor"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="hypervisor">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.template"/>:</div>
@ -169,7 +179,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.os.type"/>:</div>
@ -181,7 +191,7 @@ dictionary = {
</select>
</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.service.offering"/>:</div>
@ -191,7 +201,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.ha.enabled"/>:</div>
@ -205,36 +215,6 @@ dictionary = {
</select>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.created"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="created">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.account"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="account">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.domain"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="domain">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
@ -266,7 +246,37 @@ dictionary = {
<input class="text" id="group_edit" style="width: 200px; display: none;" type="text" />
<div id="group_edit_errormsg" style="display:none"></div>
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.domain"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="domain">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.account"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="account">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.created"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="created">
</div>
</div>
</div>
</div>
<div class="grid_botactionpanel">

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

@ -1899,8 +1899,9 @@ function vmJsonToDetailsTab(){
$thisTab.find("#vmname").text(vmName);
$thisTab.find("#vmname_edit").val(fromdb(jsonObj.displayname));
$thisTab.find("#ipaddress").text(fromdb(jsonObj.ipaddress));
$thisTab.find("#ipaddress").text(fromdb(jsonObj.ipaddress));
$thisTab.find("#hypervisor").text(fromdb(jsonObj.hypervisor));
$thisTab.find("#templateName").text(fromdb(jsonObj.templatename));
$thisTab.find("#ostypename").text(osTypeMap[fromdb(jsonObj.guestosid)]);
@ -2243,7 +2244,8 @@ function vmJsonClearDetailsTab(){
$thisTab.find("#title").text("");
$thisTab.find("#vmname").text("");
$thisTab.find("#vmname_edit").val("");
$thisTab.find("#ipaddress").text("");
$thisTab.find("#ipaddress").text("");
$thisTab.find("#hypervisor").text("");
$thisTab.find("#templateName").text("");
$thisTab.find("#ostypename").text("");
$thisTab.find("#ostypename_edit").val("");