From 21b9af464584638e26e47d822e53be57a22c2f6f Mon Sep 17 00:00:00 2001 From: Jiri Tomasek Date: Wed, 14 Jan 2015 15:53:25 +0100 Subject: [PATCH] Role detail page fixes Added title to nodes table, fixed position of graph filter dropdown Change-Id: I29e3bda5667840cbe519e786a99c1c26f5bd8c05 --- tuskar_ui/infrastructure/roles/tables.py | 1 + tuskar_ui/infrastructure/roles/templates/roles/detail.html | 7 ++----- .../templates/infrastructure/_performance_chart_box.html | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tuskar_ui/infrastructure/roles/tables.py b/tuskar_ui/infrastructure/roles/tables.py index da39a0c30..b7c10c6bd 100644 --- a/tuskar_ui/infrastructure/roles/tables.py +++ b/tuskar_ui/infrastructure/roles/tables.py @@ -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" diff --git a/tuskar_ui/infrastructure/roles/templates/roles/detail.html b/tuskar_ui/infrastructure/roles/templates/roles/detail.html index 03ec23343..0839ca0d2 100644 --- a/tuskar_ui/infrastructure/roles/templates/roles/detail.html +++ b/tuskar_ui/infrastructure/roles/templates/roles/detail.html @@ -34,9 +34,6 @@ {% include "infrastructure/_performance_chart_box.html" with meter_conf=meter_conf node_perf_url=node_perf_url col_size=4 %} -
-
- {{ table.render }} -
-
+ +{{ table.render }} {% endblock %} diff --git a/tuskar_ui/infrastructure/templates/infrastructure/_performance_chart_box.html b/tuskar_ui/infrastructure/templates/infrastructure/_performance_chart_box.html index 6826a4cee..7f1fe6237 100644 --- a/tuskar_ui/infrastructure/templates/infrastructure/_performance_chart_box.html +++ b/tuskar_ui/infrastructure/templates/infrastructure/_performance_chart_box.html @@ -2,7 +2,7 @@ {% load url from future%} {% if meter_conf %} -
+