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 @@ +
\ 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') + +{{ 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') + +