Skynet/misc_pterodactyl-panel
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes error display on login form; closes #46

Browse source
This commit is contained in:
Dane Everitt 2016-01-25 19:21:26 -05:00
parent dd58bdfff6
commit 94f5bf0862
2 changed files with 45 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
resources/views/auth/login.blade.php
View file

@ -29,8 +29,33 @@
@section('sidebar') @section('sidebar')
@endsection @endsection
@section('resp-alerts')
@endsection
@section('resp-errors')
@endsection
@section('content') @section('content')
<div class="col-md-8"> <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"> <form action="/auth/login" method="POST" id="login-form">
<legend>{{ trans('strings.login') }}</legend> <legend>{{ trans('strings.login') }}</legend>
<fieldset> <fieldset>

36
resources/views/layouts/master.blade.php
View file

@ -234,25 +234,29 @@
<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">
@if (count($errors) > 0) @section('resp-errors')
<div class="alert alert-danger"> @if (count($errors) > 0)
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button> <div class="alert alert-danger">
<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> <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> </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
@endforeach @show
</div> </div>
</div> </div>
<div class="row"> <div class="row">