Merge "Role detail page fixes"

This commit is contained in:
Jenkins 2015-01-20 12:09:37 +00:00 committed by Gerrit Code Review
commit e4e0926e4d
3 changed files with 4 additions and 6 deletions

View File

@ -60,6 +60,7 @@ class NodeTable(nodes_tables.ProvisionedNodesTable):
class Meta:
name = "nodetable"
verbose_name = _("Nodes")
hidden_title = False
table_actions = ()
row_actions = ()
template = "horizon/common/_enhanced_data_table.html"

View File

@ -34,9 +34,6 @@
{% include "infrastructure/_performance_chart_box.html" with meter_conf=meter_conf node_perf_url=node_perf_url col_size=4 %}
</div>
</div>
<div class="row">
<div class="col-xs-12">
{{ table.render }}
</div>
</div>
{{ table.render }}
{% endblock %}

View File

@ -2,7 +2,7 @@
{% load url from future%}
{% if meter_conf %}
<div class="nodes row">
<div class="nodes">
<div id="ceilometer-stats" class="clearfix">
<form class="form-inline performance_charts" id="linechart_general_form">
<div class="pull-right">