Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
e5ff189d3e | ||
|
|
1efdfca55f | ||
|
|
6d876f2c94 | ||
|
|
70a7142877 | ||
|
|
c406c35ff7 |
@@ -10,7 +10,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"igaster/laravel-theme": "^2.0",
|
"igaster/laravel-theme": "^2.0.12",
|
||||||
"acacha/user": "^0.2.2",
|
"acacha/user": "^0.2.2",
|
||||||
"creativeorange/gravatar": "^1.0",
|
"creativeorange/gravatar": "^1.0",
|
||||||
"orchestra/asset": "^3.6"
|
"orchestra/asset": "^3.6"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<!-- Compiled app javascript -->
|
<!-- Compiled app javascript -->
|
||||||
<script src="{{ url (mix('/js/app.js')) }}"></script>
|
<script src="{{ asset('/js/app.js') }}"></script>
|
||||||
<!-- iCheck -->
|
<!-- iCheck -->
|
||||||
<script src="/plugin/iCheck/icheck.min.js"></script>
|
<script src="{{ asset('/plugin/iCheck/icheck.min.js') }}"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
@include('adminlte::layouts.partials.htmlheader')
|
@include('adminlte::layouts.partials.htmlheader')
|
||||||
@show
|
@show
|
||||||
|
|
||||||
<body class="hold-transition sidebar-mini">
|
<body class="hold-transition sidebar-mini @if (Cookie::get('toggleState') === 'closed') {{ 'sidebar-collapse' }} @endif">
|
||||||
<div id="app">
|
<div id="app">
|
||||||
<div class="wrapper">
|
<div class="wrapper">
|
||||||
@include('adminlte::layouts.partials.mainheader')
|
@include('adminlte::layouts.partials.mainheader')
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
@include('adminlte::layouts.partials.htmlheader')
|
@include('adminlte::layouts.partials.htmlheader')
|
||||||
|
|
||||||
<!-- iCheck -->
|
<!-- iCheck -->
|
||||||
<link rel="stylesheet" href="/plugin/iCheck/square/blue.css">
|
<link rel="stylesheet" href="{{ asset('/plugin/iCheck/square/blue.css') }}">
|
||||||
@show
|
@show
|
||||||
|
|
||||||
<body class="hold-transition login-page">
|
<body class="hold-transition login-page">
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
<!-- Content Header (Page header) -->
|
<!-- Content Header (Page header) -->
|
||||||
<div class="content-header">
|
<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-6">
|
||||||
<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-6">
|
||||||
<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>
|
||||||
@@ -14,7 +15,7 @@
|
|||||||
<li class="breadcrumb-item"><a href="{{url($url)}}">{{ $item }}</a></li>
|
<li class="breadcrumb-item"><a href="{{url($url)}}">{{ $item }}</a></li>
|
||||||
@endforeach
|
@endforeach
|
||||||
@endisset
|
@endisset
|
||||||
<li class="breadcrumb-item active">@yield('contentheader_title', 'Content Title')</li>
|
<li class="breadcrumb-item active">@yield('page_title','Page Title')</li>
|
||||||
</ol>
|
</ol>
|
||||||
</div><!-- /.col -->
|
</div><!-- /.col -->
|
||||||
</div><!-- /.row -->
|
</div><!-- /.row -->
|
||||||
|
|||||||
@@ -6,23 +6,23 @@
|
|||||||
<!-- CSRF Token -->
|
<!-- CSRF Token -->
|
||||||
<meta name="csrf-token" content="{{ csrf_token() }}">
|
<meta name="csrf-token" content="{{ csrf_token() }}">
|
||||||
|
|
||||||
<link href="{{ asset('/css/app.css') }}" rel="stylesheet" type="text/css" />
|
<link rel="stylesheet" href="{{ asset('/css/app.css') }}">
|
||||||
|
|
||||||
<!-- Font Awesome Icons -->
|
<!-- Font Awesome Icons -->
|
||||||
<link rel="stylesheet" href="/plugin/font-awesome/css/font-awesome.min.css">
|
<link rel="stylesheet" href="{{ asset('/plugin/font-awesome/css/font-awesome.min.css') }}">
|
||||||
<!-- IonIcons -->
|
<!-- IonIcons -->
|
||||||
<link rel="stylesheet" href="//code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
|
<link rel="stylesheet" href="{{ request()->getScheme() }}://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
|
||||||
<!-- Theme style -->
|
|
||||||
<link rel="stylesheet" href="/css/adminlte.min.css">
|
|
||||||
<!-- Google Font: Source Sans Pro -->
|
<!-- Google Font: Source Sans Pro -->
|
||||||
<link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
|
<link href="{{ request()->getScheme() }}://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
|
||||||
|
|
||||||
@if(file_exists('css/social.css'))
|
@if(file_exists('css/social.css'))
|
||||||
<!-- Social Logins -->
|
<!-- Social Logins -->
|
||||||
<link rel="stylesheet" href="/css/social.css">
|
<link rel="stylesheet" href="{{ asset('/css/social.css') }}">
|
||||||
@endif
|
@endif
|
||||||
@if(file_exists('css/print.css'))
|
@if(file_exists('css/print.css'))
|
||||||
<!-- Printing Modifications -->
|
<!-- Printing Modifications -->
|
||||||
<link rel="stylesheet" href="/css/print.css">
|
<link rel="stylesheet" href="{{ asset('/css/print.css') }}">
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
|
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
|
||||||
@@ -32,28 +32,14 @@
|
|||||||
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
|
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
|
||||||
<![endif]-->
|
<![endif]-->
|
||||||
|
|
||||||
<script>
|
|
||||||
//See https://laracasts.com/discuss/channels/vue/use-trans-in-vuejs
|
|
||||||
window.trans =
|
|
||||||
@php
|
|
||||||
// @todo Cache this processing
|
|
||||||
// copy all translations from /resources/lang/CURRENT_LOCALE/* to global JS variable
|
|
||||||
$lang_files = File::files(resource_path() . '/lang/' . App::getLocale());
|
|
||||||
$trans = [];
|
|
||||||
foreach ($lang_files as $f) {
|
|
||||||
$filename = pathinfo($f)['filename'];
|
|
||||||
$trans[$filename] = trans($filename);
|
|
||||||
}
|
|
||||||
$trans['adminlte_lang_message'] = trans('adminlte_lang::message');
|
|
||||||
echo json_encode($trans);
|
|
||||||
@endphp
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<!-- STYLESHEETS -->
|
<!-- STYLESHEETS -->
|
||||||
{!! Asset::styles() !!}
|
{!! Asset::styles() !!}
|
||||||
|
|
||||||
|
<!-- Theme style -->
|
||||||
|
<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="/css/fixes.css">
|
<link rel="stylesheet" href="{{ asset('/css/fixes.css') }}">
|
||||||
@endif
|
@endif
|
||||||
</head>
|
</head>
|
||||||
@@ -33,7 +33,13 @@
|
|||||||
<i class="fa fa-cog"></i>
|
<i class="fa fa-cog"></i>
|
||||||
</a>
|
</a>
|
||||||
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
|
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
|
||||||
<span class="dropdown-item dropdown-header">{{ $user->name ?: 'User Name' }}</span>
|
<span class="dropdown-item dropdown-header @if($user->switched) bg-danger @endif">
|
||||||
|
@if($user->switched)
|
||||||
|
SUDO (<small>{{ $user->name ?: 'User Name' }}</small>)
|
||||||
|
@else
|
||||||
|
{{ $user->name ?: 'User Name' }}
|
||||||
|
@endif
|
||||||
|
</span>
|
||||||
|
|
||||||
<div class="dropdown-divider"></div>
|
<div class="dropdown-divider"></div>
|
||||||
<a href="{{ url('settings') }}" class="dropdown-item">
|
<a href="{{ url('settings') }}" class="dropdown-item">
|
||||||
@@ -41,11 +47,19 @@
|
|||||||
</a>
|
</a>
|
||||||
|
|
||||||
<div class="dropdown-divider"></div>
|
<div class="dropdown-divider"></div>
|
||||||
<a href="{{ url('logout') }}" class="dropdown-item">
|
@if ($user->switched)
|
||||||
<i class="fa fa-sign-out mr-2"></i> Log Out
|
<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item" id="switch">
|
||||||
</a>
|
<i class="fa fa-sign-out mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }}
|
||||||
|
</a>
|
||||||
|
@else
|
||||||
|
<a href="{{ url('logout') }}" class="dropdown-item">
|
||||||
|
<i class="fa fa-sign-out mr-2"></i> Log Out
|
||||||
|
</a>
|
||||||
|
@endif
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
|
@else
|
||||||
|
<a href="{{ url('login') }}" class="text-muted pr-2"><i class="fa fa-lock"></i></a>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
<!-- Control Side Bar -->
|
<!-- Control Side Bar -->
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<!-- REQUIRED JS SCRIPTS -->
|
<!-- REQUIRED JS SCRIPTS -->
|
||||||
<!-- JQuery and bootstrap are required by Laravel 5.7 in resources/js/bootstrap.js-->
|
<!-- JQuery and bootstrap are required by Laravel 5.7 in resources/js/bootstrap.js-->
|
||||||
<!-- Laravel App -->
|
<!-- Laravel App -->
|
||||||
<script src="{{ url(mix('/js/app.js')) }}" type="text/javascript"></script>
|
<script src="{{ asset('/js/app.js') }}" type="text/javascript"></script>
|
||||||
<!-- AdminLTE -->
|
<!-- AdminLTE -->
|
||||||
<script src="/js/adminlte.min.js"></script>
|
<script src="{{ asset('/js/adminlte.min.js') }}"></script>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
// Our CSRF token to each interaction
|
// Our CSRF token to each interaction
|
||||||
@@ -21,19 +21,32 @@
|
|||||||
NoTransitionAfterReload: false
|
NoTransitionAfterReload: false
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Work out our timezone.
|
||||||
|
const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
|
||||||
|
|
||||||
$(function () {
|
$(function () {
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
$("body").on("collapsed.lte.pushmenu", function(){
|
$("body").on("collapsed.lte.pushmenu", function(){
|
||||||
if($.AdminLTESidebarTweak.options.EnableRemember){
|
if($.AdminLTESidebarTweak.options.EnableRemember) {
|
||||||
document.cookie = "toggleState=closed";
|
document.cookie = "toggleState=closed;path=/";
|
||||||
|
|
||||||
|
$("body").delay(500).queue(function () {
|
||||||
|
window.dispatchEvent(new Event('resize'));
|
||||||
|
$(this).dequeue();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// @todo this is not firing.
|
// @todo this is not firing.
|
||||||
$("body").on("expanded.lte.pushmenu", function(){
|
$("body").on("shown.lte.pushmenu", function(){
|
||||||
if($.AdminLTESidebarTweak.options.EnableRemember){
|
if($.AdminLTESidebarTweak.options.EnableRemember){
|
||||||
document.cookie = "toggleState=opened";
|
document.cookie = "toggleState=opened;path=/";
|
||||||
|
|
||||||
|
$("body").delay(500).queue(function () {
|
||||||
|
window.dispatchEvent(new Event('resize'));
|
||||||
|
$(this).dequeue();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<!-- Main Sidebar Container -->
|
<!-- Main Sidebar Container -->
|
||||||
<aside class="main-sidebar sidebar-dark-primary elevation-4">
|
<aside class="main-sidebar sidebar-dark-primary elevation-4 d-print-none">
|
||||||
<!-- Brand Logo -->
|
<!-- Brand Logo -->
|
||||||
<a href="{{ url('home') }}" class="brand-link">
|
<a href="{{ url('home') }}" class="brand-link">
|
||||||
<img src="/img/logo.png" alt="Logo" class="brand-image img-circle elevation-3" style="opacity: .8">
|
<img src="{{ asset('/img/logo.png') }}" alt="Logo" class="brand-image img-circle elevation-3" style="opacity: .8">
|
||||||
<span class="brand-text font-weight-light">{!! config('app.name_html_long','<b>App</b>Name') !!}</span>
|
<span class="brand-text font-weight-light">{!! config('app.name_html_long','<b>App</b>Name') !!}</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
@@ -11,10 +11,10 @@
|
|||||||
<!-- 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 ? $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">
|
||||||
</div>
|
</div>
|
||||||
<div class="info">
|
<div class="info">
|
||||||
<a class="d-block">{{ $user->name ?: 'Nobody' }}</a>
|
<a href="{{ url('login') }}" class="d-block">{{ $user->name ?: 'Nobody' }}</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user