mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Graphical alerts update (text/icon alignment) (#10856)

Browse Source 
* Update menu.blade.php

* Swap username and notification icon

* Hide count-notifications when zero

* slight tidy

* Accidental key press

* Decrease space to tie them together better

* Update styles.css version
This commit is contained in:
PipoCanaja
2019-11-25 05:09:40 +01:00
committed by Tony Murray
parent 3d56d763e4
commit 404b3b71ba
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/layouts/librenmsv1.blade.php
View File

@@ -41,7 +41,7 @@
<link href="{{ asset('css/select2.min.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('css/select2-bootstrap.min.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('css/query-builder.default.min.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset(LibreNMS\Config::get('stylesheet', 'css/styles.css')) }}?ver=20190912" rel="stylesheet" type="text/css" />
<link href="{{ asset(LibreNMS\Config::get('stylesheet', 'css/styles.css')) }}?ver=20191124" rel="stylesheet" type="text/css" />
<link href="{{ asset('css/' . LibreNMS\Config::get('applied_site_style', 'light') . '.css?ver=632417642') }}" rel="stylesheet" type="text/css" />
@foreach(LibreNMS\Config::get('webui.custom_css', []) as $custom_css)
<link href="{{ $custom_css }}" rel="stylesheet" type="text/css" />

9
resources/views/layouts/menu.blade.php
View File

@@ -470,9 +470,12 @@
</form>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-user fa-fw fa-lg fa-nav-icons" aria-hidden="true"></i><span class="hidden-sm"><small>{{ Auth::user()->username }}</small></span>
<span class="visible-xs-inline-block">@lang('User')</span><span
class="badge badge-navbar-user count-notif {{ $notification_count ? 'badge-danger' : 'badge-default' }}">{{ $notification_count }}</span></a>
<a href="#" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown">
<i class="fa fa-user fa-fw fa-lg fa-nav-icons" aria-hidden="true"></i>
<span class="badge badge-navbar-user count-notif {{ $notification_count ? 'badge-danger' : 'badge-default' }}">{{ $notification_count ?: '' }}</span>
<span class="hidden-sm"><small>{{ Auth::user()->username }}</small></span>
<span class="visible-xs-inline-block">@lang('User')</span>
</a>
<ul class="dropdown-menu">
<li><a href="{{ url('preferences') }}"><i class="fa fa-cog fa-fw fa-lg"
aria-hidden="true"></i> @lang('My Settings')</a></li>