TypeScript: Updated compile target, addressed issues

[bookstack] / resources / views / shelves / index.blade.php

diff --git a/resources/views/shelves/index.blade.php b/resources/views/shelves/index.blade.php
index eeb579de6c913fe5e5e631d47c1baf4177987bee..85663b413077e6483a94aaf8b1b81aa4a043df71 100644 (file)
--- a/resources/views/shelves/index.blade.php
+++ b/resources/views/shelves/index.blade.php
@@ -1,21 +1,27 @@
-@extends('tri-layout')
+@extends('layouts.tri')

 
 @section('body')
 
 @section('body')

-    @include('shelves.list', ['shelves' => $shelves, 'view' => $view])
+    @include('shelves.parts.list', ['shelves' => $shelves, 'view' => $view, 'listOptions' => $listOptions])

 @stop
 
 @section('right')
 
     <div class="actions mb-xl">
         <h5>{{ trans('common.actions') }}</h5>
 @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">
+        <div class="icon-list text-link">
+            @if(userCan('bookshelf-create-all'))
+                <a href="{{ url("/create-shelf") }}" data-shortcut="new" class="icon-list-item">

                     <span>@icon('add')</span>
                     <span>@icon('add')</span>

-                    <span>{{ trans('entities.shelves_create') }}</span>
+                    <span>{{ trans('entities.shelves_new_action') }}</span>

                 </a>
             @endif
                 </a>
             @endif

+
+            @include('entities.view-toggle', ['view' => $view, 'type' => 'bookshelves'])
+
+            <a href="{{ url('/tags') }}" class="icon-list-item">
+                <span>@icon('tag')</span>
+                <span>{{ trans('entities.tags_view_tags') }}</span>
+            </a>

         </div>
     </div>
 
         </div>
     </div>
 


@@ -25,25 +31,25 @@
     @if($recents)
         <div id="recents" class="mb-xl">
             <h5>{{ trans('entities.recently_viewed') }}</h5>
     @if($recents)
         <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" class="mb-xl">
         <h5>{{ trans('entities.shelves_popular') }}</h5>
         @if(count($popular) > 0)
         </div>
     @endif
 
     <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
         @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" class="mb-xl">
         <h5>{{ trans('entities.shelves_new') }}</h5>
         @if(count($new) > 0)
         @endif
     </div>
 
     <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
         @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
         @endif
     </div>
 @stop
\ No newline at end of file