fixes error display on login form; closes #46

pterodactyl · Jan 26, 2016 · 94f5bf0 · 94f5bf0
1 parent dd58bdf
commit 94f5bf0
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 16 deletions.
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
@@ -29,8 +29,33 @@
 @section('sidebar')
 @endsection
 
+@section('resp-alerts')
+@endsection
+
+@section('resp-errors')
+@endsection
+
 @section('content')
 <div class="col-md-8">
+    @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">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                {!! $message !!}
+            </div>
+        @endforeach
+    @endforeach
     <form action="/auth/login" method="POST" id="login-form">
         <legend>{{ trans('strings.login') }}</legend>
         <fieldset>

diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
@@ -234,25 +234,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">