openstack/horizon
Code Issues Proposed changes

Merge "Reduce page title duplication in Admin networking"

Browse Source
This commit is contained in:
Jenkins 2015-02-27 03:27:05 +00:00 committed by Gerrit Code Review
commit ca7defc955
12 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/dashboards/admin/networks/agents/views.py
View File

@ -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,

1
openstack_dashboard/dashboards/admin/networks/ports/views.py
View File

@ -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,

4
openstack_dashboard/dashboards/admin/networks/templates/networks/agents/add.html
View File

@ -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 %}

4
openstack_dashboard/dashboards/admin/networks/templates/networks/create.html
View File

@ -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 %}

4
openstack_dashboard/dashboards/admin/networks/templates/networks/index.html
View File

@ -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 %}
<div id="networks">
{{ networks_table.render }}

4
openstack_dashboard/dashboards/admin/networks/templates/networks/ports/create.html
View File

@ -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 %}

4
openstack_dashboard/dashboards/admin/networks/templates/networks/ports/update.html
View File

@ -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 %}

4
openstack_dashboard/dashboards/admin/networks/templates/networks/update.html
View File

@ -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 %}

3
openstack_dashboard/dashboards/admin/networks/views.py
View File

@ -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:

4
openstack_dashboard/dashboards/admin/routers/templates/routers/detail.html
View File

@ -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 %}
<div class="row">
<div class="col-sm-12">

4
openstack_dashboard/dashboards/admin/routers/templates/routers/index.html
View File

@ -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 %}

4
openstack_dashboard/dashboards/admin/routers/templates/routers/update.html
View File

@ -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 %}