mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-10-30 07:32:39 +01:00
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
This commit is contained in:
parent
3062bf1876
commit
70ad707c3c
@ -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())
|
||||
|
@ -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
|
||||
|
@ -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']);
|
||||
|
Loading…
Reference in New Issue
Block a user