diff --git a/openstack_dashboard/dashboards/project/database_backups/templates/database_backups/backup.html b/openstack_dashboard/dashboards/project/database_backups/templates/database_backups/backup.html index 5053701fbb..b8621b1578 100644 --- a/openstack_dashboard/dashboards/project/database_backups/templates/database_backups/backup.html +++ b/openstack_dashboard/dashboards/project/database_backups/templates/database_backups/backup.html @@ -2,10 +2,6 @@ {% load i18n %} {% block title %}{% trans "Backup Database" %}{% endblock %} -{% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Backup Database") %} -{% endblock page_header %} - {% block main %} {% include 'horizon/common/_workflow.html' %} {% endblock %} diff --git a/openstack_dashboard/dashboards/project/database_backups/templates/database_backups/index.html b/openstack_dashboard/dashboards/project/database_backups/templates/database_backups/index.html index aed5ee701e..6520926591 100644 --- a/openstack_dashboard/dashboards/project/database_backups/templates/database_backups/index.html +++ b/openstack_dashboard/dashboards/project/database_backups/templates/database_backups/index.html @@ -2,10 +2,6 @@ {% load i18n %} {% block title %}{% trans "Database Backups" %}{% endblock %} -{% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Backups") %} -{% endblock page_header %} - {% block main %} {{ table.render }} {% endblock %} diff --git a/openstack_dashboard/dashboards/project/database_backups/views.py b/openstack_dashboard/dashboards/project/database_backups/views.py index d64e591ee8..9a46cb7b08 100644 --- a/openstack_dashboard/dashboards/project/database_backups/views.py +++ b/openstack_dashboard/dashboards/project/database_backups/views.py @@ -32,6 +32,7 @@ from openstack_dashboard.dashboards.project.database_backups import workflows class IndexView(horizon_tables.DataTableView): table_class = tables.BackupsTable template_name = 'project/database_backups/index.html' + page_title = _("Backups") def _get_extra_data(self, backup): """Apply extra info to the backup.""" @@ -65,6 +66,7 @@ class IndexView(horizon_tables.DataTableView): class BackupView(horizon_workflows.WorkflowView): workflow_class = workflows.CreateBackup template_name = "project/database_backups/backup.html" + page_title = _("Backup Database") def get_context_data(self, **kwargs): context = super(BackupView, self).get_context_data(**kwargs) diff --git a/openstack_dashboard/dashboards/project/databases/templates/databases/index.html b/openstack_dashboard/dashboards/project/databases/templates/databases/index.html index a47f1e5daf..bec1e9bd42 100644 --- a/openstack_dashboard/dashboards/project/databases/templates/databases/index.html +++ b/openstack_dashboard/dashboards/project/databases/templates/databases/index.html @@ -2,10 +2,6 @@ {% load i18n %} {% block title %}{% trans "Instances" %}{% endblock %} -{% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Instances") %} -{% endblock page_header %} - {% block main %} {{ table.render }} {% endblock %} diff --git a/openstack_dashboard/dashboards/project/databases/templates/databases/launch.html b/openstack_dashboard/dashboards/project/databases/templates/databases/launch.html index 8cf2f48537..07c3aec155 100644 --- a/openstack_dashboard/dashboards/project/databases/templates/databases/launch.html +++ b/openstack_dashboard/dashboards/project/databases/templates/databases/launch.html @@ -2,10 +2,6 @@ {% load i18n %} {% block title %}{% trans "Launch Instance" %}{% endblock %} -{% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Launch Database") %} -{% endblock page_header %} - {% block main %} {% include 'horizon/common/_workflow.html' %} {% endblock %} diff --git a/openstack_dashboard/dashboards/project/databases/templates/databases/resize_instance.html b/openstack_dashboard/dashboards/project/databases/templates/databases/resize_instance.html index ebbcf83aba..4a812db317 100644 --- a/openstack_dashboard/dashboards/project/databases/templates/databases/resize_instance.html +++ b/openstack_dashboard/dashboards/project/databases/templates/databases/resize_instance.html @@ -2,10 +2,6 @@ {% load i18n %} {% block title %}{% trans "Resize Database Instance" %}{% endblock %} -{% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Resize Database Instance") %} -{% endblock %} - {% block main %} {% include "project/databases/_resize_instance.html" %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/openstack_dashboard/dashboards/project/databases/templates/databases/resize_volume.html b/openstack_dashboard/dashboards/project/databases/templates/databases/resize_volume.html index 493438a611..d6f7557ba9 100644 --- a/openstack_dashboard/dashboards/project/databases/templates/databases/resize_volume.html +++ b/openstack_dashboard/dashboards/project/databases/templates/databases/resize_volume.html @@ -2,10 +2,6 @@ {% load i18n %} {% block title %}{% trans "Resize Database Volume" %}{% endblock %} -{% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Resize Database Volume") %} -{% endblock %} - {% block main %} {% include "project/databases/_resize_volume.html" %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/openstack_dashboard/dashboards/project/databases/views.py b/openstack_dashboard/dashboards/project/databases/views.py index 85729b4930..8955c2625d 100644 --- a/openstack_dashboard/dashboards/project/databases/views.py +++ b/openstack_dashboard/dashboards/project/databases/views.py @@ -45,6 +45,7 @@ LOG = logging.getLogger(__name__) class IndexView(horizon_tables.DataTableView): table_class = tables.InstancesTable template_name = 'project/databases/index.html' + page_title = _("Instances") def has_more_data(self, table): return self._more @@ -85,6 +86,7 @@ class IndexView(horizon_tables.DataTableView): class LaunchInstanceView(horizon_workflows.WorkflowView): workflow_class = workflows.LaunchInstance template_name = "project/databases/launch.html" + page_title = _("Launch Database") def get_initial(self): initial = super(LaunchInstanceView, self).get_initial() @@ -140,6 +142,7 @@ class ResizeVolumeView(horizon_forms.ModalFormView): form_class = forms.ResizeVolumeForm template_name = 'project/databases/resize_volume.html' success_url = reverse_lazy('horizon:project:databases:index') + page_title = _("Resize Database Volume") @memoized.memoized_method def get_object(self, *args, **kwargs): @@ -166,6 +169,7 @@ class ResizeInstanceView(horizon_forms.ModalFormView): form_class = forms.ResizeInstanceForm template_name = 'project/databases/resize_instance.html' success_url = reverse_lazy('horizon:project:databases:index') + page_title = _("Resize Database Instance") @memoized.memoized_method def get_object(self, *args, **kwargs):