Compare commits

...

2 Commits

Author SHA1 Message Date
Deon George
a946ce4418 Added error dialog on login box 2019-09-03 14:38:19 +10:00
Deon George
e5ff189d3e Added tz and move adminlte css to later 2019-08-20 15:50:15 +10:00
4 changed files with 19 additions and 21 deletions

View File

@@ -29,11 +29,11 @@ return [
'signGithub' => 'Sign in using Github',
'signFacebook' => 'Sign in using Facebook',
'signTwitter' => 'Sign in using Twitter',
'signGoogle+' => 'Sign in using Google+',
'signGoogle' => 'Sign in using Google',
'signLinkedin' => 'Sign in using Linkedin',
'signW3id' => 'Sign in using W3id',
'signIBMid' => 'Sign in using IBMid',
'signMeetup' => 'Sign in using Meetup',
'signMeetup' => 'Sign in using Meetup',
'sendpassword' => 'Send Password Reset Link',
'passwordreset' => 'Reset password',
'pagenotfound' => 'Page not found',

View File

@@ -21,6 +21,15 @@
</div>
@endif
@if (Session::has('error'))
<div class="alert alert-danger">
<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
<ul>
<li>{{ Session::get('error') }}</li>
</ul>
</div>
@endif
<!-- /.login-logo -->
<div class="card">
<div class="card-body login-card-body">

View File

@@ -12,10 +12,10 @@
<link rel="stylesheet" href="{{ asset('/plugin/font-awesome/css/font-awesome.min.css') }}">
<!-- IonIcons -->
<link rel="stylesheet" href="{{ request()->getScheme() }}://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
<!-- Theme style -->
<link rel="stylesheet" href="{{ asset('/css/adminlte.min.css') }}">
<!-- Google Font: Source Sans Pro -->
<link href="{{ request()->getScheme() }}://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
@if(file_exists('css/social.css'))
<!-- Social Logins -->
<link rel="stylesheet" href="{{ asset('/css/social.css') }}">
@@ -32,26 +32,12 @@
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![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 -->
{!! Asset::styles() !!}
<!-- Theme style -->
<link rel="stylesheet" href="{{ asset('/css/adminlte.min.css') }}">
@if(file_exists('css/fixes.css'))
<!-- CSS Fixes -->
<link rel="stylesheet" href="{{ asset('/css/fixes.css') }}">

View File

@@ -21,6 +21,9 @@
NoTransitionAfterReload: false
};
// Work out our timezone.
const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
$(function () {
"use strict";