Merge remote-tracking branch 'origin/master'

This commit is contained in:
Andy Heathershaw 2018-07-12 05:59:29 +01:00
commit f007371a79
1 changed files with 3 additions and 3 deletions

View File

@ -14,7 +14,7 @@
</li> </li>
@endcan @endcan
@if (count($albums) > 0) @if (count($g_albums) > 0)
<li class="nav-item dropdown ml-2"> <li class="nav-item dropdown ml-2">
<a class="nav-link dropdown-toggle" href="{{ url('/') }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link dropdown-toggle" href="{{ url('/') }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-book"></i> @lang('navigation.navbar.albums') <i class="fa fa-book"></i> @lang('navigation.navbar.albums')
@ -44,7 +44,7 @@
</li> </li>
@endif @endif
@if (count($albums) > 0 && \App\User::currentOrAnonymous()->can('statistics.public-access')) @if (count($g_albums) > 0 && \App\User::currentOrAnonymous()->can('statistics.public-access'))
<li class="nav-item ml-2"> <li class="nav-item ml-2">
<a class="nav-link" href="{{ route('statistics.index') }}"><i class="fa fa-bar-chart"></i> @lang('navigation.navbar.statistics')</a> <a class="nav-link" href="{{ route('statistics.index') }}"><i class="fa fa-bar-chart"></i> @lang('navigation.navbar.statistics')</a>
</li> </li>
@ -82,4 +82,4 @@
</ul> </ul>
@endif @endif
</div> </div>
</nav> </nav>