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

Feature #4363: Fix quotas dashboard

Browse Source
This commit is contained in:
Daniel Molina 2016-04-13 17:32:09 +02:00
parent 5455bae853
commit ee7d095de5
4 changed files with 59 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sunstone/public/app/tabs/provision-tab.js
View File

@ -470,7 +470,7 @@ define(function(require) {
$("#provision_dashboard_rvms_percentage").html(vms["percentage"]);
$("#provision_dashboard_rvms_str").html(vms["str"]);
$("#provision_dashboard_rvms_meter").css("width", vms["percentage"]+"%");
$("#provision_dashboard_rvms_meter").val(vms["percentage"]);
var memory = QuotaWidgets.quotaMBInfo(
user.VM_QUOTA.VM.MEMORY_USED,
@ -480,7 +480,7 @@ define(function(require) {
$("#provision_dashboard_memory_percentage").html(memory["percentage"]);
$("#provision_dashboard_memory_str").html(memory["str"]);
$("#provision_dashboard_memory_meter").css("width", memory["percentage"]+"%");
$("#provision_dashboard_memory_meter").val(memory["percentage"]);
var cpu = QuotaWidgets.quotaFloatInfo(
user.VM_QUOTA.VM.CPU_USED,
@ -490,7 +490,7 @@ define(function(require) {
$("#provision_dashboard_cpu_percentage").html(cpu["percentage"]);
$("#provision_dashboard_cpu_str").html(cpu["str"]);
$("#provision_dashboard_cpu_meter").css("width", cpu["percentage"]+"%");
$("#provision_dashboard_cpu_meter").val(cpu["percentage"]);
}
}
})

92
src/sunstone/public/app/tabs/provision-tab/dashboard/quotas.hbs
View File

@ -13,60 +13,56 @@
{{! See the License for the specific language governing permissions and }}
{{! limitations under the License. }}
{{! -------------------------------------------------------------------------- }}
<div class="row">
<div class="large-12 columns">
<h4>{{tr "Quotas"}}</h2>
</div>
</div>
<div class="row">
<div class="large-10 large-centered columns">
<div class="large-11 medium-12 large-centered columns">
<div class="row">
<div class="large-4 columns text-center">
<span id="provision_dashboard_rvms_percentage" style="font-size:50px">0</span>
<span style="font-size:20px; color: #999">%</span></div>
<div class="large-4 columns text-center">
<span id="provision_dashboard_cpu_percentage" style="font-size:50px">0</span>
<span style="font-size:20px; color: #999">%</span></div>
<div class="large-4 columns text-center">
<span id="provision_dashboard_memory_percentage" style="font-size:50px">0</span>
<span style="font-size:20px; color: #999">%</span></div>
</div>
<div class="row">
<div class="large-4 columns text-center">
<div class="progress large radius">
<span id="provision_dashboard_rvms_meter" class="meter"></span>
</div>
</div>
<div class="large-4 columns text-center">
<div class="progress large radius">
<span id="provision_dashboard_cpu_meter" class="meter"></span>
</div>
</div>
<div class="large-4 columns text-center">
<div class="progress large radius">
<span id="provision_dashboard_memory_meter" class="meter"></span>
</div>
</div>
</div>
<div class="row">
<div class="large-4 columns text-center">
<span>{{tr "RUNNING VMS"}}</span>
<br>
<span id="provision_dashboard_rvms_str" style="color: #999; font-size: 14px;"></span>
</div>
<div class="large-4 columns text-center">
<span>{{tr "CPU"}}</span>
<br>
<span id="provision_dashboard_cpu_str" style="color: #999; font-size: 14px;"></span>
</div>
<div class="large-4 columns text-center">
<span>{{tr "MEMORY"}}</span>
<br>
<span id="provision_dashboard_memory_str" style="color: #999; font-size: 14px;"></span>
</div>
</div>
<div class="large-4 medium-4 columns text-center">
<h3>
<span id="provision_dashboard_rvms_percentage">0</span>
<small>%</small>
</h3>
<div class="progress large radius">
<meter id="provision_dashboard_rvms_meter" min="0" low="33" high="66" optimum="0" max="100"></meter>
</div>
<h6>
<span id="provision_dashboard_rvms_str"></span>
<br>
<span class="subheader">{{tr "RUNNING VMS"}}</span>
</h6>
</div>
<br>
<br>
<div class="large-4 medium-4 columns text-center">
<h3>
<span id="provision_dashboard_cpu_percentage">0</span>
<small>%</small>
</h3>
<div class="progress large radius">
<meter id="provision_dashboard_cpu_meter" min="0" low="33" high="66" optimum="0" max="100"></meter>
</div>
<h6>
<span id="provision_dashboard_cpu_str"></span>
<br>
<span class="subheader">{{tr "CPU"}}</span>
</h6>
</div>
<div class="large-4 medium-4 columns text-center">
<h3>
<span id="provision_dashboard_memory_percentage">0</span>
<small>%</small>
</h3>
<div class="progress large radius">
<meter id="provision_dashboard_memory_meter" min="0" low="33" high="66" optimum="0" max="100"></meter>
</div>
<h6>
<span id="provision_dashboard_memory_str"></span>
<br>
<span class="subheader">{{tr "MEMORY"}}</span>
</h6>
</div>
</div>
</div>
</div>

22
src/sunstone/public/app/tabs/provision-tab/dashboard/vms.hbs
View File

@ -17,7 +17,7 @@
<div class="large-12 columns">
<h4>{{tr "Virtual Machines"}}</h4>
<div class="row">
<div class="large-3 columns text-center">
<div class="large-3 medium-4 columns text-center">
<div class="row">
<div class="large-12 columns">
<h2>
@ -36,9 +36,9 @@
</div>
</div>
</div>
<div class="large-9 columns text-center">
<div class="large-10 large-centered columns">
<div class="large-3 columns">
<div class="large-9 medium-8 columns text-center">
<div class="large-10 medium-12 large-centered columns">
<div class="large-3 medium-3 columns">
<h4>
<span id="provision_dashboard_running">
<i class="fa fa-spinner fa-spin"></i>
@ -46,7 +46,7 @@
<small class="subheader">{{tr "RUNNING"}}</small>
</h4>
</div>
<div class="large-3 columns ">
<div class="large-3 medium-3 columns ">
<h4>
<span id="provision_dashboard_deploying" >
<i class="fa fa-spinner fa-spin"></i>
@ -54,7 +54,7 @@
<small class="subheader">{{tr "DEPLOYING"}}</small>
</h4>
</div>
<div class="large-3 columns">
<div class="large-3 medium-3 columns">
<h4>
<span id="provision_dashboard_off">
<i class="fa fa-spinner fa-spin"></i>
@ -62,7 +62,7 @@
<small class="subheader">{{tr "OFF"}}</small>
</h4>
</div>
<div class="large-3 columns ">
<div class="large-3 medium-3 columns ">
<h4>
<span id="provision_dashboard_error">
<i class="fa fa-spinner fa-spin"></i>
@ -70,10 +70,10 @@
<small class="subheader">{{tr "ERROR"}}</small>
</h4>
</div>
<hr>
<br>
</div>
<div class="large-12 columns" id="dashboard_vm_accounting">
<div class="large-4 columns text-center">
<div class="large-4 medium-12 columns text-center">
<input style="display:none;" value="vm" id="acct_group_by"/>
<div class="row">
<div class="large-12 columns graph_legend">
@ -86,7 +86,7 @@
</div>
</div>
</div>
<div class="large-4 columns text-center">
<div class="large-4 medium-12 columns text-center">
<div class="row">
<div class="large-12 columns graph_legend">
<span class="subheader">
@ -98,7 +98,7 @@
</div>
</div>
</div>
<div class="large-4 columns text-center">
<div class="large-4 medium-12 columns text-center">
<div class="row">
<div class="large-12 columns graph_legend">
<span class="subheader">

2
src/sunstone/public/scss/_layout.scss
View File

@ -28,7 +28,7 @@
color: $bold-black;
}
@include breakpoint(small only) {
@include breakpoint(medium down) {
.username,
.zonename {
display: none;