From ee7edeb1f327d05fce2fdf63d9d603f3cd029b79 Mon Sep 17 00:00:00 2001 From: zhurong Date: Sat, 7 May 2016 03:11:08 -0400 Subject: [PATCH] Made breadcrumb consistent with horizon Now horizon this patch:https://review.openstack.org/#/c/284421/ merged, so we should make murano-dashboard breadcrumb consistent with horizon. Change-Id: I436fde0e092f3ffeb499f1a3a99e2aca5197c721 Closes-Bug: #1579315 --- muranodashboard/environments/views.py | 2 -- muranodashboard/templates/deployments/reports.html | 5 +---- muranodashboard/templates/packages/detail.html | 5 +---- muranodashboard/templates/services/details.html | 5 +---- muranodashboard/templates/services/index.html | 5 +---- 5 files changed, 4 insertions(+), 18 deletions(-) diff --git a/muranodashboard/environments/views.py b/muranodashboard/environments/views.py index 2b13b8ad4..4026c1d9a 100644 --- a/muranodashboard/environments/views.py +++ b/muranodashboard/environments/views.py @@ -128,7 +128,6 @@ class DetailServiceView(tabs.TabbedTableView): env = api.environment_get(self.request, self.environment_id) context["environment_name"] = env.name breadcrumb = [ - (_("Environments"), EnvironmentDetails.get_redirect_url()), (context["environment_name"], reverse("horizon:murano:environments:services", args=[self.environment_id])), @@ -203,7 +202,6 @@ class DeploymentDetailsView(tabs.TabbedTableView): self.environment_id, self.deployment_id) breadcrumb = [ - (_("Environments"), EnvironmentDetails.get_redirect_url()), (context["environment_name"], reverse("horizon:murano:environments:services", args=[self.environment_id])), diff --git a/muranodashboard/templates/deployments/reports.html b/muranodashboard/templates/deployments/reports.html index 3a5725e74..842aba557 100644 --- a/muranodashboard/templates/deployments/reports.html +++ b/muranodashboard/templates/deployments/reports.html @@ -1,13 +1,10 @@ {% extends 'murano_base.html' %} {% load i18n sizeformat %} -{% load breadcrumb_nav %} {% block title %}{% trans "Deployment Details" %}{% endblock %} {% block page_header %} - + {% include "horizon/common/_detail_header.html" %} {% endblock page_header %} {% block main %} diff --git a/muranodashboard/templates/packages/detail.html b/muranodashboard/templates/packages/detail.html index d6b82b803..6b3211ca6 100644 --- a/muranodashboard/templates/packages/detail.html +++ b/muranodashboard/templates/packages/detail.html @@ -1,13 +1,10 @@ {% extends 'base.html' %} {% load i18n %} -{% load breadcrumb_nav %} {% block title %}{% trans "Package Details" %}{% endblock %} {% block page_header %} - + {% include "horizon/common/_detail_header.html" %} {% endblock %} {% block main %} diff --git a/muranodashboard/templates/services/details.html b/muranodashboard/templates/services/details.html index dc3208812..dcaa79e9e 100644 --- a/muranodashboard/templates/services/details.html +++ b/muranodashboard/templates/services/details.html @@ -1,6 +1,5 @@ {% extends 'murano_base.html' %} {% load i18n sizeformat %} -{% load breadcrumb_nav %} {% load static %} {% load compress %} @@ -14,9 +13,7 @@ {% endblock %} {% block page_header %} - + {% include "horizon/common/_detail_header.html" %} {% endblock page_header %} {% block main %} diff --git a/muranodashboard/templates/services/index.html b/muranodashboard/templates/services/index.html index 722fff934..67ad7236b 100644 --- a/muranodashboard/templates/services/index.html +++ b/muranodashboard/templates/services/index.html @@ -1,6 +1,5 @@ {% extends 'murano_base.html' %} {% load i18n %} -{% load breadcrumb_nav %} {% load static %} {% load compress %} {% load horizon %} @@ -8,9 +7,7 @@ {% block title %}{% trans "Components" %}{% endblock %} {% block page_header %} - + {% include "horizon/common/_detail_header.html" %} {% endblock page_header %} {% block main %}