@foreach($books as $otherBook)
@if($otherBook->id !== $book->id)
@@ -37,8 +47,8 @@
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 @@
+
\ No newline at end of file
diff --git a/resources/views/chapters/create.blade.php b/resources/views/chapters/create.blade.php
index b81cb15d7..afdbfa99d 100644
--- a/resources/views/chapters/create.blade.php
+++ b/resources/views/chapters/create.blade.php
@@ -3,7 +3,7 @@
@section('content')
-
Create New Chapter
+
{{ trans('entities.chapters_create') }}
diff --git a/resources/views/chapters/delete.blade.php b/resources/views/chapters/delete.blade.php
index e9573f228..bacb8dca3 100644
--- a/resources/views/chapters/delete.blade.php
+++ b/resources/views/chapters/delete.blade.php
@@ -2,17 +2,26 @@
@section('content')
+
+
-
Delete Chapter
-
This will delete the chapter with the name '{{$chapter->name}}', All pages will be removed
- and added directly to the book.
-
Are you sure you want to delete this chapter?
+
{{ trans('entities.chapters_delete') }}
+
{{ trans('entities.chapters_delete_explain', ['chapterName' => $chapter->name]) }}
+
{{ trans('entities.chapters_delete_confirm') }}
diff --git a/resources/views/chapters/edit.blade.php b/resources/views/chapters/edit.blade.php
index 0363da96d..272543e67 100644
--- a/resources/views/chapters/edit.blade.php
+++ b/resources/views/chapters/edit.blade.php
@@ -3,7 +3,7 @@
@section('content')
-
Edit Chapter
+
{{ trans('entities.chapters_edit') }}
-
Chapter Permissions
+ {{ trans('entities.chapters_permissions') }}
@include('form/restriction-form', ['model' => $chapter])
diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index 70b09e9ce..93eee6424 100644
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -6,30 +6,28 @@
-
+ @include('chapters._breadcrumbs', ['chapter' => $chapter])
@@ -84,19 +78,20 @@
@if($book->restricted)
- @if(userCan('restrictions-manage', $book))
-
Book Permissions Active
- @else
-
Book Permissions Active
- @endif
-
+
+ @if(userCan('restrictions-manage', $book))
+ {{ trans('entities.books_permissions_active') }}
+ @else
+ {{ trans('entities.books_permissions_active') }}
+ @endif
+
@endif
@if($chapter->restricted)
@if(userCan('restrictions-manage', $chapter))
-
Chapter Permissions Active
+
{{ trans('entities.chapters_permissions_active') }}
@else
-
Chapter Permissions Active
+
{{ trans('entities.chapters_permissions_active') }}
@endif
@endif
diff --git a/resources/views/partials/entity-selector-popup.blade.php b/resources/views/components/entity-selector-popup.blade.php
similarity index 63%
rename from resources/views/partials/entity-selector-popup.blade.php
rename to resources/views/components/entity-selector-popup.blade.php
index b9166896a..1c4d1fadb 100644
--- a/resources/views/partials/entity-selector-popup.blade.php
+++ b/resources/views/components/entity-selector-popup.blade.php
@@ -2,12 +2,12 @@
- @include('partials/entity-selector', ['name' => 'entity-selector'])
+ @include('components.entity-selector', ['name' => 'entity-selector'])
diff --git a/resources/views/partials/entity-selector.blade.php b/resources/views/components/entity-selector.blade.php
similarity index 67%
rename from resources/views/partials/entity-selector.blade.php
rename to resources/views/components/entity-selector.blade.php
index 59e174155..8fb2187e6 100644
--- a/resources/views/partials/entity-selector.blade.php
+++ b/resources/views/components/entity-selector.blade.php
@@ -1,8 +1,8 @@
\ No newline at end of file
diff --git a/resources/views/partials/image-manager.blade.php b/resources/views/components/image-manager.blade.php
similarity index 70%
rename from resources/views/partials/image-manager.blade.php
rename to resources/views/components/image-manager.blade.php
index 83625ad88..39f3bcd3c 100644
--- a/resources/views/partials/image-manager.blade.php
+++ b/resources/views/components/image-manager.blade.php
@@ -3,7 +3,7 @@
@@ -12,16 +12,16 @@
-
Load More
+
{{ trans('components.image_load_more') }}
@@ -51,15 +51,14 @@
- Image Name
+ {{ trans('components.image_image_name') }}
- This image is used in the pages below, Click delete again to confirm you want to delete
- this image.
+ {{ trans('components.image_delete_confirm') }}
@@ -73,13 +72,13 @@
- Select Image
+ {{ trans('components.image_select_image') }}
-
+
diff --git a/resources/views/components/image-picker.blade.php b/resources/views/components/image-picker.blade.php
new file mode 100644
index 000000000..47fb2b8b7
--- /dev/null
+++ b/resources/views/components/image-picker.blade.php
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
{{ trans('components.image_select_image') }}
+
+
{{ trans('common.reset') }}
+
+ @if ($showRemove)
+
|
+
{{ trans('common.remove') }}
+ @endif
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/views/components/toggle-switch.blade.php b/resources/views/components/toggle-switch.blade.php
new file mode 100644
index 000000000..ad54d5ab1
--- /dev/null
+++ b/resources/views/components/toggle-switch.blade.php
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index 19565bccb..c9e600ceb 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -4,9 +4,28 @@
-
{{ $message or 'Page Not Found' }}
-
Sorry, The page you were looking for could not be found.
-
Return To Home
+
+
+
{{ $message or trans('errors.404_page_not_found') }}
+
{{ trans('errors.sorry_page_not_found') }}
+
{{ trans('errors.return_home') }}
+
+
+
+
+
+
{{ trans('entities.pages_popular') }}
+ @include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Page::class]), 'style' => 'compact'])
+
+
+
{{ trans('entities.books_popular') }}
+ @include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Book::class]), 'style' => 'compact'])
+
+
+
{{ trans('entities.chapters_popular') }}
+ @include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Chapter::class]), 'style' => 'compact'])
+
+
@stop
\ No newline at end of file
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
index 2a58461ba..6dd96cdcc 100644
--- a/resources/views/errors/500.blade.php
+++ b/resources/views/errors/500.blade.php
@@ -3,7 +3,7 @@
@section('content')
-
An Error Occurred
+
{{ trans('errors.error_occurred') }}
{{ $message }}
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
index c79d0f68b..1ea39a7b8 100644
--- a/resources/views/errors/503.blade.php
+++ b/resources/views/errors/503.blade.php
@@ -3,8 +3,8 @@
@section('content')
-
{{ setting('app-name') }} is down right now
-
It will be back up soon.
+
{{ trans('errors.app_down', ['appName' => setting('app-name')]) }}
+
{{ trans('errors.back_soon') }}
@stop
\ No newline at end of file
diff --git a/resources/views/form/delete-button.blade.php b/resources/views/form/delete-button.blade.php
index a5b1f2809..6c53effae 100644
--- a/resources/views/form/delete-button.blade.php
+++ b/resources/views/form/delete-button.blade.php
@@ -1,5 +1,5 @@
{{ csrf_field() }}
- {{ isset($text) ? $text : 'Delete' }}
+ {{ isset($text) ? $text : trans('common.delete') }}
\ No newline at end of file
diff --git a/resources/views/form/restriction-form.blade.php b/resources/views/form/restriction-form.blade.php
index 7472fe65e..7a1605197 100644
--- a/resources/views/form/restriction-form.blade.php
+++ b/resources/views/form/restriction-form.blade.php
@@ -2,31 +2,31 @@
{!! csrf_field() !!}
-
Once enabled, These permissions will take priority over any set role permissions.
+
{{ trans('entities.permissions_intro') }}
- @include('form/checkbox', ['name' => 'restricted', 'label' => 'Enable custom permissions'])
+ @include('form/checkbox', ['name' => 'restricted', 'label' => trans('entities.permissions_enable')])
- Role
- isA('page')) colspan="3" @else colspan="4" @endif>Actions
+ {{ trans('common.role') }}
+ isA('page')) colspan="3" @else colspan="4" @endif>{{ trans('common.actions') }}
@foreach($roles as $role)
{{ $role->display_name }}
- @include('form/restriction-checkbox', ['name'=>'restrictions', 'label' => 'View', 'action' => 'view'])
+ @include('form/restriction-checkbox', ['name'=>'restrictions', 'label' => trans('common.view'), 'action' => 'view'])
@if(!$model->isA('page'))
- @include('form/restriction-checkbox', ['name'=>'restrictions', 'label' => 'Create', 'action' => 'create'])
+ @include('form/restriction-checkbox', ['name'=>'restrictions', 'label' => trans('common.create'), 'action' => 'create'])
@endif
- @include('form/restriction-checkbox', ['name'=>'restrictions', 'label' => 'Update', 'action' => 'update'])
- @include('form/restriction-checkbox', ['name'=>'restrictions', 'label' => 'Delete', 'action' => 'delete'])
+ @include('form/restriction-checkbox', ['name'=>'restrictions', 'label' => trans('common.update'), 'action' => 'update'])
+ @include('form/restriction-checkbox', ['name'=>'restrictions', 'label' => trans('common.delete'), 'action' => 'delete'])
@endforeach
-
Cancel
-
Save Permissions
+
{{ trans('common.cancel') }}
+
{{ trans('entities.permissions_save') }}
\ No newline at end of file
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 @@