Updated register link text/placement on login card

- Also extracted "Already have account?" text to translation files.

diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
index 436734816243066e10528389659b2051716d5b5b..1065945c0b0a55b89b70103fa2cfe554847aa65c 100644 (file)
--- a/resources/lang/en/auth.php
+++ b/resources/lang/en/auth.php
@@ -26,6 +26,8 @@ return [
     'remember_me' => 'Remember Me',
     'ldap_email_hint' => 'Please enter an email to use for this account.',
     'create_account' => 'Create Account',
+    'already_have_account' => 'Already have an account?',
+    'dont_have_account' => 'Don\'t have an account?',
     'social_login' => 'Social Login',
     'social_registration' => 'Social Registration',
     'social_registration_text' => 'Register and sign in using another service.',

diff --git a/resources/views/auth/forms/login/standard.blade.php b/resources/views/auth/forms/login/standard.blade.php
index 0e580943e6d06821cb6f7cd7102c13aec0fc3a17..ea63cf7ac1ba764725e7442e5ccd5a5de5534448 100644 (file)
--- a/resources/views/auth/forms/login/standard.blade.php
+++ b/resources/views/auth/forms/login/standard.blade.php
@@ -8,8 +8,5 @@
     @include('form.password', ['name' => 'password', 'tabindex' => 1])
     <span class="block small mt-s">
         <a href="{{ baseUrl('/password/email') }}">{{ trans('auth.forgot_password') }}</a>
-        @if(setting('registration-enabled', false))
-            • <a href="{{ baseUrl('/register') }}">{{ trans('auth.sign_up') }}</a>
-        @endif
     </span>
 </div>

diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 6e3f12a854af4fe9f8564635a9bc5842c18ad6d5..35c117800d908b6b3234a4c546bc1fde6146fbf6 100644 (file)
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -6,7 +6,7 @@
 
         <div class="my-l">&nbsp;</div>
 
-        <div class="card content-wrap">
+        <div class="card content-wrap auto-height">
             <h1 class="list-heading">{{ title_case(trans('auth.log_in')) }}</h1>
 
             <form action="{{ baseUrl('/login') }}" method="POST" id="login-form" class="mt-l">
@@ -25,6 +25,7 @@
                             'label' => trans('auth.remember_me'),
                         ])
                     </div>
+
                     <div class="text-right">
                         <button class="button primary" tabindex="3">{{ title_case(trans('auth.log_in')) }}</button>
                     </div>
@@ -43,6 +44,13 @@
                     </div>
                 @endforeach
             @endif
+
+            @if(setting('registration-enabled', false))
+                <div class="text-center">
+                    <hr class="my-l">
+                    <a href="{{ baseUrl('/register') }}">{{ trans('auth.dont_have_account') }}</a>
+                </div>
+            @endif
         </div>
     </div>
 

diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index d1e69e0a0706cf99f138b9f3b0a3fb38075f9d22..38904f63bb7ce880d3b5a80ae0731227f63bc83d 100644 (file)
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -5,7 +5,7 @@
 
         <div class="my-l">&nbsp;</div>
 
-        <div class="card content-wrap">
+        <div class="card content-wrap auto-height">
             <h1 class="list-heading">{{ title_case(trans('auth.sign_up')) }}</h1>
 
             <form action="{{ baseUrl("/register") }}" method="POST" class="mt-l stretch-inputs">
@@ -28,7 +28,7 @@
 
                 <div class="grid half collapse-xs gap-xl v-center mt-m">
                     <div class="text-small">
-                        <a href="{{ baseUrl('/login') }}">Already have an account?</a>
+                        <a href="{{ baseUrl('/login') }}">{{ trans('auth.already_have_account') }}</a>
                     </div>
                     <div class="from-group text-right">
                         <button class="button primary">{{ trans('auth.create_account') }}</button>