openstack/horizon
Code Issues Proposed changes

Merge "Volume limits and floating ip graphic label consistency"

Browse Source
This commit is contained in:
Jenkins
2016-11-22 18:09:50 +00:00
committed by Gerrit Code Review
parent b8507d468f 47c6bbaaa2
commit 49a078d8ec
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/floating_ips/_allocate.html
View File

@@ -10,9 +10,10 @@
<div class="quota_title">
<div class="pull-left">
<strong>{% trans "Floating IP" %}</strong>
<span>({{ usages.floating_ips.used }})</span>
</div>
<span class="pull-right">{{ usages.floating_ips.available|quota }}</span>
<span class="pull-right">
{% blocktrans with used=usages.floating_ips.used quota=usages.floating_ips.available|quotainf %}{{ used }} of {{ quota }} Used{% endblocktrans %}
</span>
</div>
<div id="floating_ip_progress"
class="quota_bar"

5
openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_extend_limits.html
View File

@@ -9,9 +9,10 @@
<div class="quota_title">
<div class="pull-left">
<strong>{% trans "Total Gibibytes" %}</strong>
<span>({{ usages.gigabytesUsed|intcomma }} {% trans "GiB" %})</span>
</div>
<span class="pull-right">{{ usages.maxTotalVolumeGigabytes|intcomma|quota:_("GiB") }}</span>
<span class="pull-right">
{% blocktrans with used=usages.gigabytesUsed|intcomma quota=usages.maxTotalVolumeGigabytes|intcomma|quotainf %}{{ used }} of {{ quota }} GiB Used{% endblocktrans %}
</span>
</div>
<div id="quota_size"

10
openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_limits.html
View File

@@ -17,9 +17,10 @@
<div class="quota_title">
<div class="pull-left">
<strong>{% trans "Total Gibibytes" %}</strong>
<span>({% block gigabytes_used %}{{ usages.gigabytesUsed|intcomma }}{% endblock %} {% trans "GiB" %})</span>
</div>
<span class="pull-right">{{ usages.maxTotalVolumeGigabytes|intcomma|quota:_("GiB") }}</span>
<span class="pull-right">
{% blocktrans with used=usages.gigabytesUsed|intcomma quota=usages.maxTotalVolumeGigabytes|intcomma|quotainf %}{{ used }} of {{ quota }} GiB Used{% endblocktrans %}
</span>
</div>
{{ minifyspace }}
@@ -36,9 +37,10 @@
<div class="quota_title">
<div class="pull-left">
<strong>{% block type_title %}{% trans "Number of Volumes" %}{% endblock %}</strong>
<span>({% block used %}{{ usages.volumesUsed|intcomma }}{% endblock %})</span>
</div>
<span class="pull-right">{% block total %}{{ usages.maxTotalVolumes|intcomma|quota }}{% endblock %}</span>
<span class="pull-right">
{% blocktrans with used=usages.volumesUsed|intcomma quota=usages.maxTotalVolumes|intcomma|quotainf %}{{ used }} of {{ quota }} Used{% endblocktrans %}
</span>
</div>
{{ minifyspace }}