From 4a71dcfd279734e9d24190f5316c99af41a047e4 Mon Sep 17 00:00:00 2001
From: Rob Cresswell <robert.cresswell@outlook.com>
Date: Mon, 30 Mar 2015 13:51:22 +0000
Subject: [PATCH] Refactor/remove obsolete page_header blocks

Most of the page_header blocks were removed by previous patches, but
then brought back by regressions in Volumes and Data Processing. This
patch removes those leftover page_header blocks, and removes a few
templates that are not used in Horizon that were found during the
process.

Change-Id: Icbd03f0809a5c664b9b83f06bc398139c3de1184
Closes-Bug: 1436311
---
 .../dashboards/admin/hypervisors/compute/views.py     |  1 +
 .../templates/hypervisors/compute/migrate_host.html   |  8 +-------
 .../networks/templates/networks/subnets/index.html    | 11 -----------
 .../volumes/volume_types/qos_specs/create.html        |  4 ----
 .../volumes/volume_types/qos_specs/index.html         |  6 +-----
 .../templates/volumes/volumes/manage_volume.html      |  4 ----
 .../templates/volumes/volumes/unmanage_volume.html    |  4 ----
 .../admin/volumes/volume_types/qos_specs/views.py     |  3 +++
 .../dashboards/admin/volumes/volumes/views.py         |  2 ++
 .../data_processing.job_executions/details.html       |  4 ----
 .../job_executions.html                               |  4 ----
 .../jobs/templates/data_processing.jobs/create.html   |  4 ----
 .../jobs/templates/data_processing.jobs/details.html  |  4 ----
 .../jobs/templates/data_processing.jobs/jobs.html     |  4 ----
 .../dashboards/project/data_processing/jobs/views.py  |  6 +++---
 .../data_processing.wizard/cluster_guide.html         |  6 +-----
 .../data_processing.wizard/job_type_select.html       |  6 +-----
 .../templates/data_processing.wizard/jobex_guide.html |  6 +-----
 .../data_processing.wizard/plugin_select.html         |  6 +-----
 .../templates/data_processing.wizard/wizard.html      |  4 ----
 .../project/data_processing/wizard/views.py           |  5 +++++
 .../project/databases/templates/databases/update.html | 11 -----------
 .../networks/templates/networks/subnets/index.html    | 11 -----------
 .../dashboards/project/volumes/backups/views.py       |  2 ++
 .../dashboards/project/volumes/snapshots/views.py     |  1 +
 .../templates/volumes/backups/create_backup.html      |  4 ----
 .../templates/volumes/backups/restore_backup.html     |  6 +-----
 .../project/volumes/templates/volumes/index.html      |  4 ----
 .../volumes/templates/volumes/snapshots/update.html   |  4 ----
 .../templates/volumes/volumes/accept_transfer.html    |  4 ----
 .../volumes/templates/volumes/volumes/attach.html     |  4 ----
 .../volumes/templates/volumes/volumes/create.html     |  4 ----
 .../templates/volumes/volumes/create_snapshot.html    |  4 ----
 .../templates/volumes/volumes/create_transfer.html    |  4 ----
 .../templates/volumes/volumes/encryption_detail.html  |  4 ----
 .../volumes/templates/volumes/volumes/extend.html     |  4 ----
 .../volumes/templates/volumes/volumes/retype.html     |  4 ----
 .../templates/volumes/volumes/show_transfer.html      |  4 ----
 .../volumes/templates/volumes/volumes/update.html     |  4 ----
 .../templates/volumes/volumes/upload_to_image.html    |  4 ----
 .../dashboards/project/volumes/views.py               |  3 +++
 .../dashboards/project/volumes/volumes/views.py       | 11 +++++++++++
 42 files changed, 38 insertions(+), 165 deletions(-)
 delete mode 100644 openstack_dashboard/dashboards/admin/networks/templates/networks/subnets/index.html
 delete mode 100644 openstack_dashboard/dashboards/project/databases/templates/databases/update.html
 delete mode 100644 openstack_dashboard/dashboards/project/networks/templates/networks/subnets/index.html

diff --git a/openstack_dashboard/dashboards/admin/hypervisors/compute/views.py b/openstack_dashboard/dashboards/admin/hypervisors/compute/views.py
index a944f8cecf..efe4dde2af 100644
--- a/openstack_dashboard/dashboards/admin/hypervisors/compute/views.py
+++ b/openstack_dashboard/dashboards/admin/hypervisors/compute/views.py
@@ -77,6 +77,7 @@ class MigrateHostView(forms.ModalFormView):
         template_name = 'admin/hypervisors/compute/migrate_host.html'
         context_object_name = 'compute_host'
         success_url = reverse_lazy("horizon:admin:hypervisors:index")
+        page_title = _("Migrate Host")
 
         def get_context_data(self, **kwargs):
             context = super(MigrateHostView, self).get_context_data(**kwargs)
diff --git a/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/migrate_host.html b/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/migrate_host.html
index 570d8629cd..db84525155 100644
--- a/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/migrate_host.html
+++ b/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/migrate_host.html
@@ -2,10 +2,4 @@
 {% load i18n %}
 {% block title %}{% trans "Migrate Host" %}{% endblock %}
 
-{% block page_header %}
-{% include "horizon/common/_page_header.html" with title=_("Migrate Host") %}
-{% endblock page_header %}
-
-{% block main %}
-
-{% endblock %}
+{% block main %}{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/networks/templates/networks/subnets/index.html b/openstack_dashboard/dashboards/admin/networks/templates/networks/subnets/index.html
deleted file mode 100644
index d70b5fded0..0000000000
--- a/openstack_dashboard/dashboards/admin/networks/templates/networks/subnets/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'base.html' %}
-{% load i18n %}
-{% block title %}{% trans "Network Details" %}{% endblock %}
-
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Network Details") %}
-{% endblock page_header %}
-
-{% block main %}
-  {{ table.render }}
-{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/create.html b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/create.html
index 82cdd65c4d..a49ec5436a 100644
--- a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/create.html
+++ b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/create.html
@@ -3,10 +3,6 @@
 
 {% block title %}{% trans "Create Spec" %}{% endblock %}
 
-{% block page_header %}
-  <h2>{% blocktrans %}Spec: {{ qos_spec_name }}{% endblocktrans %}</h2>
-{% endblock page_header %}
-
 {% block main %}
     {% include "admin/volumes/volume_types/qos_specs/_create.html" %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/index.html b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/index.html
index b4cda47fdf..b19dcf7534 100644
--- a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/index.html
+++ b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/index.html
@@ -1,10 +1,6 @@
 {% extends 'base.html' %}
 {% load i18n %}
 
-{% block page_header %}
-  <h2>{% blocktrans %}QoS Spec: {{ qos_spec_name }}{% endblocktrans %}</h2>
-{% endblock page_header %}
-
 {% block main %}
   {% include "admin/volumes/volume_types/qos_specs/_index.html" %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volumes/manage_volume.html b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volumes/manage_volume.html
index f163cddefa..190d3c8aa9 100644
--- a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volumes/manage_volume.html
+++ b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volumes/manage_volume.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Manage Volume" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Manage a Volume") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/volumes/volumes/_manage_volume.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volumes/unmanage_volume.html b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volumes/unmanage_volume.html
index 6190c0b47b..39ce9971e8 100644
--- a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volumes/unmanage_volume.html
+++ b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volumes/unmanage_volume.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Unmanage Volume" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Unmanage a Volume") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/volumes/volumes/_unmanage_volume.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/views.py b/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/views.py
index b028b50e9e..30ca07ed5d 100644
--- a/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/views.py
+++ b/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/views.py
@@ -53,6 +53,7 @@ class QosSpecMixin(object):
 class IndexView(QosSpecMixin, forms.ModalFormMixin, tables.DataTableView):
     table_class = project_tables.SpecsTable
     template_name = 'admin/volumes/volume_types/qos_specs/index.html'
+    page_title = _("QoS Spec: {{ qos_spec_name }}")
 
     def get_data(self):
         try:
@@ -75,6 +76,7 @@ class CreateKeyValuePairView(QosSpecMixin, forms.ModalFormView):
     submit_label = _("Create")
     submit_url = "horizon:admin:volumes:volume_types:qos_specs:create"
     success_url = 'horizon:admin:volumes:volume_types:qos_specs:index'
+    page_title = _("Spec: {{ qos_spec_name }}")
 
     def get_initial(self):
         qos_spec_id = self.kwargs['qos_spec_id']
@@ -101,6 +103,7 @@ class EditKeyValuePairView(QosSpecMixin, forms.ModalFormView):
     submit_label = _("Save")
     submit_url = "horizon:admin:volumes:volume_types:qos_specs_edit"
     success_url = 'horizon:admin:volumes:volume_types:qos_specs:index'
+    page_title = _("QoS Spec: {{ qos_spec_name }}")
 
     def get_success_url(self):
         return reverse(self.success_url,
diff --git a/openstack_dashboard/dashboards/admin/volumes/volumes/views.py b/openstack_dashboard/dashboards/admin/volumes/volumes/views.py
index 8aca7970d8..32a90d271e 100644
--- a/openstack_dashboard/dashboards/admin/volumes/volumes/views.py
+++ b/openstack_dashboard/dashboards/admin/volumes/volumes/views.py
@@ -50,6 +50,7 @@ class ManageVolumeView(forms.ModalFormView):
     success_url = reverse_lazy('horizon:admin:volumes:volumes_tab')
     submit_url = reverse_lazy('horizon:admin:volumes:volumes:manage')
     cancel_url = reverse_lazy("horizon:admin:volumes:index")
+    page_title = _("Manage a Volume")
 
     def get_context_data(self, **kwargs):
         context = super(ManageVolumeView, self).get_context_data(**kwargs)
@@ -65,6 +66,7 @@ class UnmanageVolumeView(forms.ModalFormView):
     success_url = reverse_lazy('horizon:admin:volumes:volumes_tab')
     submit_url = 'horizon:admin:volumes:volumes:unmanage'
     cancel_url = reverse_lazy("horizon:admin:volumes:index")
+    page_title = _("Unmanage a Volume")
 
     def get_context_data(self, **kwargs):
         context = super(UnmanageVolumeView, self).get_context_data(**kwargs)
diff --git a/openstack_dashboard/dashboards/project/data_processing/job_executions/templates/data_processing.job_executions/details.html b/openstack_dashboard/dashboards/project/data_processing/job_executions/templates/data_processing.job_executions/details.html
index d94c35c2a4..87403bf5e3 100644
--- a/openstack_dashboard/dashboards/project/data_processing/job_executions/templates/data_processing.job_executions/details.html
+++ b/openstack_dashboard/dashboards/project/data_processing/job_executions/templates/data_processing.job_executions/details.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Job Details" %}{% endblock %}
 
-{% block page_header %}
-    {% include "horizon/common/_page_header.html" with title=_("Job Details") %}
-{% endblock page_header %}
-
 {% block main %}
     <div class="row">
         <div class="col-sm-12">
diff --git a/openstack_dashboard/dashboards/project/data_processing/job_executions/templates/data_processing.job_executions/job_executions.html b/openstack_dashboard/dashboards/project/data_processing/job_executions/templates/data_processing.job_executions/job_executions.html
index e09f791b36..436624cfe3 100644
--- a/openstack_dashboard/dashboards/project/data_processing/job_executions/templates/data_processing.job_executions/job_executions.html
+++ b/openstack_dashboard/dashboards/project/data_processing/job_executions/templates/data_processing.job_executions/job_executions.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Data Processing" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Jobs") %}
-{% endblock page_header %}
-
 {% block main %}
 
 <div class="job_executions">
diff --git a/openstack_dashboard/dashboards/project/data_processing/jobs/templates/data_processing.jobs/create.html b/openstack_dashboard/dashboards/project/data_processing/jobs/templates/data_processing.jobs/create.html
index de976c351d..bc299053f0 100644
--- a/openstack_dashboard/dashboards/project/data_processing/jobs/templates/data_processing.jobs/create.html
+++ b/openstack_dashboard/dashboards/project/data_processing/jobs/templates/data_processing.jobs/create.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Create Job Template" %}{% endblock %}
 
-{% block page_header %}
-    {% include "horizon/common/_page_header.html" with title=_("Create Job Template") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'horizon/common/_workflow.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/data_processing/jobs/templates/data_processing.jobs/details.html b/openstack_dashboard/dashboards/project/data_processing/jobs/templates/data_processing.jobs/details.html
index 06fe325ad9..9d61acc9d6 100644
--- a/openstack_dashboard/dashboards/project/data_processing/jobs/templates/data_processing.jobs/details.html
+++ b/openstack_dashboard/dashboards/project/data_processing/jobs/templates/data_processing.jobs/details.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Job Template Details" %}{% endblock %}
 
-{% block page_header %}
-    {% include "horizon/common/_page_header.html" with title=_("Job Template Details") %}
-{% endblock page_header %}
-
 {% block main %}
     <div class="row">
         <div class="col-sm-12">
diff --git a/openstack_dashboard/dashboards/project/data_processing/jobs/templates/data_processing.jobs/jobs.html b/openstack_dashboard/dashboards/project/data_processing/jobs/templates/data_processing.jobs/jobs.html
index c0fe904d19..5e3c16ee55 100644
--- a/openstack_dashboard/dashboards/project/data_processing/jobs/templates/data_processing.jobs/jobs.html
+++ b/openstack_dashboard/dashboards/project/data_processing/jobs/templates/data_processing.jobs/jobs.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Data Processing" %}{% endblock %}
 
-{% block page_header %}
-{% include "horizon/common/_page_header.html" with title=_("Job Templates") %}
-{% endblock page_header %}
-
 {% block main %}
 <style type="text/css">
     .job_origin_main, .job_origin_lib {
diff --git a/openstack_dashboard/dashboards/project/data_processing/jobs/views.py b/openstack_dashboard/dashboards/project/data_processing/jobs/views.py
index a1354b88d5..74c241689a 100644
--- a/openstack_dashboard/dashboards/project/data_processing/jobs/views.py
+++ b/openstack_dashboard/dashboards/project/data_processing/jobs/views.py
@@ -38,7 +38,7 @@ LOG = logging.getLogger(__name__)
 class JobsView(tables.DataTableView):
     table_class = _tables.JobsTable
     template_name = 'project/data_processing.jobs/jobs.html'
-    page_title = _("Jobs")
+    page_title = _("Job Templates")
 
     def get_data(self):
         try:
@@ -59,13 +59,13 @@ class CreateJobView(workflows.WorkflowView):
     success_url = "horizon:project:data_processing.jobs:create-job"
     classes = ("ajax-modal",)
     template_name = "project/data_processing.jobs/create.html"
-    page_title = _("Create Job")
+    page_title = _("Create Job Template")
 
 
 class JobDetailsView(tabs.TabView):
     tab_group_class = _tabs.JobDetailsTabs
     template_name = 'project/data_processing.jobs/details.html'
-    page_title = _("Job Details")
+    page_title = _("Job Template Details")
 
     def get_context_data(self, **kwargs):
         context = super(JobDetailsView, self).get_context_data(**kwargs)
diff --git a/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/cluster_guide.html b/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/cluster_guide.html
index ddd4833710..dcdf966ad0 100644
--- a/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/cluster_guide.html
+++ b/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/cluster_guide.html
@@ -3,10 +3,6 @@
 {% load url from future %}
 {% block title %}{% trans "Data Processing" %}{% endblock %}
 
-{% block page_header %}
-    {% include "horizon/common/_page_header.html" with title=_("Guided Cluster Creation") %}
-{% endblock page_header %}
-
 {% block main %}
 
     <div class="guide">
@@ -165,4 +161,4 @@
         </div>
     </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/job_type_select.html b/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/job_type_select.html
index 6b3389524e..7897a6c9d5 100644
--- a/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/job_type_select.html
+++ b/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/job_type_select.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Choose job type" %}{% endblock %}
 
-{% block page_header %}
-    {% include "horizon/common/_page_header.html" with title=_("Choose job type") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/data_processing.wizard/_job_type_select.html' %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/jobex_guide.html b/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/jobex_guide.html
index 05c4ae9c75..7bad1c78d7 100644
--- a/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/jobex_guide.html
+++ b/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/jobex_guide.html
@@ -3,10 +3,6 @@
 {% load url from future %}
 {% block title %}{% trans "Data Processing" %}{% endblock %}
 
-{% block page_header %}
-    {% include "horizon/common/_page_header.html" with title=_("Guided Job Execution") %}
-{% endblock page_header %}
-
 {% block main %}
 
     <div class="guide">
@@ -116,4 +112,4 @@
         </div>
     </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/plugin_select.html b/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/plugin_select.html
index 13742bea08..4af7eebc4d 100644
--- a/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/plugin_select.html
+++ b/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/plugin_select.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Choose plugin and version" %}{% endblock %}
 
-{% block page_header %}
-    {% include "horizon/common/_page_header.html" with title=_("Choose plugin and version") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/data_processing.wizard/_plugin_select.html' %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/wizard.html b/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/wizard.html
index 07d848c349..768f5b25bc 100644
--- a/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/wizard.html
+++ b/openstack_dashboard/dashboards/project/data_processing/wizard/templates/data_processing.wizard/wizard.html
@@ -3,10 +3,6 @@
 {% load url from future %}
 {% block title %}{% trans "Data Processing" %}{% endblock %}
 
-{% block page_header %}
-    {% include "horizon/common/_page_header.html" with title=_("Data Processing Guides") %}
-{% endblock page_header %}
-
 {% block main %}
 
     <div class="guide">
diff --git a/openstack_dashboard/dashboards/project/data_processing/wizard/views.py b/openstack_dashboard/dashboards/project/data_processing/wizard/views.py
index 7faf5fc4da..52841cce47 100644
--- a/openstack_dashboard/dashboards/project/data_processing/wizard/views.py
+++ b/openstack_dashboard/dashboards/project/data_processing/wizard/views.py
@@ -32,6 +32,7 @@ LOG = logging.getLogger(__name__)
 
 class WizardView(horizon_views.APIView):
     template_name = 'project/data_processing.wizard/wizard.html'
+    page_title = _("Data Processing Guides")
 
     def get_data(self, request, context, *args, **kwargs):
         try:
@@ -44,6 +45,7 @@ class WizardView(horizon_views.APIView):
 
 class ClusterGuideView(horizon_views.APIView):
     template_name = 'project/data_processing.wizard/cluster_guide.html'
+    page_title = _("Guided Cluster Creation")
 
 
 class ResetClusterGuideView(generic.RedirectView):
@@ -58,6 +60,7 @@ class ResetClusterGuideView(generic.RedirectView):
 
 class JobExecutionGuideView(horizon_views.APIView):
     template_name = 'project/data_processing.wizard/jobex_guide.html'
+    page_title = _("Guided Job Execution")
 
     def show_data_sources(self):
         try:
@@ -84,6 +87,7 @@ class PluginSelectView(forms.ModalFormView):
         'horizon:project:data_processing.wizard:cluster_guide')
     classes = ("ajax-modal")
     template_name = "project/data_processing.wizard/plugin_select.html"
+    page_title = _("Choose plugin and version")
 
 
 class JobTypeSelectView(forms.ModalFormView):
@@ -92,3 +96,4 @@ class JobTypeSelectView(forms.ModalFormView):
         'horizon:project:data_processing.wizard:jobex_guide')
     classes = ("ajax-modal")
     template_name = "project/data_processing.wizard/job_type_select.html"
+    page_title = _("Choose job type")
diff --git a/openstack_dashboard/dashboards/project/databases/templates/databases/update.html b/openstack_dashboard/dashboards/project/databases/templates/databases/update.html
deleted file mode 100644
index e3aa915a6a..0000000000
--- a/openstack_dashboard/dashboards/project/databases/templates/databases/update.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'base.html' %}
-{% load i18n %}
-{% block title %}{% trans "Edit Instance" %}{% endblock %}
-
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Edit Instance") %}
-{% endblock page_header %}
-
-{% block main %}
-  {% include 'horizon/common/_workflow.html' %}
-{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/networks/templates/networks/subnets/index.html b/openstack_dashboard/dashboards/project/networks/templates/networks/subnets/index.html
deleted file mode 100644
index 833399a228..0000000000
--- a/openstack_dashboard/dashboards/project/networks/templates/networks/subnets/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'base.html' %}
-{% load i18n %}
-{% block title %}{% trans "Network" %}{% endblock %}
-
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Network") %}
-{% endblock page_header %}
-
-{% block main %}
-  {{ table.render }}
-{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/volumes/backups/views.py b/openstack_dashboard/dashboards/project/volumes/backups/views.py
index d9eed58fb7..c4f9065ada 100644
--- a/openstack_dashboard/dashboards/project/volumes/backups/views.py
+++ b/openstack_dashboard/dashboards/project/volumes/backups/views.py
@@ -35,6 +35,7 @@ class CreateBackupView(forms.ModalFormView):
     submit_label = _("Create Volume Backup")
     submit_url = "horizon:project:volumes:volumes:create_backup"
     success_url = reverse_lazy("horizon:project:volumes:backups_tab")
+    page_title = _("Create a Volume Backup")
 
     def get_context_data(self, **kwargs):
         context = super(CreateBackupView, self).get_context_data(**kwargs)
@@ -89,6 +90,7 @@ class RestoreBackupView(forms.ModalFormView):
     submit_label = _("Restore Backup to Volume")
     submit_url = "horizon:project:volumes:volumes:create_backup"
     success_url = reverse_lazy('horizon:project:volumes:index')
+    page_title = _("Restore a Volume Backup")
 
     def get_context_data(self, **kwargs):
         context = super(RestoreBackupView, self).get_context_data(**kwargs)
diff --git a/openstack_dashboard/dashboards/project/volumes/snapshots/views.py b/openstack_dashboard/dashboards/project/volumes/snapshots/views.py
index c03c9088d5..6a37c5d094 100644
--- a/openstack_dashboard/dashboards/project/volumes/snapshots/views.py
+++ b/openstack_dashboard/dashboards/project/volumes/snapshots/views.py
@@ -37,6 +37,7 @@ class UpdateView(forms.ModalFormView):
     submit_label = _("Save Changes")
     submit_url = "horizon:project:volumes:snapshots:update"
     success_url = reverse_lazy("horizon:project:volumes:index")
+    page_title = _("Edit Snapshot")
 
     @memoized.memoized_method
     def get_object(self):
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/backups/create_backup.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/backups/create_backup.html
index abdc3bc4ef..8948af1f85 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/backups/create_backup.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/backups/create_backup.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Create Volume Backup" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Create a Volume Backup") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/volumes/backups/_create_backup.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/backups/restore_backup.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/backups/restore_backup.html
index ff053ea556..15e71f8e15 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/backups/restore_backup.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/backups/restore_backup.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Restore Volume Backup" %}{% endblock %}
 
-{% block page_header %}
-    {% include "horizon/common/_page_header.html" with title=_("Restore a Volume Backup") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/volumes/backups/_restore_backup.html' %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/index.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/index.html
index 8afbc68044..4b518c863d 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/index.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/index.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Volumes" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Volumes")%}
-{% endblock page_header %}
-
 {% block main %}
 <div class="row">
   <div class="col-sm-12">
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/snapshots/update.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/snapshots/update.html
index e6fd6d17e2..5c5cbd9716 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/snapshots/update.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/snapshots/update.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Edit Snapshot" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Edit Snapshot") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/volumes/snapshots/_update.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/accept_transfer.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/accept_transfer.html
index 8177155a14..079f9a1749 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/accept_transfer.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/accept_transfer.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Accept Volume Transfer" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Accept Volume Transfer") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/volumes/volumes/_accept_transfer.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/attach.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/attach.html
index d2ec655f14..96d75a75f1 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/attach.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/attach.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Manage Volume Attachments" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Manage Volume Attachments") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/volumes/volumes/_attach.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/create.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/create.html
index b4989f2e2c..8d3209f4eb 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/create.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/create.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Create Volume" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Create a Volume") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/volumes/volumes/_create.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/create_snapshot.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/create_snapshot.html
index c8c07cdd51..55413883cf 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/create_snapshot.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/create_snapshot.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Create Volume Snapshot" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Create a Volume Snapshot") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/volumes/volumes/_create_snapshot.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/create_transfer.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/create_transfer.html
index 7d4fa2dedb..6b35292f30 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/create_transfer.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/create_transfer.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Create Volume Transfer" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Create a Volume Transfer") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/volumes/volumes/_create_transfer.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/encryption_detail.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/encryption_detail.html
index 76922277f5..8fd301c246 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/encryption_detail.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/encryption_detail.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Volume Encryption Details" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=page_title %}
-{% endblock page_header %}
-
 {% block main %}
 <div class="row-fluid">
   <div class="col-sm-12">
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/extend.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/extend.html
index 635fcaa08d..00b29e8441 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/extend.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/extend.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Extend Volume" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Extend Volume") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/volumes/volumes/_extend.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/retype.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/retype.html
index 829ab7496d..3316d9af02 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/retype.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/retype.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Change Volume Type" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Change Volume Type") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/volumes/volumes/_retype.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/show_transfer.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/show_transfer.html
index 6a46b60181..debf30847a 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/show_transfer.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/show_transfer.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Volume Transfer Details" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Volume Transfer Details") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/volumes/volumes/_show_transfer.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/update.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/update.html
index 88239ec75e..85c573b486 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/update.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/update.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Edit Volume" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Edit Volume") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/volumes/volumes/_update.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/upload_to_image.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/upload_to_image.html
index 484da4cd1c..519eec32c7 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/upload_to_image.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/upload_to_image.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Upload Volume to Image" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Upload Volume to Image") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/volumes/volumes/_upload_to_image.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/volumes/views.py b/openstack_dashboard/dashboards/project/volumes/views.py
index 2291e8d8c5..81e9fa732a 100644
--- a/openstack_dashboard/dashboards/project/volumes/views.py
+++ b/openstack_dashboard/dashboards/project/volumes/views.py
@@ -12,6 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from django.utils.translation import ugettext_lazy as _
+
 from horizon import tabs
 
 from openstack_dashboard.dashboards.project.volumes \
@@ -21,3 +23,4 @@ from openstack_dashboard.dashboards.project.volumes \
 class IndexView(tabs.TabbedTableView):
     tab_group_class = project_tabs.VolumeAndSnapshotTabs
     template_name = 'project/volumes/index.html'
+    page_title = _("Volumes")
diff --git a/openstack_dashboard/dashboards/project/volumes/volumes/views.py b/openstack_dashboard/dashboards/project/volumes/volumes/views.py
index 991ff7477f..b5bd7fceed 100644
--- a/openstack_dashboard/dashboards/project/volumes/volumes/views.py
+++ b/openstack_dashboard/dashboards/project/volumes/volumes/views.py
@@ -84,6 +84,7 @@ class CreateView(forms.ModalFormView):
     submit_label = _("Create Volume")
     submit_url = reverse_lazy("horizon:project:volumes:volumes:create")
     success_url = reverse_lazy('horizon:project:volumes:volumes_tab')
+    page_title = _("Create a Volume")
 
     def get_context_data(self, **kwargs):
         context = super(CreateView, self).get_context_data(**kwargs)
@@ -101,6 +102,7 @@ class ExtendView(forms.ModalFormView):
     submit_label = _("Extend Volume")
     submit_url = "horizon:project:volumes:volumes:extend"
     success_url = reverse_lazy("horizon:project:volumes:index")
+    page_title = _("Extend Volume")
 
     def get_object(self):
         if not hasattr(self, "_object"):
@@ -140,6 +142,7 @@ class CreateSnapshotView(forms.ModalFormView):
     template_name = 'project/volumes/volumes/create_snapshot.html'
     submit_url = "horizon:project:volumes:volumes:create_snapshot"
     success_url = reverse_lazy('horizon:project:volumes:snapshots_tab')
+    page_title = _("Create a Volume Snapshot")
 
     def get_context_data(self, **kwargs):
         context = super(CreateSnapshotView, self).get_context_data(**kwargs)
@@ -173,6 +176,7 @@ class UploadToImageView(forms.ModalFormView):
     submit_label = _("Upload")
     submit_url = "horizon:project:volumes:volumes:upload_to_image"
     success_url = reverse_lazy("horizon:project:volumes:index")
+    page_title = _("Upload Volume to Image")
 
     @memoized.memoized_method
     def get_data(self):
@@ -212,6 +216,7 @@ class CreateTransferView(forms.ModalFormView):
     modal_header = _("Create Volume Transfer")
     submit_label = _("Create Volume Transfer")
     submit_url = "horizon:project:volumes:volumes:create_transfer"
+    page_title = _("Create a Volume Transfer")
 
     def get_context_data(self, *args, **kwargs):
         context = super(CreateTransferView, self).get_context_data(**kwargs)
@@ -233,6 +238,7 @@ class AcceptTransferView(forms.ModalFormView):
     submit_label = _("Accept Volume Transfer")
     submit_url = reverse_lazy(
         "horizon:project:volumes:volumes:accept_transfer")
+    page_title = _("Accept Volume Transfer")
 
 
 class ShowTransferView(forms.ModalFormView):
@@ -243,6 +249,7 @@ class ShowTransferView(forms.ModalFormView):
     modal_header = _("Volume Transfer")
     submit_url = "horizon:project:volumes:volumes:show_transfer"
     cancel_label = _("Close")
+    page_title = _("Volume Transfer Details")
 
     def get_object(self):
         try:
@@ -278,6 +285,7 @@ class UpdateView(forms.ModalFormView):
     template_name = 'project/volumes/volumes/update.html'
     submit_url = "horizon:project:volumes:volumes:update"
     success_url = reverse_lazy("horizon:project:volumes:index")
+    page_title = _("Edit Volume")
 
     def get_object(self):
         if not hasattr(self, "_object"):
@@ -314,6 +322,7 @@ class EditAttachmentsView(tables.DataTableView, forms.ModalFormView):
     template_name = 'project/volumes/volumes/attach.html'
     submit_url = "horizon:project:volumes:volumes:attach"
     success_url = reverse_lazy("horizon:project:volumes:index")
+    page_title = _("Manage Volume Attachments")
 
     @memoized.memoized_method
     def get_object(self):
@@ -387,6 +396,7 @@ class RetypeView(forms.ModalFormView):
     submit_label = _("Change Volume Type")
     submit_url = "horizon:project:volumes:volumes:retype"
     success_url = reverse_lazy("horizon:project:volumes:index")
+    page_title = _("Change Volume Type")
 
     @memoized.memoized_method
     def get_data(self):
@@ -420,6 +430,7 @@ class RetypeView(forms.ModalFormView):
 
 class EncryptionDetailView(generic.TemplateView):
     template_name = 'project/volumes/volumes/encryption_detail.html'
+    page_title = _("Volume Encryption Details: {{ volume.name }}")
 
     def get_context_data(self, **kwargs):
         context = super(EncryptionDetailView, self).get_context_data(**kwargs)