openstack/horizon
Code Issues Proposed changes

Merge "Reduce page title duplication in settings and test"

Browse Source
This commit is contained in:
Jenkins 2015-02-17 16:13:28 +00:00 committed by Gerrit Code Review
commit 7d36214474
6 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/dashboards/settings/password/templates/password/change.html
View File

@ -2,10 +2,6 @@
{% load i18n %}
{% block title %}{% trans "Change Password" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Change Password") %}
{% endblock page_header %}
{% block main %}
{% include "settings/password/_change.html" %}
{% endblock %}

3
openstack_dashboard/dashboards/settings/password/views.py
View File

@ -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 forms
from openstack_dashboard.dashboards.settings.password \
@ -21,3 +23,4 @@ from openstack_dashboard.dashboards.settings.password \
class PasswordView(forms.ModalFormView):
form_class = pass_forms.PasswordForm
template_name = 'settings/password/change.html'
page_title = _("Change Password")

4
openstack_dashboard/dashboards/settings/user/templates/user/settings.html
View File

@ -2,10 +2,6 @@
{% load i18n %}
{% block title %}{% trans "User Settings" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("User Settings") %}
{% endblock page_header %}
{% block main %}
{% include "settings/user/_settings.html" %}
{% endblock %}

2
openstack_dashboard/dashboards/settings/user/views.py
View File

@ -13,6 +13,7 @@
# under the License.
from django.conf import settings
from django.utils.translation import ugettext_lazy as _
from horizon import forms
from horizon.utils import functions as utils
@ -22,6 +23,7 @@ from openstack_dashboard.dashboards.settings.user import forms as user_forms
class UserSettingsView(forms.ModalFormView):
form_class = user_forms.UserSettingsForm
template_name = 'settings/user/settings.html'
page_title = _("User Settings")
def get_initial(self):
return {

4
openstack_dashboard/test/test_panels/plugin_panel/templates/plugin_panel/index.html
View File

@ -2,10 +2,6 @@
{% load i18n %}
{% block title %}Plugin-based Panel{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title="Plugin-based Panel"%}
{% endblock page_header %}
{% block main %}
<div class="row">
<div class="col-sm-12">

7
openstack_dashboard/test/test_panels/plugin_panel/views.py
View File

@ -10,8 +10,11 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.views.generic import TemplateView # noqa
from django.utils.translation import ugettext_lazy as _
from horizon import views
class IndexView(TemplateView):
class IndexView(views.HorizonTemplateView):
template_name = 'admin/plugin_panel/index.html'
page_title = _("Plugin-based Panel")