From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 13 Nov 2014 00:57:23 +0000 (+0100)
Subject: Lists as default desk when logged in
X-Git-Tag: 1.5.0rc1~27^2~50
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1baa36c9231a0f76f5e0723df2c753bcfbe006ab;p=telemeta.git

Lists as default desk when logged in
---

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index c498ae67..8e8557c7 100644
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -60,14 +60,12 @@
 {% if user.is_authenticated %}
 <img src="{{ STATIC_URL }}telemeta/images/user.png" alt="user" style="vertical-align:middle" />
 {% trans "Welcome" %},
+<a href="{% url "telemeta-profile-detail" user.username %}">
 {% if user.first_name or user.last_name %}
-{{ user.first_name }} {{ user.last_name }} |
+{{ user.first_name }} {{ user.last_name }}</a> |
 {% else %}
 {{ user.username }} |
 {% endif %}
-{% if not perms.telemeta.can_not_view_users_and_profiles %}
-<a href="{% url "telemeta-profile-detail" user.username %}">{% trans "Profile" %}</a> |
-{% endif %}
 <a href="{% url "telemeta-flatpage" "help" %}">{% trans "Help" %}</a> |
 <a href="{% url "telemeta-logout" %}">{% trans "Sign out" %}
 <img src="{{ STATIC_URL }}telemeta/images/logout.png" alt="logout" style="vertical-align:middle" /></a>
@@ -95,13 +93,7 @@
 
 <ul id="nav">
  {% if user.is_authenticated %}
-  <li><a href="#desk#" class="blue">{% trans "Desk" %}</a>
-   <ul>
-    <li><a href="{% url "telemeta-desk-lists" %}">{% trans "Lists" %}</a></li>
-    <li><a href="{% url "telemeta-desk-profile" user.username %}">{% trans "Profile" %}</a></li>
-    <li><a href="{% url "telemeta-desk-home" %}">{% trans "Home" %}</a></li>
-   </ul>
-  </li>
+  <li><a href="{% url "telemeta-desk-lists" %}" class="blue">{% trans "Desk" %}</a></li>
  {% else %}
   <li><a href="{% url "telemeta-home" %}" class="blue">{% trans "Home" %}</a></li>
  {% endif %}