From 96aca54f61dc5cf38a38e4adb6bc2a8e13f125ea Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Tue, 10 Jul 2012 02:46:00 +0200 Subject: [PATCH] update user setting page --- .../templates/participant/password_change.html | 11 ++++++++--- .../templates/participant/settings.html | 15 +++++++++------ openslides/templates/base.html | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/openslides/participant/templates/participant/password_change.html b/openslides/participant/templates/participant/password_change.html index e77cefd94..f420d83cb 100644 --- a/openslides/participant/templates/participant/password_change.html +++ b/openslides/participant/templates/participant/password_change.html @@ -2,9 +2,14 @@ {% load i18n %} -{% block title %}{{ block.super }} - {%trans "New password" %}{% endblock %} +{% block title %}{{ block.super }} – {% trans "Password Settings" %}{% endblock %} {% block submenu %} +

{% trans "User Settings" %}

+ {% endblock %} {% block content %} @@ -16,8 +21,8 @@ - - diff --git a/openslides/participant/templates/participant/settings.html b/openslides/participant/templates/participant/settings.html index e1f32ed73..1ac9ccb70 100644 --- a/openslides/participant/templates/participant/settings.html +++ b/openslides/participant/templates/participant/settings.html @@ -2,13 +2,18 @@ {% load i18n %} -{% block title %}{{ block.super }} - {%trans "Your Settings" %}{% endblock %} +{% block title %}{{ block.super }} – {% trans "Personal Settings" %}{% endblock %} {% block submenu %} +

{% trans "User Settings" %}

+ {% endblock %} {% block content %} -

{%trans "Your Settings" %}

+

{% trans "Personal Settings" %}

{% csrf_token %} {{ form_user.as_p }} @@ -16,12 +21,10 @@ - -
- {% trans 'Change your password' %} -

{% endblock %} diff --git a/openslides/templates/base.html b/openslides/templates/base.html index b0d7ece6c..b92f3b85d 100644 --- a/openslides/templates/base.html +++ b/openslides/templates/base.html @@ -26,7 +26,7 @@ {% if user.is_authenticated %}
  • |{%trans "Logout" %}
  • {% url user_settings as url_usersettings %} -
  • |{% if request.path == url_usersettings %}{% endif %}{%trans "User Settings" %}{% if request.path == url_usersettings %}{% endif %}
  • +
  • |{% if request.path == url_usersettings %}{% endif %}{% trans "User Settings" %}{% if request.path == url_usersettings %}{% endif %}
  • {%trans "Welcome" %}, {{ user.username }}
  • {% else %}
  • {%trans "Login" %}