Menubar Change

Fix #1575
This commit is contained in:
Rosiak
2015-12-09 23:56:12 +01:00
parent 810f53fac7
commit 0d649c1ee6
2 changed files with 33 additions and 5 deletions

View File

@@ -1770,6 +1770,19 @@ label {
padding: 15px 6px; 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) { @media only screen and (max-width: 480px) {
.thumbnail_graph_table b { font-size : 6px;} .thumbnail_graph_table b { font-size : 6px;}
.thumbnail_graph_table img { .thumbnail_graph_table img {

View File

@@ -488,10 +488,27 @@ if(is_file("includes/print-menubar-custom.inc.php")) {
</div> </div>
</form> </form>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<?php <?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"> <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> <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"> <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="divider"></li>
<li role="presentation" class="dropdown-header"> Users</li> <li role="presentation" class="dropdown-header"> Users</li>
@@ -550,8 +566,7 @@ if ($_SESSION['authenticated']) {
<ul class="dropdown-menu scrollable-menu"> <ul class="dropdown-menu scrollable-menu">
<li><a href="#"><span class="countdown_timer_status" id="countdown_timer_status"></span></a></li> <li><a href="#"><span class="countdown_timer_status" id="countdown_timer_status"></span></a></li>
</ul> </ul>
</li> </li>');
<li><a href="logout/"><i class="fa fa-sign-out fa-fw fa-lg"></i> Logout</a></li>');
} }
?> ?>