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

diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php
index e6d0b776101f2773ee254883000ff990f129e796..cd8063e12a1b755a81827d9fd63471c386e73db2 100644 (file)
--- a/resources/views/base.blade.php
+++ b/resources/views/base.blade.php
@@ -57,6 +57,9 @@
                             @endif
                             @if(!signedInUser())
                                 <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
                         </div>
                         @if(signedInUser())

diff --git a/resources/views/users/profile.blade.php b/resources/views/users/profile.blade.php
index bd63ce93822773cdcf7fa307d38d0c6048a63ab9..c4a8f6323cdcee50c2d66dec1929352f0e209d73 100644 (file)
--- a/resources/views/users/profile.blade.php
+++ b/resources/views/users/profile.blade.php
@@ -37,21 +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="#book">
+                    <div class="text-book">
+                        @icon('book')  {{ trans_choice('entities.x_books', $assetCounts['books']) }}
+                    </div>
+                </a>
+                <a href="#chapter">
+                    <div class="text-chapter">
+                        @icon('chapter') {{ trans_choice('entities.x_chapters', $assetCounts['chapters']) }}
+                    </div>
+                </a>
+                <a href="#page">
+                    <div class="text-page">
+                        @icon('page') {{ trans_choice('entities.x_pages', $assetCounts['pages']) }}
+                    </div>
+                </a>
             </div>
         </div>
 
 
         <hr class="even">
-
+        <a name="page"></a>
         <h3>{{ trans('entities.recently_created_pages') }}</h3>
         @if (count($recentlyCreated['pages']) > 0)
             @include('partials/entity-list', ['entities' => $recentlyCreated['pages']])
@@ -60,7 +66,7 @@
         @endif
 
         <hr class="even">
-
+        <a name="chapter"></a>
         <h3>{{ trans('entities.recently_created_chapters') }}</h3>
         @if (count($recentlyCreated['chapters']) > 0)
             @include('partials/entity-list', ['entities' => $recentlyCreated['chapters']])
@@ -69,7 +75,7 @@
         @endif
 
         <hr class="even">
-
+        <a name="book"></a>
         <h3>{{ trans('entities.recently_created_books') }}</h3>
         @if (count($recentlyCreated['books']) > 0)
             @include('partials/entity-list', ['entities' => $recentlyCreated['books']])