diff options
author | Jaromir Coufal <jcoufal@redhat.com> | 2013-07-17 12:52:35 +0200 |
---|---|---|
committer | Tomas Sedovic <tomas@sedovic.cz> | 2013-08-01 16:18:56 +0200 |
commit | 278fda2679c5ebe2ac025bcd98884d799eeb3dfb (patch) | |
tree | 21c7306c6379295b04caf1a5e768fb728a832c5a | |
parent | 6649463a897bcb962b90e18f090795dcca7734a2 (diff) | |
download | tuskar-ui-278fda2679c5ebe2ac025bcd98884d799eeb3dfb.tar.gz |
Added breadcrumbs
Change-Id: Ia4dd624fbdbae732b90b8a1e1604cdc6f22bfb21
8 files changed, 112 insertions, 18 deletions
diff --git a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/flavors/detail.html b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/flavors/detail.html index daee3bb1..dff5156a 100644 --- a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/flavors/detail.html +++ b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/flavors/detail.html @@ -6,4 +6,13 @@ {% include "horizon/common/_page_header.html" with title=_("Flavor Detail") %} {% endblock page_header %} +{% block breadcrumbs %} + <div class="breadcrumbs"> + <a href="{% url 'horizon:infrastructure:resource_management:index' %}?tab=resource_management_tabs__resource_classes_tab" >Home</a> + <span class="separator"></span> + <a href="{% url 'horizon:infrastructure:resource_management:index' %}?tab=resource_management_tabs__flavors_tab" >Flavors</a> + <span class="separator"></span> + </div> +{% endblock breadcrumbs %} + {% block name %}{{ flavor.name }}{% endblock %} diff --git a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/index.html b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/index.html index e60e6e3e..1f0775a0 100644 --- a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/index.html +++ b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/index.html @@ -7,6 +7,12 @@ {% endblock page_header %} {% block main %} + +<div class="breadcrumbs"> + <a href="{% url 'horizon:infrastructure:resource_management:index' %}?tab=resource_management_tabs__resource_classes_tab" >Home</a> + <span class="separator"></span> +</div> + <div class="row-fluid"> <div class="span12"> {{ tab_group.render }} diff --git a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/nodes/detail.html b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/nodes/detail.html index b3badaab..aff31d5c 100644 --- a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/nodes/detail.html +++ b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/nodes/detail.html @@ -6,6 +6,21 @@ {% include "horizon/common/_page_header.html" with title=_("Node Detail") %} {% endblock page_header %} +{% block breadcrumbs %} + <div class="breadcrumbs"> + <a href="{% url 'horizon:infrastructure:resource_management:index' %}?tab=resource_management_tabs__resource_classes_tab" >Home</a> + <span class="separator"></span> + <a href="{% url 'horizon:infrastructure:resource_management:index' %}?tab=resource_management_tabs__racks_tab" >Racks</a> + <span class="separator"></span> + {% if node.rack %} + <a href="{% url 'horizon:infrastructure:resource_management:racks:detail' node.rack.id %}">{{ node.rack.name }}</a> + {% else %} + <a href="{% url 'horizon:infrastructure:resource_management:nodes:unracked' %}" >Unracked Nodes</a> + {% endif %} + <span class="separator"></span> + </div> +{% endblock breadcrumbs %} + {% block name %}{{ node.name }}{% endblock %} {% block overall_usage %} diff --git a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/nodes/unracked.html b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/nodes/unracked.html index ed306389..6dd105be 100644 --- a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/nodes/unracked.html +++ b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/nodes/unracked.html @@ -6,7 +6,16 @@ {% include "horizon/common/_page_header.html" with title=_("Resource Management") %} {% endblock page_header %} + {% block main %} + +<div class="breadcrumbs"> + <a href="{% url 'horizon:infrastructure:resource_management:index' %}?tab=resource_management_tabs__resource_classes_tab" >Home</a> + <span class="separator"></span> + <a href="{% url 'horizon:infrastructure:resource_management:index' %}?tab=resource_management_tabs__racks_tab" >Racks</a> + <span class="separator"></span> +</div> + <h3>{% trans "Unracked Nodes" %}</h3> <div class="row-fluid"> diff --git a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/racks/detail.html b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/racks/detail.html index f46cea9b..5f93c67d 100644 --- a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/racks/detail.html +++ b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/racks/detail.html @@ -6,6 +6,15 @@ {% include "horizon/common/_page_header.html" with title=_("Rack Detail") %} {% endblock page_header %} +{% block breadcrumbs %} + <div class="breadcrumbs"> + <a href="{% url 'horizon:infrastructure:resource_management:index' %}?tab=resource_management_tabs__resource_classes_tab" >Home</a> + <span class="separator"></span> + <a href="{% url 'horizon:infrastructure:resource_management:index' %}?tab=resource_management_tabs__racks_tab" >Racks</a> + <span class="separator"></span> + </div> +{% endblock breadcrumbs %} + {% block name %}{{ rack.name }}{% endblock %} {% block overall_usage %} diff --git a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/resource_classes/detail.html b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/resource_classes/detail.html index 73b7b836..114e01a3 100644 --- a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/resource_classes/detail.html +++ b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/resource_classes/detail.html @@ -6,6 +6,15 @@ {% include "horizon/common/_page_header.html" with title="Resource Class Detail" %} {% endblock page_header %} +{% block breadcrumbs %} + <div class="breadcrumbs"> + <a href="{% url 'horizon:infrastructure:resource_management:index' %}?tab=resource_management_tabs__resource_classes_tab" >Home</a> + <span class="separator"></span> + <a href="{% url 'horizon:infrastructure:resource_management:index' %}?tab=resource_management_tabs__resource_classes_tab" >Classes</a> + <span class="separator"></span> + </div> +{% endblock breadcrumbs %} + {% block name %}{{ resource_class.name }}{% endblock %} {% block overall_usage %} diff --git a/openstack_dashboard/dashboards/infrastructure/static/infrastructure/less/infrastructure.less b/openstack_dashboard/dashboards/infrastructure/static/infrastructure/less/infrastructure.less index db3cc0f9..ae26ee65 100644 --- a/openstack_dashboard/dashboards/infrastructure/static/infrastructure/less/infrastructure.less +++ b/openstack_dashboard/dashboards/infrastructure/static/infrastructure/less/infrastructure.less @@ -62,7 +62,7 @@ body { // topbar .topbar { padding: 5px 30px; - margin: 0 0 30px 0; + margin: 0 0 10px 0; background: rgb(244,244,244); h2 { @@ -173,6 +173,26 @@ table.table { tr td { padding: 5px; } + + .table_search input { + padding-left: 10px; + } + + .table-bordered tr.table_caption + tr th:first-child { + border-top-left-radius: 2px; + } + + .table-bordered tr.table_caption + tr th:last-child { + border-top-right-radius: 2px; + } + + .table-bordered tfoot tr td:first-child { + border-bottom-left-radius: 2px; + } + + .table-bordered tfoot tr td:last-child { + border-bottom-right-radius: 2px; + } } // detail pages @@ -291,27 +311,40 @@ svg { padding-top: 40px; } -.btn, -input { - border-radius: 2px; -} +// breadcrumbs -.table_search input { - padding-left: 10px; -} +.breadcrumbs { + font-size: 85%; + margin: 0 30px 20px 30px; -.table-bordered tr.table_caption + tr th:first-child { - border-top-left-radius: 2px; -} + a { + color: rgb(180, 180, 180); + text-decoration: underline; -.table-bordered tr.table_caption + tr th:last-child { - border-top-right-radius: 2px; -} + &:hover { + text-decoration: none; + color: rgb(100, 100, 100); + } + } + + .separator { + color: rgb(200, 200, 200); -.table-bordered tfoot tr td:first-child { - border-bottom-left-radius: 2px; + &:before { + display: inline; + content: ">>"; + margin: 0 7px; + } + + &:last-child:after { + display: inline; + content: "..."; + } + } } -.table-bordered tfoot tr td:last-child { - border-bottom-right-radius: 2px; +// others +.btn, +input { + border-radius: 2px; } diff --git a/openstack_dashboard/dashboards/infrastructure/templates/infrastructure/base_detail.html b/openstack_dashboard/dashboards/infrastructure/templates/infrastructure/base_detail.html index f9c7ae70..8618ae69 100644 --- a/openstack_dashboard/dashboards/infrastructure/templates/infrastructure/base_detail.html +++ b/openstack_dashboard/dashboards/infrastructure/templates/infrastructure/base_detail.html @@ -1,8 +1,12 @@ {% extends 'infrastructure/base.html' %} {% block main %} + +{% block breadcrumbs %}{% endblock %} + <h3>{% block name %}{% endblock %}</h3> + <div class="row-fluid"> <div class="span12"> <div class="pull-right"> |