openstack/horizon
Code Issues Proposed changes

Merge "Do not include HTML tags in blocktrans"

Browse Source
This commit is contained in:
Jenkins 2017-03-27 03:33:51 +00:00 committed by Gerrit Code Review
commit 57b30f2ab4
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
openstack_dashboard/dashboards/project/instances/templates/instances/_flavors_and_quotas.html
View File

@ -19,9 +19,11 @@
<h4>{% trans "Project Limits" %}</h4>
<div class="quota_title">
<strong class="pull-left">{% trans "Number of Instances" %}</strong>
{% blocktrans trimmed with used=usages.totalInstancesUsed|intcomma quota=usages.maxTotalInstances|intcomma|quotainf %}
<span class="pull-right">{{ used }} of {{ quota }} Used</span>
{% endblocktrans %}
<span class="pull-right">
{% blocktrans trimmed with used=usages.totalInstancesUsed|intcomma quota=usages.maxTotalInstances|intcomma|quotainf %}
{{ used }} of {{ quota }} Used
{% endblocktrans %}
</span>
</div>
{{ minifyspace }}
@ -37,9 +39,11 @@
<div class="quota_title">
<strong class="pull-left">{% trans "Number of VCPUs" %}</strong>
{% blocktrans trimmed with used=usages.totalCoresUsed|intcomma quota=usages.maxTotalCores|intcomma|quotainf %}
<span class="pull-right">{{ used }} of {{ quota }} Used</span>
{% endblocktrans %}
<span class="pull-right">
{% blocktrans trimmed with used=usages.totalCoresUsed|intcomma quota=usages.maxTotalCores|intcomma|quotainf %}
{{ used }} of {{ quota }} Used
{% endblocktrans %}
</span>
</div>
{{ minifyspace }}
@ -55,9 +59,11 @@
<div class="quota_title">
<strong class="pull-left">{% trans "Total RAM" %}</strong>
{% blocktrans trimmed with used=usages.totalRAMUsed|intcomma quota=usages.maxTotalRAMSize|intcomma|quotainf %}
<span class="pull-right">{{ used }} of {{ quota }} MB Used</span>
{% endblocktrans %}
<span class="pull-right">
{% blocktrans trimmed with used=usages.totalRAMUsed|intcomma quota=usages.maxTotalRAMSize|intcomma|quotainf %}
{{ used }} of {{ quota }} MB Used
{% endblocktrans %}
</span>
</div>
{{ minifyspace }}
@ -74,8 +80,11 @@
{% if cinder_enabled %}
<div class="quota_title">
<strong class="pull-left">{% trans "Number of Volumes" %}</strong>
{% blocktrans with used=usages.totalVolumesUsed|intcomma quota=usages.maxTotalVolumes|intcomma|quotainf %}
<span class="pull-right">{{ used }} of {{ quota }} Used</span>{% endblocktrans %}
<span class="pull-right">
{% blocktrans with used=usages.totalVolumesUsed|intcomma quota=usages.maxTotalVolumes|intcomma|quotainf %}
{{ used }} of {{ quota }} Used
{% endblocktrans %}
</span>
</div>
<div id="quota_volume"
class="quota_bar"
@ -88,8 +97,11 @@
<div class="quota_title">
<strong class="pull-left">{% trans "Total Volume Storage" %}</strong>
{% blocktrans with used=usages.gigabytesUsed|intcomma quota=usages.maxTotalVolumeGigabytes|intcomma|quotainf %}
<span class="pull-right">{{ used }} of {{ quota }} GiB Used</span>{% endblocktrans %}
<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_volume_storage"
class="quota_bar"