From 9b4f1fb9813711ae90d6f8ccf310cca11e00958e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 23 Oct 2023 11:53:19 +0100
Subject: [PATCH] Styles: Aligned empty state alignment & consistency

- Fixed inital empty state margins/paddings to be aligned and not differ
when lists are empty.
- Aligned button/action display when viewing empty entities.
- Fixed use of non-existing permission in books for book empty state
  button.

Fixes #4563
---
 resources/sass/_blocks.scss                    |  2 +-
 resources/sass/_lists.scss                     |  2 +-
 resources/views/books/index.blade.php          |  6 +++---
 resources/views/books/parts/list.blade.php     | 10 ++++++++--
 resources/views/common/activity-list.blade.php |  2 +-
 resources/views/entities/list.blade.php        |  2 +-
 resources/views/home/default.blade.php         |  8 ++++++--
 resources/views/shelves/index.blade.php        |  4 ++--
 resources/views/shelves/parts/list.blade.php   |  9 +++++++--
 9 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/resources/sass/_blocks.scss b/resources/sass/_blocks.scss
index d63ed3802..9e96e920b 100644
--- a/resources/sass/_blocks.scss
+++ b/resources/sass/_blocks.scss
@@ -8,7 +8,7 @@
   border-radius: 3px;
   break-inside: avoid;
   .body, p.empty-text {
-    padding: $-m;
+    padding-block: $-m;
   }
   a, p {
     word-wrap: break-word;
diff --git a/resources/sass/_lists.scss b/resources/sass/_lists.scss
index 323551196..299bfbc33 100644
--- a/resources/sass/_lists.scss
+++ b/resources/sass/_lists.scss
@@ -342,7 +342,7 @@ details.sort-box[open] summary .caret-container svg {
   font-size: 0.9em;
 }
 .card .activity-list-item {
-  padding: $-s $-m;
+  padding-block: $-s;
 }
 
 .user-list-item {
diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php
index bf9795b3a..0b407a860 100644
--- a/resources/views/books/index.blade.php
+++ b/resources/views/books/index.blade.php
@@ -17,7 +17,7 @@
         @if(count($popular) > 0)
             @include('entities.list', ['entities' => $popular, 'style' => 'compact'])
         @else
-            <div class="body text-muted">{{ trans('entities.books_popular_empty') }}</div>
+            <p class="text-muted pb-l mb-none">{{ trans('entities.books_popular_empty') }}</p>
         @endif
     </div>
 
@@ -26,7 +26,7 @@
         @if(count($popular) > 0)
             @include('entities.list', ['entities' => $new, 'style' => 'compact'])
         @else
-            <div class="body text-muted">{{ trans('entities.books_new_empty') }}</div>
+            <p class="text-muted pb-l mb-none">{{ trans('entities.books_new_empty') }}</p>
         @endif
     </div>
 @stop
@@ -36,7 +36,7 @@
     <div class="actions mb-xl">
         <h5>{{ trans('common.actions') }}</h5>
         <div class="icon-list text-link">
-            @if(user()->can('book-create-all'))
+            @if(userCan('book-create-all'))
                 <a href="{{ url("/create-book") }}" data-shortcut="new" class="icon-list-item">
                     <span>@icon('add')</span>
                     <span>{{ trans('entities.books_create') }}</span>
diff --git a/resources/views/books/parts/list.blade.php b/resources/views/books/parts/list.blade.php
index 2cf83dfa9..8b658c711 100644
--- a/resources/views/books/parts/list.blade.php
+++ b/resources/views/books/parts/list.blade.php
@@ -24,8 +24,14 @@
         </div>
     @else
         <p class="text-muted">{{ trans('entities.books_empty') }}</p>
-        @if(userCan('books-create-all'))
-            <a href="{{ url("/create-book") }}" class="text-pos">@icon('edit'){{ trans('entities.create_now') }}</a>
+        @if(userCan('book-create-all'))
+            <div class="icon-list block inline">
+                <a href="{{ url("/create-book") }}"
+                   class="icon-list-item text-book">
+                    <span>@icon('add')</span>
+                    <span>{{ trans('entities.create_now') }}</span>
+                </a>
+            </div>
         @endif
     @endif
 </main>
\ No newline at end of file
diff --git a/resources/views/common/activity-list.blade.php b/resources/views/common/activity-list.blade.php
index 90272b21c..bcaf2ac11 100644
--- a/resources/views/common/activity-list.blade.php
+++ b/resources/views/common/activity-list.blade.php
@@ -8,5 +8,5 @@
         @endforeach
     </div>
 @else
-    <p class="text-muted empty-text">{{ trans('common.no_activity') }}</p>
+    <p class="text-muted empty-text mb-none pb-l">{{ trans('common.no_activity') }}</p>
 @endif
\ No newline at end of file
diff --git a/resources/views/entities/list.blade.php b/resources/views/entities/list.blade.php
index 25673c583..a12a90878 100644
--- a/resources/views/entities/list.blade.php
+++ b/resources/views/entities/list.blade.php
@@ -5,7 +5,7 @@
         @endforeach
     </div>
 @else
-    <p class="text-muted empty-text">
+    <p class="text-muted empty-text pb-l mb-none">
         {{ $emptyText ?? trans('common.no_items') }}
     </p>
 @endif
\ No newline at end of file
diff --git a/resources/views/home/default.blade.php b/resources/views/home/default.blade.php
index 2d71e37f6..a546ddeca 100644
--- a/resources/views/home/default.blade.php
+++ b/resources/views/home/default.blade.php
@@ -60,14 +60,18 @@
                         'emptyText' => trans('entities.no_pages_recently_updated'),
                         ])
                     </div>
-                    <a href="{{ url("/pages/recently-updated") }}" class="card-footer-link">{{ trans('common.view_all') }}</a>
+                    @if(count($recentlyUpdatedPages) > 0)
+                        <a href="{{ url("/pages/recently-updated") }}" class="card-footer-link">{{ trans('common.view_all') }}</a>
+                    @endif
                 </div>
             </div>
 
             <div>
                 <div id="recent-activity" class="card mb-xl">
                     <h3 class="card-title">{{ trans('entities.recent_activity') }}</h3>
-                    @include('common.activity-list', ['activity' => $activity])
+                    <div class="px-m">
+                        @include('common.activity-list', ['activity' => $activity])
+                    </div>
                 </div>
             </div>
 
diff --git a/resources/views/shelves/index.blade.php b/resources/views/shelves/index.blade.php
index eafc339ce..85663b413 100644
--- a/resources/views/shelves/index.blade.php
+++ b/resources/views/shelves/index.blade.php
@@ -40,7 +40,7 @@
         @if(count($popular) > 0)
             @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>
 
@@ -49,7 +49,7 @@
         @if(count($new) > 0)
             @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
diff --git a/resources/views/shelves/parts/list.blade.php b/resources/views/shelves/parts/list.blade.php
index da9c06d92..7f6e02a8b 100644
--- a/resources/views/shelves/parts/list.blade.php
+++ b/resources/views/shelves/parts/list.blade.php
@@ -30,8 +30,13 @@
     @else
         <p class="text-muted">{{ trans('entities.shelves_empty') }}</p>
         @if(userCan('bookshelf-create-all'))
-            <a href="{{ url("/create-shelf") }}"
-               class="button outline">@icon('edit'){{ trans('entities.create_now') }}</a>
+            <div class="icon-list block inline">
+                <a href="{{ url("/create-shelf") }}"
+                   class="icon-list-item text-bookshelf">
+                    <span>@icon('add')</span>
+                    <span>{{ trans('entities.create_now') }}</span>
+                </a>
+            </div>
         @endif
     @endif