colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'qianmengnet-master'

This commit is contained in:
Dan Brown 2019-01-05 15:01:38 +00:00
parent a2087fe3ff 70ad707c3c
commit d682a0157f
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
3 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/views/base.blade.php
View File

@ -56,6 +56,9 @@
<a href="{{ baseUrl('/settings') }}">@icon('settings'){{ trans('settings.settings') }}</a>
@endif
@if(!signedInUser())
@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>

33
resources/views/users/profile.blade.php
View File

@ -37,22 +37,27 @@
</div>
<div class="col-md-5 text-bigger" id="content-counts">
<div class="text-muted">{{ trans('entities.profile_created_content') }}</div>
<div class="text-book">
@icon('book') {{ trans_choice('entities.x_books', $assetCounts['books']) }}
</div>
<div class="text-chapter">
@icon('chapter') {{ trans_choice('entities.x_chapters', $assetCounts['chapters']) }}
</div>
<div class="text-page">
@icon('page') {{ trans_choice('entities.x_pages', $assetCounts['pages']) }}
</div>
<a href="#recent-books">
<div class="text-book">
@icon('book') {{ trans_choice('entities.x_books', $assetCounts['books']) }}
</div>
</a>
<a href="#recent-chapters">
<div class="text-chapter">
@icon('chapter') {{ trans_choice('entities.x_chapters', $assetCounts['chapters']) }}
</div>
</a>
<a href="#recent-pages">
<div class="text-page">
@icon('page') {{ trans_choice('entities.x_pages', $assetCounts['pages']) }}
</div>
</a>
</div>
</div>
<hr class="even">
<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
@ -60,8 +65,7 @@
@endif
<hr class="even">
<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
@ -69,8 +73,7 @@
@endif
<hr class="even">
<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

18
tests/PublicActionTest.php
View File

@ -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']);