shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Update dashboard style

Browse Source
This commit is contained in:
Daniel Molina 2014-04-09 17:44:46 +02:00
parent a369c7523a
commit 5abcbbbfc7
5 changed files with 67 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sunstone/public/css/app.css
View File

File diff suppressed because one or more lines are too long

96
src/sunstone/public/js/plugins/dashboard-tab.js
View File

@ -99,51 +99,57 @@ var widgets = {
</h4>\
</div>\
</div>\
<div class="small-4 large-4 columns">\
<div class="row graph_legend text-center">\
<div class="small-9 large-9 columns">\
<div class="row">\
<div class="small-6 large-6 columns">\
<h4 class="subheader"><small>'+tr("CPU")+'</small></h4>\
<div class="row graph_legend text-center">\
<div class="small-6 large-6 columns">\
<h4 class="subheader"><small>'+tr("CPU")+'</small></h4>\
</div>\
</div>\
<div class="row">\
<h4 class="subheader">\
<small class="subheader small-4 large-4 columns right">'+tr("Allocated")+
'</small>\
</h4>\
<div class="small-8 large-8 columns" id="dash_host_allocated_cpu" >\
</div>\
</div>\
<div class="row">\
<h4 class="subheader">\
<small class="subheader small-4 large-4 columns right">'+tr("Real")+
'</small>\
</h4>\
<div class="small-8 large-8 columns" id="dash_host_real_cpu" >\
</div>\
</div>\
</div>\
</div>\
<div class="row">\
<h4 class="subheader">\
<small class="subheader small-4 large-4 columns">'+tr("Allocated")+
'</small>\
</h4>\
<div class="small-8 large-8 columns" id="dash_host_allocated_cpu" >\
</div>\
</div>\
<div class="row">\
<h4 class="subheader">\
<small class="subheader small-4 large-4 columns">'+tr("Real")+
'</small>\
</h4>\
<div class="small-8 large-8 columns" id="dash_host_real_cpu" >\
<div class="small-6 large-6 columns">\
<div class="row graph_legend text-center">\
<div class="small-6 large-6 columns">\
<h4 class="subheader"><small>'+tr("MEMORY")+'</small></h4>\
</div>\
</div>\
<div class="row">\
<h4 class="subheader">\
<small class="subheader small-4 large-4 columns right">'+tr("Allocated")+
'</small>\
</h4>\
<div class="small-8 large-8 columns" id="dash_host_allocated_mem" >\
</div>\
</div>\
<div class="row">\
<h4 class="subheader">\
<small class="subheader small-4 large-4 columns right">'+tr("Real")+
'</small>\
</h4>\
<div class="small-8 large-8 columns" id="dash_host_real_mem" >\
</div>\
</div>\
</div>\
</div>\
</div>\
<div class="small-4 large-4 columns">\
<div class="row graph_legend text-center">\
<div class="small-6 large-6 columns">\
<h4 class="subheader"><small>'+tr("MEMORY")+'</small></h4>\
</div>\
</div>\
<div class="row">\
<h4 class="subheader">\
<small class="subheader small-4 large-4 columns">'+tr("Allocated")+
'</small>\
</h4>\
<div class="small-8 large-8 columns" id="dash_host_allocated_mem" >\
</div>\
</div>\
<div class="row">\
<h4 class="subheader">\
<small class="subheader small-4 large-4 columns">'+tr("Real")+
'</small>\
</h4>\
<div class="small-8 large-8 columns" id="dash_host_real_mem" >\
</div>\
</div>\
<div class="small-1 large-1 columns">\
</div>\
</div>\
</fieldset>',
@ -176,18 +182,18 @@ var widgets = {
</div>\
<div class="row">\
<h4 class="subheader">\
<small class="subheader small-4 large-4 columns">'+tr("CPU")+
<small class="subheader small-2 large-2 columns right">'+tr("CPU")+
'</small>\
</h4>\
<div class="small-8 large-8 columns" id="dash_vm_real_cpu" >\
<div class="small-10 large-10 columns" id="dash_vm_real_cpu" >\
</div>\
</div>\
<div class="row">\
<h4 class="subheader">\
<small class="subheader small-4 large-4 columns">'+tr("Memory")+
<small class="subheader small-2 large-2 columns right">'+tr("Memory")+
'</small>\
</h4>\
<div class="small-8 large-8 columns" id="dash_vm_real_mem" >\
<div class="small-10 large-10 columns" id="dash_vm_real_mem" >\
</div>\
</div>\
</div>\
@ -393,7 +399,7 @@ $(document).ready(function(){
var html = '<div class="small-6 large-6 columns">'+widgets[widget]+'</div>';
$('#two_per_row', $dashboard).append(html);
})
$.each(Config.dashboardWidgets('widgets_one_per_row'), function(id, widget){
var html = '<div class="row"><div class="large-12 columns">'+widgets[widget]+'</div></div><br>';
$('#one_per_row', $dashboard).append(html);

12
src/sunstone/public/js/plugins/provision-tab.js
View File

@ -901,12 +901,12 @@ function show_provision_user_info_callback(request, response) {
var quotas_html;
if (vms_quota || cpu_quota || memory_quota || volatile_size_quota || image_quota || network_quota || datastore_quota) {
quotas_html = '<div class="large-12 columns">' + vms_quota + '</div>';
quotas_html += '<div class="large-12 columns">' + cpu_quota + '</div>';
quotas_html += '<div class="large-12 columns">' + memory_quota + '</div>';
quotas_html += '<div class="large-12 columns">' + volatile_size_quota+ '</div>';
quotas_html += '<div class="large-12 columns">' + image_quota + '</div>';
quotas_html += '<div class="large-12 columns">' + network_quota + '</div>';
quotas_html = '<div class="large-12 columns">' + vms_quota + '<br><br></div>';
quotas_html += '<div class="large-12 columns">' + cpu_quota + '<br><br></div>';
quotas_html += '<div class="large-12 columns">' + memory_quota + '<br><br></div>';
quotas_html += '<div class="large-12 columns">' + volatile_size_quota+ '<br><br></div>';
quotas_html += '<div class="large-12 columns">' + image_quota + '<br><br></div>';
quotas_html += '<div class="large-12 columns">' + network_quota + '<br><br></div>';
quotas_html += '<div class="large-12 columns">' + datastore_quota + '</div>';
} else {
quotas_html = '<div class="row">'+

2
src/sunstone/public/js/sunstone.js
View File

@ -3523,7 +3523,7 @@ function usageBarHtml(usage, limit, info_str, color){
}
}
html = '<div class="progress-container"><div class="progress secondary radius">\
html = '<div class="progress-container"><div class="progress secondary round">\
<span class="'+classes+'" style="width: '+percentage+'%"></span></div>\
<div class="progress-text">'+info_str+'</div></div>';

15
src/sunstone/public/scss/app.scss
View File

@ -771,21 +771,22 @@ div.dataTables_scrollFoot table {
color: #368a54;
}
#provision_user_info_quotas_div {
fieldset {
margin: 1.125rem 0;
}
#provision_user_info_quotas_div, #dashboard-tab {
.progress {
height: 1.5625rem !important;
border: none;
background-color: #dfdfdf;
border: 1px solid #efefef;
background-color: #f7f7f7;
box-shadow: 0px 1px #dfdfdf;
}
.progress-text {
color: #333 !important;
margin-top: 4px;
}
.meter {
box-shadow: 0px 1px #dfdfdf;
}
}
.provision-input {