Added custom.js, login redirects to current page, added form-start/form-end and change breadcrumb width
This commit is contained in:
parent
8b83990a66
commit
f131db31c6
@ -13,7 +13,8 @@
|
|||||||
|
|
||||||
<!-- Content Wrapper. Contains page content -->
|
<!-- Content Wrapper. Contains page content -->
|
||||||
<div class="content-wrapper">
|
<div class="content-wrapper">
|
||||||
|
<!-- In case we have input fields in the header -->
|
||||||
|
@yield('page-form-start')
|
||||||
@include('adminlte::layouts.partials.contentheader')
|
@include('adminlte::layouts.partials.contentheader')
|
||||||
|
|
||||||
<!-- Main content -->
|
<!-- Main content -->
|
||||||
@ -24,6 +25,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</section><!-- /.content -->
|
</section><!-- /.content -->
|
||||||
|
|
||||||
|
@yield('page-form-end')
|
||||||
</div><!-- /.content-wrapper -->
|
</div><!-- /.content-wrapper -->
|
||||||
|
|
||||||
@isset($controlsidebar)
|
@isset($controlsidebar)
|
||||||
|
@ -2,12 +2,12 @@
|
|||||||
<div class="content-header d-print-none">
|
<div class="content-header d-print-none">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div class="row mb-2">
|
<div class="row mb-2">
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-8">
|
||||||
<h1 class="m-0 text-dark">@yield('contentheader_title', 'Content Title')</h1>
|
<h1 class="m-0 text-dark">@yield('contentheader_title', 'Content Title')</h1>
|
||||||
<small>@yield('contentheader_description','Description')</small>
|
<small>@yield('contentheader_description','Description')</small>
|
||||||
</div><!-- /.col -->
|
</div><!-- /.col -->
|
||||||
|
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-4">
|
||||||
<ol class="breadcrumb float-sm-right small">
|
<ol class="breadcrumb float-sm-right small">
|
||||||
<li class="breadcrumb-item"><a href="{{ url('/home'.(isset($ido) ? '/'.$ido->id : '')) }}">Home</a></li>
|
<li class="breadcrumb-item"><a href="{{ url('/home'.(isset($ido) ? '/'.$ido->id : '')) }}">Home</a></li>
|
||||||
@isset($breadcrumb)
|
@isset($breadcrumb)
|
||||||
|
@ -59,7 +59,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
@else
|
@else
|
||||||
<a href="{{ url('login') }}" class="text-muted pr-2"><i class="fa fa-lock"></i></a>
|
<a href="{{ url()->current().'?login=1' }}" class="text-muted pr-2"><i class="fa fa-lock"></i></a>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
<!-- Control Side Bar -->
|
<!-- Control Side Bar -->
|
||||||
|
@ -71,3 +71,8 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@if(file_exists('js/custom.js'))
|
||||||
|
<!-- Any Custom JS -->
|
||||||
|
<script src="{{ asset('js/custom.js') }}"></script>
|
||||||
|
@endif
|
@ -14,13 +14,13 @@
|
|||||||
@if($user->exists)
|
@if($user->exists)
|
||||||
<img src="{{ Gravatar::get(($user->exists AND $user->email) ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
|
<img src="{{ Gravatar::get(($user->exists AND $user->email) ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
|
||||||
@else
|
@else
|
||||||
<a href="{{ url('login') }}" class="d-block"><i class="pl-1 fa fa-3x fa-lock"></i></a>
|
<a name="login" href="{{ url()->current().'?login=1' }}" class="d-block"><i class="pl-1 fa fa-3x fa-lock"></i></a>
|
||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="info">
|
<div class="info">
|
||||||
<a href="{{ url('login') }}" class="d-block">{{ $user->exists ? ($user->name ?: 'No Name') : 'Login' }}</a>
|
<a href="{{ url('login') }}" class="d-block">{{ $user->exists ? ($user->name ?: 'No Name') : 'Login' }}</a>
|
||||||
@isset($user->lastlogin)<a span="d-block"><small><span style="color: #747474;">Last On:</span> {{ $user->lastlogin->format('Y-m-d H:i') }}</small></a>@endisset
|
@isset($user->lastlogin)<a name="login" span="d-block"><small><span style="color: #747474;">Last On:</span> {{ $user->lastlogin->format('Y-m-d H:i') }}</small></a>@endisset
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user