From d3220fa553e67e83897dbcc21400bd39972bd63e Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sat, 29 Oct 2016 20:29:26 -0400
Subject: [PATCH] Fixes double error display on login forms

---
 resources/views/layouts/admin.blade.php  | 36 +++++++++++++-----------
 resources/views/layouts/master.blade.php | 36 +++++++++++++-----------
 2 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php
index 2ff4b0713..05f476f67 100644
--- a/resources/views/layouts/admin.blade.php
+++ b/resources/views/layouts/admin.blade.php
@@ -155,25 +155,29 @@
             <div class="col-md-9">
                 <div class="row">
                     <div class="col-md-12" id="tpl_messages">
-                        @if (count($errors) > 0)
-                            <div class="alert alert-danger">
-                                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                                <strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
-                                <ul>
-                                    @foreach ($errors->all() as $error)
-                                        <li>{{ $error }}</li>
-                                    @endforeach
-                                </ul>
-                            </div>
-                        @endif
-                        @foreach (Alert::getMessages() as $type => $messages)
-                            @foreach ($messages as $message)
-                                <div class="alert alert-{{ $type }} alert-dismissable" role="alert">
+                        @section('resp-errors')
+                            @if (count($errors) > 0)
+                                <div class="alert alert-danger">
                                     <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                                    {!! $message !!}
+                                    <strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
+                                    <ul>
+                                        @foreach ($errors->all() as $error)
+                                            <li>{{ $error }}</li>
+                                        @endforeach
+                                    </ul>
                                 </div>
+                            @endif
+                        @show
+                        @section('resp-alerts')
+                            @foreach (Alert::getMessages() as $type => $messages)
+                                @foreach ($messages as $message)
+                                    <div class="alert alert-{{ $type }} alert-dismissable" role="alert">
+                                        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                                        {!! $message !!}
+                                    </div>
+                                @endforeach
                             @endforeach
-                        @endforeach
+                        @show
                     </div>
                 </div>
                 <div class="row">
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
index 903ec0a4e..522155139 100644
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -260,25 +260,29 @@
             <div class="col-md-9">
                 <div class="row">
                     <div class="col-md-12" id="tpl_messages">
-                        @if (count($errors) > 0)
-                            <div class="alert alert-danger">
-                                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                                <strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
-                                <ul>
-                                    @foreach ($errors->all() as $error)
-                                        <li>{{ $error }}</li>
-                                    @endforeach
-                                </ul>
-                            </div>
-                        @endif
-                        @foreach (Alert::getMessages() as $type => $messages)
-                            @foreach ($messages as $message)
-                                <div class="alert alert-{{ $type }} alert-dismissable" role="alert">
+                        @section('resp-errors')
+                            @if (count($errors) > 0)
+                                <div class="alert alert-danger">
                                     <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                                    {!! $message !!}
+                                    <strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
+                                    <ul>
+                                        @foreach ($errors->all() as $error)
+                                            <li>{{ $error }}</li>
+                                        @endforeach
+                                    </ul>
                                 </div>
+                            @endif
+                        @show
+                        @section('resp-alerts')
+                            @foreach (Alert::getMessages() as $type => $messages)
+                                @foreach ($messages as $message)
+                                    <div class="alert alert-{{ $type }} alert-dismissable" role="alert">
+                                        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                                        {!! $message !!}
+                                    </div>
+                                @endforeach
                             @endforeach
-                        @endforeach
+                        @show
                     </div>
                 </div>
                 <div class="row">