From 9d6ea6b2f678b4effb0a0d5a74b1b2551ba77a6f Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 21 Jun 2015 11:59:35 +0200
Subject: [PATCH] Some view updates [skip ci]

---
 resources/twig/auth/login.twig      | 91 ++++++++++++++--------------
 resources/twig/auth/password.twig   | 76 +++++++++++++-----------
 resources/twig/auth/register.twig   | 92 +++++++++++++----------------
 resources/twig/layout/guest.twig    | 44 ++++++--------
 resources/twig/list/bills.twig      |  2 +-
 resources/twig/list/categories.twig |  2 +-
 resources/twig/list/reminders.twig  | 45 --------------
 resources/twig/new-user/index.twig  | 75 +++++++++++------------
 8 files changed, 182 insertions(+), 245 deletions(-)
 delete mode 100644 resources/twig/list/reminders.twig

diff --git a/resources/twig/auth/login.twig b/resources/twig/auth/login.twig
index 8cd48afb22..59b52f7a25 100644
--- a/resources/twig/auth/login.twig
+++ b/resources/twig/auth/login.twig
@@ -2,56 +2,53 @@
 
 {% block content %}
 
-{% if errors.has('email') %}
-<div class="row">
-    <div class="col-lg-12">
-        <div class="alert alert-danger alert-dismissible" role="alert">
-            <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span></button>
-            <strong>Error!</strong> {{  errors.get('email')[0] }}
-        </div>
-    </div>
-</div>
-{% endif %}
-
-
-<div class="row">
-    <div class="col-md-4 col-md-offset-4">
-        <div class="login-panel panel panel-default">
-            <div class="box-header with-border">
-                <h3 class="panel-title">Firefly III &mdash; Sign In</h3>
+    {% if errors.has('email') %}
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="alert alert-danger alert-dismissible" role="alert">
+                    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+                    </button>
+                    <strong>Error!</strong> {{ errors.get('email')[0] }}
+                </div>
             </div>
-            <div class="box-body">
-                <form role="form" method="POST" id="login" action="/auth/login">
-                    <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                    <div class="form-group">
-                        <label class="control-label">E-Mail</label>
-                        <input type="email" class="form-control" id="inputEmail" name="email" placeholder="E-Mail">
-                    </div>
-
-                    <div class="form-group">
-                        <label class="control-label">Password</label>
-                        <input type="password" class="form-control" id="inputPassword" name="password" placeholder="Password">
-                    </div>
-
-
-        <div class="checkbox">
-            <label>
-                <input type="checkbox" name="remember" value="1"> Remember me
-            </label>
-        </div>
-        <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')  %}
-                <a href="{{ route('register') }}" class="btn btn-default">Register</a>
-            {% endif %}
-            <a href="/password/email" class="btn btn-default">Forgot your password?</a>
         </div>
+    {% endif %}
+
+
+    <div class="login-box-body">
+        <p class="login-box-msg">Sign in to start your session</p>
+
+        <form action="/auth/login" method="post">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
+
+            <div class="form-group has-feedback">
+                <input type="email" name="email" class="form-control" placeholder="Email"/>
+                <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
+            </div>
+            <div class="form-group has-feedback">
+                <input type="password" name="password" class="form-control" placeholder="Password"/>
+                <span class="glyphicon glyphicon-lock form-control-feedback"></span>
+            </div>
+            <div class="row">
+                <div class="col-xs-8">
+                    <div class="checkbox">
+                        <label>
+                            <input type="checkbox" name="remember" value="1"> Remember Me
+                        </label>
+                    </div>
+                </div>
+                <!-- /.col -->
+                <div class="col-xs-4">
+                    <button type="submit" class="btn btn-primary btn-block btn-flat">Sign In</button>
+                </div>
+                <!-- /.col -->
+            </div>
         </form>
+        {% if Config.get('auth.allow_register') %}
+            <a href="{{ route('register') }}" class="text-center">Register a new account</a><br>
+        {% endif %}
+        <a href="/password/email">I forgot my password</a>
     </div>
-</div>
-</div>
-</div>
+    <!-- /.login-box-body -->
 {% endblock %}
 
diff --git a/resources/twig/auth/password.twig b/resources/twig/auth/password.twig
index 4cd8359490..a0af6bfcac 100644
--- a/resources/twig/auth/password.twig
+++ b/resources/twig/auth/password.twig
@@ -1,45 +1,49 @@
 {% extends "./layout/guest.twig" %}
 
 {% block content %}
-    <div class="row">
-        <div class="col-md-4 col-md-offset-4">
-            <div class="login-panel panel panel-default">
-                <div class="box-header with-border">
-                    <h3 class="panel-title">Firefly III &mdash; Reset Password</h3>
+
+
+    {% if session.status %}
+        <div class="alert alert-success">
+            {{ session.status }}
+        </div>
+    {% endif %}
+
+    {% if errors|length > 0 %}
+        <div class="alert alert-danger">
+            <strong>Whoops!</strong> There were some problems with your input.<br><br>
+            <ul>
+                {% for error in errors.all %}
+                    <li>{{ error }}</li>
+                {% endfor %}
+            </ul>
+        </div>
+    {% endif %}
+
+    <div class="login-box-body">
+        <p class="login-box-msg">Reset your password</p>
+
+        <form role="form" method="POST" action="/password/email">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
+
+            <div class="form-group has-feedback">
+                <input type="email" class="form-control" name="email" placeholder="Email"/>
+                <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
+            </div>
+
+            <div class="row">
+                <!-- /.col -->
+                <div class="col-xs-12">
+                    <button type="submit" class="btn btn-primary btn-flat pull-right">Reset</button>
                 </div>
-				<div class="box-body">
-					{% if session.status %}
-						<div class="alert alert-success">
-							{{ session.status }}
-						</div>
-					{% endif %}
+                <!-- /.col -->
+            </div>
 
-					{% if errors|length > 0 %}
-						<div class="alert alert-danger">
-							<strong>Whoops!</strong> There were some problems with your input.<br><br>
-							<ul>
-								{% for error in errors.all %}
-									<li>{{ error }}</li>
-								{% endfor %}
-							</ul>
-						</div>
-					{% endif %}
+        </form>
 
-					<form role="form" method="POST" action="/password/email">
-						<input type="hidden" name="_token" value="{{ csrf_token() }}">
-						<div class="form-group">
-							<label class="control-label">E-Mail</label>
-                            <input type="email" class="form-control" placeholder="E-Mail" name="email" value="{{ old.email }}">
-						</div>
+        <a href="/auth/login">I want to login</a><br>
+        <a href="/password/email">I forgot my password</a>
 
-                        <p>
-                            <button type="submit" class="btn btn-lg btn-success btn-block">Send Password Reset</button>
-                        </p>
+    </div><!-- /.login-box-body -->
 
-					</form>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
 {% endblock %}
diff --git a/resources/twig/auth/register.twig b/resources/twig/auth/register.twig
index 2080c56768..ab329d2bee 100644
--- a/resources/twig/auth/register.twig
+++ b/resources/twig/auth/register.twig
@@ -1,58 +1,48 @@
 {% extends "./layout/guest.twig" %}
 
 {% block content %}
-	<div class="row">
-		<div class="col-md-4 col-md-offset-4">
-            <div class="login-panel panel panel-default">
-				<div class="box-header with-border">
-                    <h3 class="panel-title">Firefly III &mdash; Register</h3>
+
+    {% if errors|length > 0 %}
+        <div class="alert alert-danger">
+            <strong>Whoops!</strong> There were some problems with your input.<br><br>
+            <ul>
+                {% for error in errors.all %}
+                    <li>{{ error }}</li>
+                {% endfor %}
+            </ul>
+        </div>
+    {% endif %}
+
+
+
+    <div class="register-box-body">
+        <p class="login-box-msg">Register a new account</p>
+
+        <form role="form" id="register" method="POST" action="/auth/register">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}">
+
+            <div class="form-group has-feedback">
+                <input type="email" name="email" class="form-control" placeholder="Email"/>
+                <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
+            </div>
+            <div class="form-group has-feedback">
+                <input type="password" class="form-control" placeholder="Password" name="password"/>
+                <span class="glyphicon glyphicon-lock form-control-feedback"></span>
+            </div>
+            <div class="form-group has-feedback">
+                <input type="password" class="form-control" placeholder="Retype password" name="password_confirmation"/>
+                <span class="glyphicon glyphicon-log-in form-control-feedback"></span>
+            </div>
+            <div class="row">
+                <div class="col-xs-12">
+                    <button type="submit" class="btn btn-primary pull-right btn-flat">Register</button>
                 </div>
-				<div class="box-body">
-					<p>
-						Registering an account on Firefly requires an e-mail address.
-					</p>
-                    {% if errors|length > 0 %}
-						<div class="alert alert-danger">
-							<strong>Whoops!</strong> There were some problems with your input.<br><br>
-							<ul>
-                                {% for error in errors.all %}
-									<li>{{  error }}</li>
-								{% endfor %}
-							</ul>
-						</div>
-					{% endif %}
+                <!-- /.col -->
+            </div>
+        </form>
 
-					<form role="form" id="register" method="POST" action="/auth/register">
-						<input type="hidden" name="_token" value="{{ csrf_token() }}">
+        <a href="/auth/login">I want to login</a><br>
+        <a href="/password/email">I forgot my password</a>
+    </div><!-- /.form-box -->
 
-						<div class="form-group">
-							<label class="control-label">E-Mail</label>
-							<input type="email" class="form-control" placeholder="E-Mail" name="email" value="{{ old.email }}">
-						</div>
-
-						<div class="form-group">
-							<label class="control-label">Password</label>
-							<input type="password" placeholder="Password" class="form-control" name="password">
-						</div>
-
-						<div class="form-group">
-							<label class="control-label">Confirm Password</label>
-							<input type="password" placeholder="Confirm Password" class="form-control" name="password_confirmation">
-						</div>
-
-                        <p>
-                            <button type="submit" class="btn btn-lg btn-success btn-block">Register</button>
-                        </p>
-
-
-                        <div class="btn-group btn-group-justified btn-group-sm">
-                            <a href="/auth/login" class="btn btn-default">Login</a>
-                            <a href="/password/email" class="btn btn-default">Forgot your password?</a>
-                        </div>
-
-					</form>
-				</div>
-			</div>
-		</div>
-	</div>
 {% endblock %}
diff --git a/resources/twig/layout/guest.twig b/resources/twig/layout/guest.twig
index 90a026e44d..b6fb5346fc 100644
--- a/resources/twig/layout/guest.twig
+++ b/resources/twig/layout/guest.twig
@@ -1,24 +1,18 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
 <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <base href="{{ route('index') }}/">
+    <meta charset="UTF-8">
     <title>Firefly III</title>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
+    <base href="{{ route('index') }}/">
+    <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" type="text/css" media="all"/>
+    <link rel="stylesheet" href="font-awesome/css/font-awesome.min.css" type="text/css" media="all"/>
+    <link href="dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" type="text/css" media="all" />
-    <!-- <link rel="stylesheet" href="css/metisMenu.min.css" type="text/css" media="all" /> -->
-    <!-- new css for SB admin -->
-    <link rel="stylesheet" href="css/metisMenu.min.css" type="text/css" media="all" />
-    <link rel="stylesheet" href="css/sb-admin-2.css" type="text/css" media="all" />
-    <link rel="stylesheet" href="font-awesome/css/font-awesome.min.css" type="text/css" media="all" />
-
-    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-    <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
 
     <!-- favicons -->
@@ -41,22 +35,18 @@
     <meta name="msapplication-TileImage" content="/mstile-144x144.png?v=Lb54KlrQnz">
     <meta name="theme-color" content="#ffffff">
 
-
 </head>
-<body>
-<div class="container">
-
-    <!-- include "partials/flashes.twig" -->
-
-
-
+<body class="login-page">
+<div class="login-box">
+    <div class="login-logo">
+        <a href="{{ route('index') }}"><b>Firefly</b>III</a>
+    </div>
     {% block content %}{% endblock %}
 </div>
+<!-- /.login-box -->
+</body>
 <script type="text/javascript" src="js/jquery-2.1.3.min.js"></script>
 <script type="text/javascript" src="bootstrap/js/bootstrap.min.js"></script>
-<!-- new js for sb admin -->
-<script type="text/javascript" src="js/metisMenu.min.js"></script>
-<script type="text/javascript" src="js/sb-admin-2.js"></script>
 
 <script>
     (function (i, s, o, g, r, a, m) {
diff --git a/resources/twig/list/bills.twig b/resources/twig/list/bills.twig
index c20d3b1a63..f22c78b624 100644
--- a/resources/twig/list/bills.twig
+++ b/resources/twig/list/bills.twig
@@ -1,4 +1,4 @@
-<table class="table table-bordered table-striped sortable">
+<table class="table table-hover sortable">
     <thead>
     <tr>
         <th data-defaultsort="disabled">&nbsp;</th>
diff --git a/resources/twig/list/categories.twig b/resources/twig/list/categories.twig
index d2a2f6d3c4..2d4377d100 100644
--- a/resources/twig/list/categories.twig
+++ b/resources/twig/list/categories.twig
@@ -1,4 +1,4 @@
-<table class="table table-striped table-bordered sortable">
+<table class="table table-hover sortable">
     <thead>
         <tr>
             <th data-defaultsort="disabled">&nbsp;</th>
diff --git a/resources/twig/list/reminders.twig b/resources/twig/list/reminders.twig
deleted file mode 100644
index c3d597cc35..0000000000
--- a/resources/twig/list/reminders.twig
+++ /dev/null
@@ -1,45 +0,0 @@
-<div class="row">
-    {% if reminders|length > 0 %}
-        {% for reminder in reminders %}
-            <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-                <div class="box">
-                    <div class="box-header with-border">
-                        <a href="{{ route('reminders.show',reminder.id) }}">
-                        {% if reminder.notnow %}
-                            Dismissed reminder
-                        {% else %}
-                            Reminder
-                        {% endif %}
-                        for piggy bank "{{reminder.remindersable.name}}"
-                        </a>
-                    </div>
-                    <div class="box-body">
-                        <p>
-                            This reminder is active between {{reminder.startdate.format('jS F Y')}}
-                            and {{reminder.enddate.format('jS F Y')}}.
-                        </p>
-                        {% if reminder.description %}
-                            <p>{{ reminder.description|raw }}</p>
-                        {% endif %}
-                    </div>
-                    <div class="panel-footer">
-                        <div class="btn-group">
-                            {% if not reminder.notnow %}
-                                <a class="btn btn-warning" href="{{route('reminders.dismiss',reminder.id)}}">Dismiss</a>
-                            {% endif %}
-                            {% if reminder.active %}
-                                <a class="btn btn-success" href="{{route('reminders.act',reminder.id)}}">Act</a>
-                            {% endif %}
-                        </div>
-                    </div>
-                </div>
-            </div>
-        {% endfor %}
-    {% else %}
-        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-            <p class="small">
-                (No reminders)
-            </p>
-        </div>
-    {% endif %}
-</div>
diff --git a/resources/twig/new-user/index.twig b/resources/twig/new-user/index.twig
index 6fb5e5580f..42b0cf6a4d 100644
--- a/resources/twig/new-user/index.twig
+++ b/resources/twig/new-user/index.twig
@@ -6,44 +6,45 @@
 
 {% block content %}
 
-<div class="row">
-    <div class="col-lg-6 col-sm-8 col-xs-12">
-        <h3>{{ 'getting_started'|_ }}</h3>
-        <p>
-            {{ 'to_get_started'|_ }}
-        </p>
-        <form action="{{ route('new-user.submit') }}" method="post" id="store" class="form-horizontal">
-            <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+    <form action="{{ route('new-user.submit') }}" method="post" id="store" class="form-horizontal">
+        <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
 
-            {{ ExpandedForm.text('bank_name')}}
-            {{ ExpandedForm.balance('bank_balance')}}
+        <div class="row">
+            <div class="col-lg-6 col-sm-8 col-xs-12">
 
-            <p>
-                {{ 'savings_balance_text'|_ }}
-            </p>
-
-            {{ ExpandedForm.balance('savings_balance') }}
-
-            <p>
-                {{ 'cc_balance_text'|_ }}
-
-            </p>
-
-            {{ ExpandedForm.balance('credit_card_limit') }}
-
-            <p>
-                <input type="submit" name="submit" value="{{ 'submit'|_ }}" class="bt btn-success btn-lg" />
-            </p>
-        </form>
-    </div>
-</div>
+                <div class="box box-primary">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'getting_started'|_ }}</h3>
+                    </div>
+                    <div class="box-body">
+                        <p>
+                            {{ 'to_get_started'|_ }}
+                        </p>
+                        {{ ExpandedForm.text('bank_name') }}
+                        {{ ExpandedForm.balance('bank_balance') }}
 
 
-{% endblock %}
-{% block scripts %}
-    <!-- load the libraries and scripts necessary for Google Charts: -->
-    <script type="text/javascript" src="https://www.google.com/jsapi"></script>
-    <script type="text/javascript" src="js/gcharts.options.js"></script>
-    <script type="text/javascript" src="js/gcharts.js"></script>
-    <script type="text/javascript" src="js/index.js"></script>
-{% endblock %}
+                        <p>
+                            {{ 'savings_balance_text'|_ }}
+                        </p>
+
+                        {{ ExpandedForm.balance('savings_balance') }}
+
+                        <p>
+                            {{ 'cc_balance_text'|_ }}
+
+                        </p>
+
+                        {{ ExpandedForm.balance('credit_card_limit') }}
+
+                    </div>
+                    <div class="box-footer">
+                        <input type="submit" name="submit" value="{{ 'submit'|_ }}" class="btn btn-success pull-right"/>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+
+
+{% endblock %}
\ No newline at end of file