X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/a9eef437702d5df7a2f97010e6798c689371808c..babd81c7454731fa1f8cfeaecbc71dc7d4ad3817:/forum/skins/default/templates/header.html

diff --git a/forum/skins/default/templates/header.html b/forum/skins/default/templates/header.html
index cb12bb9..c53604c 100644
--- a/forum/skins/default/templates/header.html
+++ b/forum/skins/default/templates/header.html
@@ -5,7 +5,10 @@
 		<div id="navBar">
 			<div id="top">
                 {% if request.user.is_authenticated %}
-                    <a href="{% url users %}{{ request.user.id }}/{{ request.user.username }}/">{{ request.user.username }}</a> {% get_score_badge request.user %} 
+                    {% if request.user.is_superuser %}
+                        <a href="{% url admin_index %}">{% trans "administration" %}</a>   
+                    {% endif %}
+                    <a href="{% url user_profile id=request.user.id,slug=request.user.username|slugify %}">{{ request.user.username }}</a> {% get_score_badge request.user %} 
                     <a href="{% url logout %}">{% trans "logout" %}</a>
                 {% else %}
                     <a href="{% url auth_signin %}">{% trans "login" %}</a>
@@ -18,20 +21,17 @@
 				<td width="23%">
 					<div id="logo">
 						<a href="{% url index %}">
-							<img src="{% media  "/media/images/logo.png" %}" title="{% trans "back to home page" %}" alt="{{settings.APP_TITLE}} logo"/>
+							<img src="{{ settings.APP_LOGO }}" title="{% trans "back to home page" %}" alt="{{settings.APP_TITLE}} logo"/>
 						</a>
 					</div>
             	</td>
 				<td width="77%" valign="bottom">
                 <div class="nav">
-                    <a id="nav_questions" href="{% url questions %}" >{% trans "questions" %}</a>
-                    <a id="nav_tags" href="{% url tags %}">{% trans "tags" %}</a>
-                    <a id="nav_users" href="{% url users %}">{% trans "users" %}</a>
-                    {% if settings.BOOKS_ON %}
-                    <a id="nav_books" href="{% url books %}">{% trans "books" %}</a>
-                    {% endif %}
-                    <a id="nav_badges" href="{% url badges %}">{% trans "badges" %}</a>
-                    <a id="nav_unanswered" href="{% url unanswered %}">{% trans "unanswered questions" %}</a>
+                    <a id="nav_questions"{% ifequal tab "questions" %} class="on"{% endifequal %} href="{% url questions %}" >{% trans "questions" %}</a>
+                    <a id="nav_tags"{% ifequal tab "tags" %} class="on"{% endifequal %} href="{% url tags %}">{% trans "tags" %}</a>
+                    <a id="nav_users"{% ifequal tab "users" %} class="on"{% endifequal %} href="{% url users %}">{% trans "users" %}</a>
+                    <a id="nav_badges"{% ifequal tab "badges" %} class="on"{% endifequal %} href="{% url badges %}">{% trans "badges" %}</a>
+                    <a id="nav_unanswered"{% ifequal tab "unanswered" %} class="on"{% endifequal %} href="{% url unanswered %}">{% trans "unanswered questions" %}</a>
                     <div class="focus">
                     <a id="nav_ask" href="{% url ask %}" class="special">{% trans "ask a question" %}</a>
                     </div>