From 0d649c1ee6b5680b679e5cc7043fba2da82a6735 Mon Sep 17 00:00:00 2001
From: Rosiak <sorenrosiak@gmail.com>
Date: Wed, 9 Dec 2015 23:56:12 +0100
Subject: [PATCH] Menubar Change

Fix #1575
---
 html/css/styles.css             | 13 +++++++++++++
 html/includes/print-menubar.php | 25 ++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/html/css/styles.css b/html/css/styles.css
index 3c2de2ca7..504400d76 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -1770,6 +1770,19 @@ label {
     padding: 15px 6px;
 }
 
+.badge-navbar-user{
+   background:red;
+   border-radius: 40%;
+   font-size: 60%;
+   height: auto;
+   margin: 0;
+   padding:5px;
+   position:absolute;
+   right:-4px;
+   top:5px;
+   width: auto;
+  }
+
 @media only screen and (max-width: 480px) {
     .thumbnail_graph_table b { font-size : 6px;}
     .thumbnail_graph_table img {
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 61116e193..c15444c80 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -488,10 +488,27 @@ if(is_file("includes/print-menubar-custom.inc.php")) {
          </div>
      </form>
     <ul class="nav navbar-nav navbar-right">
+      <li class="dropdown">
 <?php
-$notifications = new ObjCache('notifications');
-echo '       <li><a href="notifications/"><span class="badge count-notif">'.($notifications['sticky_count']+$notifications['count']).'</span></a></li>';
+
+    $notifications = new ObjCache('notifications');
+    echo('<a href="#" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-user fa-fw fa-lg fa-nav-icons"></i><span class="badge badge-navbar-user">'.($notifications['sticky_count']+$notifications['count']).'</span></a>');
 ?>
+        <ul class="dropdown-menu">
+          <li role="presentation" class="dropdown-header"> Settings</li>
+          <li><a href="preferences/"><i class="fa fa-cog fa-fw fa-lg"></i> My Settings</a></li>
+          <li role="presentation" class="dropdown-header"> Notifications</li>
+          <li><a href="notifications/"><i class="fa fa-envelope-o fa-fw fa-lg"></i> Notifications</a></li>
+          <li role="presentation" class="divider"></li>
+<?php 
+
+if ($_SESSION['authenticated']) {
+    echo('
+           <li><a href="logout/"><i class="fa fa-sign-out fa-fw fa-lg"></i> Logout</a></li>');
+}
+?>
+         </ul>
+       </li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-cog fa-fw fa-lg fa-nav-icons"></i></a>
         <ul class="dropdown-menu">
@@ -502,7 +519,6 @@ if ($_SESSION['userlevel'] >= '10') {
 }
 
 ?>
-          <li><a href="preferences/"><i class="fa fa-cog fa-fw fa-lg"></i> My Settings</a></li>
           <li role="presentation" class="divider"></li>
           <li role="presentation" class="dropdown-header"> Users</li>
 
@@ -550,8 +566,7 @@ if ($_SESSION['authenticated']) {
                <ul class="dropdown-menu scrollable-menu">
                    <li><a href="#"><span class="countdown_timer_status" id="countdown_timer_status"></span></a></li>
                </ul>
-           </li>
-           <li><a href="logout/"><i class="fa fa-sign-out fa-fw fa-lg"></i> Logout</a></li>');
+           </li>');
 }
 ?>