restart

resources/views/vendor/boilerplate/layout/contentheader.blade.php

@@ -1,34 +1,30 @@
 <div class="content-header pt-2 pb-1">
     <div class="container-fluid">
-        <div class="row mb-2 align-items-end">
-            <div class="col-sm-6">
-                <h1 class="m-0">
-                    {{ $title }}
-                    @if(isset($subtitle))
-                        <small class="font-weight-light ml-1 text-md">{{ $subtitle }}</small>
-                    @endif
-                </h1>
-            </div>
-            <div class="col-sm-6">
-                <ol class="breadcrumb float-sm-right text-sm">
-                    <li class="breadcrumb-item">
-                        <a href="{{ route('boilerplate.dashboard') }}">
-                            {{ __('boilerplate::layout.home') }}
-                        </a>
-                    </li>
-                    @if(isset($breadcrumb))
-                        @foreach($breadcrumb as $label => $route)
-                            @if(is_numeric($label))
-                                <li class="breadcrumb-item active">{{ $route }}</li>
-                            @elseif(is_array($route))
-                                <li class="breadcrumb-item"><a href="{{ route($route[0], $route[1]) }}">{{ $label }}</a></li>
-                            @else
-                                <li class="breadcrumb-item"><a href="{{ route($route) }}">{{ $label }}</a></li>
-                            @endif
-                        @endforeach
-                    @endif
-                </ol>
-            </div>
+        <div class="d-flex align-items-end flex-wrap justify-content-between pb-2">
+            <h1 class="m-0 pr-3">
+                {{ $title }}
+                @if(isset($subtitle))
+                    <small class="font-weight-light ml-1 text-md">{{ $subtitle }}</small>
+                @endif
+            </h1>
+            <ol class="breadcrumb text-sm">
+                <li class="breadcrumb-item">
+                    <a href="{{ route('boilerplate.dashboard') }}">
+                        {{ __('boilerplate::layout.home') }}
+                    </a>
+                </li>
+                @if(isset($breadcrumb))
+                    @foreach($breadcrumb as $label => $route)
+                        @if(is_numeric($label))
+                            <li class="breadcrumb-item active">{{ $route }}</li>
+                        @elseif(is_array($route))
+                            <li class="breadcrumb-item"><a href="{{ route($route[0], $route[1]) }}">{{ $label }}</a></li>
+                        @else
+                            <li class="breadcrumb-item"><a href="{{ route($route) }}">{{ $label }}</a></li>
+                        @endif
+                    @endforeach
+                @endif
+            </ol>
         </div>
     </div>
 </div>

resources/views/vendor/boilerplate/layout/footer.blade.php

@@ -1,18 +1,20 @@
 <footer class="main-footer text-sm">
-    <strong>
-        &copy; {{ date('Y') }}
-        @if(config('boilerplate.theme.footer.vendorlink'))
-            <a href="{{ config('boilerplate.theme.footer.vendorlink') }}">
-                {!! config('boilerplate.theme.footer.vendorname') !!}
-            </a>.
-        @else
-            {!! config('boilerplate.theme.footer.vendorname') !!}.
-        @endif
-    </strong>
-    {{ __('boilerplate::layout.rightsres') }}
-    <div class="float-right d-none d-sm-inline">
+    <div class="d-flex justify-content-between flex-wrap">
+        <div>
+            <strong>
+                &copy; {{ date('Y') }}
+                @if(config('boilerplate.theme.footer.vendorlink'))
+                    <a href="{{ config('boilerplate.theme.footer.vendorlink') }}">
+                        {!! config('boilerplate.theme.footer.vendorname') !!}
+                    </a>.
+                @else
+                    {!! config('boilerplate.theme.footer.vendorname') !!}.
+                @endif
+            </strong>
+            {{ __('boilerplate::layout.rightsres') }}
+        </div>
         <a href="https://github.com/sebastienheyd/boilerplate">
-            Boilerplate
+            Boilerplate | {{ \Composer\InstalledVersions::getPrettyVersion('sebastienheyd/boilerplate') }}
         </a>
     </div>
 </footer>

resources/views/vendor/boilerplate/layout/header.blade.php

@@ -6,59 +6,20 @@
                     <i class="fas fa-fw fa-bars"></i>
                 </a>
             </li>
+            @foreach(app('boilerplate.navbar.items')->getItems('left') as $view){!! $view !!}@endforeach
         </ul>
-        @foreach(app('boilerplate.navbar.items')->getItems('left') as $view)
-        {!! $view !!}
-        @endforeach
     </div>
     <div class="navbar-right ml-auto d-flex">
-        @foreach(app('boilerplate.navbar.items')->getItems('right') as $view)
-        {!! $view !!}
-        @endforeach
         <ul class="nav navbar-nav">
-            @if(config('boilerplate.locale.switch', false))
-            <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle px-2" data-toggle="dropdown" href="#" aria-expanded="false">
-                    {{ Config::get('boilerplate.locale.languages.'.App::getLocale().'.label') }}
-                </a>
-                <div class="dropdown-menu dropdown-menu-right" style="left: inherit; right: 0px;">
-@foreach(collect(config('boilerplate.locale.languages'))->map(function($e){return $e['label'];})->toArray() as $lang => $label)
-@if ($lang !== App::getLocale())
-                    <a href="{{ route('boilerplate.lang.switch', $lang) }}" class="dropdown-item">{{ $label }}</a>
-@endif
-@endforeach
-                </div>
-            </li>
-            @endif
-            @if(config('boilerplate.theme.navbar.user.visible'))
-            <li class="nav-item">
-                <a href="{{ route('boilerplate.user.profile') }}" class="nav-link d-flex align-items-center px-2">
-                    <img src="{{ Auth::user()->avatar_url }}" class="avatar-img img-circle bg-gray mr-0 mr-md-2 elevation-{{ config('boilerplate.theme.navbar.user.shadow') }}" alt="{{ Auth::user()->name }}" height="32">
-                    <span class="d-none d-md-block">{{ Auth::user()->name }}</span>
-                </a>
-            </li>
-            @endif
-            @if(config('boilerplate.theme.darkmode', false))
-            <li class="nav-item">
-                <a class="nav-link px-2" data-widget="darkmode" href="#" role="button">
-                    @if(setting('darkmode', false))
-                    <i class="fas fa-fw fa-sun"></i>
-                    @else
-                    <i class="far fa-fw fa-moon"></i>
-                    @endif
-                </a>
-            </li>
-            @endif
-            @if(config('boilerplate.theme.fullscreen', false))
-            <li class="nav-item">
-                <a class="nav-link px-2" data-widget="fullscreen" href="#" role="button">
-                    <i class="fas fa-fw fa-expand-arrows-alt"></i>
-                </a>
-            </li>
-            @endif
+            @includeWhen(config('boilerplate.theme.navbar.user.visible'), 'boilerplate::layout.header.user')
+            @foreach(app('boilerplate.navbar.items')->getItems('right') as $view){!! $view !!}@endforeach
+            @includeWhen((config('boilerplate.app.allowImpersonate') && Auth::user()->hasRole('admin')) || session()->has('impersonate'), 'boilerplate::layout.header.impersonate')
+            @includeWhen(config('boilerplate.locale.switch', false), 'boilerplate::layout.header.language')
+            @includeWhen(config('boilerplate.theme.darkmode', false), 'boilerplate::layout.header.darkmode')
+            @includeWhen(config('boilerplate.theme.fullscreen', false), 'boilerplate::layout.header.fullscreen')
             <li class="nav-item">
                 {!! Form::open(['route' => 'boilerplate.logout', 'method' => 'post', 'id' => 'logout-form']) !!}
-                <button type="submit" class="btn nav-link d-flex align-items-center logout px-2" data-question="{{ __('boilerplate::layout.logoutconfirm') }}">
+                <button type="submit" class="btn nav-link d-flex align-items-center logout px-2" data-question="{{ __('boilerplate::layout.logoutconfirm') }}" data-toggle="tooltip" title="@lang('boilerplate::layout.logout')">
                     <span class="fa fa-fw fa-power-off hidden-xs pr-1"></span>
                 </button>
                 {!! Form::close() !!}

resources/views/vendor/boilerplate/layout/index.blade.php

@@ -47,7 +47,7 @@
         $.ajaxSetup({headers:{'X-CSRF-TOKEN':'{{ csrf_token() }}'}});
         bootbox.setLocale('{{ App::getLocale() }}');
         var bpRoutes={
-            settings:"{{ route('boilerplate.settings',null,false) }}"
+            settings:"{{ route('boilerplate.user.settings',null,false) }}"
         };
         var session={
             keepalive:"{{ route('boilerplate.keepalive', null, false) }}",

resources/views/vendor/boilerplate/layout/mainsidebar.blade.php

@@ -1,22 +1,25 @@
 <aside class="main-sidebar sidebar-{{ config('boilerplate.theme.sidebar.type') }}-{{ config('boilerplate.theme.sidebar.links.bg') }} elevation-{{ config('boilerplate.theme.sidebar.shadow') }}">
-    <a href="{{ route('boilerplate.dashboard') }}" class="brand-link {{ !empty(config('boilerplate.theme.sidebar.brand.bg')) ? 'bg-'.config('boilerplate.theme.sidebar.brand.bg') : ''}}">
+    <a href="{{ route('boilerplate.dashboard') }}" class="brand-link d-flex {{ !empty(config('boilerplate.theme.sidebar.brand.bg')) ? 'bg-'.config('boilerplate.theme.sidebar.brand.bg') : ''}}">
         <span class="brand-logo bg-{{ config('boilerplate.theme.sidebar.brand.logo.bg') }} elevation-{{ config('boilerplate.theme.sidebar.brand.logo.shadow') }}">
             {!! config('boilerplate.theme.sidebar.brand.logo.icon') !!}
         </span>
-        <span class="brand-text">{!! config('boilerplate.theme.sidebar.brand.logo.text') !!}</span>
+        <span class="brand-text text-truncate pr-2" title="{!! strip_tags(config('boilerplate.theme.sidebar.brand.logo.text')) !!}">{!! config('boilerplate.theme.sidebar.brand.logo.text') !!}</span>
     </a>
     <div class="sidebar">
         @if(config('boilerplate.theme.sidebar.user.visible'))
-            <div class="user-panel py-3 d-flex">
+            <div class="user-panel d-flex align-items-center">
                 <div class="image">
                     <img src="{{ Auth::user()->avatar_url }}" class="avatar-img img-circle elevation-{{ config('boilerplate.theme.sidebar.user.shadow') }}" alt="{{ Auth::user()->name }}">
                 </div>
                 <div class="info">
-                    <a href="{{ route('boilerplate.user.profile') }}" class="d-block">{{ Auth::user()->name }}</a>
+                    <a href="{{ route('boilerplate.user.profile') }}" class="d-flex flex-wrap">
+                        <span class="mr-1">{{ Auth::user()->first_name }}</span>
+                        <span class="text-truncate text-uppercase font-weight-bolder">{{ Auth::user()->last_name }}</span>
+                    </a>
                 </div>
             </div>
         @endif
-        <nav class="mt-3">
+        <nav class="mt-2">
             {!! $menu !!}
         </nav>
     </div>