From 96aca54f61dc5cf38a38e4adb6bc2a8e13f125ea Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
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 %}
+    <h4 class="sectiontitle">{% trans "User Settings" %}</h4>
+    <ul>
+        <li><a href="{% url user_settings %}">{% trans "Personal Settings" %}</a></li>
+        <li class="selected"><a href="{% url password_change %}">{% trans "Password Settings" %}</a></li>
+    </ul>
 {% endblock %}
 
 {% block content %}
@@ -16,8 +21,8 @@
         <button class="button" type="submit">
             <span class="icon ok">{%trans 'Save' %}</span>
         </button>
-        <a href='{% url item_overview %}'>
-        <button class="button" type="button" onclick="window.location='{% url item_overview %}'">
+        <a href=''>
+        <button class="button" type="button">
             <span class="icon cancel">{%trans 'Cancel' %}</span>
         </button>
         </a>
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 %}
+    <h4 class="sectiontitle">{% trans "User Settings" %}</h4>
+    <ul>
+        <li class="selected"><a href="{% url user_settings %}">{% trans "Personal Settings" %}</a></li>
+        <li><a href="{% url password_change %}">{% trans "Password Settings" %}</a></li>
+    </ul>
 {% endblock %}
 
 {% block content %}
-    <h1>{%trans "Your Settings" %}</h1>
+    <h1>{% trans "Personal Settings" %}</h1>
 
     <form action="" method="post">{% csrf_token %}
         {{ form_user.as_p }}
@@ -16,12 +21,10 @@
         <button class="button" type="submit">
             <span class="icon ok">{%trans 'Save' %}</span>
         </button>
-        <a href='{% url item_overview %}'>
-        <button class="button" type="button" onclick="window.location='{% url item_overview %}'">
+        <a href=''>
+        <button class="button" type="button">
             <span class="icon cancel">{%trans 'Cancel' %}</span>
         </button>
         </a>
     </form>
-    <a href="{% url password_change %}">{% trans 'Change your password' %}</a>
-    <p></p>
 {% 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 %}
                 <li>|<a href="{% url user_logout %}">{%trans "Logout" %}</a></li>
                 {% url user_settings as url_usersettings %}
-                <li>|<a href="{% url user_settings %}">{% if request.path == url_usersettings %}<strong>{% endif %}{%trans "User Settings" %}{% if request.path == url_usersettings %}</strong>{% endif %}</a></li>
+                <li>|<a href="{% url user_settings %}">{% if request.path == url_usersettings %}<strong>{% endif %}{% trans "User Settings" %}{% if request.path == url_usersettings %}</strong>{% endif %}</a></li>
                 <li>{%trans "Welcome" %}, <strong>{{ user.username }}</strong></li>
             {% else %}
                 <li><a href="{% url user_login %}">{%trans "Login" %}</a></li>