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

Cleaned up the UI for Beta2 features.

This commit is contained in:
will 2010-12-09 15:15:17 -08:00
parent 1915cbcdc7
commit e54892290c
6 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@ label.menu.alerts=Alerts
label.menu.system=System
label.menu.physical.resources=Physical Resources
label.menu.virtual.resources=Virtual Resources
label.menu.virtual.routers=Virtual Routers
label.menu.virtual.appliances=Virtual Appliances
label.menu.system.vms=System VMs
label.menu.configuration=Configuration
label.menu.service.offerings=Service Offerings

2
client/WEB-INF/classes/resources/messages_en.properties
View File

@ -63,7 +63,7 @@ label.menu.alerts=Alerts
label.menu.system=System
label.menu.physical.resources=Physical Resources
label.menu.virtual.resources=Virtual Resources
label.menu.virtual.routers=Virtual Routers
label.menu.virtual.appliances=Virtual Appliances
label.menu.system.vms=System VMs
label.menu.configuration=Configuration
label.menu.service.offerings=Service Offerings

4
ui/index.jsp
View File

@ -772,7 +772,7 @@
<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
</div>
<div><fmt:message key="label.menu.virtual.routers"/></div>
<div><fmt:message key="label.menu.virtual.appliances"/></div>
</div>
</div>
</div>
@ -840,10 +840,12 @@
<!-- Left Menu ends here-->
</div>
<div id="footer">
<!--
<div class="footer_testprovisiongtool" id="launch_test" style="display:none">
<div class="footer_testprovisiongtool_icon"></div>
<a href="#">Launch Test Provisioning Tool</a>
</div>
-->
<div class="poweredby_box">
</div>
</div>

27
ui/jsp/instance.jsp
View File

@ -106,8 +106,10 @@
<%=t.t("Volumes")%></div>
<div class="content_tabs off" id="tab_statistics">
<%=t.t("Statistics")%></div>
<!--
<div class="content_tabs off" id="tab_router" style="display:none">
<%=t.t("Router")%></div>
-->
</div>
<!--Details tab (start)-->
<div id="tab_content_details">
@ -150,12 +152,13 @@
<div class="vm_status_textline green" id="state">
</div>
<br />
<!--
<p id="ipAddress">
</p>
-->
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
@ -189,6 +192,7 @@
<div id="vmname_edit_errormsg" style="display:none"></div>
</div>
</div>
<!--
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
@ -198,8 +202,9 @@
<div class="row_celltitles" id="ipaddress">
</div>
</div>
</div>
<div class="grid_rows even">
</div>
-->
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Template")%>:</div>
@ -209,7 +214,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("Service")%>:</div>
@ -219,7 +224,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("HA.Enabled")%>:</div>
@ -233,7 +238,7 @@
</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">
<%=t.t("Created")%>:</div>
@ -243,7 +248,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("Account")%>:</div>
@ -253,7 +258,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("Domain")%>:</div>
@ -263,7 +268,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("Host")%>:</div>
@ -273,7 +278,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("ISO.attached")%>:</div>
@ -283,7 +288,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("Group")%>:</div>

38
ui/jsp/router.jsp
View File

@ -16,7 +16,7 @@
<img src="images/title_routersicon.gif" alt="Routers" /></div>
<h1>
Router
Virtual Appliance
</h1>
</div>
<div class="contentbox" id="right_panel_content">
@ -55,24 +55,24 @@
</div>
</div>
<div class="grid_rows odd">
<div class="vm_statusbox">
<div id="view_console_container">
<div id="view_console_template" style="display:block">
<div class="vm_consolebox" id="box0">
</div>
<div class="vm_consolebox" id="box1" style="display: none">
</div>
</div>
</div>
<div class="vm_status_textbox">
<div class="vm_status_textline green" id="state">
</div>
<br />
<p id="ipAddress">
</p>
</div>
</div>
</div>
<div class="vm_statusbox">
<div id="view_console_container" style="float: left;">
<div id="view_console_template" style="display: block">
<div class="vm_consolebox" id="box0">
</div>
<div class="vm_consolebox" id="box1" style="display: none">
</div>
</div>
</div>
<div class="vm_status_textbox">
<div class="vm_status_textline green" id="state">
</div>
<br />
<p id="ipAddress">
</p>
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">

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

@ -1462,7 +1462,7 @@ function vmToMidmenu(jsonObj, $midmenuItem1) {
var vmName = getVmName(jsonObj.name, jsonObj.displayname);
$midmenuItem1.find("#first_row").text(vmName);
$midmenuItem1.find("#second_row").text(jsonObj.ipaddress);
$midmenuItem1.find("#second_row").text(jsonObj.templatename);
updateVmStateInMidMenu(jsonObj, $midmenuItem1);
$midmenuItem1.data("toRightPanelFn", vmToRightPanel);