Merged updates from other projects
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
@extends('layouts.auth')
|
||||
@extends('adminlte::layouts.auth')
|
||||
|
||||
@section('htmlheader_title')
|
||||
Log in
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
@if (count($errors) > 0)
|
||||
<div class="alert alert-danger">
|
||||
<strong>Whoops!</strong> {{ trans('message.someproblems') }}<br><br>
|
||||
<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@@ -24,20 +24,21 @@
|
||||
@endif
|
||||
|
||||
<div class="login-box-body">
|
||||
<p class="login-box-msg"> {{ trans('message.siginsession') }} </p>
|
||||
<p class="login-box-msg"> {{ trans('adminlte_lang::message.siginsession') }} </p>
|
||||
|
||||
<login-form name="{{ config('auth.providers.users.field','email') }}"
|
||||
domain="{{ config('auth.defaults.domain','') }}"></login-form>
|
||||
|
||||
<a href="{{ url('/password/reset') }}">{{ trans('message.forgotpassword') }}</a><br>
|
||||
<a href="{{ url('/password/reset') }}">{{ trans('adminlte_lang::message.forgotpassword') }}</a><br>
|
||||
|
||||
@if(isset($site_social))
|
||||
@include('auth.partials.social_login')
|
||||
@if(count(config('auth.social',[])))
|
||||
@include('adminlte::auth.partials.social_login')
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@include('layouts.partials.scripts_auth')
|
||||
|
||||
@include('adminlte::layouts.partials.scripts_auth')
|
||||
|
||||
<script>
|
||||
$(function () {
|
||||
|
Reference in New Issue
Block a user