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

CS-14461: Add more infrastructure page shortcuts 

-Add additional shortcuts for:
  -Primary storage
  -Secondary storgage
  -Virtual routers
  -System VMs

-Replace host stats with the new shortcuts

-Add 'zone' dropdown to create form for the newly added-shortcuts'
 sections, to support creating these items without a zone context
This commit is contained in:
bfederle 2012-04-30 10:32:43 -07:00
parent 03b23d3645
commit 898952479e
6 changed files with 1167 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,9 @@
#new labels (begin) **********************************************************************************************
label.action.register.template=Register template
label.virtual.routers=Virtual Routers
label.primary.storage.count=Primary Storage Pools
label.secondary.storage.count=Secondary Storage Pools
label.number.of.system.vms=Number of System VMs
label.number.of.virtual.routers=Number of Virtual Routers
label.action.register.iso=Register ISO
label.isolation.method=Isolation method
#new labels (end) ************************************************************************************************

21
ui/css/cloudstack3.css
View File

@ -3473,7 +3473,7 @@ Dialogs*/
margin: 6px 9px 9px;
padding: 9px;
color: #FFFFFF;
/* Adjusting the font size for proper display */
/*Adjusting the font size for proper display*/
font-size: 10px;
border-left: 1px solid #6A6A6A;
border-right: 1px solid #6A6A6A;
@ -5967,7 +5967,7 @@ label.error {
width: 59px;
height: 23px;
padding: 2px 9px 0 12px;
background: url(../images/bg-gradients.png) 0px 53px;
background: url(../images/bg-gradients.png) 0px -1342px;
border: 1px solid #C4C4C4;
/*+border-radius:4px;*/
-moz-border-radius: 4px;
@ -7249,6 +7249,12 @@ div.panel.ui-dialog div.list-view div.fixed-header {
font-weight: bold;
}
.system-dashboard.zone {
height: 609px;
background-position: 0px -1423px;
background-color: #FFFFFF;
}
.system-dashboard-view .toolbar {
position: relative;
}
@ -7347,6 +7353,13 @@ div.panel.ui-dialog div.list-view div.fixed-header {
float: left;
}
.system-dashboard.zone .status_box li {
margin-bottom: 120px;
height: 176px;
background-position: 0px -1005px;
background-color: #35404B;
}
.system-dashboard .status_box li span {
color: #FFFFFF;
/*+text-shadow:0px 1px 1px #000000;*/
@ -7388,6 +7401,10 @@ div.panel.ui-dialog div.list-view div.fixed-header {
text-shadow: 0px 1px 2px #000000;
}
.system-dashboard.zone .status_box li span.header {
font-size: 13px;
}
.system-dashboard .status_box li span.status {
font-size: 27px;
/*+placement:shift 13px 141px;*/

BIN
ui/images/bg-gradients.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

83
ui/index.jsp
View File

@ -948,58 +948,70 @@
</div>
<!-- Zone dashboard -->
<div class="system-dashboard">
<div class="system-dashboard zone">
<div class="head">
<span><fmt:message key="label.zones"/></span>
<div class="view-all zones" view-all-target="zones"><span><fmt:message key="label.view.all"/></span></div>
<span><fmt:message key="label.menu.infrastructure"/></span>
<div class="view-all zones"
view-all-title="Zones"
view-all-target="zones"><span><fmt:message key="label.view.all"/></span></div>
</div>
<ul class="status_box good">
<li class="block">
<span class="header"><fmt:message key="label.number.of.zones"/></span>
<span class="header"><fmt:message key="label.zones"/></span>
<span class="overview total" data-item="zoneCount"></span>
<span class="button view-all zones" view-all-target="zones"><fmt:message key="label.view.all"/></span>
<span class="button view-all zones"
view-all-title="<fmt:message key="label.zones"/>"
view-all-target="zones"><fmt:message key="label.view.all"/></span>
</li>
<li class="block">
<span class="header"><fmt:message key="label.number.of.pods"/></span>
<span class="header"><fmt:message key="label.pods"/></span>
<span class="overview total" data-item="podCount"></span>
<span class="button view-all pods" view-all-target="pods"><fmt:message key="label.view.all"/></span>
<span class="button view-all pods"
view-all-title="<fmt:message key="label.pods"/>"
view-all-target="pods"><fmt:message key="label.view.all"/></span>
</li>
<li class="block">
<span class="header"><fmt:message key="label.number.of.clusters"/></span>
<span class="header"><fmt:message key="label.clusters"/></span>
<span class="overview total" data-item="clusterCount"></span>
<span class="button view-all clusters" view-all-target="clusters"><fmt:message key="label.view.all"/></span>
<span class="button view-all clusters"
view-all-title="<fmt:message key="label.clusters"/>"
view-all-target="clusters"><fmt:message key="label.view.all"/></span>
</li>
<li class="block last">
<span class="header"><fmt:message key="label.number.of.hosts"/></span>
<span class="header"><fmt:message key="label.hosts"/></span>
<span class="overview total" data-item="hostCount"></span>
<span class="button view-all hosts" view-all-target="hosts"><fmt:message key="label.view.all"/></span>
<span class="button view-all hosts"
view-all-title="<fmt:message key="label.hosts"/>"
view-all-target="hosts"><fmt:message key="label.view.all"/></span>
</li>
</ul>
</div>
<!-- Host dashboard -->
<div class="system-dashboard">
<div class="head">
<span><fmt:message key="label.hosts"/></span>
<div class="view-more" view-all-target="hosts"><span><fmt:message key="label.view.all"/></span></div>
</div>
<ul class="status_box good">
<li class="block">
<span class="header"><fmt:message key="label.total.hosts"/></span>
<span class="overview total" data-item="hostCount"></span>
<span class="header"><fmt:message key="label.primary.storage"/></span>
<span class="overview total" data-item="primaryStorageCount"></span>
<span class="button view-all zones"
view-all-title="<fmt:message key="label.primary.storage"/>"
view-all-target="primaryStorage"><fmt:message key="label.view.all"/></span>
</li>
<li class="block capacity">
<span class="header"><fmt:message key="label.total.CPU"/></span>
<span class="overview total" data-item="cpuCapacityTotal"></span>
<li class="block">
<span class="header"><fmt:message key="label.secondary.storage"/></span>
<span class="overview total" data-item="secondaryStorageCount"></span>
<span class="button view-all pods"
view-all-title="<fmt:message key="label.secondary.storage"/>"
view-all-target="secondaryStorage"><fmt:message key="label.view.all"/></span>
</li>
<li class="block capacity">
<span class="header"><fmt:message key="label.total.memory"/></span>
<span class="overview total" data-item="memCapacityTotal"></span>
</li>
<li class="block last capacity">
<span class="header"><fmt:message key="label.total.storage"/></span>
<span class="overview total" data-item="storageCapacityTotal"></span>
<li class="block">
<span class="header"><fmt:message key="label.system.vms"/></span>
<span class="overview total" data-item="systemVmCount"></span>
<span class="button view-all clusters"
view-all-title="<fmt:message key="label.system.vms"/>"
view-all-target="systemVms"><fmt:message key="label.view.all"/></span>
</li>
<li class="block last">
<span class="header"><fmt:message key="label.virtual.routers"/></span>
<span class="overview total" data-item="virtualRouterCount"></span>
<span class="button view-all hosts"
view-all-title="<fmt:message key="label.virtual.routers"/>"
view-all-target="virtualRouters"><fmt:message key="label.view.all"/></span>
</li>
</ul>
</div>
</div>
@ -1659,6 +1671,11 @@
<script language="javascript">
dictionary = {
'label.virtual.routers': '<fmt:message key="label.virtual.routers"/>',
'label.primary.storage.count': '<fmt:message key="label.primary.storage.count"/>',
'label.secondary.storage.count': '<fmt:message key="label.secondary.storage.count"/>',
'label.number.of.system.vms': '<fmt:message key="label.number.of.system.vms"/>',
'label.number.of.virtual.routers': '<fmt:message key="label.number.of.virtual.routers"/>',
'label.max.networks': '<fmt:message key="label.max.networks"/>',
'label.latest.events': '<fmt:message key="label.latest.events"/>',
'state.Enabled': '<fmt:message key="state.Enabled"/>',

1119
ui/scripts/system.js
View File

File diff suppressed because it is too large Load Diff

2
ui/scripts/ui-custom/physicalResources.js
View File

@ -41,7 +41,7 @@
if ($target.closest('[view-all-target]').size()) {
var targetID = $target.closest('[view-all-target]').attr('view-all-target');
args.$browser.cloudBrowser('addPanel', {
title: targetID.charAt(0).toUpperCase() + targetID.substr(1).toLowerCase(),
title: $target.closest('[view-all-title]').attr('view-all-title'),
data: '',
noSelectPanel: true,
maximizeIfSelected: true,