diff --git a/src/resources/lang/en/crud.php b/src/resources/lang/en/crud.php
index d04d6f05b0..fcc394f023 100644
--- a/src/resources/lang/en/crud.php
+++ b/src/resources/lang/en/crud.php
@@ -20,6 +20,10 @@
'save_action_save_and_preview' => 'Save and preview',
'save_action_changed_notification' => 'Default behaviour after saving has been changed.',
+ // headings
+ 'page_heading' => ':plural',
+ 'page_subheading' => ':action :singular',
+
// Create form
'add' => 'Add',
'back_to_all' => 'Back to all ',
diff --git a/src/resources/views/crud/create.blade.php b/src/resources/views/crud/create.blade.php
index f6dd72ad85..c722c99543 100644
--- a/src/resources/views/crud/create.blade.php
+++ b/src/resources/views/crud/create.blade.php
@@ -13,17 +13,11 @@
@section('header')
{!! $crud->getSubheading() ?? trans('backpack::crud.add').' '.$crud->entity_name !!}.
-
-
- {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }}
-
-
- {!! $crud->getSubheading() ?? trans('backpack::crud.edit').' '.$crud->entity_name !!}.
- {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }}
- {!! $crud->getHeading() ?? $crud->entity_name_plural !!}
- {!! $crud->getHeading() ?? $crud->entity_name_plural !!}
-
+ {!! $crud->getSubheading() ?? trans('backpack::crud.page_subheading', [ + 'singular' => $singular, + 'plural' => $plural, + 'action' => $action + ]) + !!} +
+@if ($backButton ?? true && $crud->hasAccess('list')) ++ + + {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }} + + +
+@endif \ No newline at end of file diff --git a/src/resources/views/crud/list.blade.php b/src/resources/views/crud/list.blade.php index b16e0869e5..487cb86093 100644 --- a/src/resources/views/crud/list.blade.php +++ b/src/resources/views/crud/list.blade.php @@ -13,8 +13,12 @@ @section('header'){!! $crud->getSubheading() ?? '' !!}
+ @include('crud::inc.page_headings', [ + 'singular' => '', + 'plural' => $crud->entity_name_plural, + 'action' => '', + 'backButton' => false + ]){!! $crud->getSubheading() ?? trans('backpack::crud.reorder').' '.$crud->entity_name_plural !!}
- @if ($crud->hasAccess('list')) -- {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }} -
- @endif + @include('crud::inc.page_headings', [ + 'singular' => $crud->entity_name, + 'plural' => $crud->entity_name_plural, + 'action' => trans('backpack::crud.reorder') + ]){!! $crud->getSubheading() ?? mb_ucfirst(trans('backpack::crud.preview')).' '.$crud->entity_name !!}
- @if ($crud->hasAccess('list')) -- {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }} -
- @endif + @include('crud::inc.page_headings', [ + 'singular' => $crud->entity_name, + 'plural' => $crud->entity_name_plural, + 'action' => trans('backpack::crud.preview') + ])