From 37619b0a804b12a92e102e2d26ef2fe7f6769407 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sun, 20 May 2012 22:34:41 +0200
Subject: [PATCH] #114: Set participants tab inactive if usersettings page is
 active

---
 openslides/participant/urls.py | 5 -----
 openslides/templates/base.html | 3 ++-
 openslides/urls.py             | 8 +++++++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/openslides/participant/urls.py b/openslides/participant/urls.py
index 2aef5ef59..a7d152c21 100644
--- a/openslides/participant/urls.py
+++ b/openslides/participant/urls.py
@@ -71,11 +71,6 @@ urlpatterns = patterns('participant.views',
         name='user_group_delete',
     ),
 
-    url(r'^user/settings$',
-        'user_settings',
-        name='user_settings',
-    ),
-
     url(r'^resetpassword/(?P<user_id>\d+)$',
         'reset_password',
         name='user_reset_password',
diff --git a/openslides/templates/base.html b/openslides/templates/base.html
index 0fa8f5325..b0d7ece6c 100644
--- a/openslides/templates/base.html
+++ b/openslides/templates/base.html
@@ -25,7 +25,8 @@
             <ul>
             {% if user.is_authenticated %}
                 <li>|<a href="{% url user_logout %}">{%trans "Logout" %}</a></li>
-                <li>|<a href="{% url user_settings %}">{%trans "User Settings" %}</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>{%trans "Welcome" %}, <strong>{{ user.username }}</strong></li>
             {% else %}
                 <li><a href="{% url user_login %}">{%trans "Login" %}</a></li>
diff --git a/openslides/urls.py b/openslides/urls.py
index 009cf272c..adf959772 100644
--- a/openslides/urls.py
+++ b/openslides/urls.py
@@ -64,5 +64,11 @@ urlpatterns += patterns('',
     url(r'^logout/$',
         'django.contrib.auth.views.logout_then_login',
         name='user_logout',
-    )
+    ),
+
+    url(r'^usersettings$',
+        'participant.views.user_settings',
+        name='user_settings',
+    ),
+
 )