From 70ad707c3c42fdf0dbfcebcbb6cdc8f7cb8560b9 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 5 Jan 2019 15:01:16 +0000
Subject: [PATCH] Tweaked profile page anchor links and swapped register/login
 links

Also added test for login/register links on non-auth app view
Relates to #1146
---
 resources/views/base.blade.php          |  4 ++--
 resources/views/users/profile.blade.php | 15 ++++++---------
 tests/PublicActionTest.php              | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php
index cd8063e12..3c144fea8 100644
--- a/resources/views/base.blade.php
+++ b/resources/views/base.blade.php
@@ -56,10 +56,10 @@
                                 <a href="{{ baseUrl('/settings') }}">@icon('settings'){{ trans('settings.settings') }}</a>
                             @endif
                             @if(!signedInUser())
-                                <a href="{{ baseUrl('/login') }}">@icon('login') {{ trans('auth.log_in') }}</a>
-							    @if(setting('registration-enabled', false))
+                                @if(setting('registration-enabled', false))
                                     <a href="{{ baseUrl("/register") }}">@icon('new-user') {{ trans('auth.sign_up') }}</a>
                                 @endif
+                                <a href="{{ baseUrl('/login') }}">@icon('login') {{ trans('auth.log_in') }}</a>
                             @endif
                         </div>
                         @if(signedInUser())
diff --git a/resources/views/users/profile.blade.php b/resources/views/users/profile.blade.php
index c4a8f6323..4f67f1be2 100644
--- a/resources/views/users/profile.blade.php
+++ b/resources/views/users/profile.blade.php
@@ -37,17 +37,17 @@
             </div>
             <div class="col-md-5 text-bigger" id="content-counts">
                 <div class="text-muted">{{ trans('entities.profile_created_content') }}</div>
-                <a href="#book">
+                <a href="#recent-books">
                     <div class="text-book">
                         @icon('book')  {{ trans_choice('entities.x_books', $assetCounts['books']) }}
                     </div>
                 </a>
-                <a href="#chapter">
+                <a href="#recent-chapters">
                     <div class="text-chapter">
                         @icon('chapter') {{ trans_choice('entities.x_chapters', $assetCounts['chapters']) }}
                     </div>
                 </a>
-                <a href="#page">
+                <a href="#recent-pages">
                     <div class="text-page">
                         @icon('page') {{ trans_choice('entities.x_pages', $assetCounts['pages']) }}
                     </div>
@@ -57,8 +57,7 @@
 
 
         <hr class="even">
-        <a name="page"></a>
-        <h3>{{ trans('entities.recently_created_pages') }}</h3>
+        <h3 id="recent-pages">{{ trans('entities.recently_created_pages') }}</h3>
         @if (count($recentlyCreated['pages']) > 0)
             @include('partials/entity-list', ['entities' => $recentlyCreated['pages']])
         @else
@@ -66,8 +65,7 @@
         @endif
 
         <hr class="even">
-        <a name="chapter"></a>
-        <h3>{{ trans('entities.recently_created_chapters') }}</h3>
+        <h3 id="recent-chapters">{{ trans('entities.recently_created_chapters') }}</h3>
         @if (count($recentlyCreated['chapters']) > 0)
             @include('partials/entity-list', ['entities' => $recentlyCreated['chapters']])
         @else
@@ -75,8 +73,7 @@
         @endif
 
         <hr class="even">
-        <a name="book"></a>
-        <h3>{{ trans('entities.recently_created_books') }}</h3>
+        <h3 id="recent-books">{{ trans('entities.recently_created_books') }}</h3>
         @if (count($recentlyCreated['books']) > 0)
             @include('partials/entity-list', ['entities' => $recentlyCreated['books']])
         @else
diff --git a/tests/PublicActionTest.php b/tests/PublicActionTest.php
index 671b5ee42..27b4822fa 100644
--- a/tests/PublicActionTest.php
+++ b/tests/PublicActionTest.php
@@ -14,6 +14,24 @@ class PublicActionTest extends BrowserKitTest
         $this->visit($page->getUrl())->seePageIs('/login');
     }
 
+    public function test_login_link_visible()
+    {
+        $this->setSettings(['app-public' => 'true']);
+        $this->visit('/')->see(url('/login'));
+    }
+
+    public function test_register_link_visible_when_enabled()
+    {
+        $this->setSettings(['app-public' => 'true']);
+
+        $this->visit('/')->see(url('/login'));
+        $this->visit('/')->dontSee(url('/register'));
+
+        $this->setSettings(['app-public' => 'true', 'registration-enabled' => 'true']);
+        $this->visit('/')->see(url('/login'));
+        $this->visit('/')->see(url('/register'));
+    }
+
     public function test_books_viewable()
     {
         $this->setSettings(['app-public' => 'true']);