From: Dan Brown <redacted>
Date: Sat, 30 Jan 2021 16:40:13 +0000 (+0000)
Subject: Merge branch 'feature_add_add-button_to_home_view' of git://github.com/philjak/BookSt... 
X-Git-Tag: v21.04~1^2~19
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/ccb2cb5b7cf0f4a3d21ddb87ec31ccde0d25b154

Merge branch 'feature_add_add-button_to_home_view' of git://github.com/philjak/BookStack into philjak-feature_add_add-button_to_home_view
---

ccb2cb5b7cf0f4a3d21ddb87ec31ccde0d25b154
diff --cc resources/views/common/home-book.blade.php
index 3dbcd2875,de2822261..1c18edb24
--- a/resources/views/common/home-book.blade.php
+++ b/resources/views/common/home-book.blade.php
@@@ -12,9 -12,14 +12,15 @@@
      <div class="actions mb-xl">
          <h5>{{ trans('common.actions') }}</h5>
          <div class="icon-list text-primary">
 -            @if($currentUser->can('book-create-all'))
++            @if(user()->can('book-create-all'))
+                 <a href="{{ url("/https/source.bookstackapp.com/create-book") }}" class="icon-list-item">
+                     <span>@icon('add')</span>
+                     <span>{{ trans('entities.books_create') }}</span>
+                 </a>
+             @endif
 -            @include('partials.view-toggle', ['view' => $view, 'type' => 'book'])
 +            @include('partials.view-toggle', ['view' => $view, 'type' => 'books'])
              @include('components.expand-toggle', ['target' => '.entity-list.compact .entity-item-snippet', 'key' => 'home-details'])
 +            @include('partials.dark-mode-toggle', ['classes' => 'text-muted icon-list-item text-primary'])
          </div>
      </div>
--@stop
++@stop
diff --cc resources/views/common/home-shelves.blade.php
index fccbef288,3935734d4..957fa6578
--- a/resources/views/common/home-shelves.blade.php
+++ b/resources/views/common/home-shelves.blade.php
@@@ -12,9 -12,14 +12,15 @@@
      <div class="actions mb-xl">
          <h5>{{ trans('common.actions') }}</h5>
          <div class="icon-list text-primary">
 -            @if($currentUser->can('bookshelf-create-all'))
++            @if(user()->can('bookshelf-create-all'))
+                 <a href="{{ url("/https/source.bookstackapp.com/create-shelf") }}" class="icon-list-item">
+                     <span>@icon('add')</span>
+                     <span>{{ trans('entities.shelves_new_action') }}</span>
+                 </a>
+             @endif
 -            @include('partials.view-toggle', ['view' => $view, 'type' => 'shelf'])
 +            @include('partials.view-toggle', ['view' => $view, 'type' => 'shelves'])
              @include('components.expand-toggle', ['target' => '.entity-list.compact .entity-item-snippet', 'key' => 'home-details'])
 +            @include('partials.dark-mode-toggle', ['classes' => 'text-muted icon-list-item text-primary'])
          </div>
      </div>
--@stop
++@stop