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

Merge branch 'master' of git://github.com/qianmengnet/BookStack into qianmengnet-master

This commit is contained in:
Dan Brown 2019-01-05 14:47:47 +00:00
parent a2087fe3ff 3c796b1ae7
commit 3062bf1876
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,6 +57,9 @@
@endif @endif
@if(!signedInUser()) @if(!signedInUser())
<a href="{{ baseUrl('/login') }}">@icon('login') {{ trans('auth.log_in') }}</a> <a href="{{ baseUrl('/login') }}">@icon('login') {{ trans('auth.log_in') }}</a>
@if(setting('registration-enabled', false))
<a href="{{ baseUrl("/register") }}">@icon('new-user') {{ trans('auth.sign_up') }}</a>
@endif
@endif @endif
</div> </div>
@if(signedInUser()) @if(signedInUser())

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

@ -37,21 +37,27 @@
</div> </div>
<div class="col-md-5 text-bigger" id="content-counts"> <div class="col-md-5 text-bigger" id="content-counts">
<div class="text-muted">{{ trans('entities.profile_created_content') }}</div> <div class="text-muted">{{ trans('entities.profile_created_content') }}</div>
<a href="#book">
<div class="text-book"> <div class="text-book">
@icon('book') {{ trans_choice('entities.x_books', $assetCounts['books']) }} @icon('book') {{ trans_choice('entities.x_books', $assetCounts['books']) }}
</div> </div>
</a>
<a href="#chapter">
<div class="text-chapter"> <div class="text-chapter">
@icon('chapter') {{ trans_choice('entities.x_chapters', $assetCounts['chapters']) }} @icon('chapter') {{ trans_choice('entities.x_chapters', $assetCounts['chapters']) }}
</div> </div>
</a>
<a href="#page">
<div class="text-page"> <div class="text-page">
@icon('page') {{ trans_choice('entities.x_pages', $assetCounts['pages']) }} @icon('page') {{ trans_choice('entities.x_pages', $assetCounts['pages']) }}
</div> </div>
</a>
</div> </div>
</div> </div>
<hr class="even"> <hr class="even">
<a name="page"></a>
<h3>{{ trans('entities.recently_created_pages') }}</h3> <h3>{{ trans('entities.recently_created_pages') }}</h3>
@if (count($recentlyCreated['pages']) > 0) @if (count($recentlyCreated['pages']) > 0)
@include('partials/entity-list', ['entities' => $recentlyCreated['pages']]) @include('partials/entity-list', ['entities' => $recentlyCreated['pages']])
@ -60,7 +66,7 @@
@endif @endif
<hr class="even"> <hr class="even">
<a name="chapter"></a>
<h3>{{ trans('entities.recently_created_chapters') }}</h3> <h3>{{ trans('entities.recently_created_chapters') }}</h3>
@if (count($recentlyCreated['chapters']) > 0) @if (count($recentlyCreated['chapters']) > 0)
@include('partials/entity-list', ['entities' => $recentlyCreated['chapters']]) @include('partials/entity-list', ['entities' => $recentlyCreated['chapters']])
@ -69,7 +75,7 @@
@endif @endif
<hr class="even"> <hr class="even">
<a name="book"></a>
<h3>{{ trans('entities.recently_created_books') }}</h3> <h3>{{ trans('entities.recently_created_books') }}</h3>
@if (count($recentlyCreated['books']) > 0) @if (count($recentlyCreated['books']) > 0)
@include('partials/entity-list', ['entities' => $recentlyCreated['books']]) @include('partials/entity-list', ['entities' => $recentlyCreated['books']])