openstack
/
horizon
Code Issues Proposed changes

show limit summary in GB 

Prior this change RAM in limit overview would be shown in MB,
but it makes sense to change this to use variable sizes.
This change also introduces to show 1 decimal position for sizes
shown in float (earlier it was zero).

Fixes bug 1223856

Change-Id: I243c9ea1616bc2684911b5d7d9399b4c3ee4aacd
This commit is contained in:
Matthias Runge 2013-09-23 12:41:56 +02:00
parent 4586248e87
commit a08dac0f5a
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/templates/horizon/common/_limit_summary.html
View File

@ -19,7 +19,7 @@
<div class="d3_quota_bar">
<div class="d3_pie_chart" data-used="{% widthratio usage.limits.totalRAMUsed usage.limits.maxTotalRAMSize 100 %}"></div>
<strong>{% trans "RAM" %} <br />
{% blocktrans with used=usage.limits.totalRAMUsed|intcomma available=usage.limits.maxTotalRAMSize|intcomma %}Used <span> {{ used }} MB </span> of <span> {{ available }} MB </span>{% endblocktrans %}
{% blocktrans with used=usage.limits.totalRAMUsed|mb_float_format available=usage.limits.maxTotalRAMSize|mb_float_format %}Used <span> {{ used }} </span> of <span> {{ available }} </span>{% endblocktrans %}
</strong>
</div>

11
horizon/templatetags/sizeformat.py
View File

@ -35,7 +35,7 @@ def int_format(value):
def float_format(value):
return formats.number_format(round(value, 1), 0)
return formats.number_format(round(value, 1), 1)
def filesizeformat(bytes, filesize_number_format):
@ -71,6 +71,15 @@ def mbformat(mb):
return filesizeformat(mb * 1024 * 1024, int_format).replace(' ', '')
@register.filter(name='mb_float_format')
def mb_float_format(mb):
""" Takes a size value in mb, and prints returns the data in a
saner unit. """
if not mb:
return 0
return filesizeformat(mb * 1024 * 1024, float_format)
@register.filter(name='diskgbformat')
def diskgbformat(gb):
return filesizeformat(gb * 1024 * 1024 * 1024,