← Back to branch summary

~ubuntu-branches/ubuntu/trusty/horizon/trusty

« back to all changes in this revision

Viewing changes to horizon/templates/horizon/common/_usage_summary.html

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-03-09 11:50:22 UTC
  • mfrom: (1.1.9)
  • Revision ID: package-import@ubuntu.com-20120309115022-ymiww5i58rbg97my
Tags: 2012.1~rc1~20120308.1479-0ubuntu1
https://launchpad.net/bugs/947118
https://launchpad.net/bugs/944235
* New upstream version.
* debian/rules: Fix symlink when installing horizon.
  (LP: #947118)
* debian/control: Add python-django-nose as a dep. (LP: #944235)
* debian/control: Fix broken depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
horizon/templates/horizon/common/_usage_summary.html
1
1
{% load i18n sizeformat %}
2
2
 
3
 
<form action="" method="get" id="date_form" class="form-horizontal">
4
 
  <h3>{% trans "Select a month to query its usage" %}: </h3>
5
 
  <div class="form-row">
6
 
    {{ form.month }}
7
 
    {{ form.year }}
8
 
    <input class="btn btn-small" type="submit"/>
9
 
  </div>
10
 
</form>
 
3
<div class="usage_info_wrapper">
 
4
  <form action="" method="get" id="date_form" class="form-horizontal">
 
5
    <h3>{% trans "Select a month to query its usage" %}: </h3>
 
6
    <div class="form-row">
 
7
      {{ form.month }}
 
8
      {{ form.year }}
 
9
      <input class="btn btn-small" type="submit"/>
 
10
    </div>
 
11
  </form>
11
12
 
12
 
<p id="activity">
13
 
  <span><strong>{% trans "Active Instances" %}:</strong> {{ usage.summary.instances|default:'-' }}</span>
14
 
  <span><strong>{% trans "Active Memory" %}:</strong> {{ usage.summary.memory_mb|mbformat|default:'-' }}</span>
15
 
  <span><strong>{% trans "This Month's VCPU-Hours" %}:</strong> {{ usage.summary.vcpu_hours|floatformat|default:'-' }}</span>
16
 
  <span><strong>{% trans "This Month's GB-Hours" %}:</strong> {{ usage.summary.disk_gb_hours|floatformat|default:'-' }}</span>
17
 
</p>
 
13
  <p id="activity">
 
14
    <span><strong>{% trans "Active Instances" %}:</strong> {{ usage.summary.instances|default:'-' }}</span>
 
15
    <span><strong>{% trans "Active Memory" %}:</strong> {{ usage.summary.memory_mb|mbformat|default:'-' }}</span>
 
16
    <span><strong>{% trans "This Month's VCPU-Hours" %}:</strong> {{ usage.summary.vcpu_hours|floatformat:2|default:'-' }}</span>
 
17
    <span><strong>{% trans "This Month's GB-Hours" %}:</strong> {{ usage.summary.disk_gb_hours|floatformat:2|default:'-' }}</span>
 
18
  </p>
 
19
</div>