diff --git a/openstack_dashboard/dashboards/admin/networks/agents/views.py b/openstack_dashboard/dashboards/admin/networks/agents/views.py
index 683620a58b..deb5d00652 100644
--- a/openstack_dashboard/dashboards/admin/networks/agents/views.py
+++ b/openstack_dashboard/dashboards/admin/networks/agents/views.py
@@ -28,12 +28,12 @@ from openstack_dashboard.dashboards.admin.networks.agents \
class AddView(forms.ModalFormView):
form_class = project_forms.AddDHCPAgent
form_id = "add_dhcp_agent_form"
- modal_header = _("Add DHCP Agent")
template_name = 'admin/networks/agents/add.html'
success_url = 'horizon:admin:networks:detail'
failure_url = 'horizon:admin:networks:detail'
- submit_label = _("Add DHCP Agent")
submit_url = "horizon:admin:networks:adddhcpagent"
+ title_and_label = _("Add DHCP Agent")
+ submit_label = modal_header = page_title = title_and_label
def get_success_url(self):
return reverse(self.success_url,
diff --git a/openstack_dashboard/dashboards/admin/networks/ports/views.py b/openstack_dashboard/dashboards/admin/networks/ports/views.py
index 9ba4d961a9..f9cd2e0db8 100644
--- a/openstack_dashboard/dashboards/admin/networks/ports/views.py
+++ b/openstack_dashboard/dashboards/admin/networks/ports/views.py
@@ -36,6 +36,7 @@ class CreateView(forms.ModalFormView):
submit_url = "horizon:admin:networks:addport"
success_url = 'horizon:admin:networks:detail'
failure_url = 'horizon:admin:networks:detail'
+ page_title = _("Create Port")
def get_success_url(self):
return reverse(self.success_url,
diff --git a/openstack_dashboard/dashboards/admin/networks/templates/networks/agents/add.html b/openstack_dashboard/dashboards/admin/networks/templates/networks/agents/add.html
index 2d414a5ea1..a873521992 100644
--- a/openstack_dashboard/dashboards/admin/networks/templates/networks/agents/add.html
+++ b/openstack_dashboard/dashboards/admin/networks/templates/networks/agents/add.html
@@ -2,10 +2,6 @@
{% load i18n %}
{% block title %}{% trans "Add DHCP Agent" %}{% endblock %}
-{% block page_header %}
- {% include "horizon/common/_page_header.html" with title=_("Add DHCP Agent") %}
-{% endblock page_header %}
-
{% block main %}
{% include "admin/networks/agents/_add.html" %}
{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/networks/templates/networks/create.html b/openstack_dashboard/dashboards/admin/networks/templates/networks/create.html
index 975227f4e1..79d02fb63d 100644
--- a/openstack_dashboard/dashboards/admin/networks/templates/networks/create.html
+++ b/openstack_dashboard/dashboards/admin/networks/templates/networks/create.html
@@ -2,10 +2,6 @@
{% load i18n %}
{% block title %}{% trans "Create Network" %}{% endblock %}
-{% block page_header %}
- {% include "horizon/common/_page_header.html" with title=_("Create Network") %}
-{% endblock page_header %}
-
{% block main %}
{% include "admin/networks/_create.html" %}
{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/networks/templates/networks/index.html b/openstack_dashboard/dashboards/admin/networks/templates/networks/index.html
index bcb1b74f89..df92ca98fc 100644
--- a/openstack_dashboard/dashboards/admin/networks/templates/networks/index.html
+++ b/openstack_dashboard/dashboards/admin/networks/templates/networks/index.html
@@ -2,10 +2,6 @@
{% load i18n %}
{% block title %}{% trans "Networks" %}{% endblock %}
-{% block page_header %}
- {% include "horizon/common/_page_header.html" with title=_("Networks") %}
-{% endblock page_header %}
-
{% block main %}
{{ networks_table.render }}
diff --git a/openstack_dashboard/dashboards/admin/networks/templates/networks/ports/create.html b/openstack_dashboard/dashboards/admin/networks/templates/networks/ports/create.html
index e99551300e..7dbc4e7c78 100644
--- a/openstack_dashboard/dashboards/admin/networks/templates/networks/ports/create.html
+++ b/openstack_dashboard/dashboards/admin/networks/templates/networks/ports/create.html
@@ -2,10 +2,6 @@
{% load i18n %}
{% block title %}{% trans "Create Port" %}{% endblock %}
-{% block page_header %}
- {% include "horizon/common/_page_header.html" with title=_("Create Port") %}
-{% endblock page_header %}
-
{% block main %}
{% include "admin/networks/ports/_create.html" %}
{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/networks/templates/networks/ports/update.html b/openstack_dashboard/dashboards/admin/networks/templates/networks/ports/update.html
index ae0f91cfa1..cb90bb2e88 100644
--- a/openstack_dashboard/dashboards/admin/networks/templates/networks/ports/update.html
+++ b/openstack_dashboard/dashboards/admin/networks/templates/networks/ports/update.html
@@ -2,10 +2,6 @@
{% load i18n %}
{% block title %}{% trans "Update Port" %}{% endblock %}
-{% block page_header %}
- {% include "horizon/common/_page_header.html" with title=_("Update Port") %}
-{% endblock page_header %}
-
{% block main %}
{% include 'admin/networks/ports/_update.html' %}
{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/networks/templates/networks/update.html b/openstack_dashboard/dashboards/admin/networks/templates/networks/update.html
index a70a0b1a71..f5e2cb2e1f 100644
--- a/openstack_dashboard/dashboards/admin/networks/templates/networks/update.html
+++ b/openstack_dashboard/dashboards/admin/networks/templates/networks/update.html
@@ -2,10 +2,6 @@
{% load i18n %}
{% block title %}{% trans "Update Network" %}{% endblock %}
-{% block page_header %}
- {% include "horizon/common/_page_header.html" with title=_("Update Network") %}
-{% endblock page_header %}
-
{% block main %}
{% include 'admin/networks/_update.html' %}
{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/networks/views.py b/openstack_dashboard/dashboards/admin/networks/views.py
index 3c72d4b783..50e4b4fa4a 100644
--- a/openstack_dashboard/dashboards/admin/networks/views.py
+++ b/openstack_dashboard/dashboards/admin/networks/views.py
@@ -39,6 +39,7 @@ from openstack_dashboard.dashboards.admin.networks \
class IndexView(tables.DataTableView):
table_class = networks_tables.NetworksTable
template_name = 'admin/networks/index.html'
+ page_title = _("Networks")
@memoized.memoized_method
def _get_tenant_list(self):
@@ -94,6 +95,7 @@ class CreateView(forms.ModalFormView):
form_class = project_forms.CreateNetwork
template_name = 'admin/networks/create.html'
success_url = reverse_lazy('horizon:admin:networks:index')
+ page_title = _("Create Network")
class DetailView(tables.MultiTableView):
@@ -101,6 +103,7 @@ class DetailView(tables.MultiTableView):
ports_tables.PortsTable,
agents_tables.DHCPAgentsTable)
template_name = 'project/networks/detail.html'
+ page_title = _("Network Details: {{ network.name }}")
def get_subnets_data(self):
try:
diff --git a/openstack_dashboard/dashboards/admin/routers/templates/routers/detail.html b/openstack_dashboard/dashboards/admin/routers/templates/routers/detail.html
index c940e4906e..cb7125820d 100644
--- a/openstack_dashboard/dashboards/admin/routers/templates/routers/detail.html
+++ b/openstack_dashboard/dashboards/admin/routers/templates/routers/detail.html
@@ -2,10 +2,6 @@
{% load i18n %}
{% block title %}{% trans "Router Details" %}{% endblock %}
-{% block page_header %}
- {% include "horizon/common/_page_header.html" with title=_("Router Details") %}
-{% endblock page_header %}
-
{% block main %}
diff --git a/openstack_dashboard/dashboards/admin/routers/templates/routers/index.html b/openstack_dashboard/dashboards/admin/routers/templates/routers/index.html
index 8389f15add..88ed3111c9 100644
--- a/openstack_dashboard/dashboards/admin/routers/templates/routers/index.html
+++ b/openstack_dashboard/dashboards/admin/routers/templates/routers/index.html
@@ -2,10 +2,6 @@
{% load i18n %}
{% block title %}{% trans "Routers" %}{% endblock %}
-{% block page_header %}
- {% include "horizon/common/_page_header.html" with title=_("Routers") %}
-{% endblock page_header %}
-
{% block main %}
{{ table.render }}
{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/routers/templates/routers/update.html b/openstack_dashboard/dashboards/admin/routers/templates/routers/update.html
index 35ca281907..7fc65f8cca 100644
--- a/openstack_dashboard/dashboards/admin/routers/templates/routers/update.html
+++ b/openstack_dashboard/dashboards/admin/routers/templates/routers/update.html
@@ -2,10 +2,6 @@
{% load i18n %}
{% block title %}{% trans "Update Router" %}{% endblock %}
-{% block page_header %}
- {% include "horizon/common/_page_header.html" with title=_("Update Router") %}
-{% endblock page_header %}
-
{% block main %}
{% include 'admin/routers/_update.html' %}
{% endblock %}