Compare commits

...

11 Commits

Author SHA1 Message Date
Deon George
f131db31c6 Added custom.js, login redirects to current page, added form-start/form-end and change breadcrumb width 2020-01-09 18:44:07 +11:00
Deon George
8b83990a66 Changed not logged in user to padlock with 'Login' 2019-12-16 11:29:34 +11:00
Deon George
4472202afb Display improvements for login note 2019-11-29 11:13:24 +11:00
Deon George
2040266ab2 Disable autocomplete in search 2019-11-26 09:58:45 +11:00
Deon George
1774987dea Dispatch resize event if sidebar collapsed 2019-11-22 14:22:37 +11:00
Deon George
6c60298e8f Add a note on the login page 2019-11-21 14:33:33 +11:00
Deon George
41b320a5b9 Fix file_exist check for custom.css 2019-11-17 23:26:12 +11:00
Deon George
1096f0e28d Added custom.css to app.blade 2019-10-30 14:31:32 +08:00
Deon George
b0730b9ed3 Revert name to igaster/laravel-theme 2019-10-30 14:15:20 +08:00
Deon George
163a7f2587 Add github cvs to composer 2019-10-30 12:15:23 +08:00
Deon George
4f2707a374 Switch laravel-them to fix issue with @ directives 2019-10-30 09:49:19 +08:00
8 changed files with 44 additions and 13 deletions

View File

@@ -10,7 +10,7 @@
} }
], ],
"require": { "require": {
"igaster/laravel-theme": "^2.0.12", "igaster/laravel-theme": "^2.0.15",
"creativeorange/gravatar": "^1.0", "creativeorange/gravatar": "^1.0",
"orchestra/asset": "^4.0" "orchestra/asset": "^4.0"
}, },

View File

@@ -5,7 +5,16 @@
@endsection @endsection
@section('content') @section('content')
<div class="login-box"> @if(isset($login_note) AND $login_note)
<div class="alert alert-info alert-dismissible m-auto">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<h5><i class="icon fa fa-info"></i> NOTE!</h5>
{!! $login_note !!}
</div>
<br>
@endisset
<div class="login-box m-auto">
<div class="login-logo"> <div class="login-logo">
<a>{!! config('app.name_html_long') !!}</a> <a>{!! config('app.name_html_long') !!}</a>
</div> </div>

View File

@@ -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)

View File

@@ -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)

View File

@@ -39,7 +39,12 @@
<link rel="stylesheet" href="{{ asset('/css/adminlte.min.css') }}"> <link rel="stylesheet" href="{{ asset('/css/adminlte.min.css') }}">
@if(file_exists('css/fixes.css')) @if(file_exists('css/fixes.css'))
<!-- CSS Fixes --> <!-- CSS Fixes -->
<link rel="stylesheet" href="{{ asset('/css/fixes.css') }}"> <link rel="stylesheet" href="{{ asset('/css/fixes.css') }}">
@endif @endif
@if(file_exists('css/custom.css'))
<!-- Custom CSS -->
<link rel="stylesheet" href="{{ asset('/css/custom.css') }}">
@endif
</head> </head>

View File

@@ -11,7 +11,7 @@
<!-- SEARCH FORM --> <!-- SEARCH FORM -->
<form class="form-inline ml-3"> <form class="form-inline ml-3">
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">
<input class="form-control form-control-navbar" name="q" type="search" placeholder="Search" aria-label="Search"> <input class="form-control form-control-navbar" name="q" type="search" placeholder="Search" aria-label="Search" autocomplete="off">
<div class="input-group-append"> <div class="input-group-append">
<button class="btn btn-navbar" type="submit"> <button class="btn btn-navbar" type="submit">
<i class="fa fa-search"></i> <i class="fa fa-search"></i>
@@ -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 -->

View File

@@ -60,9 +60,19 @@
$(this).removeClass('hold-transition'); $(this).removeClass('hold-transition');
}); });
}else{ }else{
$("body").addClass('sidebar-collapse'); $("body")
.addClass('sidebar-collapse')
.delay(500).queue(function () {
window.dispatchEvent(new Event('resize'));
$(this).dequeue();
});
} }
} }
} }
}); });
</script> </script>
@if(file_exists('js/custom.js'))
<!-- Any Custom JS -->
<script src="{{ asset('js/custom.js') }}"></script>
@endif

View File

@@ -11,11 +11,16 @@
<!-- Sidebar user panel (optional) --> <!-- Sidebar user panel (optional) -->
<div class="user-panel mt-3 pb-3 mb-3 d-flex"> <div class="user-panel mt-3 pb-3 mb-3 d-flex">
<div class="image"> <div class="image">
<img src="{{ Gravatar::get(($user->exists AND $user->email) ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User"> @if($user->exists)
<img src="{{ Gravatar::get(($user->exists AND $user->email) ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
@else
<a name="login" href="{{ url()->current().'?login=1' }}" class="d-block"><i class="pl-1 fa fa-3x fa-lock"></i></a>
@endif
</div> </div>
<div class="info"> <div class="info">
<a href="{{ url('login') }}" class="d-block">{{ $user->name ?: 'Nobody' }}</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>