mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-16 18:25:00 -06:00
Some changes to the login view.
This commit is contained in:
James Cole
parent
14aacf42b9
commit
3068a8d58d
@ -47,8 +47,6 @@ class UserController extends BaseController
|
||||
];
|
||||
$result = Auth::attempt($data, $rememberMe);
|
||||
if ($result) {
|
||||
Session::flash('success', 'Logged in!');
|
||||
|
||||
return Redirect::route('index');
|
||||
}
|
||||
|
||||
|
||||
@ -1,53 +1,40 @@
|
||||
@extends('layouts.guest')
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-md-12 col-sm-12">
|
||||
<h1>Firefly<br/>
|
||||
<small>Login</small>
|
||||
</h1>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-md-12 col-sm-12">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4 col-md-offset-4">
|
||||
<div class="login-panel panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">Firefly III — Sign In</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-4 col-md-4 col-sm-12">
|
||||
{{Form::open()}}
|
||||
<div class="form-group">
|
||||
<label for="inputEmail">Email address</label>
|
||||
<input type="email" class="form-control" id="inputEmail" name="email" placeholder="Enter email">
|
||||
<input type="email" class="form-control" id="inputEmail" name="email" placeholder="E-mail">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="inputPassword">Password</label>
|
||||
<input type="password" class="form-control" id="inputPassword" name="password" placeholder="Password">
|
||||
</div>
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" name="remember_me" value="1"> Remember login
|
||||
<input type="checkbox" name="remember_me" value="1"> Remember me
|
||||
</label>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-info">Login</button>
|
||||
<p>
|
||||
<button type="submit" class="btn btn-lg btn-success btn-block">Login</button>
|
||||
</p>
|
||||
<div class="btn-group btn-group-justified btn-group-sm">
|
||||
@if(Config::get('auth.allow_register') === true)
|
||||
<a href="{{route('register')}}" class="btn btn-default">Register</a>
|
||||
@endif
|
||||
<a href="{{route('remindme')}}" class="btn btn-default">Forgot your password?</a>
|
||||
</div>
|
||||
{{Form::close()}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-lg-4 col-md-4 col-sm-12">
|
||||
<p>
|
||||
|
||||
</p>
|
||||
@if(Config::get('auth.allow_register') === true)
|
||||
<p>
|
||||
<a href="{{route('register')}}" class="btn btn-default">Register a new account</a>
|
||||
</p>
|
||||
@endif
|
||||
<p>
|
||||
<a href="{{route('remindme')}}" class="btn btn-default">Forgot your password?</a>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@stop
|
||||
@ -1,42 +1,33 @@
|
||||
@extends('layouts.guest')
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-md-12 col-sm-12">
|
||||
<h1>Firefly<br/>
|
||||
<small>Register a new account</small>
|
||||
</h1>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4 col-md-offset-4">
|
||||
<div class="login-panel panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">Firefly III — Register</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<p>
|
||||
Registering an account on Firefly requires an e-mail address.
|
||||
All instructions will be sent to you.
|
||||
</p>
|
||||
{{Form::open()}}
|
||||
<div class="form-group">
|
||||
<label for="inputEmail">Email address</label>
|
||||
<input type="email" class="form-control" id="inputEmail" name="email" placeholder="Enter email">
|
||||
</div>
|
||||
<p>
|
||||
<button type="submit" class="btn btn-success btn-lg btn-block">Submit</button>
|
||||
</p>
|
||||
{{Form::close()}}
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-md-12 col-sm-12">
|
||||
</div>
|
||||
</div>
|
||||
<div class="btn-group btn-group-justified btn-group-sm">
|
||||
<a href="{{route('login')}}" class="btn btn-default">Back to the login form</a>
|
||||
<a href="{{route('remindme')}}" class="btn btn-default">Forgot your password?</a>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-4 col-md-4 col-sm-12">
|
||||
{{Form::open()}}
|
||||
<div class="form-group">
|
||||
<label for="inputEmail">Email address</label>
|
||||
<input type="email" class="form-control" id="inputEmail" name="email" placeholder="Enter email">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-info">Submit</button>
|
||||
{{Form::close()}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-lg-4 col-md-4 col-sm-12">
|
||||
<p>
|
||||
|
||||
</p>
|
||||
<p>
|
||||
<a href="{{route('login')}}" class="btn btn-default">Back to login form</a>
|
||||
</p>
|
||||
<p>
|
||||
<a href="{{route('remindme')}}" class="btn btn-default">Reset password</a>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
@ -1,42 +1,27 @@
|
||||
@extends('layouts.guest')
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-md-12 col-sm-12">
|
||||
<h1>Firefly<br/>
|
||||
<small>Forgot your password?</small>
|
||||
</h1>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-md-12 col-sm-12">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-4 col-md-4 col-sm-12">
|
||||
{{Form::open()}}
|
||||
<div class="form-group">
|
||||
<label for="inputEmail">Email address</label>
|
||||
<input type="email" class="form-control" id="inputEmail" name="email" placeholder="Enter email">
|
||||
<div class="col-md-4 col-md-offset-4">
|
||||
<div class="login-panel panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">Firefly III — Reset your password</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
{{Form::open()}}
|
||||
<div class="form-group">
|
||||
<label for="inputEmail">Email address</label>
|
||||
<input type="email" class="form-control" id="inputEmail" name="email" placeholder="Enter email">
|
||||
</div>
|
||||
<p>
|
||||
<button type="submit" class="btn btn-success btn-lg btn-block">Submit</button>
|
||||
</p>
|
||||
{{Form::close()}}
|
||||
<div class="btn-group btn-group-justified btn-group-sm">
|
||||
<a href="{{route('login')}}" class="btn btn-default">Back to the login form</a>
|
||||
<a href="{{route('register')}}" class="btn btn-default">Register a new account</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-info">Submit</button>
|
||||
{{Form::close()}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-lg-4 col-md-4 col-sm-12">
|
||||
<p>
|
||||
|
||||
</p>
|
||||
<p>
|
||||
<a href="{{route('login')}}" class="btn btn-default">Back to login form</a>
|
||||
</p>
|
||||
<p>
|
||||
<a href="{{route('register')}}" class="btn btn-default">Register a new account</a>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
Loading…
Reference in New Issue
Block a user