From: Damien Lespiau <damien.lespiau@intel.com>
Date: Fri, 18 Dec 2015 17:34:29 +0000 (+0000)
Subject: ui: Merge the TODO list into the user dropdown
X-Git-Tag: v1.1.0~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d5748453623a8271a2ae2885e571002be2455ac;p=thirdparty%2Fpatchwork.git

ui: Merge the TODO list into the user dropdown

We still leave the badge on the top bar so we can see, at a glance, the
number of items on the TODO list. The actual menu item is folded into
the dropdown.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Acked-by: Stephen Finucane <stephen.finucane@intel.com>
---

diff --git a/templates/base.html b/templates/base.html
index 6a44b69e..f5a065dd 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -68,16 +68,18 @@
 {% endif %}
      <ul class="nav navbar-nav navbar-right">
 {% if user.is_authenticated %}
-     <li>
-      <a href="{% url 'user-todos' %}">
-       Todo
-       <span class="badge">{{ user.profile.n_todo_patches }}</span></a>
-     </li>
      <li class="dropdown">
-       <a href="#" class="dropdown-toggle" data-toggle="dropdown"
-        ><strong>{{ user.username }}</strong>&nbsp;<span
-        class="caret" /></a>
+       <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+         <span class="badge">{{ user.profile.n_todo_patches }}</span>
+         <strong>{{ user.username }}</strong>&nbsp;<span class="caret" />
+       </a>
        <ul class="dropdown-menu" role="menu">
+         <li>
+           <a href="{% url 'user-todos' %}">
+             Reviews pending
+             <span class="badge">{{ user.profile.n_todo_patches }}</span>
+           </a>
+         </li>
 {% if user.is_staff %}
          <li><a href="{% url 'admin:index' %}">Administration</a></li>
 {% endif %}