From aa58783b5d48990e8e39ec989eb701842a0f9131 Mon Sep 17 00:00:00 2001 From: faissaloux Date: Tue, 9 Nov 2021 00:33:56 +0100 Subject: [PATCH 1/4] fix article control buttons --- .../components/articles/actions.blade.php | 44 +++++++++++++++---- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/resources/views/components/articles/actions.blade.php b/resources/views/components/articles/actions.blade.php index fab8fd7f0..126f8d59c 100644 --- a/resources/views/components/articles/actions.blade.php +++ b/resources/views/components/articles/actions.blade.php @@ -1,38 +1,64 @@
-
+
@if (Auth::check() && $article->isAuthoredBy(Auth::user())) - + - Edit article + Edit article @endif @if ($article->isNotPublished() && $article->isAwaitingApproval()) @can(App\Policies\ArticlePolicy::APPROVE, $article) - + - Publish article + Publish article @endcan @can(App\Policies\ArticlePolicy::DECLINE, $article) - + - Decline article + Decline article @endcan @else @can(App\Policies\ArticlePolicy::DISAPPROVE, $article) - + - Unpublish article + Unpublish article @endcan From 7f3468a151acf814134395c33c3c1369ec7acfd5 Mon Sep 17 00:00:00 2001 From: faissaloux Date: Tue, 9 Nov 2021 11:30:23 +0100 Subject: [PATCH 2/4] apply changes to rest of buttons --- .../components/articles/actions.blade.php | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/resources/views/components/articles/actions.blade.php b/resources/views/components/articles/actions.blade.php index 126f8d59c..ea816313f 100644 --- a/resources/views/components/articles/actions.blade.php +++ b/resources/views/components/articles/actions.blade.php @@ -1,8 +1,8 @@ -
-
+
+
@if (Auth::check() && $article->isAuthoredBy(Auth::user())) + - - {{ $article->isPinned() ? 'Unpin article' : 'Pin article' }} + + {{ $article->isPinned() ? 'Unpin article' : 'Pin article' }} @endcan
@can(App\Policies\ArticlePolicy::DELETE, $article) - + - Delete article + Delete article @endcan From 4ad3e23f2628b1221e83afed9869a8a5842c8509 Mon Sep 17 00:00:00 2001 From: faissaloux Date: Tue, 9 Nov 2021 11:31:36 +0100 Subject: [PATCH 3/4] change [publish, decline] icons --- resources/views/components/articles/actions.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/components/articles/actions.blade.php b/resources/views/components/articles/actions.blade.php index ea816313f..838a6ce42 100644 --- a/resources/views/components/articles/actions.blade.php +++ b/resources/views/components/articles/actions.blade.php @@ -27,7 +27,7 @@ class="w-full" class="w-full" > - + Publish article @@ -42,7 +42,7 @@ class="w-full" class="w-full" > - + Decline article From 1cf7bb00db117ef73b2eb36980aac8364c0fe44b Mon Sep 17 00:00:00 2001 From: faissaloux Date: Fri, 12 Nov 2021 16:33:59 +0100 Subject: [PATCH 4/4] formatting --- resources/views/components/articles/actions.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/components/articles/actions.blade.php b/resources/views/components/articles/actions.blade.php index 838a6ce42..e73483acb 100644 --- a/resources/views/components/articles/actions.blade.php +++ b/resources/views/components/articles/actions.blade.php @@ -1,6 +1,6 @@
@if (Auth::check() && $article->isAuthoredBy(Auth::user())) @@ -75,7 +75,7 @@ class="w-full" > - {{ $article->isPinned() ? 'Unpin article' : 'Pin article' }} + {{ $article->isPinned() ? 'Unpin article' : 'Pin article' }} @endcan