From 96075dee7be755b3e885cb613f90f67952eded85 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 3 Dec 2016 18:35:40 +0000 Subject: [PATCH] Extracted text from page views & standardised breadcrumbs --- resources/assets/sass/_lists.scss | 3 + resources/assets/sass/_text.scss | 3 + resources/lang/en/common.php | 10 ++- resources/lang/en/entities.php | 68 +++++++++++++++++++ resources/views/books/_breadcrumbs.blade.php | 3 + resources/views/books/delete.blade.php | 10 +++ resources/views/books/edit.blade.php | 10 +++ resources/views/books/restrictions.blade.php | 4 +- resources/views/books/show.blade.php | 5 +- resources/views/books/sort.blade.php | 18 +++-- .../views/chapters/_breadcrumbs.blade.php | 5 ++ resources/views/chapters/delete.blade.php | 10 +++ resources/views/chapters/move.blade.php | 8 +-- .../views/chapters/restrictions.blade.php | 6 +- resources/views/chapters/show.blade.php | 4 +- resources/views/pages/_breadcrumbs.blade.php | 12 ++++ resources/views/pages/delete.blade.php | 18 +++-- resources/views/pages/export.blade.php | 8 +-- resources/views/pages/form-toolbox.blade.php | 62 ++++++++--------- resources/views/pages/form.blade.php | 30 ++++---- resources/views/pages/guest-create.blade.php | 8 +-- resources/views/pages/list-item.blade.php | 5 +- resources/views/pages/move.blade.php | 19 ++---- resources/views/pages/page-display.blade.php | 2 +- resources/views/pages/pdf.blade.php | 1 - resources/views/pages/restrictions.blade.php | 17 +---- resources/views/pages/revision.blade.php | 6 +- resources/views/pages/revisions.blade.php | 39 ++++------- resources/views/pages/show.blade.php | 43 +++++------- tests/Entity/SortTest.php | 2 +- tests/PublicActionTest.php | 2 +- 31 files changed, 266 insertions(+), 175 deletions(-) create mode 100644 resources/views/books/_breadcrumbs.blade.php create mode 100644 resources/views/chapters/_breadcrumbs.blade.php create mode 100644 resources/views/pages/_breadcrumbs.blade.php diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss index 54fd55dff..d88db2ec2 100644 --- a/resources/assets/sass/_lists.scss +++ b/resources/assets/sass/_lists.scss @@ -320,6 +320,9 @@ ul.pagination { font-size: 0.75em; margin-top: $-xs; } + .text-muted p.text-muted { + margin-top: 0; + } .page.draft .text-page { color: $color-page-draft; } diff --git a/resources/assets/sass/_text.scss b/resources/assets/sass/_text.scss index 9bad2e83d..dd2f32e1c 100644 --- a/resources/assets/sass/_text.scss +++ b/resources/assets/sass/_text.scss @@ -109,6 +109,9 @@ em, i, .italic { small, p.small, span.small, .text-small { font-size: 0.8em; color: lighten($text-dark, 20%); + small, p.small, span.small, .text-small { + font-size: 1em; + } } sup, .superscript { diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index 6517c8cc5..9ee359641 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -6,7 +6,9 @@ return [ */ 'cancel' => 'Cancel', 'confirm' => 'Confirm', - + 'back' => 'Back', + 'save' => 'Save', + 'continue' => 'Continue', /** * Form Labels @@ -23,4 +25,10 @@ return [ 'create' => 'Create', 'update' => 'Update', 'delete' => 'Delete', + + + /** + * Misc + */ + 'deleted_user' => 'Deleted User', ]; \ No newline at end of file diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php index bc83a4a4f..751aa5a12 100644 --- a/resources/lang/en/entities.php +++ b/resources/lang/en/entities.php @@ -13,6 +13,7 @@ return [ 'sort' => 'Sort', 'move' => 'Move', 'delete' => 'Delete', + 'revisions' => 'Revisions', 'meta_created' => 'Created :timeLength', 'meta_created_name' => 'Created :timeLength by :user', 'meta_updated' => 'Updated :timeLength', @@ -56,6 +57,9 @@ return [ 'books_permissions_active' => 'Book Permissions Active', 'books_search_this' => 'Search this book', 'books_navigation' => 'Book Navigation', + 'books_sort' => 'Sort Book Contents', + 'books_sort_show_other' => 'Show Other Books', + 'books_sort_save' => 'Save New Order', /** * Chapters @@ -81,4 +85,68 @@ return [ 'pages_new' => 'New Page', 'pages_attachments' => 'Attachments', 'pages_navigation' => 'Page Navigation', + 'pages_delete' => 'Delete Page', + 'pages_delete_draft' => 'Delete Draft Page', + 'pages_delete_confirm' => 'Are you sure you want to delete this page?', + 'pages_delete_draft_confirm' => 'Are you sure you want to delete this draft page?', + 'pages_edit_toggle_header' => 'Toggle header', + 'pages_edit_save_draft' => 'Save Draft', + 'pages_edit_delete_draft' => 'Delete Draft', + 'pages_edit_discard_draft' => 'Discard Draft', + 'pages_edit_set_changelog' => 'Set Changelog', + 'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made', + 'pages_edit_enter_changelog' => 'Enter Changelog', + 'pages_save' => 'Save Page', + 'pages_title' => 'Page Title', + 'pages_name' => 'Page Name', + 'pages_md_editor' => 'Editor', + 'pages_md_preview' => 'Preview', + 'pages_md_insert_image' => 'Insert Image', + 'pages_md_insert_link' => 'Insert Entity Link', + 'pages_not_in_chapter' => 'Page is not in a chapter', + 'pages_move' => 'Move Page', + 'pages_permissions' => 'Page Permissions', + 'pages_revisions' => 'Page Revisions', + 'pages_revisions_created_by' => 'Created By', + 'pages_revisions_date' => 'Revision Date', + 'pages_revisions_changelog' => 'Changelog', + 'pages_revisions_changes' => 'Changes', + 'pages_revisions_current' => 'Current Version', + 'pages_revisions_preview' => 'Preview', + 'pages_revisions_restore' => 'Restore', + 'pages_revisions_none' => 'This page has no revisions', + 'pages_export' => 'Export', + 'pages_export_html' => 'Contained Web File', + 'pages_export_pdf' => 'PDF File', + 'pages_export_text' => 'Plain Text File', + 'pages_copy_link' => 'Copy Link', + 'pages_permissions_active' => 'Page Permissions Active', + + /** + * Editor sidebar + */ + 'page_tags' => 'Page Tags', + 'tag' => 'Tag', + 'tag_value' => 'Tag Value (Optional)', + 'tags_explain' => "Add some tags to better categorise your content. \n You can assign a value to a tag for more in-depth organisation.", + 'tags_add' => 'Add another tag', + 'attachments' => 'Attachments', + 'attachments_explain' => 'Upload some files or attach some link to display on your page. These are visible in the page sidebar.', + 'attachments_explain_instant_save' => 'Changes here are saved instantly.', + 'attachments_items' => 'Attached Items', + 'attachments_upload' => 'Upload File', + 'attachments_link' => 'Attach Link', + 'attachments_set_link' => 'Set Link', + 'attachments_delete_confirm' => 'Click delete again to confirm you want to delete this attachment.', + 'attachments_no_files' => 'No files have been uploaded', + 'attachments_explain_link' => 'You can attach a link if you\'d prefer not to upload a file. This can be a link to another page or a link to a file in the cloud.', + 'attachments_link_name' => 'Link Name', + 'attachment_link' => 'Attachment link', + 'attachments_link_url' => 'Link to file', + 'attachments_link_url_hint' => 'Url of site or file', + 'attach' => 'Attach', + 'attachments_edit_file' => 'Edit File', + 'attachments_edit_file_name' => 'File Name', + 'attachments_edit_drop_upload' => 'Drop files or click here to upload and overwrite', + ]; \ No newline at end of file diff --git a/resources/views/books/_breadcrumbs.blade.php b/resources/views/books/_breadcrumbs.blade.php new file mode 100644 index 000000000..e588127ce --- /dev/null +++ b/resources/views/books/_breadcrumbs.blade.php @@ -0,0 +1,3 @@ +
+ {{ $book->getShortName() }} +
\ No newline at end of file diff --git a/resources/views/books/delete.blade.php b/resources/views/books/delete.blade.php index b47cae2cc..0b1e67d4a 100644 --- a/resources/views/books/delete.blade.php +++ b/resources/views/books/delete.blade.php @@ -2,6 +2,16 @@ @section('content') +
+
+
+
+ @include('books._breadcrumbs', ['book' => $book]) +
+
+
+
+

{{ trans('entities.books_delete') }}

{{ trans('entities.books_delete_explain', ['bookName' => $book->name]) }}

diff --git a/resources/views/books/edit.blade.php b/resources/views/books/edit.blade.php index 2b9e376e7..2419b68da 100644 --- a/resources/views/books/edit.blade.php +++ b/resources/views/books/edit.blade.php @@ -2,6 +2,16 @@ @section('content') +
+
+
+
+ @include('books._breadcrumbs', ['book' => $book]) +
+
+
+
+

{{ trans('entities.books_edit') }}

diff --git a/resources/views/books/restrictions.blade.php b/resources/views/books/restrictions.blade.php index f14042933..f558fdfce 100644 --- a/resources/views/books/restrictions.blade.php +++ b/resources/views/books/restrictions.blade.php @@ -6,9 +6,7 @@
-
- {{ $book->getShortName() }} -
+ @include('books._breadcrumbs', ['book' => $book])
diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php index 6ae126c63..2d1c21cdd 100644 --- a/resources/views/books/show.blade.php +++ b/resources/views/books/show.blade.php @@ -5,7 +5,10 @@
-
+
+ @include('books._breadcrumbs', ['book' => $book]) +
+
@if(userCan('page-create', $book)) {{ trans('entities.pages_new') }} diff --git a/resources/views/books/sort.blade.php b/resources/views/books/sort.blade.php index 984db0ce6..d96f502f1 100644 --- a/resources/views/books/sort.blade.php +++ b/resources/views/books/sort.blade.php @@ -6,8 +6,18 @@ @section('content') +
+
+
+
+ @include('books._breadcrumbs', ['book' => $book]) +
+
+
+
+
-

Sorting Pages & ChaptersFor {{ $book->name }}

+

{{ trans('entities.books_sort') }}

@@ -17,7 +27,7 @@ @if(count($books) > 1)
-

Show Other Books

+

{{ trans('entities.books_sort_show_other') }}

@foreach($books as $otherBook) @if($otherBook->id !== $book->id) @@ -37,8 +47,8 @@
- Cancel - + {{ trans('common.cancel') }} +
diff --git a/resources/views/chapters/_breadcrumbs.blade.php b/resources/views/chapters/_breadcrumbs.blade.php new file mode 100644 index 000000000..9064cc7c3 --- /dev/null +++ b/resources/views/chapters/_breadcrumbs.blade.php @@ -0,0 +1,5 @@ +
+ {{ $chapter->book->getShortName() }} + » + {{$chapter->getShortName()}} +
\ No newline at end of file diff --git a/resources/views/chapters/delete.blade.php b/resources/views/chapters/delete.blade.php index 7005312c8..bacb8dca3 100644 --- a/resources/views/chapters/delete.blade.php +++ b/resources/views/chapters/delete.blade.php @@ -2,6 +2,16 @@ @section('content') +
+
+
+
+ @include('chapters._breadcrumbs', ['chapter' => $chapter]) +
+
+
+
+

{{ trans('entities.chapters_delete') }}

{{ trans('entities.chapters_delete_explain', ['chapterName' => $chapter->name]) }}

diff --git a/resources/views/chapters/move.blade.php b/resources/views/chapters/move.blade.php index 291ab5015..a28d61d41 100644 --- a/resources/views/chapters/move.blade.php +++ b/resources/views/chapters/move.blade.php @@ -6,18 +6,14 @@
-
- {{ $book->getShortName() }} - » - {{ $chapter->getShortName() }} -
+ @include('chapters._breadcrumbs', ['chapter' => $chapter])
-

{{ trans('entities.chapters_move') }} {{$chapter->name}}

+

{{ trans('entities.chapters_move') }}

{!! csrf_field() !!} diff --git a/resources/views/chapters/restrictions.blade.php b/resources/views/chapters/restrictions.blade.php index 7a38fa104..7b908ee15 100644 --- a/resources/views/chapters/restrictions.blade.php +++ b/resources/views/chapters/restrictions.blade.php @@ -6,11 +6,7 @@
-
- {{ $chapter->book->getShortName() }} - » - {{$chapter->getShortName()}} -
+ @include('chapters._breadcrumbs', ['chapter' => $chapter])
diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php index d929d61cc..5dd4e5379 100644 --- a/resources/views/chapters/show.blade.php +++ b/resources/views/chapters/show.blade.php @@ -6,9 +6,7 @@
-
- {{ $book->getShortName() }} -
+ @include('chapters._breadcrumbs', ['chapter' => $chapter])
diff --git a/resources/views/pages/_breadcrumbs.blade.php b/resources/views/pages/_breadcrumbs.blade.php new file mode 100644 index 000000000..0d2a61ab2 --- /dev/null +++ b/resources/views/pages/_breadcrumbs.blade.php @@ -0,0 +1,12 @@ +
+ {{ $page->book->getShortName() }} + @if($page->hasChapter()) + » + + + {{ $page->chapter->getShortName() }} + + @endif + » + {{ $page->getShortName() }} +
\ No newline at end of file diff --git a/resources/views/pages/delete.blade.php b/resources/views/pages/delete.blade.php index 57cc86054..f94a614fb 100644 --- a/resources/views/pages/delete.blade.php +++ b/resources/views/pages/delete.blade.php @@ -2,15 +2,25 @@ @section('content') +
+
+
+
+ @include('pages._breadcrumbs', ['page' => $page]) +
+
+
+
+
-

Delete {{ $page->draft ? 'Draft' : '' }} Page

-

Are you sure you want to delete this {{ $page->draft ? 'draft' : '' }} page?

+

{{ $page->draft ? trans('entities.pages_delete_draft') : trans('entities.pages_delete') }}

+

{{ $page->draft ? trans('entities.pages_delete_draft_confirm'): trans('entities.pages_delete_confirm') }}

{!! csrf_field() !!} - Cancel - + {{ trans('common.cancel') }} +
diff --git a/resources/views/pages/export.blade.php b/resources/views/pages/export.blade.php index 96f06290e..19a635563 100644 --- a/resources/views/pages/export.blade.php +++ b/resources/views/pages/export.blade.php @@ -15,15 +15,11 @@
- @include('pages/page-display') + @include('pages.page-display')
-

- Created {{$page->created_at->toDayDateTimeString()}} @if($page->createdBy) by {{$page->createdBy->name}} @endif -
- Last Updated {{$page->updated_at->toDayDateTimeString()}} @if($page->updatedBy) by {{$page->updatedBy->name}} @endif -

+ @include('partials.entity-meta', ['entity' => $page])
diff --git a/resources/views/pages/form-toolbox.blade.php b/resources/views/pages/form-toolbox.blade.php index a6e66a24a..cd9b7ed80 100644 --- a/resources/views/pages/form-toolbox.blade.php +++ b/resources/views/pages/form-toolbox.blade.php @@ -3,22 +3,22 @@
- + @if(userCan('attachment-create-all')) - + @endif
-

Page Tags

+

{{ trans('entities.page_tags') }}

-

Add some tags to better categorise your content.
You can assign a value to a tag for more in-depth organisation.

+

{!! nl2br(e(trans('entities.tags_explain'))) !!}

- - + + @@ -28,7 +28,7 @@ @@ -39,17 +39,17 @@ @if(userCan('attachment-create-all'))
-

Attachments

+

{{ trans('entities.attachments') }}

-

Upload some files or attach some link to display on your page. These are visible in the page sidebar. Changes here are saved instantly.

+

{{ trans('entities.attachments_explain') }} {{ trans('entities.attachments_explain_instant_save') }}

-
Attached Items
-
Upload File
-
Attach Link
+
{{ trans('entities.attachments_items') }}
+
{{ trans('entities.attachments_upload') }}
+
{{ trans('entities.attachments_link') }}
- +
@@ -59,9 +59,9 @@ @@ -71,25 +71,25 @@
- Click delete again to confirm you want to delete this attachment. + {{ trans('entities.attachments_delete_confirm') }}
- Cancel + {{ trans('common.cancel') }}

- No files have been uploaded. + {{ trans('entities.attachments_no_files') }}

-

You can attach a link if you'd prefer not to upload a file. This can be a link to another page or a link to a file in the cloud.

+

{{ trans('entities.attachments_explain_link') }}

- - + +

- - + +

- +
@@ -97,34 +97,34 @@
-
Edit File
+
{{ trans('entities.attachments_edit_file') }}
- - + +

-
Upload File
-
Set Link
+
{{ trans('entities.attachments_upload') }}
+
{{ trans('entities.attachments_set_link') }}
- +
- - + +

- - + +
diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php index c4baf38f7..eb5ebb0bd 100644 --- a/resources/views/pages/form.blade.php +++ b/resources/views/pages/form.blade.php @@ -9,8 +9,8 @@
- Back - Toggle Header + {{ trans('common.back') }} + {{ trans('entities.pages_edit_toggle_header') }}
@@ -20,13 +20,13 @@
@@ -34,16 +34,16 @@
- @{{(changeSummary | limitTo:16) + (changeSummary.length>16?'...':'') || 'Set Changelog'}} +
  • -

    Enter a brief description of the changes you've made

    - +

    {{ trans('entities.pages_edit_enter_changelog_desc') }}

    +
- +
@@ -53,7 +53,7 @@ {{--Title input--}}
- @include('form/text', ['name' => 'name', 'placeholder' => 'Page Title']) + @include('form/text', ['name' => 'name', 'placeholder' => trans('entities.pages_title')])
@@ -78,24 +78,24 @@
- Editor + {{ trans('entities.pages_md_editor') }}
- +  |  - +
+ @if($errors->has('markdown')) class="neg" @endif>@if(isset($model) || old('markdown')){{htmlspecialchars( old('markdown') ? old('markdown') : ($model->markdown === '' ? $model->html : $model->markdown))}}@endif
-
Preview
+
{{ trans('entities.pages_md_preview') }}
diff --git a/resources/views/pages/guest-create.blade.php b/resources/views/pages/guest-create.blade.php index 00d9f5560..10e16cb97 100644 --- a/resources/views/pages/guest-create.blade.php +++ b/resources/views/pages/guest-create.blade.php @@ -3,19 +3,19 @@ @section('content')
-

Create Page

+

{{ trans('entities.pages_new') }}

{!! csrf_field() !!}
- + @include('form/text', ['name' => 'name'])
- Cancel - + {{ trans('common.cancel') }} +
diff --git a/resources/views/pages/list-item.blade.php b/resources/views/pages/list-item.blade.php index 7aa5d7933..70b309e7d 100644 --- a/resources/views/pages/list-item.blade.php +++ b/resources/views/pages/list-item.blade.php @@ -12,8 +12,7 @@ @if(isset($style) && $style === 'detailed')
- Created {{$page->created_at->diffForHumans()}} @if($page->createdBy)by {{$page->createdBy->name}}@endif
- Last updated {{ $page->updated_at->diffForHumans() }} @if($page->updatedBy)by {{$page->updatedBy->name}} @endif + @include('partials.entity-meta', ['entity' => $page])
{{ $page->book->getShortName(30) }} @@ -21,7 +20,7 @@ @if($page->chapter) {{ $page->chapter->getShortName(30) }} @else - Page is not in a chapter + {{ trans('entities.pages_not_in_chapter') }} @endif
diff --git a/resources/views/pages/move.blade.php b/resources/views/pages/move.blade.php index d0fae60ca..2bf226047 100644 --- a/resources/views/pages/move.blade.php +++ b/resources/views/pages/move.blade.php @@ -6,25 +6,14 @@
-
- {{ $book->getShortName() }} - @if($page->hasChapter()) - » - - - {{ $page->chapter->getShortName() }} - - @endif - » - {{ $page->getShortName() }} -
+ @include('pages._breadcrumbs', ['page' => $page])
-

Move Page {{$page->name}}

+

{{ trans('entities.pages_move') }}

{!! csrf_field() !!} @@ -32,8 +21,8 @@ @include('partials/entity-selector', ['name' => 'entity_selection', 'selectorSize' => 'large', 'entityTypes' => 'book,chapter']) - Cancel - + {{ trans('common.cancel') }} +
diff --git a/resources/views/pages/page-display.blade.php b/resources/views/pages/page-display.blade.php index 6ffe4b502..fcc046aae 100644 --- a/resources/views/pages/page-display.blade.php +++ b/resources/views/pages/page-display.blade.php @@ -7,7 +7,7 @@ - + diff --git a/resources/views/pages/pdf.blade.php b/resources/views/pages/pdf.blade.php index 5c9fd5eea..7e43c5e1a 100644 --- a/resources/views/pages/pdf.blade.php +++ b/resources/views/pages/pdf.blade.php @@ -36,6 +36,5 @@ max-width: none; display: none; } - @stop \ No newline at end of file diff --git a/resources/views/pages/restrictions.blade.php b/resources/views/pages/restrictions.blade.php index bd88919df..cfef2ed21 100644 --- a/resources/views/pages/restrictions.blade.php +++ b/resources/views/pages/restrictions.blade.php @@ -6,26 +6,15 @@
-
- {{ $page->book->getShortName() }} - @if($page->hasChapter()) - » - - - {{ $page->chapter->getShortName() }} - - @endif - » - {{ $page->getShortName() }} -
+ @include('pages._breadcrumbs', ['page' => $page])
-

Page Permissions

- @include('form/restriction-form', ['model' => $page]) +

{{ trans('entities.pages_permissions') }}

+ @include('form.restriction-form', ['model' => $page])
@stop diff --git a/resources/views/pages/revision.blade.php b/resources/views/pages/revision.blade.php index bc054ef83..fe0dd9511 100644 --- a/resources/views/pages/revision.blade.php +++ b/resources/views/pages/revision.blade.php @@ -7,14 +7,12 @@
- @include('pages/page-display') + @include('pages.page-display')
- - @include('partials/highlight') - + @include('partials.highlight') @stop diff --git a/resources/views/pages/revisions.blade.php b/resources/views/pages/revisions.blade.php index 720e34fea..3549f5f05 100644 --- a/resources/views/pages/revisions.blade.php +++ b/resources/views/pages/revisions.blade.php @@ -6,37 +6,24 @@
-
- {{ $page->book->getShortName() }} - @if($page->hasChapter()) - » - - - {{ $page->chapter->getShortName() }} - - @endif - » - {{ $page->getShortName() }} -
+ @include('pages._breadcrumbs', ['page' => $page])
- -
-

Page Revisions For "{{ $page->name }}"

+

{{ trans('entities.pages_revisions') }}

@if(count($page->revisions) > 0)
Page Tags{{ trans('entities.page_tags') }}
- - - - - + + + + + @foreach($page->revisions as $index => $revision) @@ -46,19 +33,19 @@ {{ $revision->createdBy->name }} @endif - + @@ -66,7 +53,7 @@
NameCreated ByRevision DateChangelogActions{{ trans('entities.pages_name') }}{{ trans('entities.pages_revisions_created_by') }}{{ trans('entities.pages_revisions_date') }}{{ trans('entities.pages_revisions_changelog') }}{{ trans('common.actions') }}
@if($revision->createdBy) {{ $revision->createdBy->name }} @else Deleted User @endif @if($revision->createdBy) {{ $revision->createdBy->name }} @else {{ trans('common.deleted_user') }} @endif {{ $revision->created_at->format('jS F, Y H:i:s') }}
({{ $revision->created_at->diffForHumans() }})		 {{ $revision->summary }} - Changes + {{ trans('entities.pages_revisions_changes') }}  |  @if ($index === 0) - Current Version + {{ trans('entities.pages_revisions_current') }} @else - Preview + {{ trans('entities.pages_revisions_preview') }}  |  - Restore + {{ trans('entities.pages_revisions_restore') }} @endif
@else -

This page has no revisions.

+

{{ trans('entities.pages_revisions_none') }}

@endif
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php index 0a96afdab..ced311f94 100644 --- a/resources/views/pages/show.blade.php +++ b/resources/views/pages/show.blade.php @@ -6,43 +6,34 @@
-
- {{ $book->getShortName() }} - @if($page->hasChapter()) - » - - - {{ $page->chapter->getShortName() }} - - @endif -
+ @include('pages._breadcrumbs', ['page' => $page])
-
Export
+
{{ trans('entities.pages_export') }}
 @if(userCan('page-update', $page)) - Edit + {{ trans('entities.edit') }} @endif @if(userCan('page-update', $page) || userCan('restrictions-manage', $page) || userCan('page-delete', $page))
@@ -64,7 +55,7 @@
- +
@@ -84,27 +75,27 @@ @if($book->restricted) @if(userCan('restrictions-manage', $book)) - Book Permissions Active + {{ trans('entities.books_permissions_active') }} @else - Book Permissions Active + {{ trans('entities.books_permissions_active') }} @endif
@endif @if($page->chapter && $page->chapter->restricted) @if(userCan('restrictions-manage', $page->chapter)) - Chapter Permissions Active + {{ trans('entities.chapters_permissions_active') }} @else - Chapter Permissions Active + {{ trans('entities.chapters_permissions_active') }} @endif
@endif @if($page->restricted) @if(userCan('restrictions-manage', $page)) - Page Permissions Active + {{ trans('entities.pages_permissions_active') }} @else - Page Permissions Active + {{ trans('entities.pages_permissions_active') }} @endif
@endif diff --git a/tests/Entity/SortTest.php b/tests/Entity/SortTest.php index 80783912a..2c18c29d3 100644 --- a/tests/Entity/SortTest.php +++ b/tests/Entity/SortTest.php @@ -28,7 +28,7 @@ class SortTest extends TestCase $currentBook = $page->book; $newBook = \BookStack\Book::where('id', '!=', $currentBook->id)->first(); $this->asAdmin()->visit($page->getUrl() . '/move') - ->see('Move Page')->see($page->name) + ->see('Move Page') ->type('book:' . $newBook->id, 'entity_selection')->press('Move Page'); $page = \BookStack\Page::find($page->id); diff --git a/tests/PublicActionTest.php b/tests/PublicActionTest.php index 685146423..2ea5fbfed 100644 --- a/tests/PublicActionTest.php +++ b/tests/PublicActionTest.php @@ -64,7 +64,7 @@ class PublicActionTest extends TestCase $this->visit($chapter->book->getUrl()); $this->visit($chapter->getUrl()) ->click('New Page') - ->see('Create Page') + ->see('New Page') ->seePageIs($chapter->getUrl('/create-page')); $this->submitForm('Continue', [