diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php index 5e364799d..3762905b9 100644 --- a/resources/lang/en/auth.php +++ b/resources/lang/en/auth.php @@ -18,6 +18,7 @@ return [ */ 'sign_up' => 'Sign up', 'log_in' => 'Log in', + 'logout' => 'Logout', 'name' => 'Name', 'username' => 'Username', diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index 9ee359641..e6648fbcd 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -9,6 +9,7 @@ return [ 'back' => 'Back', 'save' => 'Save', 'continue' => 'Continue', + 'select' => 'Select', /** * Form Labels @@ -24,11 +25,30 @@ return [ 'view' => 'View', 'create' => 'Create', 'update' => 'Update', + 'edit' => 'Edit', 'delete' => 'Delete', + 'search' => 'Search', + 'search_clear' => 'Clear Search', /** * Misc */ 'deleted_user' => 'Deleted User', + 'no_activity' => 'No activity to show', + 'no_items' => 'No items available', + 'back_to_top' => 'Back to top', + 'toggle_details' => 'Toggle Details', + + /** + * Header + */ + 'view_profile' => 'View Profile', + 'edit_profile' => 'Edit Profile', + + /** + * Email Content + */ + 'email_action_help' => 'If you’re having trouble clicking the ":actionText" button, copy and paste the URL below into your web browser:', + 'email_rights' => 'All rights reserved', ]; \ No newline at end of file diff --git a/resources/lang/en/components.php b/resources/lang/en/components.php new file mode 100644 index 000000000..2b4796179 --- /dev/null +++ b/resources/lang/en/components.php @@ -0,0 +1,18 @@ + 'Image Select', + 'imagem_all' => 'All', + 'imagem_all_title' => 'View all images', + 'imagem_book_title' => 'View images uploaded to this book', + 'imagem_page_title' => 'View images uploaded to this page', + 'imagem_search_hint' => 'Search by image name', + 'imagem_uploaded' => 'Uploaded :uploadedDate', + 'imagem_load_more' => 'Load More', + 'imagem_image_name' => 'Image Name', + 'imagem_delete_confirm' => 'This image is used in the pages below, Click delete again to confirm you want to delete this image.', + 'imagem_select_image' => 'Select Image' +]; \ No newline at end of file diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php index 751aa5a12..b2fb23d0e 100644 --- a/resources/lang/en/entities.php +++ b/resources/lang/en/entities.php @@ -5,6 +5,10 @@ return [ * Shared */ 'recently_created' => 'Recently Created', + 'recently_created_pages' => 'Recently Created Pages', + 'recently_updated_pages' => 'Recently Updated Pages', + 'recently_created_chapters' => 'Recently Created Chapters', + 'recently_created_books' => 'Recently Created Books', 'recently_update' => 'Recently Updated', 'recently_viewed' => 'Recently Viewed', 'recent_activity' => 'Recent Activity', @@ -19,6 +23,13 @@ return [ 'meta_updated' => 'Updated :timeLength', 'meta_updated_name' => 'Updated :timeLength by :user', 'x_pages' => ':count Pages', + 'entity_select' => 'Entity Select', + 'images' => 'Images', + 'my_recent_drafts' => 'My Recent Drafts', + 'my_recently_viewed' => 'My Recently Viewed', + 'no_pages_viewed' => 'You have not viewed any pages', + 'no_pages_recently_created' => 'No pages have been recently created', + 'no_pages_recently_updated' => 'No pages have been recently updated', /** * Permissions and restrictions @@ -33,13 +44,19 @@ return [ */ 'search_results' => 'Search Results', 'search_clear' => 'Clear Search', + 'search_view_pages' => 'View all matches pages', + 'search_view_chapters' => 'View all matches chapters', + 'search_view_books' => 'View all matches books', + 'search_no_pages' => 'No pages matched this search', /** * Books */ + 'book' => 'Book', 'books' => 'Books', 'books_empty' => 'No books have been created', 'books_popular' => 'Popular Books', + 'books_recent' => 'Recent Books', 'books_popular_empty' => 'The most popular books will appear here.', 'books_create' => 'Create New Book', 'books_delete' => 'Delete Book', @@ -64,6 +81,7 @@ return [ /** * Chapters */ + 'chapter' => 'Chapter', 'chapters_popular' => 'Popular Chapters', 'chapters_new' => 'New Chapter', 'chapters_create' => 'Create New Chapter', @@ -81,6 +99,8 @@ return [ /** * Pages */ + 'page' => 'Page', + 'pages' => 'Pages', 'pages_popular' => 'Popular Pages', 'pages_new' => 'New Page', 'pages_attachments' => 'Attachments', @@ -149,4 +169,12 @@ return [ 'attachments_edit_file_name' => 'File Name', 'attachments_edit_drop_upload' => 'Drop files or click here to upload and overwrite', + /** + * Profile View + */ + 'profile_user_for_x' => 'User for :time', + 'profile_created_content' => 'Created Content', + 'profile_not_created_pages' => ':userName has not created any pages', + 'profile_not_created_chapters' => ':userName has not created any chapters', + 'profile_not_created_books' => ':userName has not created any books', ]; \ No newline at end of file diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php index 1b0bcad33..dcbfe6dde 100644 --- a/resources/lang/en/settings.php +++ b/resources/lang/en/settings.php @@ -10,7 +10,11 @@ return [ 'settings' => 'Settings', 'settings_save' => 'Save Settings', - + + /** + * App settings + */ + 'app_settings' => 'App Settings', 'app_name' => 'Application name', 'app_name_desc' => 'This name is shown in the header and any emails.', @@ -27,6 +31,10 @@ return [ 'app_primary_color' => 'Application primary color', 'app_primary_color_desc' => 'This should be a hex value.
Leave empty to reset to the default color.', + /** + * Registration settings + */ + 'reg_settings' => 'Registration Settings', 'reg_allow' => 'Allow registration?', 'reg_default_role' => 'Default user role after registration', @@ -36,4 +44,86 @@ return [ 'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application.
Note that users will be able to change their email addresses after successful registration.', 'reg_confirm_restrict_domain_placeholder' => 'No restriction set', -]; \ No newline at end of file + /** + * Role settings + */ + + 'roles' => 'Roles', + 'role_user_roles' => 'User Roles', + 'role_create' => 'Create New Role', + 'role_delete' => 'Delete Role', + 'role_delete_confirm' => 'This will delete the role with the name \':roleName\'.', + 'role_delete_users_assigned' => 'This role has :userCount users assigned to it. If you would like to migrate the users from this role select a new role below.', + 'role_delete_sure' => 'Are you sure you want to delete this role?', + 'role_edit' => 'Edit Role', + 'role_details' => 'Role Details', + 'role_name' => 'Role Name', + 'role_desc' => 'Short Description of Role', + 'role_system' => 'System Permissions', + 'role_manage_users' => 'Manage users', + 'role_manage_roles' => 'Manage roles & role permissions', + 'role_manage_entity_permissions' => 'Manage all book, chapter & page permissions', + 'role_manage_own_entity_permissions' => 'Manage permissions on own book, chapter & pages', + 'role_manage_settings' => 'Manage app settings', + 'role_asset' => 'Asset Permissions', + 'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.', + 'role_all' => 'All', + 'role_own' => 'Own', + 'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to', + 'role_save' => 'Save Role', + 'role_users' => 'Users in this role', + 'role_users_none' => 'No users are currently assigned to this role', + + /** + * Users + */ + + 'users' => 'Users', + 'users_add_new' => 'Add New User', + 'users_search' => 'Search Users', + 'users_role' => 'User Roles', + 'users_external_auth_id' => 'External Authentication ID', + 'users_password_warning' => 'Only fill the below if you would like to change your password:', + 'users_system_public' => 'This user represents any guest users that visit your instance. It cannot be used to log in but is assigned automatically.', + 'users_delete' => 'Delete User', + 'users_delete_warning' => 'This will fully delete this user with the name \':userName\' from the system.', + 'users_delete_confirm' => 'Are you sure you want to delete this user?', + 'users_edit' => 'Edit User', + 'users_edit_profile' => 'Edit Profile', + 'users_avatar' => 'User Avatar', + 'users_avatar_desc' => 'This image should be approx 256px square.', + 'users_social_accounts' => 'Social Accounts', + 'users_social_accounts_info' => 'Here you can connect your other accounts for quicker and easier login. Disconnecting an account here does not previously authorized access. Revoke access from your profile settings on the connected social account.', + 'users_social_connect' => 'Connect Account', + 'users_social_disconnect' => 'Disconnect Account', +]; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index 08acf725d..b1c74fbd0 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -53,32 +53,16 @@
- Books + {{ trans('entities.books') }} @if(isset($currentUser) && userCan('settings-manage')) - Settings + {{ trans('settings.settings') }} @endif @if(!isset($signedIn) || !$signedIn) - Sign In + {{ trans('auth.log_in') }} @endif
@if(isset($signedIn) && $signedIn) -
- - {{ $currentUser->name }} - {{ $currentUser->getShortName(9) }} - - -
+ @include('partials._header-dropdown', ['currentUser' => $currentUser]) @endif
@@ -93,7 +77,7 @@
- Back to top + {{ trans('common.back_to_top') }}
@yield('bottom') diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 2fb4ac855..0d97a6a4b 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -5,14 +5,9 @@
-
+
- Toggle Details -
-
-
-
- + {{ trans('common.toggle_details') }}
@@ -25,44 +20,44 @@
@if(count($draftPages) > 0) -

My Recent Drafts

+

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

@include('partials/entity-list', ['entities' => $draftPages, 'style' => 'compact']) @endif
@if($signedIn) -

My Recently Viewed

+

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

@else -

Recent Books

+

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

@endif @include('partials/entity-list', [ 'entities' => $recents, 'style' => 'compact', - 'emptyText' => $signedIn ? 'You have not viewed any pages' : 'No books have been created' + 'emptyText' => $signedIn ? trans('entities.no_pages_viewed') : trans('entities.books_empty') ])
-

Recently Created Pages

+

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

@include('partials/entity-list', [ 'entities' => $recentlyCreatedPages, 'style' => 'compact', - 'emptyText' => 'No pages have been recently created' + 'emptyText' => trans('entities.no_pages_recently_created') ])
-

Recently Updated Pages

+

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

@include('partials/entity-list', [ 'entities' => $recentlyUpdatedPages, 'style' => 'compact', - 'emptyText' => 'No pages have been recently updated' + 'emptyText' => trans('entites.no_pages_recently_updated') ])
-

Recent Activity

+

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

@include('partials/activity-list', ['activity' => $activity])
diff --git a/resources/views/partials/_header-dropdown.blade.php b/resources/views/partials/_header-dropdown.blade.php new file mode 100644 index 000000000..1c839c9cb --- /dev/null +++ b/resources/views/partials/_header-dropdown.blade.php @@ -0,0 +1,17 @@ +
+ + {{ $currentUser->name }} + {{ $currentUser->getShortName(9) }} + + +
\ No newline at end of file diff --git a/resources/views/partials/activity-item.blade.php b/resources/views/partials/activity-item.blade.php index c45ca6c7a..3f162e0bd 100644 --- a/resources/views/partials/activity-item.blade.php +++ b/resources/views/partials/activity-item.blade.php @@ -11,7 +11,7 @@ @if($activity->user) {{ $activity->user->name }} @else - A deleted user + {{ trans('common.deleted_user') }} @endif {{ $activity->getText() }} diff --git a/resources/views/partials/activity-list.blade.php b/resources/views/partials/activity-list.blade.php index de72f5051..0dc38091e 100644 --- a/resources/views/partials/activity-list.blade.php +++ b/resources/views/partials/activity-list.blade.php @@ -8,5 +8,5 @@ @endforeach
@else -

No activity to show

+

{{ trans('common.no_activity') }}

@endif \ No newline at end of file diff --git a/resources/views/partials/entity-list.blade.php b/resources/views/partials/entity-list.blade.php index 412d3be8f..95ebfcd4f 100644 --- a/resources/views/partials/entity-list.blade.php +++ b/resources/views/partials/entity-list.blade.php @@ -17,7 +17,7 @@ @endforeach @else

- {{ $emptyText or 'No items available' }} + {{ $emptyText or trans('common.no_items') }}

@endif
\ No newline at end of file diff --git a/resources/views/partials/entity-selector-popup.blade.php b/resources/views/partials/entity-selector-popup.blade.php index b9166896a..a758cc021 100644 --- a/resources/views/partials/entity-selector-popup.blade.php +++ b/resources/views/partials/entity-selector-popup.blade.php @@ -2,12 +2,12 @@
-
Entity Select
+
{{ trans('entities.entity_select') }}
@include('partials/entity-selector', ['name' => 'entity-selector'])
- +
diff --git a/resources/views/partials/entity-selector.blade.php b/resources/views/partials/entity-selector.blade.php index 59e174155..8f3d82f67 100644 --- a/resources/views/partials/entity-selector.blade.php +++ b/resources/views/partials/entity-selector.blade.php @@ -1,7 +1,7 @@
- +
@include('partials/loading-icon')
diff --git a/resources/views/partials/image-manager.blade.php b/resources/views/partials/image-manager.blade.php index 83625ad88..bed269fbe 100644 --- a/resources/views/partials/image-manager.blade.php +++ b/resources/views/partials/image-manager.blade.php @@ -3,7 +3,7 @@
-
Image Select
+
{{ trans('components.imagem_select') }}
@@ -12,16 +12,16 @@
-
All
-
Book
-
Page
+
{{ trans('components.imagem_all') }}
+
{{ trans('entities.book') }}
+
{{ trans('entities.page') }}
- - - + + +
@@ -31,11 +31,11 @@
- Uploaded @{{ getDate(image.created_at) }} + {{ trans('components.imagem_uploaded', ['uploadedDate' => "{{ getDate(image.created_at) }" . "}"]) }}
-
Load More
+
{{ trans('components.imagem_load_more') }}
@@ -51,15 +51,14 @@
- +

- This image is used in the pages below, Click delete again to confirm you want to delete - this image. + {{ trans('components.imagem_delete_confirm') }}

diff --git a/resources/views/public.blade.php b/resources/views/public.blade.php index 16aebe2bb..05cf043fd 100644 --- a/resources/views/public.blade.php +++ b/resources/views/public.blade.php @@ -25,7 +25,7 @@ -@include('partials/notifications') +@include('partials.notifications')
diff --git a/resources/views/search/all.blade.php b/resources/views/search/all.blade.php index fcfb2c902..d4053752f 100644 --- a/resources/views/search/all.blade.php +++ b/resources/views/search/all.blade.php @@ -2,49 +2,55 @@ @section('content') -
+
+
+
+
+
+ {{ $searchTerm }} +
+
+
+
+
-

Search Results    {{ $searchTerm }}

+ +
+ +

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

- @if(count($pages) > 0) - View all matched pages + {{ trans('entities.search_view_pages') }} @endif - @if(count($chapters) > 0)      - View all matched chapters + {{ trans('entities.search_view_chapters') }} @endif @if(count($books) > 0)      - View all matched books + {{ trans('entities.search_view_books') }} @endif

-
+
-

Matching Pages

+

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

@include('partials/entity-list', ['entities' => $pages, 'style' => 'detailed'])
-
- @if(count($books) > 0) -

Matching Books

+

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

@include('partials/entity-list', ['entities' => $books]) @endif @if(count($chapters) > 0) -

Matching Chapters

+

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

@include('partials/entity-list', ['entities' => $chapters]) @endif -
- -
diff --git a/resources/views/search/book.blade.php b/resources/views/search/book.blade.php index 5af2c4d06..0b9119cd5 100644 --- a/resources/views/search/book.blade.php +++ b/resources/views/search/book.blade.php @@ -7,7 +7,7 @@
@endforeach @else -

No pages matched this search

+

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

@endif
diff --git a/resources/views/search/entity-ajax-list.blade.php b/resources/views/search/entity-ajax-list.blade.php index 97d5e4da7..93f2633aa 100644 --- a/resources/views/search/entity-ajax-list.blade.php +++ b/resources/views/search/entity-ajax-list.blade.php @@ -16,7 +16,7 @@ @endforeach @else

- No items available + {{ trans('common.no_items') }}

@endif
\ No newline at end of file diff --git a/resources/views/search/entity-search-list.blade.php b/resources/views/search/entity-search-list.blade.php index dd9c6a509..4e743f6bd 100644 --- a/resources/views/search/entity-search-list.blade.php +++ b/resources/views/search/entity-search-list.blade.php @@ -2,17 +2,27 @@ @section('content') +
+
+
+
+
+ {{ $searchTerm }} +
+
+
+
+
+
-

{{ $title }} {{ $searchTerm }}

+

{{ $title }}

@include('partials.entity-list', ['entities' => $entities, 'style' => 'detailed']) {!! $entities->links() !!}
-
-
@stop \ No newline at end of file diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index ac25eb3b5..8ad219507 100644 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -11,7 +11,7 @@
{!! csrf_field() !!} -

App Settings

+

{{ trans('settings.app_settings') }}

diff --git a/resources/views/settings/navbar.blade.php b/resources/views/settings/navbar.blade.php index f4526b4c8..15000b1cf 100644 --- a/resources/views/settings/navbar.blade.php +++ b/resources/views/settings/navbar.blade.php @@ -4,13 +4,13 @@
@if($currentUser->can('settings-manage')) - Settings + {{ trans('settings.settings') }} @endif @if($currentUser->can('users-manage')) - Users + {{ trans('settings.users') }} @endif @if($currentUser->can('user-roles-manage')) - Roles + {{ trans('settings.roles') }} @endif
diff --git a/resources/views/settings/roles/create.blade.php b/resources/views/settings/roles/create.blade.php index 6a59c0c54..bae42540c 100644 --- a/resources/views/settings/roles/create.blade.php +++ b/resources/views/settings/roles/create.blade.php @@ -5,7 +5,7 @@ @include('settings/navbar', ['selected' => 'roles'])
-

Create New Role

+

{{ trans('settings.role_create') }}

@include('settings/roles/form') diff --git a/resources/views/settings/roles/delete.blade.php b/resources/views/settings/roles/delete.blade.php index 1377d07ae..0b8e1626f 100644 --- a/resources/views/settings/roles/delete.blade.php +++ b/resources/views/settings/roles/delete.blade.php @@ -5,8 +5,8 @@ @include('settings/navbar', ['selected' => 'roles'])
-

Delete Role

-

This will delete the role with the name '{{ $role->display_name }}'.

+

{{ trans('settings.role_delete') }}

+

{{ trans('settings.role_delete_confirm', ['roleName' => $role->display_name]) }}

id}") }}" method="POST"> {!! csrf_field() !!} @@ -14,14 +14,14 @@ @if($role->users->count() > 0)
-

This role has {{$role->users->count()}} users assigned to it. If you would like to migrate the users from this role select a new role below.

+

{{ trans('settings.role_delete_users_assigned', ['userCount' => $role->users->count()]) }}

@include('form/role-select', ['options' => $roles, 'name' => 'migration_role_id'])
@endif -

Are you sure you want to delete this role?

- id}") }}" class="button">Cancel - +

{{ trans('settings.role_delete_sure') }}

+ id}") }}" class="button muted">{{ trans('common.cancel') }} +
diff --git a/resources/views/settings/roles/edit.blade.php b/resources/views/settings/roles/edit.blade.php index 7e186e898..b46b64663 100644 --- a/resources/views/settings/roles/edit.blade.php +++ b/resources/views/settings/roles/edit.blade.php @@ -7,11 +7,11 @@
-

Edit Role {{ $role->display_name }}

+

{{ trans('settings.role_edit') }}

- id}") }}" class="button neg float right">Delete Role + id}") }}" class="button neg float right">{{ trans('settings.role_delete') }}
diff --git a/resources/views/settings/roles/form.blade.php b/resources/views/settings/roles/form.blade.php index 78e9e1533..319f3a2df 100644 --- a/resources/views/settings/roles/form.blade.php +++ b/resources/views/settings/roles/form.blade.php @@ -5,128 +5,126 @@
-

Role Details

+

{{ trans('settings.role_details') }}

- + @include('form/text', ['name' => 'display_name'])
- + @include('form/text', ['name' => 'description'])
-

System Permissions

- - - - - +

{{ trans('settings.role_system') }}

+ + + + +
-

Asset Permissions

-

- These permissions control default access to the assets within the system. - Permissions on Books, Chapters and Pages will override these permissions. -

+

{{ trans('settings.role_asset') }}

+

{{ trans('settings.role_asset_desc') }}

+ - - - - + + + + - + - + - + - + - + - + - +
CreateViewEditDelete{{ trans('common.create') }}{{ trans('common.view') }}{{ trans('common.edit') }}{{ trans('common.delete') }}
Books{{ trans('entities.books') }} - + - - + + - - + + - - + +
Chapters{{ trans('entities.chapters') }} - - + + - - + + - - + + - - + +
Pages{{ trans('entities.pages') }} - - + + - - + + - - + + - - + +
Images{{ trans('entities.images') }} @include('settings/roles/checkbox', ['permission' => 'image-create-all'])Controlled by the asset they are uploaded to{{ trans('settings.role_controlled_by_asset') }} - - + + - - + +
Attachments{{ trans('entities.attachments') }} @include('settings/roles/checkbox', ['permission' => 'attachment-create-all'])Controlled by the asset they are uploaded to{{ trans('settings.role_controlled_by_asset') }} - - + + - - + +
- Cancel - + {{ trans('common.cancel') }} +
-

Users in this role

+

{{ trans('settings.role_users') }}

@if(isset($role) && count($role->users) > 0) @@ -147,7 +145,7 @@
@else

- No users currently in this role. + {{ trans('settings.role_users_none') }}

@endif diff --git a/resources/views/settings/roles/index.blade.php b/resources/views/settings/roles/index.blade.php index 2c905ae22..7925ef042 100644 --- a/resources/views/settings/roles/index.blade.php +++ b/resources/views/settings/roles/index.blade.php @@ -8,19 +8,19 @@
-

User Roles

+

{{ trans('settings.role_user_roles') }}

- Add new role + {{ trans('settings.role_create') }}
- + - + @foreach($roles as $role) diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php index b25f2ee8a..bff79820a 100644 --- a/resources/views/users/create.blade.php +++ b/resources/views/users/create.blade.php @@ -3,6 +3,18 @@ @section('content') +
+
+
+
+
+ Users +
+
+
+
+
+

Create User

diff --git a/resources/views/users/delete.blade.php b/resources/views/users/delete.blade.php index 74b993b3c..135231a32 100644 --- a/resources/views/users/delete.blade.php +++ b/resources/views/users/delete.blade.php @@ -2,16 +2,30 @@ @section('content') +
+
+
+
+
+ Users + » + id}") }}" class="text-button">{{ $user->name }} +
+
+
+
+
+
-

Delete User

-

This will fully delete this user with the name '{{ $user->name }}' from the system.

-

Are you sure you want to delete this user?

+

{{ trans('settings.users_delete') }}

+

{{ trans('settings.users_delete_warning', ['userName' => $user->name]) }}

+

{{ trans('settings.users_delete_confirm') }}

id}") }}" method="POST"> {!! csrf_field() !!} - id}") }}" class="button muted">Cancel - + id}") }}" class="button muted">{{ trans('common.cancel') }} +
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 6cbbdb7f7..b753dfc45 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -11,12 +11,12 @@
id}") }}" method="post">
-

Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}

+

{{ $user->id === $currentUser->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}

@if($authMethod !== 'system') - id}/delete") }}" class="neg button float right">Delete User + id}/delete") }}" class="neg button float right">{{ trans('settings.users_delete') }} @endif
@@ -29,8 +29,8 @@
- -

This image should be approx 256px square.

+ +

{{ trans('settings.users_avatar_desc') }}

@@ -40,20 +40,17 @@
@if($currentUser->id === $user->id && count($activeSocialDrivers) > 0) -

Social Accounts

-

- Here you can connect your other accounts for quicker and easier login.
- Disconnecting an account here does not previously authorized access. Revoke access from your profile settings on the connected social account. -

+

{{ trans('settings.users_social_accounts') }}

+

{{ trans('settings.users_social_accounts_info') }}

@if(isset($activeSocialDrivers['google']))
@@ -63,9 +60,9 @@
diff --git a/resources/views/users/forms/ldap.blade.php b/resources/views/users/forms/ldap.blade.php index 6e4d2a5fd..0a6cf79ae 100644 --- a/resources/views/users/forms/ldap.blade.php +++ b/resources/views/users/forms/ldap.blade.php @@ -1,30 +1,30 @@
- + @include('form.text', ['name' => 'name'])
@if(userCan('users-manage'))
- + @include('form.text', ['name' => 'email'])
@endif @if(userCan('users-manage'))
- + @include('form/role-checkboxes', ['name' => 'roles', 'roles' => $roles])
@endif @if(userCan('users-manage'))
- + @include('form.text', ['name' => 'external_auth_id'])
@endif
- Cancel - + {{ trans('common.cancel') }} +
\ No newline at end of file diff --git a/resources/views/users/forms/standard.blade.php b/resources/views/users/forms/standard.blade.php index d902c5b2c..39ae4c770 100644 --- a/resources/views/users/forms/standard.blade.php +++ b/resources/views/users/forms/standard.blade.php @@ -1,16 +1,16 @@
- + @include('form.text', ['name' => 'name'])
- + @include('form.text', ['name' => 'email'])
@if(userCan('users-manage'))
- + @include('form/role-checkboxes', ['name' => 'roles', 'roles' => $roles])
@endif @@ -18,23 +18,23 @@ @if(isset($model))
- Only fill the below if you would like
to change your password: + {{ trans('settings.users_password_warning') }}
@endif
- + @include('form.password', ['name' => 'password'])
- + @include('form.password', ['name' => 'password-confirm'])
- Cancel - + {{ trans('common.cancel') }} +
diff --git a/resources/views/users/forms/system.blade.php b/resources/views/users/forms/system.blade.php index 3ee5f6409..868dad854 100644 --- a/resources/views/users/forms/system.blade.php +++ b/resources/views/users/forms/system.blade.php @@ -1,25 +1,26 @@ @if($user->system_name == 'public') -

This user represents any guest users that visit your instance. It cannot be used for logins but is assigned automatically.

+

{{ trans('settings.users_system_public') }}

@endif
- + @include('form.text', ['name' => 'name'])
- + @include('form.text', ['name' => 'email'])
@if(userCan('users-manage'))
- + @include('form/role-checkboxes', ['name' => 'roles', 'roles' => $roles])
@endif
- Cancel - + {{ trans('common.cancel') }} +
+ diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index 105fddb5b..3ea5a03f7 100644 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -9,12 +9,12 @@
-

Users

+

{{ trans('settings.users') }}

@if(userCan('users-manage')) - Add new user + {{ trans('settings.users_add_new') }} @endif
@@ -30,20 +30,17 @@ @foreach(collect($listDetails)->except('search') as $name => $val) @endforeach - +
-
- -
Role Name{{ trans('settings.role_name') }} Users{{ trans('settings.users') }}
- - - + + + @foreach($users as $user) diff --git a/resources/views/users/profile.blade.php b/resources/views/users/profile.blade.php index 1ae869979..10bd0ec63 100644 --- a/resources/views/users/profile.blade.php +++ b/resources/views/users/profile.blade.php @@ -17,21 +17,21 @@

{{ $user->name }}

- User for {{ $user->created_at->diffForHumans(null, true) }} + {{ trans('entities.profile_user_for_x', ['time' => $user->created_at->diffForHumans(null, true)]) }}

-
Created Content
+
{{ trans('entities.profile_created_content') }}
- {{ $assetCounts['books'] }} {{ str_plural('Book', $assetCounts['books']) }} + {{ $assetCounts['books'] }} {{ str_plural(trans('entities.book'), $assetCounts['books']) }}
- {{ $assetCounts['chapters'] }} {{ str_plural('Chapter', $assetCounts['chapters']) }} + {{ $assetCounts['chapters'] }} {{ str_plural(trans('entities.chapter'), $assetCounts['chapters']) }}
- {{ $assetCounts['pages'] }} {{ str_plural('Page', $assetCounts['pages']) }} + {{ $assetCounts['pages'] }} {{ str_plural(trans('entities.page'), $assetCounts['pages']) }}
@@ -39,34 +39,34 @@
-

Recently Created Pages

+

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

@if (count($recentlyCreated['pages']) > 0) @include('partials/entity-list', ['entities' => $recentlyCreated['pages']]) @else -

{{ $user->name }} has not created any pages

+

{{ trans('entities.profile_not_created_pages', ['userName' => $user->name]) }}

@endif
-

Recently Created Chapters

+

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

@if (count($recentlyCreated['chapters']) > 0) @include('partials/entity-list', ['entities' => $recentlyCreated['chapters']]) @else -

{{ $user->name }} has not created any chapters

+

{{ trans('entities.profile_not_created_chapters', ['userName' => $user->name]) }}

@endif
-

Recently Created Books

+

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

@if (count($recentlyCreated['books']) > 0) @include('partials/entity-list', ['entities' => $recentlyCreated['books']]) @else -

{{ $user->name }} has not created any books

+

{{ trans('entities.profile_not_created_books', ['userName' => $user->name]) }}

@endif
-

Recent Activity

+

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

@include('partials/activity-list', ['activity' => $activity])
diff --git a/resources/views/vendor/notifications/email-plain.blade.php b/resources/views/vendor/notifications/email-plain.blade.php index 79634b611..7ca1dc8d0 100644 --- a/resources/views/vendor/notifications/email-plain.blade.php +++ b/resources/views/vendor/notifications/email-plain.blade.php @@ -18,5 +18,5 @@ if (! empty($outroLines)) { echo implode("\n", $outroLines), "\n\n"; } -echo 'Regards,', "\n"; +echo "\n"; echo setting('app-name'), "\n"; diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php index 297c6be05..3e02cbba9 100644 --- a/resources/views/vendor/notifications/email.blade.php +++ b/resources/views/vendor/notifications/email.blade.php @@ -159,8 +159,7 @@ $style = [ diff --git a/tests/Auth/AuthTest.php b/tests/Auth/AuthTest.php index f287f8490..664ec297a 100644 --- a/tests/Auth/AuthTest.php +++ b/tests/Auth/AuthTest.php @@ -24,7 +24,7 @@ class AuthTest extends TestCase $settings->put('app-public', 'true'); $this->visit('/') ->seePageIs('/') - ->see('Sign In'); + ->see('Log In'); } public function test_registration_showing() @@ -132,7 +132,7 @@ class AuthTest extends TestCase $this->asAdmin() ->visit('/settings/users') - ->click('Add new user') + ->click('Add New User') ->type($user->name, '#name') ->type($user->email, '#email') ->check('roles[admin]') diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php index 60b5ceebd..3f60f9c36 100644 --- a/tests/Entity/EntitySearchTest.php +++ b/tests/Entity/EntitySearchTest.php @@ -15,8 +15,8 @@ class EntitySearchTest extends TestCase ->type($page->name, 'term') ->press('header-search-box-button') ->see('Search Results') - ->see($page->name) - ->click($page->name) + ->seeInElement('.entity-list', $page->name) + ->clickInElement('.entity-list', $page->name) ->seePageIs($page->getUrl()); } diff --git a/tests/Entity/SortTest.php b/tests/Entity/SortTest.php index 2c18c29d3..d78b94479 100644 --- a/tests/Entity/SortTest.php +++ b/tests/Entity/SortTest.php @@ -48,7 +48,7 @@ class SortTest extends TestCase $newBook = \BookStack\Book::where('id', '!=', $currentBook->id)->first(); $this->asAdmin()->visit($chapter->getUrl() . '/move') - ->see('Move Chapter')->see($chapter->name) + ->see('Move Chapter') ->type('book:' . $newBook->id, 'entity_selection')->press('Move Chapter'); $chapter = \BookStack\Chapter::find($chapter->id); diff --git a/tests/Permissions/RolesTest.php b/tests/Permissions/RolesTest.php index 1d44e9691..500dd3b67 100644 --- a/tests/Permissions/RolesTest.php +++ b/tests/Permissions/RolesTest.php @@ -81,7 +81,7 @@ class RolesTest extends TestCase $this->asAdmin()->visit('/settings') ->click('Roles') ->seePageIs('/settings/roles') - ->click('Add new role') + ->click('Create New Role') ->type('Test Role', 'display_name') ->type('A little test description', 'description') ->press('Save Role')
NameEmailUser Roles{{ trans('auth.name') }}{{ trans('auth.email') }}{{ trans('settings.role_user_roles') }}

- If you’re having trouble clicking the "{{ $actionText }}" button, - copy and paste the URL below into your web browser: + {{ trans('common.email_action_help', ['actionText' => $actionText]) }}

@@ -188,7 +187,7 @@ $style = [

© {{ date('Y') }} {{ setting('app-name') }}. - All rights reserved. + {{ trans('common.email_rights') }}