Fixed various styling issues

Made some changes agreed on in discussion, like getting rid of repeated headers.

Change-Id: Icadfede4d29c57cf87a7185868896ce3ff8c28fc
This commit is contained in:
Lennart Regebro 2014-08-13 18:53:01 +02:00
parent af5b6ccd33
commit 11bee26782
10 changed files with 28 additions and 17 deletions

View File

@ -69,7 +69,7 @@ class FlavorsTable(tables.DataTable):
class Meta:
name = "flavors"
verbose_name = _("Flavors")
verbose_name = _("Available")
table_actions = (CreateFlavor,
DeleteFlavor,
flavor_tables.FlavorFilterAction)
@ -93,6 +93,12 @@ class FlavorRolesTable(tables.DataTable):
)
super(FlavorRolesTable, self).__init__(request, *args, **kwargs)
class Meta:
name = "flavor_roles"
verbose_name = _("Overcloud Roles")
table_actions = ()
row_actions = ()
class FlavorSuggestionsTable(tables.DataTable):
arch = tables.Column('cpu_arch', verbose_name=_('Architecture'))

View File

@ -38,7 +38,7 @@ def get_flavor_suggestions(request):
class FlavorsTab(horizon.tabs.TableTab):
name = _("Flavors")
name = _("Available")
slug = 'flavors'
table_classes = (tables.FlavorsTable,)
template_name = ("horizon/common/_detail_table.html")
@ -121,7 +121,7 @@ class FlavorSuggestion(object):
class FlavorSuggestionsTab(horizon.tabs.TableTab):
name = _("Flavor Suggestions")
name = _("Suggested")
slug = 'flavor_suggestions'
table_classes = (tables.FlavorSuggestionsTable,)
template_name = ("horizon/common/_detail_table.html")

View File

@ -27,7 +27,6 @@
<dt>{% trans "Ramdisk" %}</dt>
<dd>{{ ramdisk_image.name|default:"&mdash;" }}</dd>
</dl>
<h4>{% trans "Overcloud Roles" %}</h4>
{{ table.render }}
</div>
</div>

View File

@ -10,7 +10,9 @@
{% block main %}
<div class="row">
<div class="col-xs-12">
{{ tab_group.render }}
<div class="no-table-title"> {% comment %}This will likely move to the tables Meta in the future{% endcomment %}
{{ tab_group.render }}
</div>
</div>
</div>
{% endblock %}

View File

@ -9,7 +9,9 @@
{% block main %}
<div class="row-fluid">
<div class="span12">
{{ table.render }}
<div class="no-table-title"> {% comment %}This will likely move to the tables Meta in the future{% endcomment %}
{{ table.render }}
</div>
</div>
</div>

View File

@ -9,8 +9,9 @@
{% block main %}
<div class="row-fluid">
<div class="span12">
<h4>{% trans "Provisioning Images" %}</h4>
{{ table.render }}
<div class="no-table-title"> {% comment %}This will likely move to the tables Meta in the future{% endcomment %}
{{ table.render }}
</div>
</div>
</div>

View File

@ -4,17 +4,13 @@
{% block title %}{% trans 'Service Configuration' %}{% endblock %}
{% block page_header %}
{% include 'horizon/common/_page_header.html' with title=title %}
{% include 'horizon/common/_page_header.html' with title=_('Service Configuration') %}
{% endblock page_header %}
{% block main %}
<div class="row-fluid">
<div class="span12">
<ul>
{% for p in plan_parameters %}
<li>{{ p.parameter_group|default:"General" }}: {{ p.name }}</li>
{% endfor %}
</ul>
<h4>To Be Done</h4>
</div>
</div>
{% endblock %}

View File

@ -26,7 +26,6 @@
{% endif %}
</dl>
<h3>{% trans 'Nodes' %}</h3>
{{ table.render }}
</div>
</div>

View File

@ -9,8 +9,9 @@
{% block main %}
<div class="row-fluid">
<div class="span12">
<h4>{% trans "Deployment Roles" %}</h4>
{{ table.render }}
<div class="no-table-title"> {% comment %}This will likely move to the tables Meta in the future{% endcomment %}
{{ table.render }}
</div>
</div>
</div>

View File

@ -14,3 +14,8 @@
#tenant_switcher {
visibility: hidden;
}
// Some tables should not have a title because it just repeats the page title.
.no-table-title h3.table_title {
display: none;
}