A free open source IT asset/license management system
Fixed #18678 - small UI tweaks
snipef412b56caa7b
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.phpindex d6e467161e..da28178628 100644--- a/resources/views/layouts/default.blade.php+++ b/resources/views/layouts/default.blade.php@@ -1133,6 +1133,15 @@</li>@endcan+ @can('index', \App\Models\User::class)+ <li aria-hidden="true"{!! (request()->is('users*') ? ' class="active"' : '') !!}>+ <a href="{{ route('users.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=6" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.users') }}">+ <x-icon type="users" class="fa-fw" />+ <span class="sr-only">{{ trans('general.users') }}</span>+ </a>+ </li>+ @endcan+@can('index', \App\Models\Asset::class)<li><form class="navbar-form navbar-left form-inline" role="search" action="{{ route('findbytag/hardware') }}" method="get">@@ -1239,7 +1248,7 @@<ul class="dropdown-menu"><!-- User image -->@can('self.profile')- <li {!! (request()->is('account/profile') ? ' class="active"' : '') !!}>+ <li {!! (request()->is('account/view-assets') ? ' class="active"' : '') !!}><a href="{{ route('view-assets') }}"><x-icon type="checkmark" class="fa-fw" />{{ trans('general.viewassets') }}@@ -1263,7 +1272,7 @@</li>@endcan- <li>+ <li {!! (request()->is('account/password') ? ' class="active"' : '') !!}><a href="{{ route('profile') }}"><x-icon type="user" class="fa-fw" />{{ trans('general.editprofile') }}@@ -1272,7 +1281,7 @@@can('self.profile')@if (Auth::user()->ldap_import!='1')- <li>+ <li {!! (request()->is('account/profile') ? ' class="active"' : '') !!}><a href="{{ route('account.password.index') }}"><x-icon type="password" class="fa-fw" />{{ trans('general.changepassword') }}@@ -1288,7 +1297,7 @@</li>@can('self.api')- <li>+ <li {!! (request()->is('account/api') ? ' class="active"' : '') !!}><a href="{{ route('user.api') }}"><x-icon type="api-key" class="fa-fw" />{{ trans('general.manage_api_keys') }}@@ -1336,7 +1345,7 @@<!-- sidebar menu: : style can be found in sidebar.less --><ul class="sidebar-menu" data-widget="tree" {{ \App\Helpers\Helper::determineLanguageDirection() == 'rtl' ? 'style="margin-right:12px' : '' }}>@can('admin')- <li {!! (\Request::route()->getName()=='home' ? ' class="active"' : '') !!} class="firstnav">+ <li {!! (\request()->route()->getName()=='home' ? ' class="active"' : '') !!} class="firstnav"><a href="{{ route('home') }}"><x-icon type="dashboard" class="fa-fw" /><span>{{ trans('general.dashboard') }}</span>@@ -1351,7 +1360,7 @@<x-icon type="angle-left" class="pull-right fa-fw"/></a><ul class="treeview-menu">- <li>+ <li {!! (!request()->query('status') && (request()->is('hardware')) ? ' class="active"' : '') !!}><a href="{{ url('hardware') }}"><x-icon type="circle" class="text-grey fa-fw"/>{{ trans('general.list_all') }}@@ -1374,48 +1383,48 @@@endif- <li id="deployed-sidenav-option" {!! (Request::query('status') == 'Deployed' ? ' class="active"' : '') !!}>+ <li id="deployed-sidenav-option" {!! (request()->query('status') == 'Deployed' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Deployed') }}"><x-icon type="circle" class="text-blue fa-fw" />{{ trans('general.deployed') }}<span class="badge">{{ (isset($total_deployed_sidebar)) ? $total_deployed_sidebar : '' }}</span></a></li>- <li id="rtd-sidenav-option"{!! (Request::query('status') == 'RTD' ? ' class="active"' : '') !!}>+ <li id="rtd-sidenav-option"{!! (request()->query('status') == 'RTD' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=RTD') }}"><x-icon type="circle" class="text-green fa-fw" />{{ trans('general.ready_to_deploy') }}<span class="badge">{{ (isset($total_rtd_sidebar)) ? $total_rtd_sidebar : '' }}</span></a></li>- <li id="pending-sidenav-option"{!! (Request::query('status') == 'Pending' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Pending') }}">+ <li id="pending-sidenav-option"{!! (request()->query('status') == 'Pending' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Pending') }}"><x-icon type="circle" class="text-orange fa-fw" />{{ trans('general.pending') }}<span class="badge">{{ (isset($total_pending_sidebar)) ? $total_pending_sidebar : '' }}</span></a></li>- <li id="undeployable-sidenav-option"{!! (Request::query('status') == 'Undeployable' ? ' class="active"' : '') !!} ><a+ <li id="undeployable-sidenav-option"{!! (request()->query('status') == 'Undeployable' ? ' class="active"' : '') !!} ><ahref="{{ url('hardware?status=Undeployable') }}"><x-icon type="x" class="text-red fa-fw" />{{ trans('general.undeployable') }}<span class="badge">{{ (isset($total_undeployable_sidebar)) ? $total_undeployable_sidebar : '' }}</span></a></li>- <li id="byod-sidenav-option"{!! (Request::query('status') == 'byod' ? ' class="active"' : '') !!}><a+ <li id="byod-sidenav-option"{!! (request()->query('status') == 'byod' ? ' class="active"' : '') !!}><ahref="{{ url('hardware?status=byod') }}"><x-icon type="x" class="text-red fa-fw" />{{ trans('general.byod') }}<span class="badge">{{ (isset($total_byod_sidebar)) ? $total_byod_sidebar : '' }}</span></a></li>- <li id="archived-sidenav-option"{!! (Request::query('status') == 'Archived' ? ' class="active"' : '') !!}><a+ <li id="archived-sidenav-option"{!! (request()->query('status') == 'Archived' ? ' class="active"' : '') !!}><ahref="{{ url('hardware?status=Archived') }}"><x-icon type="x" class="text-red fa-fw" />{{ trans('admin/hardware/general.archived') }}<span class="badge">{{ (isset($total_archived_sidebar)) ? $total_archived_sidebar : '' }}</span></a></li>- <li id="requestable-sidenav-option"{!! (Request::query('status') == 'Requestable' ? ' class="active"' : '') !!}><a+ <li id="requestable-sidenav-option"{!! (request()->query('status') == 'Requestable' ? ' class="active"' : '') !!}><ahref="{{ url('hardware?status=Requestable') }}"><x-icon type="checkmark" class="text-blue fa-fw" />{{ trans('admin/hardware/general.requestable') }}