Merge user menu and notifications menu

wiki/plugins/notifications/templates/wiki/plugins/notifications/menubaritem.html

-{% load i18n sekizai_tags %}
-<script type="text/javascript">
-  URL_NOTIFY_GET_NEW = "{% url notify:json_get %}";
-  URL_NOTIFY_MARK_READ = "{% url notify:json_mark_read_base %}";
-  URL_NOTIFY_GOTO = "{% url notify:goto_base %}";
-</script>
-<script type="text/javascript" src="{{ STATIC_URL }}wiki/plugins/notifications/js/ui.js"></script>
+{% comment %}
 
   <li class="dropdown">
     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -20,3 +14,11 @@
     </ul>
   </li>
 
+{% endcomment %}
+{% load i18n sekizai_tags %}
+<script type="text/javascript">
+  URL_NOTIFY_GET_NEW = "{% url notify:json_get %}";
+  URL_NOTIFY_MARK_READ = "{% url notify:json_mark_read_base %}";
+  URL_NOTIFY_GOTO = "{% url notify:goto_base %}";
+</script>
+<script type="text/javascript" src="{{ STATIC_URL }}wiki/plugins/notifications/js/ui.js"></script>

wiki/templates/wiki/base.html

@@ -118,7 +118,7 @@
               {% include "wiki/plugins/notifications/menubaritem.html" %}
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                  <span class="icon-user"></span>
+                  <span class="badge notification-cnt">0</span>
                   {{ user }}
                   <b class="caret"></b>
                 </a>
@@ -129,6 +129,13 @@
                       {% trans "Log out" %}
                     </a>
                   </li>
+                  <li class="divider"></li>
+                  <div class="notification-list">
+                    <div class="notification-li-container"></div>
+                    <li class="notifications-empty"><a href="#"><em>{% trans "No notifications" %}</em></a></li>
+                    <li class="divider"></li>
+                    <li><a href="#" onclick="notify_mark_read()">{% trans "Clear notifications list" %}</a></li>
+                  </div>
                 </ul>
               </li>
             </ul>