MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-30 11:53:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes double error display on login forms

Browse Source
This commit is contained in:
Dane Everitt
2016-10-29 20:29:26 -04:00
parent 51c07bf1f2
commit d3220fa553
2 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/layouts/admin.blade.php
View File

@@ -155,6 +155,7 @@
<div class="col-md-9"> <div class="col-md-9">
<div class="row"> <div class="row">
<div class="col-md-12" id="tpl_messages"> <div class="col-md-12" id="tpl_messages">
@section('resp-errors')
@if (count($errors) > 0) @if (count($errors) > 0)
<div class="alert alert-danger"> <div class="alert alert-danger">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
@@ -166,6 +167,8 @@
</ul> </ul>
</div> </div>
@endif @endif
@show
@section('resp-alerts')
@foreach (Alert::getMessages() as $type => $messages) @foreach (Alert::getMessages() as $type => $messages)
@foreach ($messages as $message) @foreach ($messages as $message)
<div class="alert alert-{{ $type }} alert-dismissable" role="alert"> <div class="alert alert-{{ $type }} alert-dismissable" role="alert">
@@ -174,6 +177,7 @@
</div> </div>
@endforeach @endforeach
@endforeach @endforeach
@show
</div> </div>
</div> </div>
<div class="row"> <div class="row">

4
resources/views/layouts/master.blade.php
View File

@@ -260,6 +260,7 @@
<div class="col-md-9"> <div class="col-md-9">
<div class="row"> <div class="row">
<div class="col-md-12" id="tpl_messages"> <div class="col-md-12" id="tpl_messages">
@section('resp-errors')
@if (count($errors) > 0) @if (count($errors) > 0)
<div class="alert alert-danger"> <div class="alert alert-danger">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
@@ -271,6 +272,8 @@
</ul> </ul>
</div> </div>
@endif @endif
@show
@section('resp-alerts')
@foreach (Alert::getMessages() as $type => $messages) @foreach (Alert::getMessages() as $type => $messages)
@foreach ($messages as $message) @foreach ($messages as $message)
<div class="alert alert-{{ $type }} alert-dismissable" role="alert"> <div class="alert alert-{{ $type }} alert-dismissable" role="alert">
@@ -279,6 +282,7 @@
</div> </div>
@endforeach @endforeach
@endforeach @endforeach
@show
</div> </div>
</div> </div>
<div class="row"> <div class="row">