X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/20988962fe7eb124ecca4cf4750eb7e08925aba6..refs/pull/5725/head:/resources/views/shelves/index.blade.php

diff --git a/resources/views/shelves/index.blade.php b/resources/views/shelves/index.blade.php
index 717053a08..85663b413 100644
--- a/resources/views/shelves/index.blade.php
+++ b/resources/views/shelves/index.blade.php
@@ -1,23 +1,27 @@
-@extends('tri-layout')
+@extends('layouts.tri')
 
 @section('body')
-    <div class="content-wrap card">
-        @include('shelves.list', ['shelves' => $shelves, 'view' => $view])
-    </div>
+    @include('shelves.parts.list', ['shelves' => $shelves, 'view' => $view, 'listOptions' => $listOptions])
 @stop
 
 @section('right')
 
     <div class="actions mb-xl">
         <h5>{{ trans('common.actions') }}</h5>
-        <div class="icon-list text-primary">
-            @include('partials.view-toggle', ['view' => $view, 'type' => 'shelf'])
-            @if($currentUser->can('bookshelf-create-all'))
-                <a href="{{ baseUrl("/create-shelf") }}" class="icon-list-item">
-                    <span class="icon">@icon('add')</span>
-                    <span>{{ trans('entities.shelves_create') }}</span>
+        <div class="icon-list text-link">
+            @if(userCan('bookshelf-create-all'))
+                <a href="{{ url("/http/source.bookstackapp.com/create-shelf") }}" data-shortcut="new" class="icon-list-item">
+                    <span>@icon('add')</span>
+                    <span>{{ trans('entities.shelves_new_action') }}</span>
                 </a>
             @endif
+
+            @include('entities.view-toggle', ['view' => $view, 'type' => 'bookshelves'])
+
+            <a href="{{ url('/http/source.bookstackapp.com/tags') }}" class="icon-list-item">
+                <span>@icon('tag')</span>
+                <span>{{ trans('entities.tags_view_tags') }}</span>
+            </a>
         </div>
     </div>
 
@@ -25,27 +29,27 @@
 
 @section('left')
     @if($recents)
-        <div id="recents-shelves">
+        <div id="recents" class="mb-xl">
             <h5>{{ trans('entities.recently_viewed') }}</h5>
-            @include('partials.entity-list', ['entities' => $recents, 'style' => 'compact'])
+            @include('entities.list', ['entities' => $recents, 'style' => 'compact'])
         </div>
     @endif
 
-    <div id="popular-shelves">
+    <div id="popular" class="mb-xl">
         <h5>{{ trans('entities.shelves_popular') }}</h5>
         @if(count($popular) > 0)
-            @include('partials.entity-list', ['entities' => $popular, 'style' => 'compact'])
+            @include('entities.list', ['entities' => $popular, 'style' => 'compact'])
         @else
-            <div class="text-muted">{{ trans('entities.shelves_popular_empty') }}</div>
+            <p class="text-muted pb-l mb-none">{{ trans('entities.shelves_popular_empty') }}</p>
         @endif
     </div>
 
-    <div id="new-shelves">
+    <div id="new" class="mb-xl">
         <h5>{{ trans('entities.shelves_new') }}</h5>
         @if(count($new) > 0)
-            @include('partials.entity-list', ['entities' => $new, 'style' => 'compact'])
+            @include('entities.list', ['entities' => $new, 'style' => 'compact'])
         @else
-            <div class="text-muted">{{ trans('entities.shelves_new_empty') }}</div>
+            <p class="text-muted pb-l mb-none">{{ trans('entities.shelves_new_empty') }}</p>
         @endif
     </div>
 @stop
\ No newline at end of file