Adding Croatian translation files

[bookstack] / app / Http / Controllers / PageController.php

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 134c22081382bdd0a3a407b469bd7684ccb9c4d0..31ee4e970bd4952c9a9613863a723d33f7972560 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -2,6 +2,7 @@
 
 use BookStack\Actions\View;
 use BookStack\Entities\Tools\BookContents;
 
 use BookStack\Actions\View;
 use BookStack\Entities\Tools\BookContents;

+use BookStack\Entities\Tools\NextPreviousContentLocator;

 use BookStack\Entities\Tools\PageContent;
 use BookStack\Entities\Tools\PageEditActivity;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Entities\Tools\PageEditActivity;
 use BookStack\Entities\Models\Page;


@@ -13,7 +14,6 @@ use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;

-use Views;

 
 class PageController extends Controller
 {
 
 class PageController extends Controller
 {


@@ -142,6 +142,8 @@ class PageController extends Controller
             $page->load(['comments.createdBy']);
         }
 
             $page->load(['comments.createdBy']);
         }
 

+        $nextPreviousLocator = new NextPreviousContentLocator($page, $sidebarTree);
+

         View::incrementFor($page);
         $this->setPageTitle($page->getShortName());
         return view('pages.show', [
         View::incrementFor($page);
         $this->setPageTitle($page->getShortName());
         return view('pages.show', [


@@ -150,7 +152,9 @@ class PageController extends Controller
             'current' => $page,
             'sidebarTree' => $sidebarTree,
             'commentsEnabled' => $commentsEnabled,
             'current' => $page,
             'sidebarTree' => $sidebarTree,
             'commentsEnabled' => $commentsEnabled,

-            'pageNav' => $pageNav
+            'pageNav' => $pageNav,
+            'next' => $nextPreviousLocator->getNext(),
+            'previous' => $nextPreviousLocator->getPrevious(),

         ]);
     }
 
         ]);
     }
 


@@ -243,8 +247,8 @@ class PageController extends Controller
 
         $updateTime = $draft->updated_at->timestamp;
         return response()->json([
 
         $updateTime = $draft->updated_at->timestamp;
         return response()->json([

-            'status'    => 'success',
-            'message'   => trans('entities.pages_edit_draft_save_at'),
+            'status' => 'success',
+            'message' => trans('entities.pages_edit_draft_save_at'),

             'timestamp' => $updateTime
         ]);
     }
             'timestamp' => $updateTime
         ]);
     }


@@ -267,7 +271,7 @@ class PageController extends Controller
     {
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-delete', $page);
     {
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-delete', $page);

-        $this->setPageTitle(trans('entities.pages_delete_named', ['pageName'=>$page->getShortName()]));
+        $this->setPageTitle(trans('entities.pages_delete_named', ['pageName' => $page->getShortName()]));

         return view('pages.delete', [
             'book' => $page->book,
             'page' => $page,
         return view('pages.delete', [
             'book' => $page->book,
             'page' => $page,


@@ -283,7 +287,7 @@ class PageController extends Controller
     {
         $page = $this->pageRepo->getById($pageId);
         $this->checkOwnablePermission('page-update', $page);
     {
         $page = $this->pageRepo->getById($pageId);
         $this->checkOwnablePermission('page-update', $page);

-        $this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName'=>$page->getShortName()]));
+        $this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName' => $page->getShortName()]));

         return view('pages.delete', [
             'book' => $page->book,
             'page' => $page,
         return view('pages.delete', [
             'book' => $page->book,
             'page' => $page,


@@ -378,7 +382,7 @@ class PageController extends Controller
         try {
             $parent = $this->pageRepo->move($page, $entitySelection);
         } catch (Exception $exception) {
         try {
             $parent = $this->pageRepo->move($page, $entitySelection);
         } catch (Exception $exception) {

-            if ($exception instanceof  PermissionsException) {
+            if ($exception instanceof PermissionsException) {

                 $this->showPermissionError();
             }
 
                 $this->showPermissionError();
             }
 


@@ -422,7 +426,7 @@ class PageController extends Controller
         try {
             $pageCopy = $this->pageRepo->copy($page, $entitySelection, $newName);
         } catch (Exception $exception) {
         try {
             $pageCopy = $this->pageRepo->copy($page, $entitySelection, $newName);
         } catch (Exception $exception) {

-            if ($exception instanceof  PermissionsException) {
+            if ($exception instanceof PermissionsException) {

                 $this->showPermissionError();
             }
 
                 $this->showPermissionError();
             }
 


@@ -443,7 +447,7 @@ class PageController extends Controller
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
         $this->checkOwnablePermission('restrictions-manage', $page);
         return view('pages.permissions', [
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
         $this->checkOwnablePermission('restrictions-manage', $page);
         return view('pages.permissions', [

-            'page'  => $page,
+            'page' => $page,

         ]);
     }
 
         ]);
     }