Skip to content

Commit 94f5bf0

Browse files
committed
fixes error display on login form; closes pterodactyl#46
1 parent dd58bdf commit 94f5bf0

File tree

2 files changed

+45
-16
lines changed

2 files changed

+45
-16
lines changed

resources/views/auth/login.blade.php

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,33 @@
2929
@section('sidebar')
3030
@endsection
3131

32+
@section('resp-alerts')
33+
@endsection
34+
35+
@section('resp-errors')
36+
@endsection
37+
3238
@section('content')
3339
<div class="col-md-8">
40+
@if (count($errors) > 0)
41+
<div class="alert alert-danger">
42+
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
43+
<strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
44+
<ul>
45+
@foreach ($errors->all() as $error)
46+
<li>{{ $error }}</li>
47+
@endforeach
48+
</ul>
49+
</div>
50+
@endif
51+
@foreach (Alert::getMessages() as $type => $messages)
52+
@foreach ($messages as $message)
53+
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
54+
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
55+
{!! $message !!}
56+
</div>
57+
@endforeach
58+
@endforeach
3459
<form action="/auth/login" method="POST" id="login-form">
3560
<legend>{{ trans('strings.login') }}</legend>
3661
<fieldset>

resources/views/layouts/master.blade.php

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -234,25 +234,29 @@
234234
<div class="col-md-9">
235235
<div class="row">
236236
<div class="col-md-12" id="tpl_messages">
237-
@if (count($errors) > 0)
238-
<div class="alert alert-danger">
239-
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
240-
<strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
241-
<ul>
242-
@foreach ($errors->all() as $error)
243-
<li>{{ $error }}</li>
244-
@endforeach
245-
</ul>
246-
</div>
247-
@endif
248-
@foreach (Alert::getMessages() as $type => $messages)
249-
@foreach ($messages as $message)
250-
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
237+
@section('resp-errors')
238+
@if (count($errors) > 0)
239+
<div class="alert alert-danger">
251240
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
252-
{!! $message !!}
241+
<strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
242+
<ul>
243+
@foreach ($errors->all() as $error)
244+
<li>{{ $error }}</li>
245+
@endforeach
246+
</ul>
253247
</div>
248+
@endif
249+
@show
250+
@section('resp-alerts')
251+
@foreach (Alert::getMessages() as $type => $messages)
252+
@foreach ($messages as $message)
253+
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
254+
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
255+
{!! $message !!}
256+
</div>
257+
@endforeach
254258
@endforeach
255-
@endforeach
259+
@show
256260
</div>
257261
</div>
258262
<div class="row">

0 commit comments

Comments
 (0)