From 67304ace38cb99cc02bae950677c5e8a93d6895c Mon Sep 17 00:00:00 2001
From: Rob Cresswell <robert.cresswell@outlook.com>
Date: Thu, 24 Sep 2015 12:26:38 +0100
Subject: [PATCH] Add breadcrumb to more details pages

This patch adds basic Breadcrumb nav to the detail pages for Data
Processing, Databases, Metadata Definitions and Routers.

Change-Id: I114e93799b957db39cbe0d4e49d3e6869bc9d92d
Partial-Bug: 1413823
---
 .../database_clusters/_detail_overview.html          |  6 +-----
 .../database_clusters/_detail_overview_mongodb.html  |  2 --
 .../database_clusters/_detail_overview_vertica.html  |  6 +-----
 .../contrib/trove/content/database_clusters/tests.py |  2 +-
 .../contrib/trove/content/database_clusters/views.py |  6 +++---
 .../templates/databases/_detail_overview.html        | 12 ++----------
 .../databases/_detail_overview_cassandra.html        |  2 --
 .../databases/_detail_overview_couchbase.html        |  4 +---
 .../databases/_detail_overview_mongodb.html          |  2 --
 .../templates/databases/_detail_overview_mysql.html  |  4 +---
 .../templates/databases/_detail_overview_redis.html  |  4 +---
 .../contrib/trove/content/databases/tests.py         |  2 +-
 .../contrib/trove/content/databases/views.py         |  4 ++--
 13 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview.html b/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview.html
index 451b1dd..4273589 100644
--- a/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview.html
+++ b/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview.html
@@ -1,10 +1,6 @@
 {% load i18n sizeformat %}
 
-<h3>{% trans "Cluster Overview" %}</h3>
-
-<div class="status row detail">
-    <h4>{% trans "Information" %}</h4>
-    <hr class="header_rule">
+<div class="detail">
     <dl class="dl-horizontal">
         <dt>{% trans "Name" %}</dt>
         <dd>{{ cluster.name }}</dd>
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview_mongodb.html b/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview_mongodb.html
index d215a36..4a1a800 100644
--- a/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview_mongodb.html
+++ b/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview_mongodb.html
@@ -2,7 +2,6 @@
 {% load i18n sizeformat %}
 
 {% block connection_info %}
-<div class="addresses row detail">
     <h4>{% trans "Connection Information" %}</h4>
     <hr class="header_rule">
     <dl>
@@ -23,5 +22,4 @@
             {% endif %} <!-- ends else block -->
         {% endwith %}
     </dl>
-</div>
 {% endblock %}
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview_vertica.html b/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview_vertica.html
index 75a4709..d429e0f 100644
--- a/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview_vertica.html
+++ b/openstack_dashboard/contrib/trove/content/database_clusters/templates/database_clusters/_detail_overview_vertica.html
@@ -1,10 +1,6 @@
 {% load i18n sizeformat %}
 
-<h3>{% trans "Cluster Overview" %}</h3>
-
-<div class="status row detail">
-    <h4>{% trans "Information" %}</h4>
-    <hr class="header_rule">
+<div class="detail">
     <dl class="dl-horizontal">
         <dt>{% trans "Name" %}</dt>
         <dd>{{ cluster.name }}</dd>
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/tests.py b/openstack_dashboard/contrib/trove/content/database_clusters/tests.py
index 61ec0b6..fd5d705 100644
--- a/openstack_dashboard/contrib/trove/content/database_clusters/tests.py
+++ b/openstack_dashboard/contrib/trove/content/database_clusters/tests.py
@@ -291,5 +291,5 @@ class ClustersTests(test.TestCase):
         details_url = reverse('horizon:project:database_clusters:detail',
                               args=[cluster.id])
         res = self.client.get(details_url)
-        self.assertTemplateUsed(res, 'project/database_clusters/detail.html')
+        self.assertTemplateUsed(res, 'horizon/common/_detail.html')
         self.assertContains(res, cluster.ip[0])
diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/views.py b/openstack_dashboard/contrib/trove/content/database_clusters/views.py
index 817c1ae..e0de3ee 100644
--- a/openstack_dashboard/contrib/trove/content/database_clusters/views.py
+++ b/openstack_dashboard/contrib/trove/content/database_clusters/views.py
@@ -97,12 +97,12 @@ class LaunchClusterView(horizon_forms.ModalFormView):
 
 class DetailView(horizon_tabs.TabbedTableView):
     tab_group_class = tabs.ClusterDetailTabs
-    template_name = 'project/database_clusters/detail.html'
-
-    page_title = _("Cluster Details: {{ cluster.name }}")
+    template_name = 'horizon/common/_detail.html'
+    page_title = "{{ cluster.name|default:cluster.id }}"
 
     def get_context_data(self, **kwargs):
         context = super(DetailView, self).get_context_data(**kwargs)
+        context["url"] = reverse('horizon:project:database_clusters:index')
         context["cluster"] = self.get_data()
         return context
 
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview.html b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview.html
index e9e3fa0..a873c1b 100644
--- a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview.html
+++ b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview.html
@@ -1,11 +1,7 @@
 {% load i18n sizeformat %}
 {% load url from future %}
 
-<h3>{% trans "Instance Overview" %}</h3>
-
-<div class="status row detail">
-  <h4>{% trans "Information" %}</h4>
-  <hr class="header_rule">
+<div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Name" %}</dt>
     <dd>{{ instance.name }}</dd>
@@ -18,9 +14,7 @@
     <dt>{% trans "Status" %}</dt>
     <dd>{{ instance.status|title }}</dd>
   </dl>
-</div>
 
-<div class="specs row detail">
   <h4>{% trans "Specs" %}</h4>
   <hr class="header_rule">
   <dl class="dl-horizontal">
@@ -37,13 +31,11 @@
     <dt>{% trans "Updated" %}</dt>
     <dd>{{ instance.updated|parse_isotime }}</dd>
   </dl>
-</div>
 
 {% block connection_info %}
 {% endblock %}
 
 {% if instance.replica_of or instance.replicas %}
-<div class="specs row detail">
   <h4>{% trans "Replication" %}</h4>
   <hr class="header_rule">
   <dl>
@@ -65,5 +57,5 @@
       {% endfor %}
     {% endif %}
   </dl>
-</div>
 {% endif %}
+</div>
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_cassandra.html b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_cassandra.html
index 0b2f4d4..dedf2ee 100644
--- a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_cassandra.html
+++ b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_cassandra.html
@@ -2,7 +2,6 @@
 {% load i18n sizeformat %}
 
 {% block connection_info %}
-  <div class="addresses row detail">
     <h4>{% trans "Connection Information" %}</h4>
     <hr class="header_rule">
     <dl class="dl-horizontal">
@@ -19,5 +18,4 @@
           {% endif %} <!-- ends else block -->
       {% endwith %}
     </dl>
-  </div>
 {% endblock %}
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_couchbase.html b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_couchbase.html
index 95c61fe..7a6f714 100644
--- a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_couchbase.html
+++ b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_couchbase.html
@@ -2,7 +2,6 @@
 {% load i18n sizeformat %}
 
 {% block connection_info %}
-  <div class="addresses row detail">
     <h4>{% trans "Connection Info" %}</h4>
     <hr class="header_rule">
     <dl class="dl-horizontal">
@@ -17,5 +16,4 @@
           {% endif %} <!-- ends else block -->
       {% endwith %}
     </dl>
-  </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_mongodb.html b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_mongodb.html
index 28f3d22..952d24d 100644
--- a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_mongodb.html
+++ b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_mongodb.html
@@ -2,7 +2,6 @@
 {% load i18n sizeformat %}
 
 {% block connection_info %}
-  <div class="addresses row detail">
     <h4>{% trans "Connection Information" %}</h4>
     <hr class="header_rule">
     <dl class="dl-horizontal">
@@ -28,5 +27,4 @@
         {% endwith %}
         </dl>
     {% endif %}
-</div>
 {% endblock %}
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_mysql.html b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_mysql.html
index 583c07b..a8ede56 100644
--- a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_mysql.html
+++ b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_mysql.html
@@ -2,7 +2,6 @@
 {% load i18n sizeformat %}
 
 {% block connection_info %}
-  <div class="addresses row detail">
     <h4>{% trans "Connection Info" %}</h4>
     <hr class="header_rule">
     <dl class="dl-horizontal">
@@ -20,5 +19,4 @@
           {% endif %} <!-- ends else block -->
       {% endwith %}
     </dl>
-  </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_redis.html b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_redis.html
index dfde2b2..1be6ec6 100644
--- a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_redis.html
+++ b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview_redis.html
@@ -2,7 +2,6 @@
 {% load i18n sizeformat %}
 
 {% block connection_info %}
-  <div class="addresses row detail">
     <h4>{% trans "Connection Info" %}</h4>
     <hr class="header_rule">
     <dl class="dl-horizontal">
@@ -17,5 +16,4 @@
           {% endif %} <!-- ends else block -->
       {% endwith %}
     </dl>
-  </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/openstack_dashboard/contrib/trove/content/databases/tests.py b/openstack_dashboard/contrib/trove/content/databases/tests.py
index 52ff21b..6a1643d 100644
--- a/openstack_dashboard/contrib/trove/content/databases/tests.py
+++ b/openstack_dashboard/contrib/trove/content/databases/tests.py
@@ -317,7 +317,7 @@ class DatabaseTests(test.TestCase):
 
         self.mox.ReplayAll()
         res = self.client.get(DETAILS_URL)
-        self.assertTemplateUsed(res, 'project/databases/detail.html')
+        self.assertTemplateUsed(res, 'horizon/common/_detail.html')
         if with_designate:
             self.assertContains(res, database.hostname)
         else:
diff --git a/openstack_dashboard/contrib/trove/content/databases/views.py b/openstack_dashboard/contrib/trove/content/databases/views.py
index b2dcc34..7aa20a1 100644
--- a/openstack_dashboard/contrib/trove/content/databases/views.py
+++ b/openstack_dashboard/contrib/trove/content/databases/views.py
@@ -100,8 +100,8 @@ class LaunchInstanceView(horizon_workflows.WorkflowView):
 
 class DetailView(horizon_tabs.TabbedTableView):
     tab_group_class = tabs.InstanceDetailTabs
-    template_name = 'project/databases/detail.html'
-    page_title = _("Instance Details: {{ instance.name }}")
+    template_name = 'horizon/common/_detail.html'
+    page_title = _("{{ instance.name }}")
 
     def get_context_data(self, **kwargs):
         context = super(DetailView, self).get_context_data(**kwargs)