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
This commit is contained in:
zhurong 2016-05-07 03:11:08 -04:00
parent 21ab20ae88
commit ee7edeb1f3
5 changed files with 4 additions and 18 deletions

View File

@ -128,7 +128,6 @@ class DetailServiceView(tabs.TabbedTableView):
env = api.environment_get(self.request, self.environment_id) env = api.environment_get(self.request, self.environment_id)
context["environment_name"] = env.name context["environment_name"] = env.name
breadcrumb = [ breadcrumb = [
(_("Environments"), EnvironmentDetails.get_redirect_url()),
(context["environment_name"], (context["environment_name"],
reverse("horizon:murano:environments:services", reverse("horizon:murano:environments:services",
args=[self.environment_id])), args=[self.environment_id])),
@ -203,7 +202,6 @@ class DeploymentDetailsView(tabs.TabbedTableView):
self.environment_id, self.environment_id,
self.deployment_id) self.deployment_id)
breadcrumb = [ breadcrumb = [
(_("Environments"), EnvironmentDetails.get_redirect_url()),
(context["environment_name"], (context["environment_name"],
reverse("horizon:murano:environments:services", reverse("horizon:murano:environments:services",
args=[self.environment_id])), args=[self.environment_id])),

View File

@ -1,13 +1,10 @@
{% extends 'murano_base.html' %} {% extends 'murano_base.html' %}
{% load i18n sizeformat %} {% load i18n sizeformat %}
{% load breadcrumb_nav %}
{% block title %}{% trans "Deployment Details" %}{% endblock %} {% block title %}{% trans "Deployment Details" %}{% endblock %}
{% block page_header %} {% block page_header %}
<div class='page-header'> {% include "horizon/common/_detail_header.html" %}
{% breadcrumb_nav %}
</div>
{% endblock page_header %} {% endblock page_header %}
{% block main %} {% block main %}

View File

@ -1,13 +1,10 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load i18n %} {% load i18n %}
{% load breadcrumb_nav %}
{% block title %}{% trans "Package Details" %}{% endblock %} {% block title %}{% trans "Package Details" %}{% endblock %}
{% block page_header %} {% block page_header %}
<div class='page-header'> {% include "horizon/common/_detail_header.html" %}
{% breadcrumb_nav %}
</div>
{% endblock %} {% endblock %}
{% block main %} {% block main %}

View File

@ -1,6 +1,5 @@
{% extends 'murano_base.html' %} {% extends 'murano_base.html' %}
{% load i18n sizeformat %} {% load i18n sizeformat %}
{% load breadcrumb_nav %}
{% load static %} {% load static %}
{% load compress %} {% load compress %}
@ -14,9 +13,7 @@
{% endblock %} {% endblock %}
{% block page_header %} {% block page_header %}
<div class='page-header'> {% include "horizon/common/_detail_header.html" %}
{% breadcrumb_nav %}
</div>
{% endblock page_header %} {% endblock page_header %}
{% block main %} {% block main %}

View File

@ -1,6 +1,5 @@
{% extends 'murano_base.html' %} {% extends 'murano_base.html' %}
{% load i18n %} {% load i18n %}
{% load breadcrumb_nav %}
{% load static %} {% load static %}
{% load compress %} {% load compress %}
{% load horizon %} {% load horizon %}
@ -8,9 +7,7 @@
{% block title %}{% trans "Components" %}{% endblock %} {% block title %}{% trans "Components" %}{% endblock %}
{% block page_header %} {% block page_header %}
<div class='page-header'> {% include "horizon/common/_detail_header.html" %}
{% breadcrumb_nav %}
</div>
{% endblock page_header %} {% endblock page_header %}
{% block main %} {% block main %}
<input type="hidden" id="environmentId" value="{{ environment_id }}"> <input type="hidden" id="environmentId" value="{{ environment_id }}">