Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

This commit is contained in:
Kris McQueen 2010-10-13 16:09:38 -07:00
commit 354590d018
26 changed files with 1910 additions and 1419 deletions

View File

@ -64,6 +64,15 @@ value = Value
description = Description
category = Category
hypervisor = Hypervisor
dns1 = DNS 1
dns2 = DNS 2
internaldns1 = Internal DNS 1
internaldns2 = Internal DNS 2
vlan = VLAN
guestcidraddress = Guest CIDR
private.cidr = Private CIDR
private.ip.range = Private IP Range
gateway = Gateway
disk.offering = Disk Offering
copy.ISO.to = Copy ISO to

View File

@ -1258,7 +1258,27 @@ a:visited {
margin:0;
padding:0;
border-bottom:1px dashed #92a7b7;
}
.leftmenu_expandedbox{
width:220px;
height:auto;
float:left;
background:#7f9bae url(../images/leftmenu_expanded.gif) repeat-x top left;
border-bottom:1px solid #FFF;
margin:0;
padding:0;
overflow-x:scoll;
overflow-x:auto;
overflow-y:hidden;
}
.leftmenu_expandedlist{
width:100%;
height:auto;
float:left;
margin:0;
padding:0;
}
.leftmenu_content{
@ -1275,11 +1295,17 @@ a:visited {
padding:0 0 3px 0;
}
.leftmenu_content.selected{
color:#FFF;
background:#626262 url(../images/leftmenu_hover.gif) repeat-x top left;
}
.leftmenu_content.highlighted{
background:#a9b8c3 url(../images/leftmenu_highlighted.gif) repeat-x top left;
}
/*
.leftmenu_content:hover{
background:#626262 url(../images/leftmenu_hover.gif) repeat-x top left;
@ -1296,7 +1322,8 @@ a:visited {
}
.leftmenu_firstindent{
width:200px;
min-width:200px;
max-width:auto;
height:auto;
float:left;
margin:7px 0 0 10px;
@ -1305,32 +1332,70 @@ a:visited {
}
.leftmenu_secondindent{
width:180px;
min-width:180px;
max-width:auto;
height:auto;
float:left;
margin:7px 0 0 25px;
color:#FFF;
margin:7px 0 0 30px;
display:inline;
padding:0;
}
.leftmenu_thirdindent{
width:150px;
min-width:160px;
max-width:auto;
height:auto;
float:left;
margin:7px 0 0 60px;
color:#FFF;
margin:7px 0 0 50px;
display:inline;
padding:0;
}
.leftmenu_fourthindent{
width:170px;
min-width:200px;
max-width:auto;
height:auto;
float:left;
color:#FFF;
margin:7px 0 0 70px;
display:inline;
padding:0;
}
.leftmenu_fifthindent{
min-width:200px;
max-width:auto;
height:auto;
float:left;
color:#FFF;
margin:7px 0 0 100px;
display:inline;
padding:0;
}
.leftmenu_sixthindent{
min-width:200px;
max-width:auto;
height:auto;
float:left;
color:#FFF;
margin:7px 0 0 120px;
display:inline;
padding:0;
}
.leftmenu_domainindent{
min-width:180px;
max-width:auto;
height:auto;
float:left;
color:#FFF;
margin:7px 0 0 30px;
display:inline;
padding:0;
}
.leftmenu_titles {
width:auto;
@ -1355,10 +1420,10 @@ a:visited {
.leftmenu_arrows {
width:10px;
height:11px;
width:9px;
height:9px;
float:left;
margin:2px 6px 0 0;
margin:2px 4px 0 0;
padding:0;
}
@ -1366,10 +1431,26 @@ a:visited {
background:url(../images/leftmenu_closedarrow.png) no-repeat top left;
}
.leftmenu_arrows.nonexpanded_close {
background:url(../images/leftmenu_closedarrow_nonexp.png) no-repeat top left;
}
.leftmenu_arrows.open {
background:url(../images/leftmenu_openarrow.png) no-repeat top left;
}
.leftmenu_arrows.expanded_close {
background:url(../images/leftmenu_white_closedarrow.png) no-repeat top left;
}
.leftmenu_arrows.white_nonexpanded_close {
background:url(../images/leftmenu_white_closedarrow_nonexp.png) no-repeat top left;
}
.leftmenu_arrows.expanded_open {
background:url(../images/leftmenu_white_openedarrow.png) no-repeat top left;
}
.right_panel {
width:auto;
height:auto;
@ -2837,8 +2918,14 @@ a:hover.search_button {
width:auto;
height:auto;
float:left;
margin:0 0 0 0;
padding:0;
color:#FFF;
text-align:left;
font-weight:normal;
font-size:11px;
cursor:pointer;
cursor:hand;
margin:0;
padding:0 0 3px 0;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 545 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 257 B

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 172 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 393 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 171 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 190 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 183 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@ -176,7 +176,7 @@ long milliseconds = new Date().getTime();
</ul>
</div>
</div>
<div class="actionpanel_button_wrapper" id="midmenu_add_link" style="display: none">
<div class="actionpanel_button_wrapper" id="midmenu_add_link" style="display: none;">
<div class="actionpanel_button">
<div class="actionpanel_button_icons">
<img src="images/addvm_actionicon.png" alt="Add" /></div>
@ -185,6 +185,41 @@ long milliseconds = new Date().getTime();
</div>
</div>
<div class="actionpanel_button_wrapper" id="midmenu_add_link" style="display: none;">
<div class="actionpanel_button">
<div class="actionpanel_button_icons">
<img src="images/startvm_actionicon.png" alt="Start" /></div>
<div class="actionpanel_button_links">
Start</div>
</div>
</div>
<div class="actionpanel_button_wrapper" id="midmenu_add_link" style="display: none;">
<div class="actionpanel_button">
<div class="actionpanel_button_icons">
<img src="images/stopvm_actionicon.png" alt="Stop" /></div>
<div class="actionpanel_button_links">
Stop</div>
</div>
</div>
<div class="actionpanel_button_wrapper" id="midmenu_add_link" style="display: none;">
<div class="actionpanel_button">
<div class="actionpanel_button_icons">
<img src="images/rebootvm_actionicon.png" alt="Reboot" /></div>
<div class="actionpanel_button_links">
Reboot</div>
</div>
</div>
<div class="actionpanel_button_wrapper" id="midmenu_add_link" style="display: none;">
<div class="actionpanel_button">
<div class="actionpanel_button_icons">
<img src="images/destroyvm_actionicon.png" alt="Destroy" /></div>
<div class="actionpanel_button_links">
Destroy</div>
</div>
</div>
<div class="actionpanel_button_wrapper" id="add_link" style="display: block; float:right; background:none; ">
<div class="actionpanel_button">
<div class="actionpanel_button_icons">
@ -219,9 +254,9 @@ long milliseconds = new Date().getTime();
<div class="leftmenu_panel">
<div class="leftmenu_box" id="accordion_menu" style="display: none">
<div class="leftmenu_list">
<div class="leftmenu_content">
<div class="leftmenu_content" id="leftmenu_dashboard">
<div class="leftmenu_firstindent">
<div class="leftmenu_arrows close" id="arrowIcon">
<div class="leftmenu_arrows nonexpanded_close" id="arrowIcon">
</div>
<div class="leftmenu_list_icons">
<img src="images/leftmenu_dashboardicon.png" alt="Dashboard" /></div>
@ -229,17 +264,9 @@ long milliseconds = new Date().getTime();
</div>
</div>
</div>
<div class="leftmenu_list">
<div class="leftmenu_content" id="leftmenu_dashboard">
<div class="leftmenu_secondindent">
<div class="leftmenu_list_icons">
<img src="images/leftmenu_dashboardicon.png" alt="Dashboard" /></div>
<%=t.t("dashboard")%>
</div>
</div>
</div>
<div class="leftmenu_list">
<div class="leftmenu_content">
<div class="leftmenu_content highlighted">
<div class="leftmenu_firstindent">
<div class="leftmenu_arrows close" id="arrowIcon">
</div>
@ -248,29 +275,36 @@ long milliseconds = new Date().getTime();
<%=t.t("instance")%>
</div>
</div>
</div>
<div class="leftmenu_list">
<div id="leftmenu_instance_group">
<div class="leftmenu_content" id="leftmenu_instance_group_header">
<div class="leftmenu_secondindent">
<div class="leftmenu_arrows close" id="arrow_icon">
<div class="leftmenu_expandedbox">
<div id="leftmenu_instance_group">
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_instance_group_header">
<div class="leftmenu_secondindent">
<div class="leftmenu_arrows expanded_close" id="arrow_icon">
</div>
<div class="leftmenu_list_icons">
<img src="images/instance_leftmenuicon.png" alt="Instance" /></div>
<%=t.t("instance")%>
</div>
</div>
<div class="leftmenu_list_icons">
<img src="images/instance_leftmenuicon.png" alt="Instance" /></div>
<%=t.t("instance")%>
</div>
<div id="leftmenu_instance_group_container">
</div>
</div>
<div id="leftmenu_instance_group_container">
</div>
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_router">
<div class="leftmenu_secondindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="arrow_icon">
</div>
<div class="leftmenu_list_icons">
<img src="images/routers_leftmenuicon.png" alt="Router" /></div>
<%=t.t("router")%>
</div>
</div>
</div>
</div>
<div class="leftmenu_content" id="leftmenu_router">
<div class="leftmenu_secondindent">
<div class="leftmenu_list_icons">
<img src="images/routers_leftmenuicon.png" alt="Router" /></div>
<%=t.t("router")%>
</div>
</div>
</div>
</div>
<div class="leftmenu_list">
<div class="leftmenu_content">
<div class="leftmenu_firstindent">
@ -281,25 +315,35 @@ long milliseconds = new Date().getTime();
<%=t.t("storage")%>
</div>
</div>
</div>
<div class="leftmenu_list">
<div class="leftmenu_content" id="leftmenu_volume">
<div class="leftmenu_secondindent">
<div class="leftmenu_list_icons">
<img src="images/leftmenu_volumeicon.png" alt="Volume" /></div>
<%=t.t("volume")%>
</div>
</div>
<div class="leftmenu_content" id="leftmenu_snapshot">
<div class="leftmenu_secondindent">
<div class="leftmenu_list_icons">
<img src="images/leftmenu_snapshotsicon.png" alt="Snapshot" /></div>
<%=t.t("snapshot")%>
<div class="leftmenu_expandedbox">
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_volume">
<div class="leftmenu_secondindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="arrow_icon">
</div>
<div class="leftmenu_list_icons">
<img src="images/leftmenu_volumeicon.png" alt="Volume" /></div>
<%=t.t("volume")%>
</div>
</div>
</div>
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_snapshot">
<div class="leftmenu_secondindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="arrow_icon">
</div>
<div class="leftmenu_list_icons">
<img src="images/leftmenu_snapshotsicon.png" alt="Snapshot" /></div>
<%=t.t("snapshot")%>
</div>
</div>
</div>
</div>
</div>
<div class="leftmenu_list">
<div class="leftmenu_content">
<div class="leftmenu_content" id="leftmenu_ip">
<div class="leftmenu_firstindent">
<div class="leftmenu_arrows close" id="arrowIcon">
</div>
@ -309,15 +353,7 @@ long milliseconds = new Date().getTime();
</div>
</div>
</div>
<div class="leftmenu_list">
<div class="leftmenu_content" id="leftmenu_ip">
<div class="leftmenu_secondindent">
<div class="leftmenu_list_icons">
<img src="images/leftmenu_ipaddressicon.png" alt="IP Address" /></div>
<%=t.t("ip.address")%>
</div>
</div>
</div>
<div class="leftmenu_list">
<div class="leftmenu_content">
<div class="leftmenu_firstindent">
@ -330,117 +366,152 @@ long milliseconds = new Date().getTime();
</div>
</div>
<div class="leftmenu_list">
<div id="leftmenu_itemplate_filter">
<div class="leftmenu_content" id="leftmenu_template_filter_header">
<div class="leftmenu_secondindent">
<div class="leftmenu_list_icons">
<img src="images/templates_leftmenuicon.png" alt="Template" /></div>
<%=t.t("template")%>
<div class="leftmenu_expandedbox">
<div id="leftmenu_itemplate_filter">
<div class="leftmenu_content" id="leftmenu_template_filter_header">
<div class="leftmenu_secondindent">
<div class="leftmenu_arrows expanded_open" id="arrowIcon">
</div>
<div class="leftmenu_list_icons">
<img src="images/templates_leftmenuicon.png" alt="Template" /></div>
<%=t.t("template")%>
</div>
</div>
</div>
<div id="leftmenu_template_filter_container">
<div class="leftmenu_content" id="leftmenu_submenu_my_template">
<div class="leftmenu_thirdindent">
<div class="leftmenu_list_icons">
<img src="images/templates_leftmenuicon.png" alt="My Template" /></div>
<div>
<%=t.t("my.template")%></div>
</div>
</div>
<div class="leftmenu_content" id="leftmenu_submenu_featured_template">
<div class="leftmenu_thirdindent">
<div class="leftmenu_list_icons">
<img src="images/templates_leftmenuicon.png" alt="Featured Template" /></div>
<div>
<%=t.t("featured.template")%></div>
</div>
</div>
<div class="leftmenu_content" id="leftmenu_submenu_community_template">
<div class="leftmenu_thirdindent">
<div class="leftmenu_list_icons">
<img src="images/templates_leftmenuicon.png" alt="Community Template" /></div>
<div>
<%=t.t("community.template")%></div>
</div>
</div>
</div>
</div>
<div id="leftmenu_iso_filter">
<div class="leftmenu_content" id="leftmenu_iso_filter_header">
<div class="leftmenu_secondindent">
<div class="leftmenu_list_icons">
<img src="images/templates_leftmenuicon.png" alt="Templates" /></div>
<%=t.t("iso")%>
<div id="leftmenu_template_filter_container">
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_submenu_my_template">
<div class="leftmenu_thirdindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
</div>
<div class="leftmenu_list_icons">
<img src="images/templates_leftmenuicon.png" alt="My Template" /></div>
<div>
<%=t.t("my.template")%></div>
</div>
</div>
</div>
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_submenu_featured_template">
<div class="leftmenu_thirdindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
</div>
<div class="leftmenu_list_icons">
<img src="images/templates_leftmenuicon.png" alt="Featured Template" /></div>
<div>
<%=t.t("featured.template")%></div>
</div>
</div>
</div>
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_submenu_community_template">
<div class="leftmenu_thirdindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
</div>
<div class="leftmenu_list_icons">
<img src="images/templates_leftmenuicon.png" alt="Community Template" /></div>
<div>
<%=t.t("community.template")%></div>
</div>
</div>
</div>
</div>
</div>
</div>
<div id="leftmenu_iso_filter_container">
<div class="leftmenu_content" id="leftmenu_submenu_my_iso">
<div class="leftmenu_thirdindent">
<div class="leftmenu_list_icons">
<img src="images/templates_leftmenuicon.png" /></div>
<div>
<%=t.t("my.iso")%></div>
</div>
</div>
<div class="leftmenu_content" id="leftmenu_submenu_featured_iso">
<div class="leftmenu_thirdindent">
<div class="leftmenu_list_icons">
<img src="images/templates_leftmenuicon.png" /></div>
<div>
<%=t.t("featured.iso")%></div>
</div>
</div>
<div class="leftmenu_content" id="leftmenu_submenu_community_iso">
<div class="leftmenu_thirdindent">
<div class="leftmenu_list_icons">
<img src="images/templates_leftmenuicon.png" /></div>
<div>
<%=t.t("community.iso")%></div>
</div>
</div>
</div>
</div>
</div>
<div class="leftmenu_list">
<div class="leftmenu_content">
<div class="leftmenu_firstindent">
<div class="leftmenu_arrows close" id="arrowIcon">
<div id="leftmenu_iso_filter">
<div class="leftmenu_content" id="leftmenu_iso_filter_header">
<div class="leftmenu_secondindent">
<div class="leftmenu_arrows expanded_open" id="arrowIcon">
</div>
<div class="leftmenu_list_icons">
<img src="images/templates_leftmenuicon.png" alt="Templates" /></div>
<%=t.t("iso")%>
</div>
</div>
<div id="leftmenu_iso_filter_container">
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_submenu_my_iso">
<div class="leftmenu_thirdindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
</div>
<div class="leftmenu_list_icons">
<img src="images/templates_leftmenuicon.png" /></div>
<div>
<%=t.t("my.iso")%></div>
</div>
</div>
</div>
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_submenu_featured_iso">
<div class="leftmenu_thirdindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
</div>
<div class="leftmenu_list_icons">
<img src="images/templates_leftmenuicon.png" /></div>
<div>
<%=t.t("featured.iso")%></div>
</div>
</div>
</div>
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_submenu_community_iso">
<div class="leftmenu_thirdindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
</div>
<div class="leftmenu_list_icons">
<img src="images/templates_leftmenuicon.png" /></div>
<div>
<%=t.t("community.iso")%></div>
</div>
</div>
</div>
</div>
</div>
<div class="leftmenu_list_icons">
<img src="images/accounts_leftmenuicon.png" alt="Account" /></div>
<%=t.t("account")%>
</div>
</div>
</div>
<div class="leftmenu_list">
<div class="leftmenu_content" id="leftmenu_account">
<div class="leftmenu_secondindent">
<div class="leftmenu_firstindent">
<div class="leftmenu_arrows nonexpanded_close" id="arrowIcon">
</div>
<div class="leftmenu_list_icons">
<img src="images/accounts_leftmenuicon.png" alt="Account" /></div>
<%=t.t("account")%>
</div>
</div>
</div>
<div class="leftmenu_list">
<div class="leftmenu_content">
<div class="leftmenu_firstindent">
<div class="leftmenu_arrows close" id="arrowIcon">
</div>
<div class="leftmenu_list_icons">
<img src="images/domain_leftmenuicon.png" alt="Domain" /></div>
<%=t.t("domain")%>
</div>
</div>
</div>
<div class="leftmenu_list">
<div class="leftmenu_content" id="leftmenu_domain">
<div class="leftmenu_secondindent">
<div class="leftmenu_firstindent">
<div class="leftmenu_arrows close" id="arrowIcon">
</div>
<div class="leftmenu_list_icons">
<img src="images/domain_leftmenuicon.png" alt="Domain" /></div>
<%=t.t("domain")%>
</div>
</div>
<div class="leftmenu_expandedbox">
<div class="leftmenu_expandedlist">
<div class="leftmenu_content">
<div class="leftmenu_domainindent" style="margin-left:30px;">
<div id="domain_title_container" class="tree_levels">
<div class="leftmenu_arrows expanded_close" id="arrowIcon">
</div>
Domain Name
</div>
<div id="domain_children_container" style="display:none">
</div>
</div>
</div>
</div>
</div>
</div>
<div class="leftmenu_list">
<div class="leftmenu_content">
<div class="leftmenu_firstindent">
@ -451,63 +522,144 @@ long milliseconds = new Date().getTime();
<%=t.t("event")%>
</div>
</div>
</div>
<div class="leftmenu_list">
<div class="leftmenu_content" id="leftmenu_event">
<div class="leftmenu_secondindent">
<div class="leftmenu_list_icons">
<img src="images/events_leftmenuicon.png" alt="Event" /></div>
<%=t.t("event")%>
<div class="leftmenu_expandedbox">
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_event">
<div class="leftmenu_secondindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon"></div>
<div class="leftmenu_list_icons">
<img src="images/events_leftmenuicon.png" alt="Event" /></div>
<%=t.t("event")%>
</div>
</div>
</div>
</div>
<div class="leftmenu_content" id="leftmenu_alert">
<div class="leftmenu_secondindent">
<div class="leftmenu_list_icons">
<img src="images/events_leftmenuicon.png" alt="Alert" /></div>
<%=t.t("alert")%>
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_alert">
<div class="leftmenu_secondindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon"></div>
<div class="leftmenu_list_icons">
<img src="images/alert_leftmenuicon.png" alt="Alert" /></div>
<%=t.t("alert")%>
</div>
</div>
</div>
</div>
</div>
<div class="leftmenu_list">
<div class="leftmenu_content">
<div class="leftmenu_content highlighted">
<div class="leftmenu_firstindent">
<div class="leftmenu_arrows close" id="arrowIcon">
<div class="leftmenu_arrows open" id="arrowIcon">
</div>
<div class="leftmenu_list_icons">
<img src="images/configuration_leftmenuicon.png" alt="System" /></div>
<%=t.t("system")%>
</div>
</div>
<div class="leftmenu_expandedbox">
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_resource">
<div class="leftmenu_secondindent">
<div class="leftmenu_arrows expanded_close" id="arrowIcon"></div>
<div class="leftmenu_list_icons">
<img src="images/configuration_leftmenuicon.png" alt="Resources" /></div>
<%=t.t("resources")%>
</div>
</div>
</div>
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_resource">
<div class="leftmenu_thirdindent">
<div class="leftmenu_arrows expanded_close" id="arrowIcon"></div>
<div class="leftmenu_list_icons">
<img src="images/zone_zoneicon.png" alt="Zone" /></div>
Zone: <strong><span id="zone_name">Zone 1</span></strong>
</div>
</div>
</div>
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_resource">
<div class="leftmenu_fourthindent">
<div class="leftmenu_arrows expanded_close" id="arrowIcon"></div>
<div class="leftmenu_list_icons">
<img src="images/zone_podicon.png" alt="Pod" /></div>
Pod: <strong><span id="pod_name">Name of the Pod</span></strong>
</div>
</div>
</div>
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_resource">
<div class="leftmenu_fifthindent">
<div class="leftmenu_arrows expanded_close" id="arrowIcon"></div>
<div class="leftmenu_list_icons">
<img src="images/zone_clustericon.png" alt="Cluster" /></div>
Cluster: <strong><span id="cluster_name">(Name of the Cluster)</span></strong>
</div>
</div>
</div>
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_resource">
<div class="leftmenu_sixthindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon"></div>
<div class="leftmenu_list_icons">
<img src="images/zone_hosticon.png" alt="Host" /></div>
Host: <strong><span id="host_name">(Name of the Host)</span></strong>
</div>
</div>
</div>
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_resource">
<div class="leftmenu_sixthindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon"></div>
<div class="leftmenu_list_icons">
<img src="images/zone_primarystorageicon.png" alt="PrimaryStorage" /></div>
Primary: <strong><span id="primary_storage_name">(Name of the Primary Storage)</span></strong>
</div>
</div>
</div>
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" style="border-bottom:1px dashed b4c8d6;" id="leftmenu_service_offering">
<div class="leftmenu_secondindent">
<div class="leftmenu_arrows expanded_close" id="arrowIcon"></div>
<div class="leftmenu_list_icons">
<img src="images/configuration_leftmenuicon.png" alt="Service Offerings" /></div>
<%=t.t("service.offerings")%>
</div>
</div>
</div>
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_disk_offering">
<div class="leftmenu_secondindent">
<div class="leftmenu_arrows expanded_close" id="arrowIcon"></div>
<div class="leftmenu_list_icons">
<img src="images/configuration_leftmenuicon.png" alt="Disk Offerings" /></div>
<%=t.t("disk.offerings")%>
</div>
</div>
</div>
<div class="leftmenu_expandedlist">
<div class="leftmenu_content" id="leftmenu_global_setting">
<div class="leftmenu_secondindent">
<div class="leftmenu_arrows expanded_close" id="arrowIcon"></div>
<div class="leftmenu_list_icons">
<img src="images/configuration_leftmenuicon.png" alt="Global Settings" /></div>
<%=t.t("global.settings")%>
</div>
</div>
</div>
</div>
</div>
<div class="leftmenu_list">
<div class="leftmenu_content" id="leftmenu_resource">
<div class="leftmenu_secondindent">
<div class="leftmenu_list_icons">
<img src="images/configuration_leftmenuicon.png" alt="Resources" /></div>
<%=t.t("resources")%>
</div>
</div>
<div class="leftmenu_content" id="leftmenu_service_offering">
<div class="leftmenu_secondindent">
<div class="leftmenu_list_icons">
<img src="images/configuration_leftmenuicon.png" alt="Service Offerings" /></div>
<%=t.t("service.offerings")%>
</div>
</div>
<div class="leftmenu_content" id="leftmenu_disk_offering">
<div class="leftmenu_secondindent">
<div class="leftmenu_list_icons">
<img src="images/configuration_leftmenuicon.png" alt="Disk Offerings" /></div>
<%=t.t("disk.offerings")%>
</div>
</div>
<div class="leftmenu_content" id="leftmenu_global_setting">
<div class="leftmenu_secondindent">
<div class="leftmenu_list_icons">
<img src="images/configuration_leftmenuicon.png" alt="Global Settings" /></div>
<%=t.t("global.settings")%>
</div>
</div>
</div>
</div>
</div>

View File

@ -173,7 +173,8 @@
</div>
<!--Details tab (end)-->
<!--Volume tab (start)-->
<div style="display: none;" id="tab_content_volume">
<div style="display: none;" id="tab_content_volume">
Volume
</div>
<!--Volume tab (end)-->
<!--Statistics tab (start)-->

View File

@ -1,400 +1,529 @@
<%@ page import="java.util.*" %>
<%@ page import="com.cloud.utils.*" %>
<%
Locale browserLocale = request.getLocale();
CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale);
%>
<!-- domain detail panel (begin) -->
<div class="main_title" id="right_panel_header">
<!--
<div class="main_titleicon">
<img src="images/title_snapshoticon.gif" alt="Instance" /></div>
-->
<h1>
Resources
</h1>
</div>
<div class="contentbox" id="right_panel_content">
<div class="info_detailbox errorbox" id="after_action_info_container" style="display: none">
<p id="after_action_info">
</p>
</div>
<div class="tabbox" style="margin-top: 15px;">
<div class="content_tabs on" id="tab_details">
<%=t.t("details")%></div>
<div class="content_tabs off" id="tab_network">
<%=t.t("network")%></div>
<div class="content_tabs off" id="tab_secondary_storage">
<%=t.t("secondary.storage")%></div>
</div>
<!-- Details tab (start)-->
<div id="tab_content_details">
<div class="grid_container">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("ID")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="id">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Name")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="name">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Accounts")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="redirect_to_account_page">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Instances")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="redirect_to_instance_page">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Volume")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="redirect_to_volume_page">
</div>
</div>
</div>
</div>
</div>
<!-- Details tab (end)-->
<!-- Network tab (start)-->
<div style="display: none;" id="tab_content_network">
<div class="text_container">
<div class="network_dgbox">
<div class="networkdg_zonepanel">
<div class="networkdg_zonebox">
<div class="networkdg_zonecloud">
<p>Zone 1</p>
</div>
<div class="networkdg_zoneconnect"></div>
</div>
<div class="networkswitchpanel">
<div class="networkswitch_titlebox"><p>Guest VLAN 1000 -1001</p></div>
<div class="networkswitch_top"></div>
<div class="networkswitch_midpanel">
<div class="networkswitch_vlanpanel">
<div class="networkswitch_vlanconnect">
<div class="networkswitch_vlan_infoicon"></div>
<div class="networkswitch_vlan_detailsbox">
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">VM Group:</div> <span>VLAN 10</span>
</div>
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">IP:</div> <span>10.101.24.231</span>
</div>
</div>
<div class="networkswitch_typeicon direct"></div>
</div>
</div>
<div class="networkswitch_vlanpanel">
<div class="networkswitch_vlanconnect">
<div class="networkswitch_vlan_infoicon"></div>
<div class="networkswitch_vlan_detailsbox">
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">VM Group:</div> <span>VLAN 10</span>
</div>
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">IP:</div> <span>10.101.24.231</span>
</div>
</div>
<div class="networkswitch_typeicon virtual"></div>
</div>
</div>
</div>
<div class="networkswitch_end"></div>
</div>
</div>
</div>
</div>
</div>
<!-- Network tab (end)-->
<!-- Secondary Storage tab (start)-->
<div id="tab_content_secondary_storage" style="display:none">
</div>
<!-- Secondary Storage tab (end)-->
</div>
<!-- domain detail panel (end) -->
<!-- treenode template (begin) -->
<div id="treenode_template" class="tree_levelspanel" style="display:none">
<div class="tree_levelsbox" style="margin-left:20px;">
<div id="domain_title_container" class="tree_levels">
<div id="domain_expand_icon" class="zonetree_closedarrows"></div>
<div id="domain_name" class="tree_links">Domain Name</div>
</div>
<div id="domain_children_container" style="display:none">
</div>
</div>
</div>
<!-- treenode template (end) -->
<!-- admin account tab template (begin) -->
<div class="grid_container" id="admin_account_tab_template" style="display: none">
<div class="grid_header">
<div class="grid_header_title" id="title">
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("ID")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="id">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Role")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="role">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("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">
<%=t.t("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">
<%=t.t("VMs")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="vm_total">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("IPs")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="ip_total">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Bytes.Received")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="bytes_received">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Bytes.Sent")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="bytes_sent">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("State")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="state">
</div>
</div>
</div>
</div>
<!-- admin account tab template (end) -->
<!-- Zonetree Template (begin) -->
<div class="zonetree_contentbox" id="zonetree" style="display:none">
<div id="zones_container">
</div>
</div>
<!-- Zonetree Template (end) -->
<!-- Zone Template (begin) -->
<div id="zone_template" style="display:none">
<div class="adding_loading" style="height:25px;display:none" id="loading_container">
<div class="adding_animation"></div>
<div class="adding_text">Adding a zone &hellip; </div>
</div>
<div id="row_container">
<div class="leftmenu_content">
<div class="leftmenu_firstindent">
<div class="zonetree_closedarrows" id="zone_expand"></div>
<div class="leftmenu_list_icons"><img src="images/zone_zoneicon.png" alt="Zone" /></div>
Zone: <strong><span id="zone_name">Zone 1</span></strong>
</div>
</div>
<div id="zone_content" style="display:none">
<div id="pods_container">
</div>
<div id="systemvms_container">
</div>
</div>
</div>
</div>
<!-- Zone Template (end) -->
<!-- Pod Template (begin) -->
<div id="pod_template" style="display:none">
<div class="adding_loading" style="height:25px;display:none" id="loading_container">
<div class="adding_animation"></div>
<div class="adding_text">Adding a pod &hellip; </div>
</div>
<div id="row_container">
<div class="leftmenu_content">
<div class="leftmenu_secondindent">
<div class="zonetree_openarrows" id="zone_expand"></div>
<div class="leftmenu_list_icons"><img src="images/zone_podicon.png" alt="Pod" /></div>
Pod: <strong><span id="pod_name">Name of the Pod</span></strong>
</div>
</div>
<div id="pod_content">
<!--
<div id="directip_ranges_container">
</div>
-->
<div id="clusters_container">
</div>
</div>
</div>
</div>
<!-- Pod Template (end) -->
<!-- SystemVM Template (begin) -->
<div id="systemvm_template" style="display:none">
<div id="row_container">
<div class="leftmenu_content">
<div class="leftmenu_secondindent">
<div class="zonetree_openarrows" style="background:none;"></div>
<div class="leftmenu_list_icons"><img src="images/zone_systemvmicon.png" alt="System VM" /></div>
System VM: <strong><span id="systemvm_name">(System VM name)</span></strong>
</div>
</div>
</div>
</div>
<!-- SystemVM Template (end) -->
<!-- Cluster Template (begin) -->
<div id="cluster_template" style="display:none">
<div class="adding_loading" style="height:25px;display:none" id="loading_container">
<div class="adding_animation"></div>
<div class="adding_text">Adding a cluster &hellip; </div>
</div>
<div id="row_container">
<div class="leftmenu_content">
<div class="leftmenu_thirdindent">
<div class="zonetree_openarrows" id="zone_expand"></div>
<div class="leftmenu_list_icons"><img src="images/zone_clustericon.png" alt="Cluster" /></div>
Cluster: <strong><span id="cluster_name">(Name of the Cluster)</span></strong>
</div>
</div>
<div id="cluster_content">
<div id="hosts_container">
</div>
<div id="primarystorages_container">
</div>
</div>
</div>
</div>
<!-- Cluster Template (end) -->
<!-- Host Template (begin) -->
<div id="host_template" style="display:none">
<div class="adding_loading" style="height:25px;display:none" id="loading_container">
<div class="adding_animation"></div>
<div class="adding_text">Adding a host &hellip; </div>
</div>
<div id="row_container">
<div class="leftmenu_content">
<div class="leftmenu_fourthindent">
<div class="leftmenu_list_icons"><img src="images/zone_hosticon.png" alt="Host" /></div>
Host: <strong><span id="host_name">(Name of the Host)</span></strong>
</div>
</div>
</div>
</div>
<!-- Host Template (end) -->
<!-- Primary Storage Template (begin) -->
<div id="primary_storage_template" style="display:none">
<div class="adding_loading" style="height:25px;display:none" id="loading_container">
<div class="adding_animation"></div>
<div class="adding_text">Adding a primary storage &hellip; </div>
</div>
<div id="row_container">
<div class="leftmenu_content">
<div class="leftmenu_fourthindent">
<div class="leftmenu_list_icons"><img src="images/zone_primarystorageicon.png" alt="PrimaryStorage" /></div>
Primary: <strong><span id="primary_storage_name">(Name of the Primary Storage)</span></strong>
</div>
</div>
</div>
</div>
<!-- Primary Storage Template (end) -->
<%@ page import="java.util.*" %>
<%@ page import="com.cloud.utils.*" %>
<%
Locale browserLocale = request.getLocale();
CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale);
%>
<!-- domain detail panel (begin) -->
<div class="main_title" id="right_panel_header">
<!--
<div class="main_titleicon">
<img src="images/title_snapshoticon.gif" alt="Instance" /></div>
-->
<h1>
Resources
</h1>
</div>
<div class="contentbox" id="right_panel_content">
<div class="info_detailbox errorbox" id="after_action_info_container" style="display: none">
<p id="after_action_info">
</p>
</div>
<div id="zone_page" style="display:none">
<div class="tabbox" style="margin-top: 15px;">
<div class="content_tabs on" id="tab_details">
<%=t.t("details")%></div>
<div class="content_tabs off" id="tab_network">
<%=t.t("network")%></div>
<div class="content_tabs off" id="tab_secondary_storage">
<%=t.t("secondary.storage")%></div>
</div>
<!-- Details tab (start)-->
<div id="tab_content_details">
<div class="grid_container">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("ID")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="id">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("name")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="name">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("dns1")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="dns1">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("dns2")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="dns2">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("internaldns1")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="internaldns1">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("internaldns2")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="internaldns2">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("vlan")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="vlan">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("guestcidraddress")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="guestcidraddress">
</div>
</div>
</div>
</div>
</div>
<!-- Details tab (end)-->
<!-- Network tab (start)-->
<div style="display: none;" id="tab_content_network">
<div class="text_container">
<div class="network_dgbox">
<div class="networkdg_zonepanel">
<div class="networkdg_zonebox">
<div class="networkdg_zonecloud">
<p>
Zone 1</p>
</div>
<div class="networkdg_zoneconnect">
</div>
</div>
<div class="networkswitchpanel">
<div class="networkswitch_titlebox">
<p>
Guest VLAN 1000 -1001</p>
</div>
<div class="networkswitch_top">
</div>
<div class="networkswitch_midpanel">
<div class="networkswitch_vlanpanel">
<div class="networkswitch_vlanconnect">
<div class="networkswitch_vlan_infoicon">
</div>
<div class="networkswitch_vlan_detailsbox">
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">
VM Group:</div>
<span>VLAN 10</span>
</div>
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">
IP:</div>
<span>10.101.24.231</span>
</div>
</div>
<div class="networkswitch_typeicon direct">
</div>
</div>
</div>
<div class="networkswitch_vlanpanel">
<div class="networkswitch_vlanconnect">
<div class="networkswitch_vlan_infoicon">
</div>
<div class="networkswitch_vlan_detailsbox">
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">
VM Group:</div>
<span>VLAN 10</span>
</div>
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">
IP:</div>
<span>10.101.24.231</span>
</div>
</div>
<div class="networkswitch_typeicon virtual">
</div>
</div>
</div>
</div>
<div class="networkswitch_end">
</div>
</div>
</div>
</div>
</div>
</div>
<!-- Network tab (end)-->
<!-- Secondary Storage tab (start)-->
<div id="tab_content_secondary_storage" style="display: none">
Secondary Storage
</div>
<!-- Secondary Storage tab (end)-->
</div>
<div id="pod_page" style="display:none">
<div class="tabbox" style="margin-top: 15px;">
<div class="content_tabs on" id="tab_details">
<%=t.t("details")%></div>
</div>
<!-- Details tab (start)-->
<div id="tab_content_details">
<div class="grid_container">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("ID")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="id">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("name")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="name">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("private.cidr")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="cidr">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("private.ip.range")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="ipRange">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("gateway")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="gateway">
</div>
</div>
</div>
</div>
</div>
<!-- Details tab (end)-->
</div>
<div id="cluster_page" style="display:none">
Cluster Page
</div>
<div id="host_page" style="display:none">
Host page
</div>
<div id="primarystorage_page" style="display:none">
Primary Storage Page
</div>
<div id="systemvm_page" style="display:none">
System VM Page
</div>
</div>
<!-- domain detail panel (end) -->
<!-- treenode template (begin) -->
<div id="treenode_template" class="tree_levelspanel" style="display: none">
<div class="tree_levelsbox" style="margin-left: 20px;">
<div id="domain_title_container" class="tree_levels">
<div id="domain_expand_icon" class="zonetree_closedarrows">
</div>
<div id="domain_name" class="tree_links">
Domain Name</div>
</div>
<div id="domain_children_container" style="display: none">
</div>
</div>
</div>
<!-- treenode template (end) -->
<!-- admin account tab template (begin) -->
<div class="grid_container" id="admin_account_tab_template" style="display: none">
<div class="grid_header">
<div class="grid_header_title" id="title">
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("ID")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="id">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Role")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="role">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("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">
<%=t.t("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">
<%=t.t("VMs")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="vm_total">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("IPs")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="ip_total">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Bytes.Received")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="bytes_received">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Bytes.Sent")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="bytes_sent">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("State")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="state">
</div>
</div>
</div>
</div>
<!-- admin account tab template (end) -->
<!-- Zonetree Template (begin) -->
<div class="zonetree_contentbox" id="zonetree" style="display: none">
<div id="zones_container">
</div>
</div>
<!-- Zonetree Template (end) -->
<!-- Zone Template (begin) -->
<div id="zone_template" style="display: none">
<div class="adding_loading" style="height: 25px; display: none" id="loading_container">
<div class="adding_animation">
</div>
<div class="adding_text">
Adding a zone &hellip;
</div>
</div>
<div id="row_container">
<div class="leftmenu_content" id="zone_node">
<div class="leftmenu_firstindent">
<div class="zonetree_closedarrows" id="zone_expand">
</div>
<div class="leftmenu_list_icons">
<img src="images/zone_zoneicon.png" id="zone_icon" alt="Zone" /></div>
<span id="zone_label">Zone:</span> <strong><span id="zone_name">Zone 1</span> </strong>
</div>
</div>
<div id="zone_content" style="display: none">
<div id="pods_container">
</div>
<div id="systemvms_container">
</div>
</div>
</div>
</div>
<!-- Zone Template (end) -->
<!-- Pod Template (begin) -->
<div id="pod_template" style="display: none">
<div class="adding_loading" style="height: 25px; display: none" id="loading_container">
<div class="adding_animation">
</div>
<div class="adding_text">
Adding a pod &hellip;
</div>
</div>
<div id="row_container">
<div class="leftmenu_content" id="pod_node">
<div class="leftmenu_secondindent">
<div class="zonetree_closedarrows" id="pod_expand">
</div>
<div class="leftmenu_list_icons">
<img src="images/zone_podicon.png" id="pod_icon" alt="Pod" /></div>
<span id="pod_label">Pod:</span> <strong><span id="pod_name">Name of the Pod</span>
</strong>
</div>
</div>
<div id="pod_content" style="display: none">
<div id="clusters_container">
</div>
</div>
</div>
</div>
<!-- Pod Template (end) -->
<!-- Cluster Template (begin) -->
<div id="cluster_template" style="display: none">
<div class="adding_loading" style="height: 25px; display: none" id="loading_container">
<div class="adding_animation">
</div>
<div class="adding_text">
Adding a cluster &hellip;
</div>
</div>
<div id="row_container">
<div class="leftmenu_content" id="cluster_node">
<div class="leftmenu_thirdindent">
<div class="zonetree_openarrows" id="cluster_expand">
</div>
<div class="leftmenu_list_icons">
<img src="images/zone_clustericon.png" id="cluster_icon" alt="Cluster" /></div>
<span id="cluster_label"">Cluster:</span> <strong><span id="cluster_name">(Name of the
Cluster)</span> </strong>
</div>
</div>
<div id="cluster_content">
<div id="hosts_container">
</div>
<div id="primarystorages_container">
</div>
</div>
</div>
</div>
<!-- Cluster Template (end) -->
<!-- Host Template (begin) -->
<div id="host_template" style="display: none">
<div class="adding_loading" style="height: 25px; display: none" id="loading_container">
<div class="adding_animation">
</div>
<div class="adding_text">
Adding a host &hellip;
</div>
</div>
<div id="row_container">
<div class="leftmenu_content" id="host_node">
<div class="leftmenu_fourthindent">
<div class="leftmenu_list_icons">
<img src="images/zone_hosticon.png" id="host_icon" alt="Host" /></div>
<span id="host_label">Host:</span> <strong><span id="host_name">(Name of the Host)</span>
</strong>
</div>
</div>
</div>
</div>
<!-- Host Template (end) -->
<!-- Primary Storage Template (begin) -->
<div id="primarystorage_template" style="display: none">
<div class="adding_loading" style="height: 25px; display: none" id="loading_container">
<div class="adding_animation">
</div>
<div class="adding_text">
Adding a primary storage &hellip;
</div>
</div>
<div id="row_container">
<div class="leftmenu_content" id="primarystorage_node">
<div class="leftmenu_fourthindent">
<div class="leftmenu_list_icons">
<img src="images/zone_primarystorageicon.png" id="primarystorage_icon" alt="PrimaryStorage" /></div>
<span id="primarystorage_label">Storage:</span> <strong><span id="primarystorage_name">
(Name of the Primary Storage)</span> </strong>
</div>
</div>
</div>
</div>
<!-- Primary Storage Template (end) -->
<!-- SystemVM Template (begin) -->
<div id="systemvm_template" style="display: none">
<div id="row_container">
<div class="leftmenu_content" id="systemvm_node">
<div class="leftmenu_secondindent">
<div class="leftmenu_list_icons">
<img src="images/zone_systemvmicon.png" id="systemvm_icon" alt="System VM" /></div>
<span id="systemvm_label">System VM:</span> <strong><span id="systemvm_name">(System
VM name)</span> </strong>
</div>
</div>
</div>
</div>
<!-- SystemVM Template (end) -->

View File

@ -238,8 +238,8 @@ function afterLoadDomainJSP() {
refreshWholeTree(defaultRootDomainId, defaultRootLevel);
//***** switch between different tabs (begin) ********************************************************************
var tabArray = ["tab_details", "tab_resource_limits", "tab_admin_account"];
var tabContentArray = ["tab_content_details", "tab_content_resource_limits", "tab_content_admin_account"];
var tabArray = [$("#tab_details"), $("#tab_resource_limits"), $("#tab_admin_account")];
var tabContentArray = [$("#tab_content_details"), $("#tab_content_resource_limits"), $("#tab_content_admin_account")];
switchBetweenDifferentTabs(tabArray, tabContentArray);
//***** switch between different tabs (end) **********************************************************************

File diff suppressed because it is too large Load Diff

View File

@ -47,8 +47,8 @@ function clickInstanceGroupHeader($arrowIcon) {
initDialog("dialog_create_template", 400);
//***** switch between different tabs (begin) ********************************************************************
var tabArray = ["tab_details", "tab_volume", "tab_statistics", "tab_router"];
var tabContentArray = ["tab_content_details", "tab_content_volume", "tab_content_statistics", "tab_content_router"];
var tabArray = [$("#tab_details"), $("#tab_volume"), $("#tab_statistics"), $("#tab_router")];
var tabContentArray = [$("#tab_content_details"), $("#tab_content_volume"), $("#tab_content_statistics"), $("#tab_content_router")];
switchBetweenDifferentTabs(tabArray, tabContentArray);
//***** switch between different tabs (end) **********************************************************************

View File

@ -1,8 +1,8 @@
//***** baseline (begin) *******************************************************************************************************************
function afterLoadIpJSP() {
//***** switch between different tabs (begin) ********************************************************************
var tabArray = ["tab_details", "tab_port_forwarding", "tab_load_balancer"];
var tabContentArray = ["tab_content_details", "tab_content_port_forwarding", "tab_content_load_balancer"];
var tabArray = [$("#tab_details"), $("#tab_port_forwarding"), $("#tab_load_balancer")];
var tabContentArray = [$("#tab_content_details"), $("#tab_content_port_forwarding"), $("#tab_content_load_balancer")];
switchBetweenDifferentTabs(tabArray, tabContentArray);
//***** switch between different tabs (end) **********************************************************************

View File

@ -585,17 +585,17 @@ function switchBetweenDifferentTabs(tabArray, tabContentArray) {
}
function switchToTab(tabIndex, tabArray, tabContentArray) {
$("#"+tabArray[tabIndex]).bind("click", function(event){
$("#"+tabArray[tabIndex]).removeClass("off").addClass("on"); //current tab turns on
tabArray[tabIndex].bind("click", function(event){
tabArray[tabIndex].removeClass("off").addClass("on"); //current tab turns on
for(var k=0; k<tabArray.length; k++) {
if(k != tabIndex)
$("#"+tabArray[k]).removeClass("on").addClass("off"); //other tabs turns off
tabArray[k].removeClass("on").addClass("off"); //other tabs turns off
}
$("#"+tabContentArray[tabIndex]).show(); //current tab content shows
tabContentArray[tabIndex].show(); //current tab content shows
for(var k=0; k<tabContentArray.length; k++) {
if(k != tabIndex)
$("#"+tabContentArray[k]).hide(); //other tab content hide
tabContentArray[k].hide(); //other tab content hide
}
return false;
});

View File

@ -1,10 +1,24 @@
function afterLoadResourceJSP() {
//***** switch between different tabs (begin) ********************************************************************
var tabArray = ["tab_details", "tab_network", "tab_secondary_storage"];
var tabContentArray = ["tab_content_details", "tab_content_network", "tab_content_secondary_storage"];
switchBetweenDifferentTabs(tabArray, tabContentArray);
//***** switch between different tabs (end) **********************************************************************
var $rightPanelConent = $("#right_panel_content");
var $zonePage = $rightPanelConent.find("#zone_page");
var $podPage = $rightPanelConent.find("#pod_page");
var $clusterPage = $rightPanelConent.find("#cluster_page");
var $hostPage = $rightPanelConent.find("#host_page");
var $primarystoragePage = $rightPanelConent.find("#primarystorage_page");
var $systemvmPage = $rightPanelConent.find("#systemvm_page");
var pageArray = [$zonePage, $podPage, $clusterPage, $hostPage, $primarystoragePage, $systemvmPage];
function showPage($pageToShow) {
for(var i=0; i<pageArray.length; i++) {
if(pageArray[i].attr("id") == $pageToShow.attr("id"))
pageArray[i].show();
else
pageArray[i].hide();
}
}
//***** build zone tree (begin) ***********************************************************************************************
var forceLogout = true; // We force a logout only if the user has first added a POD for the very first time
var $zoneetree1 = $("#zonetree").clone().attr("id", "zonetree1");
$("#midmenu_container").append($zoneetree1.show());
@ -27,6 +41,7 @@ function afterLoadResourceJSP() {
function zoneJSONToTemplate(json, template) {
var zoneid = json.id;
template.attr("id", "zone_" + zoneid);
template.data("id", zoneid).data("name", fromdb(json.name));
template.find("#zone_name")
.text(fromdb(json.name))
@ -76,12 +91,15 @@ function afterLoadResourceJSP() {
});
}
function podJSONToTemplate(json, template) {
function podJSONToTemplate(json, template) {
var podid = json.id;
template.attr("id", "pod_" + podid);
var ipRange = getIpRange(json.startip, json.endip);
template.data("id", json.id).data("name", json.name);
template.data("id", podid).data("name", json.name);
var podName = template.find("#pod_name").text(json.name);
podName.data("id", json.id);
podName.data("id", podid);
podName.data("zoneid", json.zoneid);
podName.data("name", json.name);
podName.data("cidr", json.cidr);
@ -91,7 +109,7 @@ function afterLoadResourceJSP() {
podName.data("gateway", json.gateway);
$.ajax({
data: createURL("command=listClusters&podid="+json.id+maxPageSize),
data: createURL("command=listClusters&podid="+podid+maxPageSize),
dataType: "json",
success: function(json) {
var items = json.listclustersresponse.cluster;
@ -108,8 +126,9 @@ function afterLoadResourceJSP() {
}
function systemvmJSONToTemplate(json, template) {
template.data("id", json.id).data("name", json.name);
var systemvmid = json.id;
template.attr("id", "systemvm_"+systemvmid);
template.data("id", systemvmid).data("name", json.name);
var systeymvmName = template.find("#systemvm_name").text(json.name);
systeymvmName.data("systemvmtype", json.systemvmtype);
systeymvmName.data("name", json.name);
@ -152,7 +171,7 @@ function afterLoadResourceJSP() {
var container = template.find("#primarystorages_container").empty();
if (items != null && items.length > 0) {
for (var i = 0; i < items.length; i++) {
var primaryStorageTemplate = $("#primary_storage_template").clone(true).attr("id", "primary_storage_"+items[i].id);
var primaryStorageTemplate = $("#primarystorage_template").clone(true).attr("id", "primary_storage_"+items[i].id);
primaryStorageJSONToTemplate(items[i], primaryStorageTemplate);
container.append(primaryStorageTemplate.show());
}
@ -170,7 +189,7 @@ function afterLoadResourceJSP() {
function primaryStorageJSONToTemplate(json, template) {
template.data("id", json.id).data("name", fromdb(json.name));
var primaryStorageName = template.find("#primary_storage_name").text(fromdb(json.name));
var primaryStorageName = template.find("#primarystorage_name").text(fromdb(json.name));
}
$("#zone_template").bind("click", function(event) {
@ -181,41 +200,113 @@ function afterLoadResourceJSP() {
var name = template.data("name");
switch (action) {
case "zone_expand" :
if (target.hasClass("zonetree_closedarrows")) {
$("#zone_"+id).find("#zone_content").show();
target.removeClass().addClass("zonetree_openarrows");
} else {
$("#zone_"+id).find("#zone_content").hide();
target.removeClass().addClass("zonetree_closedarrows");
case "zone_expand" :
if (target.hasClass("zonetree_closedarrows")) {
target.removeClass().addClass("zonetree_openarrows");
target.parent().parent().parent().find("#zone_content").show();
} else {
target.removeClass().addClass("zonetree_closedarrows");
target.parent().parent().parent().find("#zone_content").hide();
}
break;
case "zone_name" :
$(".zonetree_firstlevel_selected").removeClass().addClass("zonetree_firstlevel");
$(".zonetree_secondlevel_selected").removeClass().addClass("zonetree_secondlevel");
template.find(".zonetree_firstlevel").removeClass().addClass("zonetree_firstlevel_selected");
var obj = {"id": target.data("id"), "name": target.data("name"), "dns1": target.data("dns1"), "dns2": target.data("dns2"), "internaldns1": target.data("internaldns1"), "internaldns2": target.data("internaldns2"), "vlan": target.data("vlan"), "guestcidraddress": target.data("guestcidraddress")};
//zoneObjectToRightPanel(obj);
break;
case "zone_name":
$zoneetree1.find(".selected").removeClass("selected");
target.parent().parent().parent().addClass("selected");
showPage($zonePage);
var obj = {"id": target.data("id"), "name": target.data("name"), "dns1": target.data("dns1"), "dns2": target.data("dns2"), "internaldns1": target.data("internaldns1"), "internaldns2": target.data("internaldns2"), "vlan": target.data("vlan"), "guestcidraddress": target.data("guestcidraddress")};
zoneJsonToDetailsTab(obj);
break;
case "pod_expand" :
if (target.hasClass("zonetree_closedarrows")) {
target.removeClass().addClass("zonetree_openarrows");
target.parent().parent().siblings("#pod_content").show();
} else {
target.removeClass().addClass("zonetree_closedarrows");
target.parent().parent().siblings("#pod_content").hide();
}
break;
case "pod_name" :
$zoneetree1.find(".selected").removeClass("selected");
target.parent().parent().parent().addClass("selected");
showPage($podPage);
var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
podJsonToDetailsTab(obj);
break;
case "pod_name" :
$(".zonetree_firstlevel_selected").removeClass().addClass("zonetree_firstlevel");
$(".zonetree_secondlevel_selected").removeClass().addClass("zonetree_secondlevel");
target.parent(".zonetree_secondlevel").removeClass().addClass("zonetree_secondlevel_selected");
var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
//podObjectToRightPanel(obj);
case "cluster_expand" :
if (target.hasClass("zonetree_closedarrows")) {
target.removeClass().addClass("zonetree_openarrows");
target.parent().parent().siblings("#cluster_content").show();
} else {
target.removeClass().addClass("zonetree_closedarrows");
target.parent().parent().siblings("#cluster_content").hide();
}
break;
case "cluster_name" :
$zoneetree1.find(".selected").removeClass("selected");
target.parent().parent().parent().addClass("selected");
showPage($clusterPage);
//var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
//clusterObjectToRightPanel(obj);
break;
case "host_expand" :
if (target.hasClass("zonetree_closedarrows")) {
target.removeClass().addClass("zonetree_openarrows");
target.parent().parent().siblings("#host_content").show();
} else {
target.removeClass().addClass("zonetree_closedarrows");
target.parent().parent().siblings("#host_content").hide();
}
break;
case "host_name" :
$zoneetree1.find(".selected").removeClass("selected");
target.parent().parent().parent().addClass("selected");
showPage($hostPage);
//var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
//hostObjectToRightPanel(obj);
break;
case "primarystorage_expand" :
if (target.hasClass("zonetree_closedarrows")) {
target.removeClass().addClass("zonetree_openarrows");
target.parent().parent().siblings("#primarystorage_content").show();
} else {
target.removeClass().addClass("zonetree_closedarrows");
target.parent().parent().siblings("#primarystorage_content").hide();
}
break;
case "primarystorage_name" :
$zoneetree1.find(".selected").removeClass("selected");
target.parent().parent().parent().addClass("selected");
showPage($primarystoragePage);
//var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
//primarystorageObjectToRightPanel(obj);
break;
case "systemvm_name" :
$zoneetree1.find(".selected").removeClass("selected");
target.parent().parent().parent().addClass("selected");
showPage($systemvmPage);
//var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
//systemvmObjectToRightPanel(obj);
break;
default:
break;
}
return false;
});
function getIpRange(startip, endip) {
var ipRange = "";
@ -223,9 +314,45 @@ function afterLoadResourceJSP() {
ipRange = startip;
}
if (endip != null && endip.length > 0) {
ipRange = ipRange + "-" + endip;
ipRange = ipRange + " - " + endip;
}
return ipRange;
}
//***** build zone tree (end) *************************************************************************************************
//***** zone page (begin) *****************************************************************************************************
//switch between different tabs in zone page
var tabArray = [$zonePage.find("#tab_details"), $zonePage.find("#tab_network"), $zonePage.find("#tab_secondary_storage")];
var tabContentArray = [$zonePage.find("#tab_content_details"), $zonePage.find("#tab_content_network"), $zonePage.find("#tab_content_secondary_storage")];
switchBetweenDifferentTabs(tabArray, tabContentArray);
function zoneJsonToDetailsTab(jsonObj) {
var $detailsTab = $zonePage.find("#tab_content_details");
$detailsTab.data("jsonObj", jsonObj);
$detailsTab.find("#id").text(fromdb(jsonObj.id));
$detailsTab.find("#name").text(fromdb(jsonObj.name));
$detailsTab.find("#dns1").text(fromdb(jsonObj.dns1));
$detailsTab.find("#dns2").text(fromdb(jsonObj.dns2));
$detailsTab.find("#internaldns1").text(fromdb(jsonObj.internaldns1));
$detailsTab.find("#internaldns2").text(fromdb(jsonObj.internaldns2));
$detailsTab.find("#vlan").text(fromdb(jsonObj.vlan));
$detailsTab.find("#guestcidraddress").text(fromdb(jsonObj.guestcidraddress));
}
//***** zone page (end) *******************************************************************************************************
//***** pod page (begin) ******************************************************************************************************
function podJsonToDetailsTab(jsonObj) {
var $detailsTab = $podPage.find("#tab_content_details");
$detailsTab.data("jsonObj", jsonObj);
$detailsTab.find("#id").text(fromdb(jsonObj.id));
$detailsTab.find("#name").text(fromdb(jsonObj.name));
$detailsTab.find("#cidr").text(fromdb(jsonObj.cidr));
$detailsTab.find("#ipRange").text(fromdb(jsonObj.ipRange));
$detailsTab.find("#gateway").text(fromdb(jsonObj.gateway));
//if (getDirectAttachUntaggedEnabled() == "true")
// $("#submenu_content_zones #action_add_directip_vlan").data("type", "pod").data("id", obj.id).data("name", obj.name).data("zoneid", obj.zoneid).show();
}
//***** pod page (end) ********************************************************************************************************
}

View File

@ -364,8 +364,8 @@ function afterLoadVolumeJSP() {
// *** recurring snapshot dialog - event binding (end) ******************************
//***** switch between different tabs (begin) ********************************************************************
var tabArray = ["tab_details", "tab_snapshot"];
var tabContentArray = ["tab_content_details", "tab_content_snapshot"];
var tabArray = [$("#tab_details"), $("#tab_snapshot")];
var tabContentArray = [$("#tab_content_details"), $("#tab_content_snapshot")];
switchBetweenDifferentTabs(tabArray, tabContentArray);
//***** switch between different tabs (end) **********************************************************************
}