openstack/horizon
Code Issues Proposed changes

Merge "When launching instances, clarifies quota text to "X of Y Used""

Browse Source
This commit is contained in:
Jenkins 2013-06-04 23:05:25 +00:00 committed by Gerrit Code Review
commit 112df7c138
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openstack_dashboard/dashboards/project/instances/templates/instances/_launch_details_help.html
View File

@ -18,22 +18,22 @@
<div class="quota-dynamic"> <div class="quota-dynamic">
<h4>{% trans "Project Quotas" %}</h4> <h4>{% trans "Project Quotas" %}</h4>
<div class="quota_title clearfix"> <div class="quota_title clearfix">
<strong>{% trans "Number of Instances" %} <span>({{ usages.instances.used|intcomma }})</span></strong> <strong>{% trans "Number of Instances" %}</strong>
<p>{{ usages.instances.available|quota|intcomma }}</p> {% blocktrans with used=usages.instances.used|intcomma quota=usages.instances.quota|intcomma %}<p>{{ used }} of {{ quota }} Used</p>{% endblocktrans %}
</div> </div>
<div id="quota_instances" class="quota_bar" data-progress-indicator-flavor data-quota-limit="{{ usages.instances.quota }}" data-quota-used="{{ usages.instances.used }}"> <div id="quota_instances" class="quota_bar" data-progress-indicator-flavor data-quota-limit="{{ usages.instances.quota }}" data-quota-used="{{ usages.instances.used }}">
</div> </div>
<div class="quota_title clearfix"> <div class="quota_title clearfix">
<strong>{% trans "Number of VCPUs" %} <span>({{ usages.cores.used|intcomma }})</span></strong> <strong>{% trans "Number of VCPUs" %}</strong>
<p>{{ usages.cores.available|quota|intcomma }}</p> {% blocktrans with used=usages.cores.used|intcomma quota=usages.cores.quota|intcomma %}<p>{{ used }} of {{ quota }} Used</p>{% endblocktrans %}
</div> </div>
<div id="quota_vcpus" class="quota_bar" data-progress-indicator-flavor data-quota-limit="{{ usages.cores.quota }}" data-quota-used="{{ usages.cores.used }}"> <div id="quota_vcpus" class="quota_bar" data-progress-indicator-flavor data-quota-limit="{{ usages.cores.quota }}" data-quota-used="{{ usages.cores.used }}">
</div> </div>
<div class="quota_title clearfix"> <div class="quota_title clearfix">
<strong>{% trans "Total RAM" %} <span>({{ usages.ram.used|intcomma }} {% trans "MB" %})</span></strong> <strong>{% trans "Total RAM" %}</strong>
<p>{{ usages.ram.available|quota:_("MB")|intcomma }}</p> {% blocktrans with used=usages.ram.used|intcomma quota=usages.ram.quota|intcomma %}<p>{{ used }} of {{ quota }} MB Used</p>{% endblocktrans %}
</div> </div>
<div id="quota_ram" data-progress-indicator-flavor data-quota-limit="{{ usages.ram.quota }}" data-quota-used="{{ usages.ram.used }}" class="quota_bar"> <div id="quota_ram" data-progress-indicator-flavor data-quota-limit="{{ usages.ram.quota }}" data-quota-used="{{ usages.ram.used }}" class="quota_bar">
</div> </div>