Extracted text from page views & standardised breadcrumbs

diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss
index 54fd55dff6f075637a2d943a431e05a05a6458fc..d88db2ec2f20ce072bec2b32b660268a0673426d 100644 (file)
--- 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;
   }
     font-size: 0.75em;
     margin-top: $-xs;
   }

+  .text-muted p.text-muted {
+    margin-top: 0;
+  }

   .page.draft .text-page {
     color: $color-page-draft;
   }
   .page.draft .text-page {
     color: $color-page-draft;
   }

diff --git a/resources/assets/sass/_text.scss b/resources/assets/sass/_text.scss
index 9bad2e83d15aa2621b04ce27993124fe8dd7306b..dd2f32e1c2eb98e08d523ef95b464e8df79ebf60 100644 (file)
--- 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: 0.8em;
   color: lighten($text-dark, 20%);

+  small, p.small, span.small, .text-small {
+    font-size: 1em;
+  }

 }
 
 sup, .superscript {
 }
 
 sup, .superscript {

diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
index 6517c8cc5231087b2e3615b429126c407b5e802b..9ee35964152ef3a7369c6dd04a7d403be7ec218f 100644 (file)
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@ -6,7 +6,9 @@ return [
      */
     'cancel' => 'Cancel',
     'confirm' => 'Confirm',
      */
     'cancel' => 'Cancel',
     'confirm' => 'Confirm',

-
+    'back' => 'Back',
+    'save' => 'Save',
+    'continue' => 'Continue',

 
     /**
      * Form Labels
 
     /**
      * Form Labels


@@ -23,4 +25,10 @@ return [
     'create' => 'Create',
     'update' => 'Update',
     'delete' => 'Delete',
     'create' => 'Create',
     'update' => 'Update',
     'delete' => 'Delete',

+
+
+    /**
+     * Misc
+     */
+    'deleted_user' => 'Deleted User',

 ];
\ No newline at end of file
 ];
\ No newline at end of file

diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php
index bc83a4a4fabcef5c46f9e8a5140de6788cd21643..751aa5a12aacc5b2028fcd66e039d10e3ad3f268 100644 (file)
--- a/resources/lang/en/entities.php
+++ b/resources/lang/en/entities.php
@@ -13,6 +13,7 @@ return [
     'sort' => 'Sort',
     'move' => 'Move',
     'delete' => 'Delete',
     'sort' => 'Sort',
     'move' => 'Move',
     'delete' => 'Delete',

+    'revisions' => 'Revisions',

     'meta_created' => 'Created :timeLength',
     'meta_created_name' => 'Created :timeLength by :user',
     'meta_updated' => 'Updated :timeLength',
     '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_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
 
     /**
      * Chapters


@@ -81,4 +85,68 @@ return [
     'pages_new' => 'New Page',
     'pages_attachments' => 'Attachments',
     'pages_navigation' => 'Page Navigation',
     '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
 ];
\ 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 (file)
index 0000000..e588127
--- /dev/null
+++ b/resources/views/books/_breadcrumbs.blade.php
@@ -0,0 +1,3 @@
+<div class="breadcrumbs">
+    <a href="{{$book->getUrl()}}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $book->getShortName() }}</a>
+</div>
\ No newline at end of file

diff --git a/resources/views/books/delete.blade.php b/resources/views/books/delete.blade.php
index b47cae2cc3c56ee96012b9a1827ddb3ef9a80c9c..0b1e67d4acc7dc3dbd9c52dfcedf357a2c3d2444 100644 (file)
--- a/resources/views/books/delete.blade.php
+++ b/resources/views/books/delete.blade.php
@@ -2,6 +2,16 @@
 
 @section('content')
 
 
 @section('content')
 

+    <div class="faded-small toolbar">
+        <div class="container">
+            <div class="row">
+                <div class="col-sm-12 faded">
+                    @include('books._breadcrumbs', ['book' => $book])
+                </div>
+            </div>
+        </div>
+    </div>
+

     <div class="container small" ng-non-bindable>
         <h1>{{ trans('entities.books_delete') }}</h1>
         <p>{{ trans('entities.books_delete_explain', ['bookName' => $book->name]) }}</p>
     <div class="container small" ng-non-bindable>
         <h1>{{ trans('entities.books_delete') }}</h1>
         <p>{{ trans('entities.books_delete_explain', ['bookName' => $book->name]) }}</p>

diff --git a/resources/views/books/edit.blade.php b/resources/views/books/edit.blade.php
index 2b9e376e7b33f8e1bb008868ef4e3b5fe87d7a99..2419b68da807ab1a346293ee38ec694e67c1c25a 100644 (file)
--- a/resources/views/books/edit.blade.php
+++ b/resources/views/books/edit.blade.php
@@ -2,6 +2,16 @@
 
 @section('content')
 
 
 @section('content')
 

+    <div class="faded-small toolbar">
+        <div class="container">
+            <div class="row">
+                <div class="col-sm-12 faded">
+                    @include('books._breadcrumbs', ['book' => $book])
+                </div>
+            </div>
+        </div>
+    </div>
+

     <div class="container small" ng-non-bindable>
         <h1>{{ trans('entities.books_edit') }}</h1>
         <form action="{{ $book->getUrl() }}" method="POST">
     <div class="container small" ng-non-bindable>
         <h1>{{ trans('entities.books_edit') }}</h1>
         <form action="{{ $book->getUrl() }}" method="POST">

diff --git a/resources/views/books/restrictions.blade.php b/resources/views/books/restrictions.blade.php
index f1404293372fa86b4a9e5f4dd7aa39e79db39f35..f558fdfce82c2952583cbfb90c9f943d79ed7fa5 100644 (file)
--- a/resources/views/books/restrictions.blade.php
+++ b/resources/views/books/restrictions.blade.php
@@ -6,9 +6,7 @@
         <div class="container">
             <div class="row">
                 <div class="col-sm-12 faded">
         <div class="container">
             <div class="row">
                 <div class="col-sm-12 faded">

-                    <div class="breadcrumbs">
-                        <a href="{{$book->getUrl()}}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $book->getShortName() }}</a>
-                    </div>
+                    @include('books._breadcrumbs', ['book' => $book])

                 </div>
             </div>
         </div>
                 </div>
             </div>
         </div>

diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php
index 6ae126c634ce67f07906eb0b57256866c009aafe..2d1c21cdd9269bbf144fabee2dc299be3c73ccbf 100644 (file)
--- a/resources/views/books/show.blade.php
+++ b/resources/views/books/show.blade.php
@@ -5,7 +5,10 @@
     <div class="faded-small toolbar">
         <div class="container">
             <div class="row">
     <div class="faded-small toolbar">
         <div class="container">
             <div class="row">

-                <div class="col-md-12">
+                <div class="col-md-6 faded">
+                    @include('books._breadcrumbs', ['book' => $book])
+                </div>
+                <div class="col-md-6">

                     <div class="action-buttons faded">
                         @if(userCan('page-create', $book))
                             <a href="{{ $book->getUrl('/page/create') }}" class="text-pos text-button"><i class="zmdi zmdi-plus"></i>{{ trans('entities.pages_new') }}</a>
                     <div class="action-buttons faded">
                         @if(userCan('page-create', $book))
                             <a href="{{ $book->getUrl('/page/create') }}" class="text-pos text-button"><i class="zmdi zmdi-plus"></i>{{ trans('entities.pages_new') }}</a>

diff --git a/resources/views/books/sort.blade.php b/resources/views/books/sort.blade.php
index 984db0ce68e5e8c67e8b508a96b63ae25079cc7f..d96f502f167c9127b5ecdefaab4c8031c197dcb6 100644 (file)
--- a/resources/views/books/sort.blade.php
+++ b/resources/views/books/sort.blade.php
@@ -6,8 +6,18 @@
 
 @section('content')
 
 
 @section('content')
 

+    <div class="faded-small toolbar">
+        <div class="container">
+            <div class="row">
+                <div class="col-sm-12 faded">
+                    @include('books._breadcrumbs', ['book' => $book])
+                </div>
+            </div>
+        </div>
+    </div>
+

     <div class="container" ng-non-bindable>
     <div class="container" ng-non-bindable>

-        <h1>Sorting Pages & Chapters<span class="subheader">For {{ $book->name }}</span></h1>
+        <h1>{{ trans('entities.books_sort') }}</h1>

         <div class="row">
             <div class="col-md-8" id="sort-boxes">
 
         <div class="row">
             <div class="col-md-8" id="sort-boxes">
 


@@ -17,7 +27,7 @@
 
             @if(count($books) > 1)
                 <div class="col-md-4">
 
             @if(count($books) > 1)
                 <div class="col-md-4">

-                    <h3>Show Other Books</h3>
+                    <h3>{{ trans('entities.books_sort_show_other') }}</h3>

                     <div id="additional-books">
                     @foreach($books as $otherBook)
                         @if($otherBook->id !== $book->id)
                     <div id="additional-books">
                     @foreach($books as $otherBook)
                         @if($otherBook->id !== $book->id)


@@ -37,8 +47,8 @@
             <input type="hidden" name="_method" value="PUT">
             <input type="hidden" id="sort-tree-input" name="sort-tree">
             <div class="list">
             <input type="hidden" name="_method" value="PUT">
             <input type="hidden" id="sort-tree-input" name="sort-tree">
             <div class="list">

-                <a href="{{ $book->getUrl() }}" class="button muted">Cancel</a>
-                <button class="button pos" type="submit">Save Order</button>
+                <a href="{{ $book->getUrl() }}" class="button muted">{{ trans('common.cancel') }}</a>
+                <button class="button pos" type="submit">{{ trans('entities.books_sort_save') }}</button>

             </div>
         </form>
 
             </div>
         </form>
 

diff --git a/resources/views/chapters/_breadcrumbs.blade.php b/resources/views/chapters/_breadcrumbs.blade.php
new file mode 100644 (file)
index 0000000..9064cc7
--- /dev/null
+++ b/resources/views/chapters/_breadcrumbs.blade.php
@@ -0,0 +1,5 @@
+<div class="breadcrumbs">
+    <a href="{{ $chapter->book->getUrl() }}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $chapter->book->getShortName() }}</a>
+    <span class="sep">&raquo;</span>
+    <a href="{{ $chapter->getUrl() }}" class="text-chapter text-button"><i class="zmdi zmdi-collection-bookmark"></i>{{$chapter->getShortName()}}</a>
+</div>
\ No newline at end of file

diff --git a/resources/views/chapters/delete.blade.php b/resources/views/chapters/delete.blade.php
index 7005312c8e8cfa0b97fa39b010970e89eac7d7ba..bacb8dca39df45ea72f83f8d702bfbde766f8958 100644 (file)
--- a/resources/views/chapters/delete.blade.php
+++ b/resources/views/chapters/delete.blade.php
@@ -2,6 +2,16 @@
 
 @section('content')
 
 
 @section('content')
 

+    <div class="faded-small toolbar">
+        <div class="container">
+            <div class="row">
+                <div class="col-sm-12 faded">
+                    @include('chapters._breadcrumbs', ['chapter' => $chapter])
+                </div>
+            </div>
+        </div>
+    </div>
+

     <div class="container small" ng-non-bindable>
         <h1>{{ trans('entities.chapters_delete') }}</h1>
         <p>{{ trans('entities.chapters_delete_explain', ['chapterName' => $chapter->name]) }}</p>
     <div class="container small" ng-non-bindable>
         <h1>{{ trans('entities.chapters_delete') }}</h1>
         <p>{{ trans('entities.chapters_delete_explain', ['chapterName' => $chapter->name]) }}</p>

diff --git a/resources/views/chapters/move.blade.php b/resources/views/chapters/move.blade.php
index 291ab5015a324832e3a3815ba84a994f5588e15f..a28d61d41d11a58fed253fa1b1da0ded95eaebbe 100644 (file)
--- a/resources/views/chapters/move.blade.php
+++ b/resources/views/chapters/move.blade.php
@@ -6,18 +6,14 @@
         <div class="container">
             <div class="row">
                 <div class="col-sm-12 faded">
         <div class="container">
             <div class="row">
                 <div class="col-sm-12 faded">

-                    <div class="breadcrumbs">
-                        <a href="{{ $book->getUrl() }}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $book->getShortName() }}</a>
-                        <span class="sep">&raquo;</span>
-                        <a href="{{ $chapter->getUrl() }}" class="text-chapter text-button"><i class="zmdi zmdi-collection-bookmark"></i>{{ $chapter->getShortName() }}</a>
-                    </div>
+                    @include('chapters._breadcrumbs', ['chapter' => $chapter])

                 </div>
             </div>
         </div>
     </div>
 
     <div class="container">
                 </div>
             </div>
         </div>
     </div>
 
     <div class="container">

-        <h1>{{ trans('entities.chapters_move') }} <small class="subheader">{{$chapter->name}}</small></h1>
+        <h1>{{ trans('entities.chapters_move') }}</h1>

 
         <form action="{{ $chapter->getUrl('/move') }}" method="POST">
             {!! csrf_field() !!}
 
         <form action="{{ $chapter->getUrl('/move') }}" method="POST">
             {!! csrf_field() !!}

diff --git a/resources/views/chapters/restrictions.blade.php b/resources/views/chapters/restrictions.blade.php
index 7a38fa1049e90046ff652420a4a4ea09e2f0e9e1..7b908ee15d2144c927fb2b5a2673daf2a9ad5049 100644 (file)
--- a/resources/views/chapters/restrictions.blade.php
+++ b/resources/views/chapters/restrictions.blade.php
@@ -6,11 +6,7 @@
         <div class="container">
             <div class="row">
                 <div class="col-sm-12 faded">
         <div class="container">
             <div class="row">
                 <div class="col-sm-12 faded">

-                    <div class="breadcrumbs">
-                        <a href="{{ $chapter->book->getUrl() }}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $chapter->book->getShortName() }}</a>
-                        <span class="sep">&raquo;</span>
-                        <a href="{{ $chapter->getUrl() }}" class="text-chapter text-button"><i class="zmdi zmdi-collection-bookmark"></i>{{$chapter->getShortName()}}</a>
-                    </div>
+                    @include('chapters._breadcrumbs', ['chapter' => $chapter])

                 </div>
             </div>
         </div>
                 </div>
             </div>
         </div>

diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index d929d61cc778bb18fb66e94bf2d9d780c1ebb3d5..5dd4e53798b2f927a540087742d9549b4aac5013 100644 (file)
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -6,9 +6,7 @@
         <div class="container">
             <div class="row">
                 <div class="col-sm-8 faded" ng-non-bindable>
         <div class="container">
             <div class="row">
                 <div class="col-sm-8 faded" ng-non-bindable>

-                    <div class="breadcrumbs">
-                        <a href="{{ $book->getUrl() }}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $book->getShortName() }}</a>
-                    </div>
+                    @include('chapters._breadcrumbs', ['chapter' => $chapter])

                 </div>
                 <div class="col-sm-4 faded">
                     <div class="action-buttons">
                 </div>
                 <div class="col-sm-4 faded">
                     <div class="action-buttons">

diff --git a/resources/views/pages/_breadcrumbs.blade.php b/resources/views/pages/_breadcrumbs.blade.php
new file mode 100644 (file)
index 0000000..0d2a61a
--- /dev/null
+++ b/resources/views/pages/_breadcrumbs.blade.php
@@ -0,0 +1,12 @@
+<div class="breadcrumbs">
+    <a href="{{ $page->book->getUrl() }}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $page->book->getShortName() }}</a>
+    @if($page->hasChapter())
+        <span class="sep">&raquo;</span>
+        <a href="{{ $page->chapter->getUrl() }}" class="text-chapter text-button">
+            <i class="zmdi zmdi-collection-bookmark"></i>
+            {{ $page->chapter->getShortName() }}
+        </a>
+    @endif
+    <span class="sep">&raquo;</span>
+    <a href="{{ $page->getUrl() }}" class="text-page text-button"><i class="zmdi zmdi-file"></i>{{ $page->getShortName() }}</a>
+</div>
\ No newline at end of file

diff --git a/resources/views/pages/delete.blade.php b/resources/views/pages/delete.blade.php
index 57cc86054f3837dc70a4ee3159e136260b4f4dcd..f94a614fb2f32201ac9af475be6ccaa9b0f1cd61 100644 (file)
--- a/resources/views/pages/delete.blade.php
+++ b/resources/views/pages/delete.blade.php
@@ -2,15 +2,25 @@
 
 @section('content')
 
 
 @section('content')
 

+    <div class="faded-small toolbar">
+        <div class="container">
+            <div class="row">
+                <div class="col-sm-12 faded">
+                    @include('pages._breadcrumbs', ['page' => $page])
+                </div>
+            </div>
+        </div>
+    </div>
+

     <div class="container small" ng-non-bindable>
     <div class="container small" ng-non-bindable>

-        <h1>Delete {{ $page->draft ? 'Draft' : '' }} Page</h1>
-        <p class="text-neg">Are you sure you want to delete this {{ $page->draft ? 'draft' : '' }} page?</p>
+        <h1>{{ $page->draft ? trans('entities.pages_delete_draft') : trans('entities.pages_delete') }}</h1>
+        <p class="text-neg">{{ $page->draft ? trans('entities.pages_delete_draft_confirm'): trans('entities.pages_delete_confirm') }}</p>

 
         <form action="{{ $page->getUrl() }}" method="POST">
             {!! csrf_field() !!}
             <input type="hidden" name="_method" value="DELETE">
 
         <form action="{{ $page->getUrl() }}" method="POST">
             {!! csrf_field() !!}
             <input type="hidden" name="_method" value="DELETE">

-            <a href="{{ $page->getUrl() }}" class="button primary">Cancel</a>
-            <button type="submit" class="button neg">Confirm</button>
+            <a href="{{ $page->getUrl() }}" class="button primary">{{ trans('common.cancel') }}</a>
+            <button type="submit" class="button neg">{{ trans('common.confirm') }}</button>

         </form>
     </div>
 
         </form>
     </div>
 

diff --git a/resources/views/pages/export.blade.php b/resources/views/pages/export.blade.php
index 96f06290e30272b8407924eb0259aff5c3c8c81a..19a6355637c74db5c132a9b21a14529ed2d1c158 100644 (file)
--- a/resources/views/pages/export.blade.php
+++ b/resources/views/pages/export.blade.php
@@ -15,15 +15,11 @@
         <div class="col-md-8 col-md-offset-2">
             <div class="page-content">
 
         <div class="col-md-8 col-md-offset-2">
             <div class="page-content">
 

-                @include('pages/page-display')
+                @include('pages.page-display')

 
                 <hr>
 
 
                 <hr>
 

-                <p class="text-muted small">
-                    Created {{$page->created_at->toDayDateTimeString()}} @if($page->createdBy) by {{$page->createdBy->name}} @endif
-                    <br>
-                    Last Updated {{$page->updated_at->toDayDateTimeString()}} @if($page->updatedBy) by {{$page->updatedBy->name}} @endif
-                </p>
+                @include('partials.entity-meta', ['entity' => $page])

 
             </div>
         </div>
 
             </div>
         </div>

diff --git a/resources/views/pages/form-toolbox.blade.php b/resources/views/pages/form-toolbox.blade.php
index a6e66a24a13f3e778924634faea57ce4af24fd69..cd9b7ed80013ed547aa887b0a96843e6231af494 100644 (file)
--- a/resources/views/pages/form-toolbox.blade.php
+++ b/resources/views/pages/form-toolbox.blade.php
@@ -3,22 +3,22 @@
 
     <div class="tabs primary-background-light">
         <span toolbox-toggle><i class="zmdi zmdi-caret-left-circle"></i></span>
 
     <div class="tabs primary-background-light">
         <span toolbox-toggle><i class="zmdi zmdi-caret-left-circle"></i></span>

-        <span toolbox-tab-button="tags" title="Page Tags" class="active"><i class="zmdi zmdi-tag"></i></span>
+        <span toolbox-tab-button="tags" title="{{ trans('entities.page_tags') }}" class="active"><i class="zmdi zmdi-tag"></i></span>

         @if(userCan('attachment-create-all'))
         @if(userCan('attachment-create-all'))

-            <span toolbox-tab-button="files" title="Attachments"><i class="zmdi zmdi-attachment"></i></span>
+            <span toolbox-tab-button="files" title="{{ trans('entities.attachments') }}"><i class="zmdi zmdi-attachment"></i></span>

         @endif
     </div>
 
     <div toolbox-tab-content="tags" ng-controller="PageTagController" page-id="{{ $page->id or 0 }}">
         @endif
     </div>
 
     <div toolbox-tab-content="tags" ng-controller="PageTagController" page-id="{{ $page->id or 0 }}">

-        <h4>Page Tags</h4>
+        <h4>{{ trans('entities.page_tags') }}</h4>

         <div class="padded tags">
         <div class="padded tags">

-            <p class="muted small">Add some tags to better categorise your content. <br> You can assign a value to a tag for more in-depth organisation.</p>
+            <p class="muted small">{!! nl2br(e(trans('entities.tags_explain'))) !!}</p>

             <table class="no-style" tag-autosuggestions style="width: 100%;">
                 <tbody ui-sortable="sortOptions" ng-model="tags" >
                     <tr ng-repeat="tag in tags track by $index">
                         <td width="20" ><i class="handle zmdi zmdi-menu"></i></td>
             <table class="no-style" tag-autosuggestions style="width: 100%;">
                 <tbody ui-sortable="sortOptions" ng-model="tags" >
                     <tr ng-repeat="tag in tags track by $index">
                         <td width="20" ><i class="handle zmdi zmdi-menu"></i></td>

-                        <td><input autosuggest="{{ baseUrl('/ajax/tags/suggest/names') }}" autosuggest-type="name" class="outline" ng-attr-name="tags[@{{$index}}][name]" type="text" ng-model="tag.name" ng-change="tagChange(tag)" ng-blur="tagBlur(tag)" placeholder="Tag"></td>
-                        <td><input autosuggest="{{ baseUrl('/ajax/tags/suggest/values') }}" autosuggest-type="value" class="outline" ng-attr-name="tags[@{{$index}}][value]" type="text" ng-model="tag.value" ng-change="tagChange(tag)" ng-blur="tagBlur(tag)" placeholder="Tag Value (Optional)"></td>
+                        <td><input autosuggest="{{ baseUrl('/ajax/tags/suggest/names') }}" autosuggest-type="name" class="outline" ng-attr-name="tags[@{{$index}}][name]" type="text" ng-model="tag.name" ng-change="tagChange(tag)" ng-blur="tagBlur(tag)" placeholder="{{ trans('entities.tag') }}"></td>
+                        <td><input autosuggest="{{ baseUrl('/ajax/tags/suggest/values') }}" autosuggest-type="value" class="outline" ng-attr-name="tags[@{{$index}}][value]" type="text" ng-model="tag.value" ng-change="tagChange(tag)" ng-blur="tagBlur(tag)" placeholder="{{ trans('entities.tag_value') }}"></td>

                         <td width="10" ng-show="tags.length != 1" class="text-center text-neg" style="padding: 0;" ng-click="removeTag(tag)"><i class="zmdi zmdi-close"></i></td>
                     </tr>
                 </tbody>
                         <td width="10" ng-show="tags.length != 1" class="text-center text-neg" style="padding: 0;" ng-click="removeTag(tag)"><i class="zmdi zmdi-close"></i></td>
                     </tr>
                 </tbody>


@@ -28,7 +28,7 @@
                 <tr class="unsortable">
                     <td  width="34"></td>
                     <td ng-click="addEmptyTag()">
                 <tr class="unsortable">
                     <td  width="34"></td>
                     <td ng-click="addEmptyTag()">

-                        <button type="button" class="text-button">Add another tag</button>
+                        <button type="button" class="text-button">{{ trans('entities.tags_add') }}</button>

                     </td>
                     <td></td>
                 </tr>
                     </td>
                     <td></td>
                 </tr>


@@ -39,17 +39,17 @@
 
     @if(userCan('attachment-create-all'))
         <div toolbox-tab-content="files" ng-controller="PageAttachmentController" page-id="{{ $page->id or 0 }}">
 
     @if(userCan('attachment-create-all'))
         <div toolbox-tab-content="files" ng-controller="PageAttachmentController" page-id="{{ $page->id or 0 }}">

-            <h4>Attachments</h4>
+            <h4>{{ trans('entities.attachments') }}</h4>

             <div class="padded files">
 
                 <div id="file-list" ng-show="!editFile">
             <div class="padded files">
 
                 <div id="file-list" ng-show="!editFile">

-                    <p class="muted small">Upload some files or attach some link to display on your page. These are visible in the page sidebar. <span class="secondary">Changes here are saved instantly.</span></p>
+                    <p class="muted small">{{ trans('entities.attachments_explain') }} <span class="secondary">{{ trans('entities.attachments_explain_instant_save') }}</span></p>

 
                     <div tab-container>
                         <div class="nav-tabs">
 
                     <div tab-container>
                         <div class="nav-tabs">

-                            <div tab-button="list" class="tab-item">Attached Items</div>
-                            <div tab-button="file" class="tab-item">Upload File</div>
-                            <div tab-button="link" class="tab-item">Attach Link</div>
+                            <div tab-button="list" class="tab-item">{{ trans('entities.attachments_items') }}</div>
+                            <div tab-button="file" class="tab-item">{{ trans('entities.attachments_upload') }}</div>
+                            <div tab-button="link" class="tab-item">{{ trans('entities.attachments_link') }}</div>

                         </div>
                         <div tab-content="list">
                             <table class="file-table" style="width: 100%;">
                         </div>
                         <div tab-content="list">
                             <table class="file-table" style="width: 100%;">


@@ -59,9 +59,9 @@
                                     <td>
                                         <a ng-href="@{{getFileUrl(file)}}" target="_blank" ng-bind="file.name"></a>
                                         <div ng-if="file.deleting">
                                     <td>
                                         <a ng-href="@{{getFileUrl(file)}}" target="_blank" ng-bind="file.name"></a>
                                         <div ng-if="file.deleting">

-                                            <span class="neg small">Click delete again to confirm you want to delete this attachment.</span>
+                                            <span class="neg small">{{ trans('entities.attachments_delete_confirm') }}</span>

                                             <br>
                                             <br>

-                                            <span class="text-primary small" ng-click="file.deleting=false;">Cancel</span>
+                                            <span class="text-primary small" ng-click="file.deleting=false;">{{ trans('common.cancel') }}</span>

                                         </div>
                                     </td>
                                     <td width="10" ng-click="startEdit(file)" class="text-center text-primary" style="padding: 0;"><i class="zmdi zmdi-edit"></i></td>
                                         </div>
                                     </td>
                                     <td width="10" ng-click="startEdit(file)" class="text-center text-primary" style="padding: 0;"><i class="zmdi zmdi-edit"></i></td>


@@ -71,25 +71,25 @@
                                 </tbody>
                             </table>
                             <p class="small muted" ng-if="files.length == 0">
                                 </tbody>
                             </table>
                             <p class="small muted" ng-if="files.length == 0">

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

                             </p>
                         </div>
                         <div tab-content="file">
                             <drop-zone upload-url="@{{getUploadUrl()}}" uploaded-to="@{{uploadedTo}}" event-success="uploadSuccess"></drop-zone>
                         </div>
                         <div tab-content="link" sub-form="attachLinkSubmit(file)">
                             </p>
                         </div>
                         <div tab-content="file">
                             <drop-zone upload-url="@{{getUploadUrl()}}" uploaded-to="@{{uploadedTo}}" event-success="uploadSuccess"></drop-zone>
                         </div>
                         <div tab-content="link" sub-form="attachLinkSubmit(file)">

-                            <p class="muted small">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.</p>
+                            <p class="muted small">{{ trans('entities.attachments_explain_link') }}</p>

                             <div class="form-group">
                             <div class="form-group">

-                                <label for="attachment-via-link">Link Name</label>
-                                <input type="text" placeholder="Link name" ng-model="file.name">
+                                <label for="attachment-via-link">{{ trans('entities.attachments_link_name') }}</label>
+                                <input type="text" placeholder="{{ trans('entities.attachments_link_name') }}" ng-model="file.name">

                                 <p class="small neg" ng-repeat="error in errors.link.name" ng-bind="error"></p>
                             </div>
                             <div class="form-group">
                                 <p class="small neg" ng-repeat="error in errors.link.name" ng-bind="error"></p>
                             </div>
                             <div class="form-group">

-                                <label for="attachment-via-link">Link to file</label>
-                                <input type="text" placeholder="Url of site or file" ng-model="file.link">
+                                <label for="attachment-via-link">{{ trans('entities.attachments_link_url') }}</label>
+                                <input type="text" placeholder="{{ trans('entities.attachments_link_url_hint') }}" ng-model="file.link">

                                 <p class="small neg" ng-repeat="error in errors.link.link" ng-bind="error"></p>
                             </div>
                                 <p class="small neg" ng-repeat="error in errors.link.link" ng-bind="error"></p>
                             </div>

-                            <button type="submit" class="button pos">Attach</button>
+                            <button type="submit" class="button pos">{{ trans('entities.attach') }}</button>

 
                         </div>
                     </div>
 
                         </div>
                     </div>


@@ -97,34 +97,34 @@
                 </div>
 
                 <div id="file-edit" ng-if="editFile" sub-form="updateFile(editFile)">
                 </div>
 
                 <div id="file-edit" ng-if="editFile" sub-form="updateFile(editFile)">

-                    <h5>Edit File</h5>
+                    <h5>{{ trans('entities.attachments_edit_file') }}</h5>

 
                     <div class="form-group">
 
                     <div class="form-group">

-                        <label for="attachment-name-edit">File Name</label>
-                        <input type="text" id="attachment-name-edit" placeholder="File name" ng-model="editFile.name">
+                        <label for="attachment-name-edit">{{ trans('entities.attachments_edit_file_name') }}</label>
+                        <input type="text" id="attachment-name-edit" placeholder="{{ trans('entities.attachments_edit_file_name') }}" ng-model="editFile.name">

                         <p class="small neg" ng-repeat="error in errors.edit.name" ng-bind="error"></p>
                     </div>
 
                     <div tab-container="@{{ editFile.external ? 'link' : 'file' }}">
                         <div class="nav-tabs">
                         <p class="small neg" ng-repeat="error in errors.edit.name" ng-bind="error"></p>
                     </div>
 
                     <div tab-container="@{{ editFile.external ? 'link' : 'file' }}">
                         <div class="nav-tabs">

-                            <div tab-button="file" class="tab-item">Upload File</div>
-                            <div tab-button="link" class="tab-item">Set Link</div>
+                            <div tab-button="file" class="tab-item">{{ trans('entities.attachments_upload') }}</div>
+                            <div tab-button="link" class="tab-item">{{ trans('entities.attachments_set_link') }}</div>

                         </div>
                         <div tab-content="file">
                         </div>
                         <div tab-content="file">

-                            <drop-zone upload-url="@{{getUploadUrl(editFile)}}" uploaded-to="@{{uploadedTo}}" placeholder="Drop files or click here to upload and overwrite" event-success="uploadSuccessUpdate"></drop-zone>
+                            <drop-zone upload-url="@{{getUploadUrl(editFile)}}" uploaded-to="@{{uploadedTo}}" placeholder="{{ trans('entities.attachments_edit_drop_upload') }}" event-success="uploadSuccessUpdate"></drop-zone>

                             <br>
                         </div>
                         <div tab-content="link">
                             <div class="form-group">
                             <br>
                         </div>
                         <div tab-content="link">
                             <div class="form-group">

-                                <label for="attachment-link-edit">Link to file</label>
-                                <input type="text" id="attachment-link-edit" placeholder="Attachment link" ng-model="editFile.link">
+                                <label for="attachment-link-edit">{{ trans('entities.attachments_link_url') }}</label>
+                                <input type="text" id="attachment-link-edit" placeholder="{{ trans('entities.attachment_link') }}" ng-model="editFile.link">

                                 <p class="small neg" ng-repeat="error in errors.edit.link" ng-bind="error"></p>
                             </div>
                         </div>
                     </div>
 
                                 <p class="small neg" ng-repeat="error in errors.edit.link" ng-bind="error"></p>
                             </div>
                         </div>
                     </div>
 

-                    <button type="button" class="button" ng-click="cancelEdit()">Back</button>
-                    <button type="submit" class="button pos">Save</button>
+                    <button type="button" class="button" ng-click="cancelEdit()">{{ trans('entities.back') }}</button>
+                    <button type="submit" class="button pos">{{ trans('entities.save') }}</button>

                 </div>
 
             </div>
                 </div>
 
             </div>

diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php
index c4baf38f75b352046eb8181b4873c1e624c82169..eb5ebb0bdde4b807928f3de5741270f54d48697f 100644 (file)
--- a/resources/views/pages/form.blade.php
+++ b/resources/views/pages/form.blade.php
@@ -9,8 +9,8 @@
             <div class="row">
                 <div class="col-sm-4 faded">
                     <div class="action-buttons text-left">
             <div class="row">
                 <div class="col-sm-4 faded">
                     <div class="action-buttons text-left">

-                        <a href="{{ back()->getTargetUrl() }}" class="text-button text-primary"><i class="zmdi zmdi-arrow-left"></i>Back</a>
-                        <a onclick="$('body>header').slideToggle();" class="text-button text-primary"><i class="zmdi zmdi-swap-vertical"></i>Toggle Header</a>
+                        <a href="{{ back()->getTargetUrl() }}" class="text-button text-primary"><i class="zmdi zmdi-arrow-left"></i>{{ trans('common.back') }}</a>
+                        <a onclick="$('body>header').slideToggle();" class="text-button text-primary"><i class="zmdi zmdi-swap-vertical"></i>{{ trans('entities.pages_edit_toggle_header') }}</a>

                     </div>
                 </div>
                 <div class="col-sm-4 faded text-center">
                     </div>
                 </div>
                 <div class="col-sm-4 faded text-center">


@@ -20,13 +20,13 @@
                         <i class="zmdi zmdi-check-circle text-pos draft-notification" ng-class="{visible: draftUpdated}"></i>
                         <ul>
                             <li>
                         <i class="zmdi zmdi-check-circle text-pos draft-notification" ng-class="{visible: draftUpdated}"></i>
                         <ul>
                             <li>

-                                <a ng-click="forceDraftSave()" class="text-pos"><i class="zmdi zmdi-save"></i>Save Draft</a>
+                                <a ng-click="forceDraftSave()" class="text-pos"><i class="zmdi zmdi-save"></i>{{ trans('entities.pages_edit_save_draft') }}</a>

                             </li>
                             <li ng-if="isNewPageDraft">
                             </li>
                             <li ng-if="isNewPageDraft">

-                                <a href="{{ $model->getUrl('/delete') }}" class="text-neg"><i class="zmdi zmdi-delete"></i>Delete Draft</a>
+                                <a href="{{ $model->getUrl('/delete') }}" class="text-neg"><i class="zmdi zmdi-delete"></i>{{ trans('entities.pages_edit_delete_draft') }}</a>

                             </li>
                             <li>
                             </li>
                             <li>

-                                <a type="button" ng-if="isUpdateDraft" ng-click="discardDraft()" class="text-neg"><i class="zmdi zmdi-close-circle"></i>Discard Draft</a>
+                                <a type="button" ng-if="isUpdateDraft" ng-click="discardDraft()" class="text-neg"><i class="zmdi zmdi-close-circle"></i>{{ trans('entities.pages_edit_discard_draft') }}</a>

                             </li>
                         </ul>
                     </div>
                             </li>
                         </ul>
                     </div>


@@ -34,16 +34,16 @@
                 <div class="col-sm-4 faded">
                     <div class="action-buttons" ng-cloak>
                         <div dropdown class="dropdown-container">
                 <div class="col-sm-4 faded">
                     <div class="action-buttons" ng-cloak>
                         <div dropdown class="dropdown-container">

-                            <a dropdown-toggle class="text-primary text-button"><i class="zmdi zmdi-edit"></i> @{{(changeSummary | limitTo:16) + (changeSummary.length>16?'...':'') || 'Set Changelog'}}</a>
+                            <a dropdown-toggle class="text-primary text-button"><i class="zmdi zmdi-edit"></i> <span ng-bind="(changeSummary | limitTo:16) + (changeSummary.length>16?'...':'') || '{{ trans('entities.pages_edit_set_changelog') }}'"></span></a>

                             <ul class="wide">
                                 <li class="padded">
                             <ul class="wide">
                                 <li class="padded">

-                                    <p class="text-muted">Enter a brief description of the changes you've made</p>
-                                    <input name="summary" id="summary-input" type="text" placeholder="Enter Changelog" ng-model="changeSummary" />
+                                    <p class="text-muted">{{ trans('entities.pages_edit_enter_changelog_desc') }}</p>
+                                    <input name="summary" id="summary-input" type="text" placeholder="{{ trans('entities.pages_edit_enter_changelog') }}" ng-model="changeSummary" />

                                 </li>
                             </ul>
                         </div>
 
                                 </li>
                             </ul>
                         </div>
 

-                        <button type="submit" id="save-button" class="text-button text-pos"><i class="zmdi zmdi-floppy"></i>Save Page</button>
+                        <button type="submit" id="save-button" class="text-button text-pos"><i class="zmdi zmdi-floppy"></i>{{ trans('entities.pages_save') }}</button>

                     </div>
                 </div>
             </div>
                     </div>
                 </div>
             </div>


@@ -53,7 +53,7 @@
     {{--Title input--}}
     <div class="title-input page-title clearfix" ng-non-bindable>
         <div class="input">
     {{--Title input--}}
     <div class="title-input page-title clearfix" ng-non-bindable>
         <div class="input">

-            @include('form/text', ['name' => 'name', 'placeholder' => 'Page Title'])
+            @include('form/text', ['name' => 'name', 'placeholder' => trans('entities.pages_title')])

         </div>
     </div>
 
         </div>
     </div>
 


@@ -78,24 +78,24 @@
 
                 <div class="markdown-editor-wrap">
                     <div class="editor-toolbar">
 
                 <div class="markdown-editor-wrap">
                     <div class="editor-toolbar">

-                        <span class="float left">Editor</span>
+                        <span class="float left">{{ trans('entities.pages_md_editor') }}</span>

                         <div class="float right buttons">
                         <div class="float right buttons">

-                            <button class="text-button" type="button" data-action="insertImage"><i class="zmdi zmdi-image"></i>Insert Image</button>
+                            <button class="text-button" type="button" data-action="insertImage"><i class="zmdi zmdi-image"></i>{{ trans('entities.pages_md_insert_image') }}</button>

                             &nbsp;|&nbsp;
                             &nbsp;|&nbsp;

-                            <button class="text-button" type="button" data-action="insertEntityLink"><i class="zmdi zmdi-link"></i>Insert Entity Link</button>
+                            <button class="text-button" type="button" data-action="insertEntityLink"><i class="zmdi zmdi-link"></i>{{ trans('entities.pages_md_insert_link') }}</button>

                         </div>
                     </div>
 
                     <div markdown-input md-change="editorChange" md-model="editContent" class="flex flex-fill">
                         <textarea ng-non-bindable id="markdown-editor-input"  name="markdown" rows="5"
                         </div>
                     </div>
 
                     <div markdown-input md-change="editorChange" md-model="editContent" class="flex flex-fill">
                         <textarea ng-non-bindable id="markdown-editor-input"  name="markdown" rows="5"

-                                  @if($errors->has('markdown')) class="neg" @endif>@if(isset($model) || old('markdown')){{htmlspecialchars( old('markdown') ? old('markdown') : ($model->markdown === '' ? $model->html : $model->markdown))}}@endif</textarea>
+                            @if($errors->has('markdown')) class="neg" @endif>@if(isset($model) || old('markdown')){{htmlspecialchars( old('markdown') ? old('markdown') : ($model->markdown === '' ? $model->html : $model->markdown))}}@endif</textarea>

                     </div>
 
                 </div>
 
                 <div class="markdown-editor-wrap">
                     <div class="editor-toolbar">
                     </div>
 
                 </div>
 
                 <div class="markdown-editor-wrap">
                     <div class="editor-toolbar">

-                        <div class="">Preview</div>
+                        <div class="">{{ trans('entities.pages_md_preview') }}</div>

                     </div>
                     <div class="markdown-display">
                         <div class="page-content" ng-bind-html="displayContent"></div>
                     </div>
                     <div class="markdown-display">
                         <div class="page-content" ng-bind-html="displayContent"></div>

diff --git a/resources/views/pages/guest-create.blade.php b/resources/views/pages/guest-create.blade.php
index 00d9f55605d3d97f15e9c8186ae1a951c3768b26..10e16cb97e3fd80f1aa3f042ae38e4f888a88e0a 100644 (file)
--- a/resources/views/pages/guest-create.blade.php
+++ b/resources/views/pages/guest-create.blade.php
@@ -3,19 +3,19 @@
 @section('content')
 
     <div class="container small" ng-non-bindable>
 @section('content')
 
     <div class="container small" ng-non-bindable>

-        <h1>Create Page</h1>
+        <h1>{{ trans('entities.pages_new') }}</h1>

         <form action="{{  $parent->getUrl('/page/create/guest') }}" method="POST">
 
             {!! csrf_field() !!}
 
             <div class="form-group title-input">
         <form action="{{  $parent->getUrl('/page/create/guest') }}" method="POST">
 
             {!! csrf_field() !!}
 
             <div class="form-group title-input">

-                <label for="name">Page Name</label>
+                <label for="name">{{ trans('entities.pages_name') }}</label>

                 @include('form/text', ['name' => 'name'])
             </div>
 
             <div class="form-group">
                 @include('form/text', ['name' => 'name'])
             </div>
 
             <div class="form-group">

-                <a href="{{ $parent->getUrl() }}" class="button muted">Cancel</a>
-                <button type="submit" class="button pos">Continue</button>
+                <a href="{{ $parent->getUrl() }}" class="button muted">{{ trans('common.cancel') }}</a>
+                <button type="submit" class="button pos">{{ trans('common.continue') }}</button>

             </div>
 
         </form>
             </div>
 
         </form>

diff --git a/resources/views/pages/list-item.blade.php b/resources/views/pages/list-item.blade.php
index 7aa5d7933fb6661968fdb38aa12e0f1fea2259fe..70b309e7d7446b91b4996c0d104a89b706d6078c 100644 (file)
--- 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')
         <div class="row meta text-muted text-small">
             <div class="col-md-6">
     @if(isset($style) && $style === 'detailed')
         <div class="row meta text-muted text-small">
             <div class="col-md-6">

-                Created {{$page->created_at->diffForHumans()}} @if($page->createdBy)by {{$page->createdBy->name}}@endif <br>
-                Last updated {{ $page->updated_at->diffForHumans() }} @if($page->updatedBy)by {{$page->updatedBy->name}} @endif
+                @include('partials.entity-meta', ['entity' => $page])

             </div>
             <div class="col-md-6">
                 <a class="text-book" href="{{ $page->book->getUrl() }}"><i class="zmdi zmdi-book"></i>{{ $page->book->getShortName(30) }}</a>
             </div>
             <div class="col-md-6">
                 <a class="text-book" href="{{ $page->book->getUrl() }}"><i class="zmdi zmdi-book"></i>{{ $page->book->getShortName(30) }}</a>


@@ -21,7 +20,7 @@
                 @if($page->chapter)
                     <a class="text-chapter" href="{{ $page->chapter->getUrl() }}"><i class="zmdi zmdi-collection-bookmark"></i>{{ $page->chapter->getShortName(30) }}</a>
                 @else
                 @if($page->chapter)
                     <a class="text-chapter" href="{{ $page->chapter->getUrl() }}"><i class="zmdi zmdi-collection-bookmark"></i>{{ $page->chapter->getShortName(30) }}</a>
                 @else

-                    <i class="zmdi zmdi-collection-bookmark"></i> Page is not in a chapter
+                    <i class="zmdi zmdi-collection-bookmark"></i> {{ trans('entities.pages_not_in_chapter') }}

                 @endif
             </div>
         </div>
                 @endif
             </div>
         </div>

diff --git a/resources/views/pages/move.blade.php b/resources/views/pages/move.blade.php
index d0fae60ca4a466fc46bca89350314f02836ce891..2bf2260471840d970068716d4ae31ee6abd63f3a 100644 (file)
--- a/resources/views/pages/move.blade.php
+++ b/resources/views/pages/move.blade.php
@@ -6,25 +6,14 @@
         <div class="container">
             <div class="row">
                 <div class="col-sm-12 faded">
         <div class="container">
             <div class="row">
                 <div class="col-sm-12 faded">

-                    <div class="breadcrumbs">
-                        <a href="{{ $book->getUrl() }}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $book->getShortName() }}</a>
-                        @if($page->hasChapter())
-                            <span class="sep">&raquo;</span>
-                            <a href="{{ $page->chapter->getUrl() }}" class="text-chapter text-button">
-                                <i class="zmdi zmdi-collection-bookmark"></i>
-                                {{ $page->chapter->getShortName() }}
-                            </a>
-                        @endif
-                        <span class="sep">&raquo;</span>
-                        <a href="{{ $page->getUrl() }}" class="text-page text-button"><i class="zmdi zmdi-file-text"></i>{{ $page->getShortName() }}</a>
-                    </div>
+                    @include('pages._breadcrumbs', ['page' => $page])

                 </div>
             </div>
         </div>
     </div>
 
     <div class="container">
                 </div>
             </div>
         </div>
     </div>
 
     <div class="container">

-        <h1>Move Page <small class="subheader">{{$page->name}}</small></h1>
+        <h1>{{ trans('entities.pages_move') }}</h1>

 
         <form action="{{ $page->getUrl('/move') }}" method="POST">
             {!! csrf_field() !!}
 
         <form action="{{ $page->getUrl('/move') }}" method="POST">
             {!! csrf_field() !!}


@@ -32,8 +21,8 @@
 
             @include('partials/entity-selector', ['name' => 'entity_selection', 'selectorSize' => 'large', 'entityTypes' => 'book,chapter'])
 
 
             @include('partials/entity-selector', ['name' => 'entity_selection', 'selectorSize' => 'large', 'entityTypes' => 'book,chapter'])
 

-            <a href="{{ $page->getUrl() }}" class="button muted">Cancel</a>
-            <button type="submit" class="button pos">Move Page</button>
+            <a href="{{ $page->getUrl() }}" class="button muted">{{ trans('common.cancel') }}</a>
+            <button type="submit" class="button pos">{{ trans('entities.pages_move') }}</button>

         </form>
     </div>
 
         </form>
     </div>
 

diff --git a/resources/views/pages/page-display.blade.php b/resources/views/pages/page-display.blade.php
index 6ffe4b50237209d6f07e5683be265a1e3f4fd0ce..fcc046aae56a4eac68bd05f018a5929e8629ae62 100644 (file)
--- a/resources/views/pages/page-display.blade.php
+++ b/resources/views/pages/page-display.blade.php
@@ -7,7 +7,7 @@
             <table>
                 <thead>
                     <tr class="text-left heading primary-background-light">
             <table>
                 <thead>
                     <tr class="text-left heading primary-background-light">

-                        <th colspan="2">Page Tags</th>
+                        <th colspan="2">{{ trans('entities.page_tags') }}</th>

                     </tr>
                 </thead>
                 <tbody>
                     </tr>
                 </thead>
                 <tbody>

diff --git a/resources/views/pages/pdf.blade.php b/resources/views/pages/pdf.blade.php
index 5c9fd5eea8707fad42b2ea5b982f3b78266a5f1c..7e43c5e1a6e0a0a2ad314cb6a146d2b8f81d67a2 100644 (file)
--- a/resources/views/pages/pdf.blade.php
+++ b/resources/views/pages/pdf.blade.php
@@ -36,6 +36,5 @@
             max-width: none;
             display: none;
         }
             max-width: none;
             display: none;
         }

-

     </style>
 @stop
\ No newline at end of file
     </style>
 @stop
\ No newline at end of file

diff --git a/resources/views/pages/restrictions.blade.php b/resources/views/pages/restrictions.blade.php
index bd88919dfa83c23571e723dca0bcdd1d74ef99c9..cfef2ed21a8f2cd994829a8f179f4ab579a2e281 100644 (file)
--- a/resources/views/pages/restrictions.blade.php
+++ b/resources/views/pages/restrictions.blade.php
@@ -6,26 +6,15 @@
         <div class="container">
             <div class="row">
                 <div class="col-sm-12 faded">
         <div class="container">
             <div class="row">
                 <div class="col-sm-12 faded">

-                    <div class="breadcrumbs">
-                        <a href="{{ $page->book->getUrl() }}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $page->book->getShortName() }}</a>
-                        @if($page->hasChapter())
-                            <span class="sep">&raquo;</span>
-                            <a href="{{ $page->chapter->getUrl() }}" class="text-chapter text-button">
-                                <i class="zmdi zmdi-collection-bookmark"></i>
-                                {{ $page->chapter->getShortName() }}
-                            </a>
-                        @endif
-                        <span class="sep">&raquo;</span>
-                        <a href="{{ $page->getUrl() }}" class="text-page text-button"><i class="zmdi zmdi-file"></i>{{ $page->getShortName() }}</a>
-                    </div>
+                    @include('pages._breadcrumbs', ['page' => $page])

                 </div>
             </div>
         </div>
     </div>
 
     <div class="container" ng-non-bindable>
                 </div>
             </div>
         </div>
     </div>
 
     <div class="container" ng-non-bindable>

-        <h1>Page Permissions</h1>
-        @include('form/restriction-form', ['model' => $page])
+        <h1>{{ trans('entities.pages_permissions') }}</h1>
+        @include('form.restriction-form', ['model' => $page])

     </div>
 
 @stop
     </div>
 
 @stop

diff --git a/resources/views/pages/revision.blade.php b/resources/views/pages/revision.blade.php
index bc054ef83fcde5f646f13d0bf5169a81898ead2b..fe0dd9511a72839336a201f580fc51a99e77c449 100644 (file)
--- a/resources/views/pages/revision.blade.php
+++ b/resources/views/pages/revision.blade.php
@@ -7,14 +7,12 @@
         <div class="row">
             <div class="col-md-9">
                 <div class="page-content anim fadeIn">
         <div class="row">
             <div class="col-md-9">
                 <div class="page-content anim fadeIn">

-                    @include('pages/page-display')
+                    @include('pages.page-display')

                 </div>
             </div>
         </div>
     </div>
 
 
                 </div>
             </div>
         </div>
     </div>
 
 

-
-    @include('partials/highlight')
-
+    @include('partials.highlight')

 @stop
 @stop

diff --git a/resources/views/pages/revisions.blade.php b/resources/views/pages/revisions.blade.php
index 720e34fea4efd76c4187e4f5b37b29e9b65e3a57..3549f5f05cea7914173c644b846f69a830350218 100644 (file)
--- a/resources/views/pages/revisions.blade.php
+++ b/resources/views/pages/revisions.blade.php
@@ -6,37 +6,24 @@
         <div class="container">
             <div class="row">
                 <div class="col-sm-12 faded">
         <div class="container">
             <div class="row">
                 <div class="col-sm-12 faded">

-                    <div class="breadcrumbs">
-                        <a href="{{ $page->book->getUrl() }}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $page->book->getShortName() }}</a>
-                        @if($page->hasChapter())
-                            <span class="sep">&raquo;</span>
-                            <a href="{{ $page->chapter->getUrl() }}" class="text-chapter text-button">
-                                <i class="zmdi zmdi-collection-bookmark"></i>
-                                {{ $page->chapter->getShortName() }}
-                            </a>
-                        @endif
-                        <span class="sep">&raquo;</span>
-                        <a href="{{ $page->getUrl() }}" class="text-page text-button"><i class="zmdi zmdi-file"></i>{{ $page->getShortName() }}</a>
-                    </div>
+                    @include('pages._breadcrumbs', ['page' => $page])

                 </div>
             </div>
         </div>
     </div>
 
                 </div>
             </div>
         </div>
     </div>
 

-
-

     <div class="container" ng-non-bindable>
     <div class="container" ng-non-bindable>

-        <h1>Page Revisions <span class="subheader">For "{{ $page->name }}"</span></h1>
+        <h1>{{ trans('entities.pages_revisions') }}</h1>

 
         @if(count($page->revisions) > 0)
 
             <table class="table">
                 <tr>
 
         @if(count($page->revisions) > 0)
 
             <table class="table">
                 <tr>

-                    <th width="23%">Name</th>
-                    <th colspan="2" width="8%">Created By</th>
-                    <th width="15%">Revision Date</th>
-                    <th width="25%">Changelog</th>
-                    <th width="20%">Actions</th>
+                    <th width="23%">{{ trans('entities.pages_name') }}</th>
+                    <th colspan="2" width="8%">{{ trans('entities.pages_revisions_created_by') }}</th>
+                    <th width="15%">{{ trans('entities.pages_revisions_date') }}</th>
+                    <th width="25%">{{ trans('entities.pages_revisions_changelog') }}</th>
+                    <th width="20%">{{ trans('common.actions') }}</th>

                 </tr>
                 @foreach($page->revisions as $index => $revision)
                     <tr>
                 </tr>
                 @foreach($page->revisions as $index => $revision)
                     <tr>


@@ -46,19 +33,19 @@
                                 <img class="avatar" src="{{ $revision->createdBy->getAvatar(30) }}" alt="{{ $revision->createdBy->name }}">
                             @endif
                         </td>
                                 <img class="avatar" src="{{ $revision->createdBy->getAvatar(30) }}" alt="{{ $revision->createdBy->name }}">
                             @endif
                         </td>

-                        <td> @if($revision->createdBy) {{ $revision->createdBy->name }} @else Deleted User @endif</td>
+                        <td> @if($revision->createdBy) {{ $revision->createdBy->name }} @else {{ trans('common.deleted_user') }} @endif</td>

                         <td><small>{{ $revision->created_at->format('jS F, Y H:i:s') }} <br> ({{ $revision->created_at->diffForHumans() }})</small></td>
                         <td>{{ $revision->summary }}</td>
                         <td>
                         <td><small>{{ $revision->created_at->format('jS F, Y H:i:s') }} <br> ({{ $revision->created_at->diffForHumans() }})</small></td>
                         <td>{{ $revision->summary }}</td>
                         <td>

-                            <a href="{{ $revision->getUrl('changes') }}" target="_blank">Changes</a>
+                            <a href="{{ $revision->getUrl('changes') }}" target="_blank">{{ trans('entities.pages_revisions_changes') }}</a>

                             <span class="text-muted">&nbsp;|&nbsp;</span>
 
                             @if ($index === 0)
                             <span class="text-muted">&nbsp;|&nbsp;</span>
 
                             @if ($index === 0)

-                                <a target="_blank" href="{{ $page->getUrl() }}"><i>Current Version</i></a>
+                                <a target="_blank" href="{{ $page->getUrl() }}"><i>{{ trans('entities.pages_revisions_current') }}</i></a>

                             @else
                             @else

-                                <a href="{{ $revision->getUrl() }}" target="_blank">Preview</a>
+                                <a href="{{ $revision->getUrl() }}" target="_blank">{{ trans('entities.pages_revisions_preview') }}</a>

                                 <span class="text-muted">&nbsp;|&nbsp;</span>
                                 <span class="text-muted">&nbsp;|&nbsp;</span>

-                                <a href="{{ $revision->getUrl('restore') }}" target="_blank">Restore</a>
+                                <a href="{{ $revision->getUrl('restore') }}" target="_blank">{{ trans('entities.pages_revisions_restore') }}</a>

                             @endif
                         </td>
                     </tr>
                             @endif
                         </td>
                     </tr>


@@ -66,7 +53,7 @@
             </table>
 
         @else
             </table>
 
         @else

-            <p>This page has no revisions.</p>
+            <p>{{ trans('entities.pages_revisions_none') }}</p>

         @endif
 
     </div>
         @endif
 
     </div>

diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 0a96afdab79bd8b4c192868e567013627b328d0f..ced311f94cc230a0e7e2fb9ce6edd1695221aebd 100644 (file)
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -6,43 +6,34 @@
         <div class="container">
             <div class="row">
                 <div class="col-sm-6 faded">
         <div class="container">
             <div class="row">
                 <div class="col-sm-6 faded">

-                    <div class="breadcrumbs">
-                        <a href="{{ $book->getUrl() }}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $book->getShortName() }}</a>
-                        @if($page->hasChapter())
-                            <span class="sep">&raquo;</span>
-                            <a href="{{ $page->chapter->getUrl() }}" class="text-chapter text-button">
-                                <i class="zmdi zmdi-collection-bookmark"></i>
-                                {{ $page->chapter->getShortName() }}
-                            </a>
-                        @endif
-                    </div>
+                    @include('pages._breadcrumbs', ['page' => $page])

                 </div>
                 <div class="col-sm-6 faded">
                     <div class="action-buttons">
                         <span dropdown class="dropdown-container">
                 </div>
                 <div class="col-sm-6 faded">
                     <div class="action-buttons">
                         <span dropdown class="dropdown-container">

-                            <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>Export</div>
+                            <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>{{ trans('entities.pages_export') }}</div>

                             <ul class="wide">
                             <ul class="wide">

-                                <li><a href="{{ $page->getUrl('/export/html') }}" target="_blank">Contained Web File <span class="text-muted float right">.html</span></a></li>
-                                <li><a href="{{ $page->getUrl('/export/pdf') }}" target="_blank">PDF File <span class="text-muted float right">.pdf</span></a></li>
-                                <li><a href="{{ $page->getUrl('/export/plaintext') }}" target="_blank">Plain Text File <span class="text-muted float right">.txt</span></a></li>
+                                <li><a href="{{ $page->getUrl('/export/html') }}" target="_blank">{{ trans('entities.pages_export_html') }} <span class="text-muted float right">.html</span></a></li>
+                                <li><a href="{{ $page->getUrl('/export/pdf') }}" target="_blank">{{ trans('entities.pages_export_pdf') }} <span class="text-muted float right">.pdf</span></a></li>
+                                <li><a href="{{ $page->getUrl('/export/plaintext') }}" target="_blank">{{ trans('entities.pages_export_text') }} <span class="text-muted float right">.txt</span></a></li>

                             </ul>
                         </span>
                         @if(userCan('page-update', $page))
                             </ul>
                         </span>
                         @if(userCan('page-update', $page))

-                            <a href="{{ $page->getUrl('/edit') }}" class="text-primary text-button" ><i class="zmdi zmdi-edit"></i>Edit</a>
+                            <a href="{{ $page->getUrl('/edit') }}" class="text-primary text-button" ><i class="zmdi zmdi-edit"></i>{{ trans('entities.edit') }}</a>

                         @endif
                         @if(userCan('page-update', $page) || userCan('restrictions-manage', $page) || userCan('page-delete', $page))
                             <div dropdown class="dropdown-container">
                                 <a dropdown-toggle class="text-primary text-button"><i class="zmdi zmdi-more-vert"></i></a>
                                 <ul>
                                     @if(userCan('page-update', $page))
                         @endif
                         @if(userCan('page-update', $page) || userCan('restrictions-manage', $page) || userCan('page-delete', $page))
                             <div dropdown class="dropdown-container">
                                 <a dropdown-toggle class="text-primary text-button"><i class="zmdi zmdi-more-vert"></i></a>
                                 <ul>
                                     @if(userCan('page-update', $page))

-                                        <li><a href="{{ $page->getUrl('/move') }}" class="text-primary" ><i class="zmdi zmdi-folder"></i>Move</a></li>
-                                        <li><a href="{{ $page->getUrl('/revisions') }}" class="text-primary"><i class="zmdi zmdi-replay"></i>Revisions</a></li>
+                                        <li><a href="{{ $page->getUrl('/move') }}" class="text-primary" ><i class="zmdi zmdi-folder"></i>{{ trans('entities.move') }}</a></li>
+                                        <li><a href="{{ $page->getUrl('/revisions') }}" class="text-primary"><i class="zmdi zmdi-replay"></i>{{ trans('entities.revisions') }}</a></li>

                                     @endif
                                     @if(userCan('restrictions-manage', $page))
                                     @endif
                                     @if(userCan('restrictions-manage', $page))

-                                        <li><a href="{{ $page->getUrl('/permissions') }}" class="text-primary"><i class="zmdi zmdi-lock-outline"></i>Permissions</a></li>
+                                        <li><a href="{{ $page->getUrl('/permissions') }}" class="text-primary"><i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.permissions') }}</a></li>

                                     @endif
                                     @if(userCan('page-delete', $page))
                                     @endif
                                     @if(userCan('page-delete', $page))

-                                        <li><a href="{{ $page->getUrl('/delete') }}" class="text-neg"><i class="zmdi zmdi-delete"></i>Delete</a></li>
+                                        <li><a href="{{ $page->getUrl('/delete') }}" class="text-neg"><i class="zmdi zmdi-delete"></i>{{ trans('entities.delete') }}</a></li>

                                     @endif
                                 </ul>
                             </div>
                                     @endif
                                 </ul>
                             </div>


@@ -64,7 +55,7 @@
                         <div class="pointer anim">
                             <i class="zmdi zmdi-link"></i>
                             <input readonly="readonly" type="text" placeholder="url">
                         <div class="pointer anim">
                             <i class="zmdi zmdi-link"></i>
                             <input readonly="readonly" type="text" placeholder="url">

-                            <button class="button icon" title="Copy Link" data-clipboard-text=""><i class="zmdi zmdi-copy"></i></button>
+                            <button class="button icon" title="{{ trans('entities.pages_copy_link') }}" data-clipboard-text=""><i class="zmdi zmdi-copy"></i></button>

                         </div>
                     </div>
 
                         </div>
                     </div>
 


@@ -84,27 +75,27 @@
 
                         @if($book->restricted)
                             @if(userCan('restrictions-manage', $book))
 
                         @if($book->restricted)
                             @if(userCan('restrictions-manage', $book))

-                                <a href="{{ $book->getUrl('/permissions') }}"><i class="zmdi zmdi-lock-outline"></i>Book Permissions Active</a>
+                                <a href="{{ $book->getUrl('/permissions') }}"><i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.books_permissions_active') }}</a>

                             @else
                             @else

-                                <i class="zmdi zmdi-lock-outline"></i>Book Permissions Active
+                                <i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.books_permissions_active') }}

                             @endif
                             <br>
                         @endif
 
                         @if($page->chapter && $page->chapter->restricted)
                             @if(userCan('restrictions-manage', $page->chapter))
                             @endif
                             <br>
                         @endif
 
                         @if($page->chapter && $page->chapter->restricted)
                             @if(userCan('restrictions-manage', $page->chapter))

-                                <a href="{{ $page->chapter->getUrl('/permissions') }}"><i class="zmdi zmdi-lock-outline"></i>Chapter Permissions Active</a>
+                                <a href="{{ $page->chapter->getUrl('/permissions') }}"><i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.chapters_permissions_active') }}</a>

                             @else
                             @else

-                                <i class="zmdi zmdi-lock-outline"></i>Chapter Permissions Active
+                                <i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.chapters_permissions_active') }}

                             @endif
                             <br>
                         @endif
 
                         @if($page->restricted)
                             @if(userCan('restrictions-manage', $page))
                             @endif
                             <br>
                         @endif
 
                         @if($page->restricted)
                             @if(userCan('restrictions-manage', $page))

-                                <a href="{{ $page->getUrl('/permissions') }}"><i class="zmdi zmdi-lock-outline"></i>Page Permissions Active</a>
+                                <a href="{{ $page->getUrl('/permissions') }}"><i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.pages_permissions_active') }}</a>

                             @else
                             @else

-                                <i class="zmdi zmdi-lock-outline"></i>Page Permissions Active
+                                <i class="zmdi zmdi-lock-outline"></i>{{ trans('entities.pages_permissions_active') }}

                             @endif
                             <br>
                         @endif
                             @endif
                             <br>
                         @endif

diff --git a/tests/Entity/SortTest.php b/tests/Entity/SortTest.php
index 80783912a46f79e9ef93a8aad43574bc1772e4a7..2c18c29d3ae49a3f146a69a82753795886a4d8ba 100644 (file)
--- 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')
         $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);
             ->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 685146423d80f54b6ce2d466ce7e8fc8e30fb417..2ea5fbfed428e89a3f02cfac45b73a8a9ec90257 100644 (file)
--- 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')
         $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', [
             ->seePageIs($chapter->getUrl('/create-page'));
 
         $this->submitForm('Continue', [