diff --git a/resources/views/plugins/user/databases/card_02/card_common.blade.php b/resources/views/plugins/user/databases/card_02/card_common.blade.php index dea721d22..afa95d341 100644 --- a/resources/views/plugins/user/databases/card_02/card_common.blade.php +++ b/resources/views/plugins/user/databases/card_02/card_common.blade.php @@ -84,37 +84,10 @@ ])
- @if ($input->status == 2) - @can('role_update_or_approval',[[$input, $frame->plugin_name, $buckets]]) - 承認待ち - @endcan - @can('posts.approval',[[$input, $frame->plugin_name, $buckets]]) -
- {{ csrf_field() }} - -
- @endcan - @endif - @can('role_update_or_approval',[[$input, $frame->plugin_name, $buckets]]) - @if (!empty($input->expires_at) && $input->expires_at <= Carbon::now()) - 公開終了 - @endif - - @if ($input->posted_at > Carbon::now()) - 公開前 - @endif - @endcan - @can('posts.update',[[$input, $frame->plugin_name, $buckets]]) - @if ($input->status == 1) - 一時保存 - @endif - - - @endcan + {{-- ステータス表示+ボタン --}} + @include('plugins.user.databases.default.databases_include_status_and_button', [ + 'add_badge_class' => 'align-bottom', + ])
diff --git a/resources/views/plugins/user/databases/card_02/databases_detail.blade.php b/resources/views/plugins/user/databases/card_02/databases_detail.blade.php index 99aa75dd6..36f744b4a 100644 --- a/resources/views/plugins/user/databases/card_02/databases_detail.blade.php +++ b/resources/views/plugins/user/databases/card_02/databases_detail.blade.php @@ -69,37 +69,11 @@ @can('role_update_or_approval', [[$inputs, $frame->plugin_name, $buckets]])
- @if ($inputs->status == 2) - @can('role_update_or_approval',[[$inputs, $frame->plugin_name, $buckets]]) - 承認待ち - @endcan - @can('posts.approval',[[$inputs, $frame->plugin_name, $buckets]]) -
- {{ csrf_field() }} - -
- @endcan - @endif - @can('role_update_or_approval',[[$inputs, $frame->plugin_name, $buckets]]) - @if (!empty($inputs->expires_at) && $inputs->expires_at <= Carbon::now()) - 公開終了 - @endif - - @if ($inputs->posted_at > Carbon::now()) - 公開前 - @endif - @endcan - @can('posts.update',[[$inputs, $frame->plugin_name, $buckets]]) - @if ($inputs->status == 1) - 一時保存 - @endif - - - @endcan + {{-- ステータス表示+ボタン --}} + @include('plugins.user.databases.default.databases_include_status_and_button', [ + 'add_badge_class' => 'align-bottom', + 'input' => $inputs, + ])
@endcan diff --git a/resources/views/plugins/user/databases/default/databases.blade.php b/resources/views/plugins/user/databases/default/databases.blade.php index 537028561..6f071b615 100644 --- a/resources/views/plugins/user/databases/default/databases.blade.php +++ b/resources/views/plugins/user/databases/default/databases.blade.php @@ -72,37 +72,10 @@
- @if ($input->status == 2) - @can('role_update_or_approval',[[$input, $frame->plugin_name, $buckets]]) - 承認待ち - @endcan - @can('posts.approval',[[$input, $frame->plugin_name, $buckets]]) -
- {{ csrf_field() }} - -
- @endcan - @endif - @can('role_update_or_approval',[[$input, $frame->plugin_name, $buckets]]) - @if (!empty($input->expires_at) && $input->expires_at <= Carbon::now()) - 公開終了 - @endif - - @if ($input->posted_at > Carbon::now()) - 公開前 - @endif - @endcan - @can('posts.update',[[$input, $frame->plugin_name, $buckets]]) - @if ($input->status == 1) - 一時保存 - @endif - - - @endcan + {{-- ステータス表示+ボタン --}} + @include('plugins.user.databases.default.databases_include_status_and_button', [ + 'add_badge_class' => 'align-bottom', + ]) {{-- いいねボタン --}} @include('plugins.common.like', [ diff --git a/resources/views/plugins/user/databases/default/databases_detail.blade.php b/resources/views/plugins/user/databases/default/databases_detail.blade.php index aa3194db9..03500734a 100644 --- a/resources/views/plugins/user/databases/default/databases_detail.blade.php +++ b/resources/views/plugins/user/databases/default/databases_detail.blade.php @@ -63,37 +63,11 @@ @can('role_update_or_approval', [[$inputs, $frame->plugin_name, $buckets]])
- @if ($inputs->status == 2) - @can('role_update_or_approval',[[$inputs, $frame->plugin_name, $buckets]]) - 承認待ち - @endcan - @can('posts.approval',[[$inputs, $frame->plugin_name, $buckets]]) -
- {{ csrf_field() }} - -
- @endcan - @endif - @can('role_update_or_approval',[[$inputs, $frame->plugin_name, $buckets]]) - @if (!empty($inputs->expires_at) && $inputs->expires_at <= Carbon::now()) - 公開終了 - @endif - - @if ($inputs->posted_at > Carbon::now()) - 公開前 - @endif - @endcan - @can('posts.update',[[$inputs, $frame->plugin_name, $buckets]]) - @if ($inputs->status == 1) - 一時保存 - @endif - - - @endcan + {{-- ステータス表示+ボタン --}} + @include('plugins.user.databases.default.databases_include_status_and_button', [ + 'add_badge_class' => 'align-bottom', + 'input' => $inputs, + ])
@endcan diff --git a/resources/views/plugins/user/databases/default/databases_include_status_and_button.blade.php b/resources/views/plugins/user/databases/default/databases_include_status_and_button.blade.php new file mode 100644 index 000000000..66ce7918e --- /dev/null +++ b/resources/views/plugins/user/databases/default/databases_include_status_and_button.blade.php @@ -0,0 +1,58 @@ +{{-- + * ステータス表示+ボタン + * + * @author 牟田口 満 + * @category データベース・プラグイン + * + * @param $use_button 承認ボタン・編集ボタンを使う + * @param $add_badge_class ラベルのクラス追加 + * @param $input データベースの1件のデータ + * + * // 暗黙で利用 + * @param $frame + * @param $frame_id + * @param $buckets + * @param $page +--}} +@php + // 承認ボタン・編集ボタンを使うかどうかのフラグ + $use_button = $use_button ?? 1; + // ラベルのクラス追加 + $add_badge_class = $add_badge_class ?? ''; +@endphp + +@if ($input->status == 2) + @can('role_update_or_approval',[[$input, $frame->plugin_name, $buckets]]) + 承認待ち + @endcan + @if ($use_button) + @can('posts.approval',[[$input, $frame->plugin_name, $buckets]]) +
+ {{ csrf_field() }} + +
+ @endcan + @endif +@endif +@can('role_update_or_approval',[[$input, $frame->plugin_name, $buckets]]) + @if (!empty($input->expires_at) && $input->expires_at <= Carbon::now()) + 公開終了 + @endif + + @if ($input->posted_at > Carbon::now()) + 公開前 + @endif +@endcan +@can('posts.update',[[$input, $frame->plugin_name, $buckets]]) + @if ($input->status == 1) + 一時保存 + @endif + + @if ($use_button) + + @endif +@endcan diff --git a/resources/views/plugins/user/databases/design-table-dl/databases.blade.php b/resources/views/plugins/user/databases/design-table-dl/databases.blade.php index 20494e92c..c81b548cb 100644 --- a/resources/views/plugins/user/databases/design-table-dl/databases.blade.php +++ b/resources/views/plugins/user/databases/design-table-dl/databases.blade.php @@ -59,6 +59,11 @@ @include('plugins.user.databases.default.databases_include_value') + + {{-- ステータス表示のみ --}} + @include('plugins.user.databases.default.databases_include_status_and_button', [ + 'use_button' => 0, + ]) @php diff --git a/resources/views/plugins/user/databases/design-table-dl/databases_detail.blade.php b/resources/views/plugins/user/databases/design-table-dl/databases_detail.blade.php index 8b40bfda6..5951382e9 100644 --- a/resources/views/plugins/user/databases/design-table-dl/databases_detail.blade.php +++ b/resources/views/plugins/user/databases/design-table-dl/databases_detail.blade.php @@ -66,37 +66,11 @@ @can('role_update_or_approval', [[$inputs, $frame->plugin_name, $buckets]])
- @if ($inputs->status == 2) - @can('role_update_or_approval',[[$inputs, $frame->plugin_name, $buckets]]) - 承認待ち - @endcan - @can('posts.approval',[[$inputs, $frame->plugin_name, $buckets]]) -
- {{ csrf_field() }} - -
- @endcan - @endif - @can('role_update_or_approval',[[$inputs, $frame->plugin_name, $buckets]]) - @if (!empty($inputs->expires_at) && $inputs->expires_at <= Carbon::now()) - 公開終了 - @endif - - @if ($inputs->posted_at > Carbon::now()) - 公開前 - @endif - @endcan - @can('posts.update',[[$inputs, $frame->plugin_name, $buckets]]) - @if ($inputs->status == 1) - 一時保存 - @endif - - - @endcan + {{-- ステータス表示+ボタン --}} + @include('plugins.user.databases.default.databases_include_status_and_button', [ + 'add_badge_class' => 'align-bottom', + 'input' => $inputs, + ])
@endcan diff --git a/resources/views/plugins/user/databases/table/databases.blade.php b/resources/views/plugins/user/databases/table/databases.blade.php index e32e7790d..5f67f1e3c 100644 --- a/resources/views/plugins/user/databases/table/databases.blade.php +++ b/resources/views/plugins/user/databases/table/databases.blade.php @@ -62,6 +62,11 @@ @include('plugins.user.databases.default.databases_include_value') + + {{-- ステータス表示のみ --}} + @include('plugins.user.databases.default.databases_include_status_and_button', [ + 'use_button' => 0, + ]) @php