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

Infra. dashboard UI fixes 

-Fix totals not showing up

-Increase height of socket info area to fit more hypervisors
This commit is contained in:
Brian Federle 2013-10-29 14:55:14 -07:00
parent 4a9f05bda0
commit 7695fff17b
5 changed files with 45 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
label.home=Home
label.sockets=Sockets
label.root.disk.size=Root disk size
label.s3.nfs.server=S3 NFS Server

62
ui/css/cloudstack3.css
View File

@ -3270,7 +3270,7 @@ div.toolbar div.filters select {
#breadcrumbs {
height: 29px;
max-height: 29px;
background: url(../images/bg-breadcrumbs.png) repeat-x;
background: #FFFFFF;
overflow: hidden;
width: 100%;
}
@ -3304,17 +3304,11 @@ div.toolbar div.filters select {
#breadcrumbs ul li,
#breadcrumbs div.active-project {
background: url(../images/gradients.png) repeat-x -522px -10px;
height: 21px;
float: left;
font-size: 12px;
/*+text-shadow:0px 1px 1px #2A3640;*/
-moz-text-shadow: 0px 1px 1px #2A3640;
-webkit-text-shadow: 0px 1px 1px #2A3640;
-o-text-shadow: 0px 1px 1px #2A3640;
text-shadow: 0px 1px 1px #2A3640;
font-size: 11px;
color: #FFFFFF;
padding: 8px 5px 0px 8px;
padding: 9px 5px 0px 8px;
cursor: pointer;
/*+placement:shift -13px 0px;*/
position: relative;
@ -3324,6 +3318,16 @@ div.toolbar div.filters select {
margin: 0 0 0 2px;
}
#breadcrumbs ul li:after {
content: ">";
font-size: 11px;
/*+placement:shift 7px -1px;*/
position: relative;
left: 7px;
top: -1px;
color: #C4C4C4;
}
.project-view #breadcrumbs ul li {
background: url(../images/bg-breadcrumb-project-view.png) 0px -2px;
}
@ -3334,31 +3338,13 @@ div.toolbar div.filters select {
position: relative;
left: 0px;
top: 0px;
color: #CED4D9;
/*+text-shadow:0px 0px;*/
-moz-text-shadow: 0px 0px;
-webkit-text-shadow: 0px 0px;
-o-text-shadow: 0px 0px;
text-shadow: 0px 0px;
-moz-text-shadow: 0px 0px none;
-webkit-text-shadow: 0px 0px none;
-o-text-shadow: 0px 0px none;
-moz-text-shadow: none;
-webkit-text-shadow: none;
-o-text-shadow: none;
font-weight: bold;
color: #63A9F1;
}
#breadcrumbs ul li:hover,
#breadcrumbs ul li.active,
#breadcrumbs ul li.maximized {
color: #FFFFFF;
/*+text-shadow:0px 1px 1px #000000;*/
-moz-text-shadow: 0px 1px 1px #000000;
-webkit-text-shadow: 0px 1px 1px #000000;
-o-text-shadow: 0px 1px 1px #000000;
text-shadow: 0px 1px 1px #000000;
font-size: 12px;
color: #000000;
}
#breadcrumbs div.end {
@ -3380,6 +3366,8 @@ div.toolbar div.filters select {
left: -37px;
top: -1px;
margin-right: 0px;
/*Disabled*/
display: none;
}
#breadcrumbs ul li {
@ -3390,7 +3378,6 @@ div.toolbar div.filters select {
top: 0px;
margin-left: -10px;
text-indent: 13px;
font-weight: bold;
}
#breadcrumbs div.active-project {
@ -8629,10 +8616,10 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
}
.system-dashboard .status_box .view-all {
/*+placement:shift 18px 128px;*/
/*+placement:shift 18px 110px;*/
position: relative;
left: 18px;
top: 128px;
top: 110px;
width: 78%;
position: absolute;
text-align: center;
@ -8641,7 +8628,7 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
.system-dashboard .status_box {
font-size: 14px;
margin: 24px 0 0;
margin: 10px 0 0;
background: transparent;
border: none;
}
@ -8662,8 +8649,8 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
}
.system-dashboard.zone .status_box li {
margin-bottom: 38px;
height: 170px;
margin-bottom: 8px;
height: 152px;
background-color: #F4F4F4;
}
@ -8855,7 +8842,7 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
.system-dashboard-view .socket-info {
width: 100%;
height: 134px;
height: 239px;
overflow: auto;
float: left;
padding: 0;
@ -8871,7 +8858,7 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
}
.system-dashboard-view .socket-info li {
width: 143px;
width: 139px;
padding: 13px;
/*+border-radius:3px;*/
-moz-border-radius: 3px;
@ -8891,6 +8878,7 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
.system-dashboard-view .socket-info li .name {
width: 100%;
font-weight: 100;
margin-bottom: 13px;
}

1
ui/dictionary.jsp
View File

@ -25,6 +25,7 @@ under the License.
<% long now = System.currentTimeMillis(); %>
<script language="javascript">
dictionary = {
'label.home': '<fmt:message key="label.home" />',
'label.sockets': '<fmt:message key="label.sockets" />',
'label.root.disk.size': '<fmt:message key="label.root.disk.size" />',
'label.s3.nfs.path': '<fmt:message key="label.s3.nfs.path" />',

42
ui/scripts/system.js
View File

@ -380,31 +380,23 @@
}
},
socketInfo: function(args) {
complete($.extend(args.data, {
socketInfo: [
{
name: 'XenServer',
hosts: 0,
sockets: 0
},
{
name: 'VMware',
hosts: 0,
sockets: 0
},
{
name: 'KVM',
hosts: 0,
sockets: 0
},
{
name: 'Hyper-V',
hosts: 0,
sockets: 0
}
]
}));
socketInfo: function(data) {
$.ajax({
url: createURL('listHypervisors'),
success: function(json) {
var hypervisors = json.listhypervisorsresponse.hypervisor;
complete($.extend(data, {
socketInfo: $(hypervisors).map(function(index, hypervisor) {
return {
name: hypervisor.name,
hosts: 0,
sockets: 0
};
})
}));
}
});
}
};

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

@ -247,7 +247,7 @@
$('<div>').attr({
id: 'breadcrumbs'
})
.append($('<div>').addClass('home'))
.append($('<div>').addClass('home').html(_l('label.home')))
.append($('<div>').addClass('end'))
)