openstack/horizon
Code Issues Proposed changes

Merge "Same styling for "Limit Summary" and "Usage Summary""

Browse Source
This commit is contained in:
Jenkins 2014-01-12 04:05:13 +00:00 committed by Gerrit Code Review
commit 86bdac1f22
4 changed files with 13 additions and 5 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

@ -1,7 +1,7 @@
{% load i18n horizon humanize sizeformat %}
<div class="quota-dynamic">
<h3>{% trans "Limit Summary" %}</h3>
<h3 class="quota-heading">{% trans "Limit Summary" %}</h3>
<div class="d3_quota_bar">
<div class="d3_pie_chart" data-used="{% widthratio usage.limits.totalInstancesUsed usage.limits.maxTotalInstances 100 %}"></div>
<strong>{% trans "Instances" %} <br />

6
horizon/templates/horizon/common/_usage_summary.html
View File

@ -1,11 +1,13 @@
{% load i18n sizeformat %}
<div class="quota-dynamic">
<h3 class="quota-heading">{% trans "Usage Summary" %}</h3>
</div>
<div class="usage_info_wrapper">
<form action="" method="get" id="date_form" class="form-horizontal">
<h3>{% trans "Select a period of time to query its usage" %}: </h3>
<div class="datepicker">
{% blocktrans with start=form.start end=form.end %}<span>From: {{ start }} </span><span>To: {{ end }} </span>{% endblocktrans %}
<button class="btn btn-small" type="submit">{% trans "Submit" %}</button>
<button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
<small>{% trans "The date should be in YYYY-mm-dd format." %}</small>
</div>
</form>

6
openstack_dashboard/static/dashboard/less/horizon.less
View File

@ -2237,6 +2237,12 @@ label.log-length {
top: -100px;
}
.quota-heading {
font-family: anivers;
font-weight: normal;
font-size: 24px;
margin-bottom: 10px;
}
/**** Resource Topology CSS ****/
.link {stroke: #999;stroke-width: 1.5px;}

4
openstack_dashboard/usage/tables.py
View File

@ -51,7 +51,7 @@ class GlobalUsageTable(BaseUsageTable):
class Meta:
name = "global_usage"
verbose_name = _("Usage Summary")
verbose_name = _("Usage")
columns = ("project", "vcpus", "disk", "memory",
"hours", "disk_hours")
table_actions = (CSVSummary,)
@ -80,7 +80,7 @@ class ProjectUsageTable(BaseUsageTable):
class Meta:
name = "project_usage"
verbose_name = _("Usage Summary")
verbose_name = _("Usage")
columns = ("instance", "vcpus", "disk", "memory", "uptime")
table_actions = (CSVSummary,)
multi_select = False