From 7ce06a28e946bb8b1f5216d83f8abe9503a10eb4 Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Wed, 15 Feb 2017 22:00:13 -0500 Subject: [PATCH] Style client facing auth screens --- .../Controllers/ClientAuth/AuthController.php | 6 +- .../ClientAuth/PasswordController.php | 10 +- .../Controllers/ClientPortalController.php | 3 - public/css/built.login.css | 8 +- public/css/built.login.css.map | 2 +- resources/assets/css/login.css | 10 +- resources/lang/en/texts.php | 1 + resources/views/auth/password.blade.php | 2 +- resources/views/clientauth/login.blade.php | 149 ++++++----------- resources/views/clientauth/password.blade.php | 150 +++++------------- resources/views/clientauth/reset.blade.php | 147 +++++------------ .../views/clientauth/sessionexpired.blade.php | 78 +-------- resources/views/login.blade.php | 13 +- 13 files changed, 171 insertions(+), 408 deletions(-) diff --git a/app/Http/Controllers/ClientAuth/AuthController.php b/app/Http/Controllers/ClientAuth/AuthController.php index 0bf8d303feed..664ba906fe5c 100644 --- a/app/Http/Controllers/ClientAuth/AuthController.php +++ b/app/Http/Controllers/ClientAuth/AuthController.php @@ -28,7 +28,9 @@ class AuthController extends Controller */ public function showLoginForm() { - $data = []; + $data = [ + 'clientauth' => true, + ]; $contactKey = session('contact_key'); if ($contactKey) { @@ -86,6 +88,6 @@ class AuthController extends Controller */ public function getSessionExpired() { - return view('clientauth.sessionexpired'); + return view('clientauth.sessionexpired')->with(['clientauth' => true]); } } diff --git a/app/Http/Controllers/ClientAuth/PasswordController.php b/app/Http/Controllers/ClientAuth/PasswordController.php index e721a9533281..38290f318883 100644 --- a/app/Http/Controllers/ClientAuth/PasswordController.php +++ b/app/Http/Controllers/ClientAuth/PasswordController.php @@ -48,7 +48,9 @@ class PasswordController extends Controller */ public function showLinkRequestForm() { - $data = []; + $data = [ + 'clientauth' => true, + ]; $contactKey = session('contact_key'); if ($contactKey) { $contact = Contact::where('contact_key', '=', $contactKey)->first(); @@ -115,7 +117,11 @@ class PasswordController extends Controller return $this->getEmail(); } - $data = compact('token'); + $data = array( + 'token' => $token, + 'clientauth' => true, + ); + if ($key) { $contact = Contact::where('contact_key', '=', $key)->first(); if ($contact && ! $contact->is_deleted) { diff --git a/app/Http/Controllers/ClientPortalController.php b/app/Http/Controllers/ClientPortalController.php index a18edc445c1a..3040c6b06cd8 100644 --- a/app/Http/Controllers/ClientPortalController.php +++ b/app/Http/Controllers/ClientPortalController.php @@ -59,9 +59,6 @@ class ClientPortalController extends BaseController if (! $account->checkSubdomain(Request::server('HTTP_HOST'))) { return response()->view('error', [ 'error' => trans('texts.invoice_not_found'), - 'hideHeader' => true, - 'clientViewCSS' => $account->clientViewCSS(), - 'clientFontUrl' => $account->getFontsUrl(), ]); } diff --git a/public/css/built.login.css b/public/css/built.login.css index f000ecf7f75d..2f17c04dd1e6 100644 --- a/public/css/built.login.css +++ b/public/css/built.login.css @@ -11,6 +11,10 @@ hr.green { border: 0; } +.alert li{ + list-style: none; +} + /****** HEADER ********************************************************************/ .row.header { @@ -316,8 +320,6 @@ fieldset[disabled] .btn-primary.active { .form-signin .form-control { padding: 15px; + border: 1px solid #e8e8e8; } - -.form-control { - border: 1px solid #e8e8 /*# sourceMappingURL=built.login.css.map */ diff --git a/public/css/built.login.css.map b/public/css/built.login.css.map index 6f5c41e49b68..91792d519b40 100644 --- a/public/css/built.login.css.map +++ b/public/css/built.login.css.map @@ -1 +1 @@ -{"version":3,"sources":["login.css"],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"built.login.css","sourcesContent":[".container {\n padding-bottom: 50px;\n}\n\nhr.green {\n background: #5ebb5e;\n margin-top: 0px;\n margin-bottom: 30px;\n width: 55px;\n height: 4px;\n border: 0;\n}\n\n/****** HEADER ********************************************************************/\n\n.row.header {\n background: #3c3b3b; /* Old browsers */\n background: -moz-linear-gradient(top, #3c3b3b 0%, #2f2c2c 100%); /* FF3.6-15 */\n background: -webkit-linear-gradient(top, #3c3b3b 0%, #2f2c2c 100%); /* Chrome10-25,Safari5.1-6 */\n background: linear-gradient(to bottom, #3c3b3b 0%, #2f2c2c 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */\n filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#3c3b3b', endColorstr='#2f2c2c', GradientType=0); /* IE6-9 */\n padding: 30px 55px;\n margin-bottom: 95px;\n}\n\n.row.header .text-right {\n font-size: 13px;\n text-transform: uppercase;\n letter-spacing: 4px;\n color: #fff;\n}\n\n@media only screen and (min-width: 64.063em) {\n .row.header .col-md-6.col-xs-12.text-center {\n text-align: left;\n }\n}\n\n/****** FORM ********************************************************************/\n\n.form-signin {\n max-width: 400px;\n padding: 15px;\n margin: 0 auto;\n font-weight: 200;\n}\n\n.form-signin .form-signin-heading,\n.form-signin .checkbox {\n margin-bottom: 10px;\n}\n\n.form-signin .checkbox {\n font-weight: normal;\n}\n\n.form-signin .form-control {\n position: relative;\n height: auto;\n -webkit-box-sizing: border-box;\n -moz-box-sizing: border-box;\n box-sizing: border-box;\n padding: 10px;\n font-size: 16px;\n}\n\n.form-signin .form-control:focus {\n z-index: 2;\n}\n\n.form-signin input:not(:last-child) {\n margin-bottom: -1px;\n border-bottom-right-radius: 0;\n border-bottom-left-radius: 0;\n}\n\n.form-signin input:not(:first-child) {\n border-top-left-radius: 0;\n border-top-right-radius: 0;\n}\n\n.form-signin input {\n text-align: center;\n}\n\n.btn-block {\n margin-top: 10px;\n}\n\n.form-signin h2 {\n font-weight: 200;\n font-size: 28px;\n text-align: center;\n}\n\n.row.existing-accounts {\n margin-top: 60px;\n text-align: center;\n font-weight: 200;\n}\n\n.row.existing-accounts .col-md-3.col-xs-6:nth-of-type(1), .row.existing-accounts .col-md-3.col-xs-6:nth-of-type(2) {\n margin-bottom: 30px;\n}\n\n.row.existing-accounts a {\n width: 100%;\n font-size: 22px;\n padding-left: 2px;\n}\n\n.row.meta {\n font-size: 11px;\n text-transform: uppercase;\n color: #464545;\n letter-spacing: 2px;\n padding: 13px 0 0 0;\n}\n\n.row.meta .col-md-7, .row.meta .col-md-5 {\n text-align: center;\n}\n\n.row.meta a {\n color: #9b9c9b;\n}\n\n@media only screen and (min-width: 64.063em) {\n .row.existing-accounts .col-md-3.col-xs-6:nth-of-type(1), .row.existing-accounts .col-md-3.col-xs-6:nth-of-type(2) {\n margin-bottom: 0;\n }\n\n .row.meta .col-md-7 {\n text-align: left;\n }\n\n .row.meta .col-md-5 {\n text-align: right;\n }\n}\n\n/****** SIGN UP ********************************************************************/\n\n.row.sign-up {\n margin-top: 100px;\n text-align: center;\n}\n\n.row.sign-up h3 {\n font-size: 26px;\n font-weight: 200;\n margin: 0;\n}\n\n.row.sign-up p {\n font-size: 17px;\n font-weight: 200;\n}\n\n.row.sign-up button {\n width: 100%;\n}\n\n.row.sign-up .col-md-3 {\n border-top: 1px solid #eee;\n padding: 30px;\n}\n\n.row.sign-up .col-md-3:nth-child(2) {\n border-left: 0;\n padding-left: 30px;\n}\n\n@media only screen and (min-width: 64.063em) {\n .row.sign-up {\n text-align: left;\n }\n\n .row.sign-up .col-md-3 {\n padding: 40px 0 30px 0\n }\n\n .row.sign-up .col-md-3:nth-child(2) {\n border-left: 1px solid #eee;\n padding-left: 70px;\n }\n}\n\n/****** SIGN UP ********************************************************************/\n\n.btn {\n text-transform: uppercase;\n letter-spacing: 3px;\n border-radius: 3px;\n font-size: 15px;\n padding: 20px 0;\n}\n\n.btn-primary {\n background-image: -webkit-linear-gradient(top, #474646 0%, #3d3d3d 100%);\n background-image: -o-linear-gradient(top, #474646 0%, #3d3d3d 100%);\n background-image: -webkit-gradient(linear, left top, left bottom, from(#474646), to(#3d3d3d));\n background-image: linear-gradient(to bottom, #474646 0%, #3d3d3d 100%);\n filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);\n filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);\n background-repeat: repeat-x;\n border-color: #3d3d3d;\n}\n\n.btn-primary:hover,\n.btn-primary:focus {\n background-color: #3d3d3d;\n background-position: 0 -15px;\n}\n\n.btn-primary:active,\n.btn-primary.active {\n background-color: #3d3d3d;\n border-color: #3d3d3d;\n}\n\n.btn-primary.green {\n background-image: -webkit-linear-gradient(top, #62c362 0%, #5cb85c 100%);\n background-image: -o-linear-gradient(top, #62c362 0%, #5cb85c 100%);\n background-image: -webkit-gradient(linear, left top, left bottom, from(#62c362), to(#5cb85c));\n background-image: linear-gradient(to bottom, #62c362 0%, #5cb85c 100%);\n filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);\n filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);\n background-repeat: repeat-x;\n border-color: #5cb85c;\n}\n\n.btn-primary.green:hover,\n.btn-primary.green:focus {\n background-color: #5cb85c;\n background-position: 0 -15px;\n}\n\n.btn-primary.green:active,\n.btn-primary.green.active {\n background-color: #5cb85c;\n border-color: #5cb85c;\n}\n\n.btn-primary.blue {\n background-image: -webkit-linear-gradient(top, #3e8ccc 0%, #377db6 100%);\n background-image: -o-linear-gradient(top, #3e8ccc 0%, #377db6 100%);\n background-image: -webkit-gradient(linear, left top, left bottom, from(#3e8ccc), to(#377db6));\n background-image: linear-gradient(to bottom, #3e8ccc 0%, #377db6 100%);\n filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);\n filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);\n background-repeat: repeat-x;\n border-color: #377db6;\n}\n\n.btn-primary.blue:hover,\n.btn-primary.blue:focus {\n background-color: #377db6;\n background-position: 0 -15px;\n}\n\n.btn-primary.blue:active,\n.btn-primary.blue.active {\n background-color: #377db6;\n border-color: #377db6;\n}\n\n.btn-primary.disabled,\n.btn-primary[disabled],\nfieldset[disabled] .btn-primary,\n.btn-primary.disabled:hover,\n.btn-primary[disabled]:hover,\nfieldset[disabled] .btn-primary:hover,\n.btn-primary.disabled:focus,\n.btn-primary[disabled]:focus,\nfieldset[disabled] .btn-primary:focus,\n.btn-primary.disabled.focus,\n.btn-primary[disabled].focus,\nfieldset[disabled] .btn-primary.focus,\n.btn-primary.disabled:active,\n.btn-primary[disabled]:active,\nfieldset[disabled] .btn-primary:active,\n.btn-primary.disabled.active,\n.btn-primary[disabled].active,\nfieldset[disabled] .btn-primary.active {\n background-color: #3d3d3d;\n background-image: none;\n}\n\n.btn-default,\n.btn-primary,\n.btn-success,\n.btn-info,\n.btn-warning,\n.btn-danger {\n text-shadow: 0 -1px 0 rgba(0, 0, 0, .2);\n -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);\n box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);\n}\n\n.btn-default:active,\n.btn-primary:active,\n.btn-success:active,\n.btn-info:active,\n.btn-warning:active,\n.btn-danger:active,\n.btn-default.active,\n.btn-primary.active,\n.btn-success.active,\n.btn-info.active,\n.btn-warning.active,\n.btn-danger.active {\n -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);\n box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);\n}\n\n.form-signin .form-control {\n padding: 15px;\n}\n\n.form-control {\n border: 1px solid #e8e8"],"sourceRoot":"/source/"} \ No newline at end of file +{"version":3,"sources":["login.css"],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"built.login.css","sourcesContent":[".container {\n padding-bottom: 50px;\n}\n\nhr.green {\n background: #5ebb5e;\n margin-top: 0px;\n margin-bottom: 30px;\n width: 55px;\n height: 4px;\n border: 0;\n}\n\n.alert li{\n list-style: none;\n}\n\n/****** HEADER ********************************************************************/\n\n.row.header {\n background: #3c3b3b; /* Old browsers */\n background: -moz-linear-gradient(top, #3c3b3b 0%, #2f2c2c 100%); /* FF3.6-15 */\n background: -webkit-linear-gradient(top, #3c3b3b 0%, #2f2c2c 100%); /* Chrome10-25,Safari5.1-6 */\n background: linear-gradient(to bottom, #3c3b3b 0%, #2f2c2c 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */\n filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#3c3b3b', endColorstr='#2f2c2c', GradientType=0); /* IE6-9 */\n padding: 30px 55px;\n margin-bottom: 95px;\n}\n\n.row.header .text-right {\n font-size: 13px;\n text-transform: uppercase;\n letter-spacing: 4px;\n color: #fff;\n}\n\n@media only screen and (min-width: 64.063em) {\n .row.header .col-md-6.col-xs-12.text-center {\n text-align: left;\n }\n}\n\n/****** FORM ********************************************************************/\n\n.form-signin {\n max-width: 400px;\n padding: 15px;\n margin: 0 auto;\n font-weight: 200;\n}\n\n.form-signin .form-signin-heading,\n.form-signin .checkbox {\n margin-bottom: 10px;\n}\n\n.form-signin .checkbox {\n font-weight: normal;\n}\n\n.form-signin .form-control {\n position: relative;\n height: auto;\n -webkit-box-sizing: border-box;\n -moz-box-sizing: border-box;\n box-sizing: border-box;\n padding: 10px;\n font-size: 16px;\n}\n\n.form-signin .form-control:focus {\n z-index: 2;\n}\n\n.form-signin input:not(:last-child) {\n margin-bottom: -1px;\n border-bottom-right-radius: 0;\n border-bottom-left-radius: 0;\n}\n\n.form-signin input:not(:first-child) {\n border-top-left-radius: 0;\n border-top-right-radius: 0;\n}\n\n.form-signin input {\n text-align: center;\n}\n\n.btn-block {\n margin-top: 10px;\n}\n\n.form-signin h2 {\n font-weight: 200;\n font-size: 28px;\n text-align: center;\n}\n\n.row.existing-accounts {\n margin-top: 60px;\n text-align: center;\n font-weight: 200;\n}\n\n.row.existing-accounts .col-md-3.col-xs-6:nth-of-type(1), .row.existing-accounts .col-md-3.col-xs-6:nth-of-type(2) {\n margin-bottom: 30px;\n}\n\n.row.existing-accounts a {\n width: 100%;\n font-size: 22px;\n padding-left: 2px;\n}\n\n.row.meta {\n font-size: 11px;\n text-transform: uppercase;\n color: #464545;\n letter-spacing: 2px;\n padding: 13px 0 0 0;\n}\n\n.row.meta .col-md-7, .row.meta .col-md-5 {\n text-align: center;\n}\n\n.row.meta a {\n color: #9b9c9b;\n}\n\n@media only screen and (min-width: 64.063em) {\n .row.existing-accounts .col-md-3.col-xs-6:nth-of-type(1), .row.existing-accounts .col-md-3.col-xs-6:nth-of-type(2) {\n margin-bottom: 0;\n }\n\n .row.meta .col-md-7 {\n text-align: left;\n }\n\n .row.meta .col-md-5 {\n text-align: right;\n }\n}\n\n/****** SIGN UP ********************************************************************/\n\n.row.sign-up {\n margin-top: 100px;\n text-align: center;\n}\n\n.row.sign-up h3 {\n font-size: 26px;\n font-weight: 200;\n margin: 0;\n}\n\n.row.sign-up p {\n font-size: 17px;\n font-weight: 200;\n}\n\n.row.sign-up button {\n width: 100%;\n}\n\n.row.sign-up .col-md-3 {\n border-top: 1px solid #eee;\n padding: 30px;\n}\n\n.row.sign-up .col-md-3:nth-child(2) {\n border-left: 0;\n padding-left: 30px;\n}\n\n@media only screen and (min-width: 64.063em) {\n .row.sign-up {\n text-align: left;\n }\n\n .row.sign-up .col-md-3 {\n padding: 40px 0 30px 0\n }\n\n .row.sign-up .col-md-3:nth-child(2) {\n border-left: 1px solid #eee;\n padding-left: 70px;\n }\n}\n\n/****** SIGN UP ********************************************************************/\n\n.btn {\n text-transform: uppercase;\n letter-spacing: 3px;\n border-radius: 3px;\n font-size: 15px;\n padding: 20px 0;\n}\n\n.btn-primary {\n background-image: -webkit-linear-gradient(top, #474646 0%, #3d3d3d 100%);\n background-image: -o-linear-gradient(top, #474646 0%, #3d3d3d 100%);\n background-image: -webkit-gradient(linear, left top, left bottom, from(#474646), to(#3d3d3d));\n background-image: linear-gradient(to bottom, #474646 0%, #3d3d3d 100%);\n filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);\n filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);\n background-repeat: repeat-x;\n border-color: #3d3d3d;\n}\n\n.btn-primary:hover,\n.btn-primary:focus {\n background-color: #3d3d3d;\n background-position: 0 -15px;\n}\n\n.btn-primary:active,\n.btn-primary.active {\n background-color: #3d3d3d;\n border-color: #3d3d3d;\n}\n\n.btn-primary.green {\n background-image: -webkit-linear-gradient(top, #62c362 0%, #5cb85c 100%);\n background-image: -o-linear-gradient(top, #62c362 0%, #5cb85c 100%);\n background-image: -webkit-gradient(linear, left top, left bottom, from(#62c362), to(#5cb85c));\n background-image: linear-gradient(to bottom, #62c362 0%, #5cb85c 100%);\n filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);\n filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);\n background-repeat: repeat-x;\n border-color: #5cb85c;\n}\n\n.btn-primary.green:hover,\n.btn-primary.green:focus {\n background-color: #5cb85c;\n background-position: 0 -15px;\n}\n\n.btn-primary.green:active,\n.btn-primary.green.active {\n background-color: #5cb85c;\n border-color: #5cb85c;\n}\n\n.btn-primary.blue {\n background-image: -webkit-linear-gradient(top, #3e8ccc 0%, #377db6 100%);\n background-image: -o-linear-gradient(top, #3e8ccc 0%, #377db6 100%);\n background-image: -webkit-gradient(linear, left top, left bottom, from(#3e8ccc), to(#377db6));\n background-image: linear-gradient(to bottom, #3e8ccc 0%, #377db6 100%);\n filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);\n filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);\n background-repeat: repeat-x;\n border-color: #377db6;\n}\n\n.btn-primary.blue:hover,\n.btn-primary.blue:focus {\n background-color: #377db6;\n background-position: 0 -15px;\n}\n\n.btn-primary.blue:active,\n.btn-primary.blue.active {\n background-color: #377db6;\n border-color: #377db6;\n}\n\n.btn-primary.disabled,\n.btn-primary[disabled],\nfieldset[disabled] .btn-primary,\n.btn-primary.disabled:hover,\n.btn-primary[disabled]:hover,\nfieldset[disabled] .btn-primary:hover,\n.btn-primary.disabled:focus,\n.btn-primary[disabled]:focus,\nfieldset[disabled] .btn-primary:focus,\n.btn-primary.disabled.focus,\n.btn-primary[disabled].focus,\nfieldset[disabled] .btn-primary.focus,\n.btn-primary.disabled:active,\n.btn-primary[disabled]:active,\nfieldset[disabled] .btn-primary:active,\n.btn-primary.disabled.active,\n.btn-primary[disabled].active,\nfieldset[disabled] .btn-primary.active {\n background-color: #3d3d3d;\n background-image: none;\n}\n\n.btn-default,\n.btn-primary,\n.btn-success,\n.btn-info,\n.btn-warning,\n.btn-danger {\n text-shadow: 0 -1px 0 rgba(0, 0, 0, .2);\n -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);\n box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);\n}\n\n.btn-default:active,\n.btn-primary:active,\n.btn-success:active,\n.btn-info:active,\n.btn-warning:active,\n.btn-danger:active,\n.btn-default.active,\n.btn-primary.active,\n.btn-success.active,\n.btn-info.active,\n.btn-warning.active,\n.btn-danger.active {\n -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);\n box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);\n}\n\n.form-signin .form-control {\n padding: 15px;\n border: 1px solid #e8e8e8;\n}"],"sourceRoot":"/source/"} \ No newline at end of file diff --git a/resources/assets/css/login.css b/resources/assets/css/login.css index df78c3fc300e..25901d0c07d8 100644 --- a/resources/assets/css/login.css +++ b/resources/assets/css/login.css @@ -11,6 +11,10 @@ hr.green { border: 0; } +.alert li{ + list-style: none; +} + /****** HEADER ********************************************************************/ .row.header { @@ -316,7 +320,5 @@ fieldset[disabled] .btn-primary.active { .form-signin .form-control { padding: 15px; -} - -.form-control { - border: 1px solid #e8e8 \ No newline at end of file + border: 1px solid #e8e8e8; +} \ No newline at end of file diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index ea1c66318dcd..c8ed75cc9ae7 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2365,6 +2365,7 @@ $LANG = array( 'sign_up_now' => 'Sign Up Now', 'not_a_member_yet' => 'Not a member yet?', 'login_create_an_account' => 'Create an Account!', + 'client_login' => 'Client Login', ); return $LANG; diff --git a/resources/views/auth/password.blade.php b/resources/views/auth/password.blade.php index 1adc2c203c5e..d9532de54739 100644 --- a/resources/views/auth/password.blade.php +++ b/resources/views/auth/password.blade.php @@ -22,7 +22,7 @@ @endif - + @if (Session::has('warning'))
{{ Session::get('warning') }}
@endif diff --git a/resources/views/clientauth/login.blade.php b/resources/views/clientauth/login.blade.php index 690f14bd8df7..c260fac5f9df 100644 --- a/resources/views/clientauth/login.blade.php +++ b/resources/views/clientauth/login.blade.php @@ -1,120 +1,67 @@ -@extends('public.header') +@extends('login') -@section('head') -@parent - - -@endsection - -@section('body') -
+@section('form') @include('partials.warn_session', ['redirectTo' => '/client/sessionexpired']) - {!! Former::open('client/login') +
+ + {!! Former::open('client/login') ->rules(['password' => 'required']) ->addClass('form-signin') !!} - {{ Former::populateField('remember', 'true') }} -
- @if (!isset($account) || !$account->hasFeature(FEATURE_WHITE_LABEL)) - - -

Invoice Ninja | {{ trans('texts.account_login') }}

- - @else -

{{ trans('texts.account_login') }}

+ +
+ + + @if (count($errors->all())) +
+ @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
    @endif -
    -
    -

    - {!! Former::password('password')->placeholder(trans('texts.password'))->raw() !!} - {!! Former::hidden('remember')->raw() !!} -

    -

    {!! Button::success(trans('texts.login')) - ->withAttributes(['id' => 'loginButton']) - ->large()->submit()->block() !!}

    - -

    - {!! link_to('/client/recover_password', trans('texts.recover_password')) !!} -

    - - - @if (count($errors->all())) -
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
    - @endif - - @if (Session::has('warning')) + @if (Session::has('warning'))
    {{ Session::get('warning') }}
    - @endif + @endif - @if (Session::has('message')) + @if (Session::has('message'))
    {{ Session::get('message') }}
    - @endif + @endif - @if (Session::has('error')) + @if (Session::has('error'))
  • {{ Session::get('error') }}
    • - @endif + @endif + {{ Former::populateField('remember', 'true') }} + +
    + {!! Former::password('password')->placeholder(trans('texts.password'))->raw() !!}
    + {!! Former::hidden('remember')->raw() !!} + {!! Button::success(trans('texts.login')) + ->withAttributes(['id' => 'loginButton', 'class' => 'green']) + ->large()->submit()->block() !!} + +
    +
    + {!! link_to('/client/recover_password', trans('texts.recover_password')) !!} +
    +
    {!! Former::close() !!}
    -@endsection \ No newline at end of file + + + + +@endsection diff --git a/resources/views/clientauth/password.blade.php b/resources/views/clientauth/password.blade.php index 41334fb32995..5092f9f7a71f 100644 --- a/resources/views/clientauth/password.blade.php +++ b/resources/views/clientauth/password.blade.php @@ -1,116 +1,44 @@ -@extends('public.header') +@extends('login') -@section('head') -@parent - + +
    -@stop - -@section('body') -
    - -{!! Former::open('client/recover_password')->addClass('form-signin') !!} -
    - @if (!isset($account) || !$account->hasFeature(FEATURE_WHITE_LABEL)) - - -

    Invoice Ninja | {{ trans('texts.password_recovery') }}

    -     - @else -

    {{ trans('texts.password_recovery') }}

    + @if (count($errors->all())) +
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
    @endif + + @if (session('status')) +
    + {{ session('status') }} +
    + @endif + + + @if (Session::has('warning')) +
    {{ Session::get('warning') }}
    + @endif + + @if (Session::has('message')) +
    {{ Session::get('message') }}
    + @endif + + @if (Session::has('error')) +
    {{ Session::get('error') }}
    + @endif + + {!! Button::success(trans('texts.send_email')) + ->withAttributes(['class' => 'green']) + ->large()->submit()->block() !!} + + {!! Former::close() !!}
    -
    - -

    {!! Button::success(trans('texts.send_email'))->large()->submit()->block() !!}

    - - @if (count($errors->all())) -
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
    - @endif - - @if (session('status')) -
    - {{ session('status') }} -
    - @endif - - - @if (Session::has('warning')) -
    {{ Session::get('warning') }}
    - @endif - - @if (Session::has('message')) -
    {{ Session::get('message') }}
    - @endif - - @if (Session::has('error')) -
    {{ Session::get('error') }}
    - @endif - - {!! Former::close() !!} - -
    -
    - - - -@stop \ No newline at end of file +@endsection \ No newline at end of file diff --git a/resources/views/clientauth/reset.blade.php b/resources/views/clientauth/reset.blade.php index fe384391127b..73e1e4159508 100644 --- a/resources/views/clientauth/reset.blade.php +++ b/resources/views/clientauth/reset.blade.php @@ -1,119 +1,52 @@ -@extends('public.header') +@extends('login') -@section('head') -@parent - + {!! Former::open('/client/password/reset')->addClass('form-signin')->rules(array( + 'password' => 'required', + 'password_confirmation' => 'required', + )) !!} -@stop + +
    -@section('body') -
    - - {!! Former::open('/client/password/reset')->addClass('form-signin')->rules(array( - 'password' => 'required', - 'password_confirmation' => 'required', - )) !!} - -
    - @if (!isset($account) || !$account->hasFeature(FEATURE_WHITE_LABEL)) - - -

    Invoice Ninja | {{ trans('texts.set_password') }}

    -     - @else -

    {{ trans('texts.set_password') }}

    + @if (count($errors->all())) +
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
    @endif -
    -
    - - - - -

    - {!! Former::password('password')->placeholder(trans('texts.password'))->raw() !!} - {!! Former::password('password_confirmation')->placeholder(trans('texts.confirm_password'))->raw() !!} - -

    - -

    {!! Button::success(trans('texts.save'))->large()->submit()->block() !!}

    - - - @if (count($errors->all())) -
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
    - @endif - @if (Session::has('warning')) -
    {{ Session::get('warning') }}
    - @endif + @if (Session::has('warning')) +
    {{ Session::get('warning') }}
    + @endif - @if (Session::has('message')) -
    {{ Session::get('message') }}
    - @endif + @if (Session::has('message')) +
    {{ Session::get('message') }}
    + @endif - @if (Session::has('error')) -
    {{ Session::get('error') }}
    - @endif + @if (Session::has('error')) +
    {{ Session::get('error') }}
    + @endif + + - {!! Former::close() !!} -
    +
    + {!! Former::password('password')->placeholder(trans('texts.password'))->raw() !!} + {!! Former::password('password_confirmation')->placeholder(trans('texts.confirm_password'))->raw() !!} +
    -
    - -@stop \ No newline at end of file +

    {!! Button::success(trans('texts.save'))->large()->submit()->withAttributes(['class' => 'green'])->block() !!}

    + + {!! Former::close() !!} +
    + +@endsection \ No newline at end of file diff --git a/resources/views/clientauth/sessionexpired.blade.php b/resources/views/clientauth/sessionexpired.blade.php index 86a1c26c046a..bd5a62854caa 100644 --- a/resources/views/clientauth/sessionexpired.blade.php +++ b/resources/views/clientauth/sessionexpired.blade.php @@ -1,72 +1,8 @@ -@extends('public.header') - -@section('head') - @parent - - -@endsection - -@section('body') -
    - +@extends('login') +@section('form') + -@endsection +@endsection \ No newline at end of file diff --git a/resources/views/login.blade.php b/resources/views/login.blade.php index ac5758aabaf8..45d1413e479d 100644 --- a/resources/views/login.blade.php +++ b/resources/views/login.blade.php @@ -1,13 +1,22 @@ @extends('master') @section('head') + @if (!empty($clientauth) && !empty($clientFontUrl)) + + @endif + + + @if (!empty($clientauth) && !empty($account)) + + @endif + - + @endsection @section('body') - @if (!Utils::isWhiteLabel()) + @if (!Utils::isWhiteLabel() || empty($clientauth))