From 221a483b40d6e2860c4552812b0a9ec90dc8c008 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 7 Apr 2019 12:00:09 +0100
Subject: [PATCH] Standardised view referencing to dot-notation

---
 app/Http/Controllers/Auth/LoginController.php    |  2 +-
 app/Http/Controllers/Auth/RegisterController.php |  4 ++--
 app/Http/Controllers/BookController.php          | 14 +++++++-------
 app/Http/Controllers/ChapterController.php       | 10 +++++-----
 app/Http/Controllers/CommentController.php       |  4 ++--
 app/Http/Controllers/SearchController.php        |  6 +++---
 resources/views/auth/login.blade.php             |  2 +-
 resources/views/auth/passwords/email.blade.php   |  2 +-
 resources/views/auth/register.blade.php          |  6 +++---
 resources/views/auth/user-unconfirmed.blade.php  |  4 ++--
 resources/views/books/create.blade.php           |  2 +-
 resources/views/books/edit.blade.php             |  2 +-
 resources/views/books/form.blade.php             |  4 ++--
 resources/views/chapters/create.blade.php        |  2 +-
 resources/views/chapters/edit.blade.php          |  2 +-
 resources/views/chapters/form.blade.php          |  4 ++--
 resources/views/chapters/show.blade.php          |  4 ++--
 resources/views/common/home.blade.php            |  8 ++++----
 resources/views/pages/copy.blade.php             |  2 +-
 resources/views/pages/form.blade.php             |  2 +-
 resources/views/pages/guest-create.blade.php     |  2 +-
 resources/views/partials/activity-list.blade.php |  2 +-
 resources/views/search/book.blade.php            |  4 ++--
 resources/views/settings/maintenance.blade.php   |  2 +-
 resources/views/settings/roles/delete.blade.php  |  2 +-
 resources/views/settings/roles/index.blade.php   |  2 +-
 resources/views/shelves/edit.blade.php           |  2 +-
 resources/views/shelves/form.blade.php           |  4 ++--
 resources/views/shelves/show.blade.php           |  2 +-
 resources/views/users/form.blade.php             |  2 +-
 30 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index e820154e7..78a8d33c0 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -128,7 +128,7 @@ class LoginController extends Controller
             ]);
         }
 
-        return view('auth/login', ['socialDrivers' => $socialDrivers, 'authMethod' => $authMethod]);
+        return view('auth.login', ['socialDrivers' => $socialDrivers, 'authMethod' => $authMethod]);
     }
 
     /**
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index cdcca116c..da4f42bb1 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -176,7 +176,7 @@ class RegisterController extends Controller
      */
     public function getRegisterConfirmation()
     {
-        return view('auth/register-confirm');
+        return view('auth.register-confirm');
     }
 
     /**
@@ -204,7 +204,7 @@ class RegisterController extends Controller
      */
     public function showAwaitingConfirmation()
     {
-        return view('auth/user-unconfirmed');
+        return view('auth.user-unconfirmed');
     }
 
     /**
diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index f6c4f0238..431ff640d 100644
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -51,7 +51,7 @@ class BookController extends Controller
         $new = $this->entityRepo->getRecentlyCreated('book', 4, 0);
 
         $this->setPageTitle(trans('entities.books'));
-        return view('books/index', [
+        return view('books.index', [
             'books' => $books,
             'recents' => $recents,
             'popular' => $popular,
@@ -71,7 +71,7 @@ class BookController extends Controller
     {
         $this->checkPermission('book-create-all');
         $this->setPageTitle(trans('entities.books_create'));
-        return view('books/create');
+        return view('books.create');
     }
 
     /**
@@ -104,7 +104,7 @@ class BookController extends Controller
         $bookChildren = $this->entityRepo->getBookChildren($book);
         Views::add($book);
         $this->setPageTitle($book->getShortName());
-        return view('books/show', [
+        return view('books.show', [
             'book' => $book,
             'current' => $book,
             'bookChildren' => $bookChildren,
@@ -122,7 +122,7 @@ class BookController extends Controller
         $book = $this->entityRepo->getBySlug('book', $slug);
         $this->checkOwnablePermission('book-update', $book);
         $this->setPageTitle(trans('entities.books_edit_named', ['bookName'=>$book->getShortName()]));
-        return view('books/edit', ['book' => $book, 'current' => $book]);
+        return view('books.edit', ['book' => $book, 'current' => $book]);
     }
 
     /**
@@ -154,7 +154,7 @@ class BookController extends Controller
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
         $this->setPageTitle(trans('entities.books_delete_named', ['bookName'=>$book->getShortName()]));
-        return view('books/delete', ['book' => $book, 'current' => $book]);
+        return view('books.delete', ['book' => $book, 'current' => $book]);
     }
 
     /**
@@ -171,7 +171,7 @@ class BookController extends Controller
         $bookChildren = $this->entityRepo->getBookChildren($book, true);
 
         $this->setPageTitle(trans('entities.books_sort_named', ['bookName'=>$book->getShortName()]));
-        return view('books/sort', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);
+        return view('books.sort', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);
     }
 
     /**
@@ -184,7 +184,7 @@ class BookController extends Controller
     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $bookChildren = $this->entityRepo->getBookChildren($book);
-        return view('books/sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
+        return view('books.sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
     }
 
     /**
diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php
index 45ecbb5d5..c19e45694 100644
--- a/app/Http/Controllers/ChapterController.php
+++ b/app/Http/Controllers/ChapterController.php
@@ -39,7 +39,7 @@ class ChapterController extends Controller
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('chapter-create', $book);
         $this->setPageTitle(trans('entities.chapters_create'));
-        return view('chapters/create', ['book' => $book, 'current' => $book]);
+        return view('chapters.create', ['book' => $book, 'current' => $book]);
     }
 
     /**
@@ -78,7 +78,7 @@ class ChapterController extends Controller
         Views::add($chapter);
         $this->setPageTitle($chapter->getShortName());
         $pages = $this->entityRepo->getChapterChildren($chapter);
-        return view('chapters/show', [
+        return view('chapters.show', [
             'book' => $chapter->book,
             'chapter' => $chapter,
             'current' => $chapter,
@@ -98,7 +98,7 @@ class ChapterController extends Controller
         $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
         $this->checkOwnablePermission('chapter-update', $chapter);
         $this->setPageTitle(trans('entities.chapters_edit_named', ['chapterName' => $chapter->getShortName()]));
-        return view('chapters/edit', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]);
+        return view('chapters.edit', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]);
     }
 
     /**
@@ -130,7 +130,7 @@ class ChapterController extends Controller
         $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
         $this->checkOwnablePermission('chapter-delete', $chapter);
         $this->setPageTitle(trans('entities.chapters_delete_named', ['chapterName' => $chapter->getShortName()]));
-        return view('chapters/delete', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]);
+        return view('chapters.delete', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]);
     }
 
     /**
@@ -162,7 +162,7 @@ class ChapterController extends Controller
         $this->setPageTitle(trans('entities.chapters_move_named', ['chapterName' => $chapter->getShortName()]));
         $this->checkOwnablePermission('chapter-update', $chapter);
         $this->checkOwnablePermission('chapter-delete', $chapter);
-        return view('chapters/move', [
+        return view('chapters.move', [
             'chapter' => $chapter,
             'book' => $chapter->book
         ]);
diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php
index 2039ce7fe..860b50762 100644
--- a/app/Http/Controllers/CommentController.php
+++ b/app/Http/Controllers/CommentController.php
@@ -54,7 +54,7 @@ class CommentController extends Controller
         $this->checkPermission('comment-create-all');
         $comment = $this->commentRepo->create($page, $request->only(['html', 'text', 'parent_id']));
         Activity::add($page, 'commented_on', $page->book->id);
-        return view('comments/comment', ['comment' => $comment]);
+        return view('comments.comment', ['comment' => $comment]);
     }
 
     /**
@@ -75,7 +75,7 @@ class CommentController extends Controller
         $this->checkOwnablePermission('comment-update', $comment);
 
         $comment = $this->commentRepo->update($comment, $request->only(['html', 'text']));
-        return view('comments/comment', ['comment' => $comment]);
+        return view('comments.comment', ['comment' => $comment]);
     }
 
     /**
diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 8ce5aaa74..7fc618ea9 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -42,7 +42,7 @@ class SearchController extends Controller
 
         $results = $this->searchService->searchEntities($searchTerm, 'all', $page, 20);
 
-        return view('search/all', [
+        return view('search.all', [
             'entities'   => $results['results'],
             'totalResults' => $results['total'],
             'searchTerm' => $searchTerm,
@@ -63,7 +63,7 @@ class SearchController extends Controller
     {
         $term = $request->get('term', '');
         $results = $this->searchService->searchBook($bookId, $term);
-        return view('partials/entity-list', ['entities' => $results]);
+        return view('partials.entity-list', ['entities' => $results]);
     }
 
     /**
@@ -77,7 +77,7 @@ class SearchController extends Controller
     {
         $term = $request->get('term', '');
         $results = $this->searchService->searchChapter($chapterId, $term);
-        return view('partials/entity-list', ['entities' => $results]);
+        return view('partials.entity-list', ['entities' => $results]);
     }
 
     /**
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 14ed507bc..eb7ca2da8 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -13,7 +13,7 @@
                 {!! csrf_field() !!}
 
                 <div class="stretch-inputs">
-                    @include('auth/forms/login/' . $authMethod)
+                    @include('auth.forms.login.' . $authMethod)
                 </div>
 
                 <div class="grid half collapse-xs gap-xl v-center">
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 91c9dc2ff..de4edff0a 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -12,7 +12,7 @@
 
                 <div class="form-group">
                     <label for="email">{{ trans('auth.email') }}</label>
-                    @include('form/text', ['name' => 'email'])
+                    @include('form.text', ['name' => 'email'])
                 </div>
 
                 <div class="from-group text-right mt-m">
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index ec8f57625..d1e69e0a0 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -13,17 +13,17 @@
 
                 <div class="form-group">
                     <label for="email">{{ trans('auth.name') }}</label>
-                    @include('form/text', ['name' => 'name'])
+                    @include('form.text', ['name' => 'name'])
                 </div>
 
                 <div class="form-group">
                     <label for="email">{{ trans('auth.email') }}</label>
-                    @include('form/text', ['name' => 'email'])
+                    @include('form.text', ['name' => 'email'])
                 </div>
 
                 <div class="form-group">
                     <label for="password">{{ trans('auth.password') }}</label>
-                    @include('form/password', ['name' => 'password', 'placeholder' => trans('auth.password_hint')])
+                    @include('form.password', ['name' => 'password', 'placeholder' => trans('auth.password_hint')])
                 </div>
 
                 <div class="grid half collapse-xs gap-xl v-center mt-m">
diff --git a/resources/views/auth/user-unconfirmed.blade.php b/resources/views/auth/user-unconfirmed.blade.php
index 536397eaf..54bf6eda3 100644
--- a/resources/views/auth/user-unconfirmed.blade.php
+++ b/resources/views/auth/user-unconfirmed.blade.php
@@ -18,9 +18,9 @@
                 <div class="form-group">
                     <label for="email">{{ trans('auth.email') }}</label>
                     @if(auth()->check())
-                        @include('form/text', ['name' => 'email', 'model' => auth()->user()])
+                        @include('form.text', ['name' => 'email', 'model' => auth()->user()])
                     @else
-                        @include('form/text', ['name' => 'email'])
+                        @include('form.text', ['name' => 'email'])
                     @endif
                 </div>
                 <div class="form-group text-right mt-m">
diff --git a/resources/views/books/create.blade.php b/resources/views/books/create.blade.php
index db93c3d1e..9079a3bf9 100644
--- a/resources/views/books/create.blade.php
+++ b/resources/views/books/create.blade.php
@@ -18,7 +18,7 @@
         <div class="content-wrap card">
             <h1 class="list-heading">{{ trans('entities.books_create') }}</h1>
             <form action="{{ baseUrl("/books") }}" method="POST" enctype="multipart/form-data">
-                @include('books/form')
+                @include('books.form')
             </form>
         </div>
     </div>
diff --git a/resources/views/books/edit.blade.php b/resources/views/books/edit.blade.php
index caeae9175..f048b543b 100644
--- a/resources/views/books/edit.blade.php
+++ b/resources/views/books/edit.blade.php
@@ -18,7 +18,7 @@
             <h1 class="list-heading">{{ trans('entities.books_edit') }}</h1>
             <form action="{{ $book->getUrl() }}" method="POST">
                 <input type="hidden" name="_method" value="PUT">
-                @include('books/form', ['model' => $book])
+                @include('books.form', ['model' => $book])
             </form>
         </div>
     </div>
diff --git a/resources/views/books/form.blade.php b/resources/views/books/form.blade.php
index 97ddd9681..ebbc279fd 100644
--- a/resources/views/books/form.blade.php
+++ b/resources/views/books/form.blade.php
@@ -2,12 +2,12 @@
 {{ csrf_field() }}
 <div class="form-group title-input">
     <label for="name">{{ trans('common.name') }}</label>
-    @include('form/text', ['name' => 'name'])
+    @include('form.text', ['name' => 'name'])
 </div>
 
 <div class="form-group description-input">
     <label for="description">{{ trans('common.description') }}</label>
-    @include('form/textarea', ['name' => 'description'])
+    @include('form.textarea', ['name' => 'description'])
 </div>
 
 <div class="form-group" collapsible id="logo-control">
diff --git a/resources/views/chapters/create.blade.php b/resources/views/chapters/create.blade.php
index 8953eb0cc..fd2c82b46 100644
--- a/resources/views/chapters/create.blade.php
+++ b/resources/views/chapters/create.blade.php
@@ -16,7 +16,7 @@
         <div class="content-wrap card">
             <h1 class="list-heading">{{ trans('entities.chapters_create') }}</h1>
             <form action="{{ $book->getUrl('/create-chapter') }}" method="POST">
-                @include('chapters/form')
+                @include('chapters.form')
             </form>
         </div>
 
diff --git a/resources/views/chapters/edit.blade.php b/resources/views/chapters/edit.blade.php
index 570182344..d282fe1dd 100644
--- a/resources/views/chapters/edit.blade.php
+++ b/resources/views/chapters/edit.blade.php
@@ -19,7 +19,7 @@
             <h1 class="list-heading">{{ trans('entities.chapters_edit') }}</h1>
             <form action="{{  $chapter->getUrl() }}" method="POST">
                 <input type="hidden" name="_method" value="PUT">
-                @include('chapters/form', ['model' => $chapter])
+                @include('chapters.form', ['model' => $chapter])
             </form>
         </div>
 
diff --git a/resources/views/chapters/form.blade.php b/resources/views/chapters/form.blade.php
index 014caf2d3..31d8597de 100644
--- a/resources/views/chapters/form.blade.php
+++ b/resources/views/chapters/form.blade.php
@@ -3,12 +3,12 @@
 
 <div class="form-group title-input">
     <label for="name">{{ trans('common.name') }}</label>
-    @include('form/text', ['name' => 'name'])
+    @include('form.text', ['name' => 'name'])
 </div>
 
 <div class="form-group description-input">
     <label for="description">{{ trans('common.description') }}</label>
-    @include('form/textarea', ['name' => 'description'])
+    @include('form.textarea', ['name' => 'description'])
 </div>
 
 <div class="form-group" collapsible id="logo-control">
diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index 7f2c135a0..399a4d662 100644
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -48,7 +48,7 @@
             {{--TODO--}}
             <h3 class="text-muted">{{ trans('entities.search_results') }} <a v-if="searching" @click="clearSearch()" class="text-small">@icon('close'){{ trans('entities.search_clear') }}</a></h3>
             <div v-if="!searchResults">
-                @include('partials/loading-icon')
+                @include('partials.loading-icon')
             </div>
             <div v-html="searchResults"></div>
         </div>
@@ -151,7 +151,7 @@
         </form>
     </div>
 
-    @include('partials/book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])
+    @include('partials.book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])
 @stop
 
 
diff --git a/resources/views/common/home.blade.php b/resources/views/common/home.blade.php
index 3271cde9e..590825faf 100644
--- a/resources/views/common/home.blade.php
+++ b/resources/views/common/home.blade.php
@@ -14,7 +14,7 @@
                     <div id="recent-drafts" class="card mb-xl">
                         <h3>{{ trans('entities.my_recent_drafts') }}</h3>
                         <div class="px-m">
-                            @include('partials/entity-list', ['entities' => $draftPages, 'style' => 'compact'])
+                            @include('partials.entity-list', ['entities' => $draftPages, 'style' => 'compact'])
                         </div>
                     </div>
                 @endif
@@ -22,7 +22,7 @@
                 <div id="{{ $signedIn ? 'recently-viewed' : 'recent-books' }}" class="card mb-xl">
                     <h3>{{ trans('entities.' . ($signedIn ? 'my_recently_viewed' : 'books_recent')) }}</h3>
                     <div class="px-m">
-                        @include('partials/entity-list', [
+                        @include('partials.entity-list', [
                         'entities' => $recents,
                         'style' => 'compact',
                         'emptyText' => $signedIn ? trans('entities.no_pages_viewed') : trans('entities.books_empty')
@@ -35,7 +35,7 @@
                 <div id="recent-pages" class="card mb-xl">
                     <h3><a class="no-color" href="{{ baseUrl("/pages/recently-updated") }}">{{ trans('entities.recently_updated_pages') }}</a></h3>
                     <div id="recently-updated-pages" class="px-m">
-                        @include('partials/entity-list', [
+                        @include('partials.entity-list', [
                         'entities' => $recentlyUpdatedPages,
                         'style' => 'compact',
                         'emptyText' => trans('entities.no_pages_recently_updated')
@@ -48,7 +48,7 @@
                 <div id="recent-activity">
                     <div class="card mb-xl">
                         <h3>{{ trans('entities.recent_activity') }}</h3>
-                        @include('partials/activity-list', ['activity' => $activity])
+                        @include('partials.activity-list', ['activity' => $activity])
                     </div>
                 </div>
             </div>
diff --git a/resources/views/pages/copy.blade.php b/resources/views/pages/copy.blade.php
index 8bb9859cf..f19742172 100644
--- a/resources/views/pages/copy.blade.php
+++ b/resources/views/pages/copy.blade.php
@@ -25,7 +25,7 @@
 
                 <div class="form-group title-input">
                     <label for="name">{{ trans('common.name') }}</label>
-                    @include('form/text', ['name' => 'name'])
+                    @include('form.text', ['name' => 'name'])
                 </div>
 
                 <div class="form-group" collapsible>
diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php
index 5a59349a1..4a55d4471 100644
--- a/resources/views/pages/form.blade.php
+++ b/resources/views/pages/form.blade.php
@@ -56,7 +56,7 @@
     {{--Title input--}}
     <div class="title-input page-title clearfix" v-pre>
         <div class="input">
-            @include('form/text', ['name' => 'name', 'placeholder' => trans('entities.pages_title')])
+            @include('form.text', ['name' => 'name', 'placeholder' => trans('entities.pages_title')])
         </div>
     </div>
 
diff --git a/resources/views/pages/guest-create.blade.php b/resources/views/pages/guest-create.blade.php
index 719abc276..39bd059ab 100644
--- a/resources/views/pages/guest-create.blade.php
+++ b/resources/views/pages/guest-create.blade.php
@@ -12,7 +12,7 @@
 
             <div class="form-group title-input">
                 <label for="name">{{ trans('entities.pages_name') }}</label>
-                @include('form/text', ['name' => 'name'])
+                @include('form.text', ['name' => 'name'])
             </div>
 
             <div class="form-group">
diff --git a/resources/views/partials/activity-list.blade.php b/resources/views/partials/activity-list.blade.php
index 45322a1e5..397a69d38 100644
--- a/resources/views/partials/activity-list.blade.php
+++ b/resources/views/partials/activity-list.blade.php
@@ -3,7 +3,7 @@
     <div class="activity-list">
         @foreach($activity as $activityItem)
             <div class="activity-list-item">
-                @include('partials/activity-item', ['activity' => $activityItem])
+                @include('partials.activity-item', ['activity' => $activityItem])
             </div>
         @endforeach
     </div>
diff --git a/resources/views/search/book.blade.php b/resources/views/search/book.blade.php
index 0b9119cd5..36732c2b8 100644
--- a/resources/views/search/book.blade.php
+++ b/resources/views/search/book.blade.php
@@ -2,7 +2,7 @@
     @if(count($pages) > 0)
         @foreach($pages as $pageIndex => $page)
             <div class="anim searchResult" style="animation-delay: {{$pageIndex*50 . 'ms'}};">
-                @include('pages/list-item', ['page' => $page])
+                @include('pages.list-item', ['page' => $page])
                 <hr>
             </div>
         @endforeach
@@ -15,7 +15,7 @@
     <div class="page-list">
         @foreach($chapters as $chapterIndex => $chapter)
             <div class="anim searchResult" style="animation-delay: {{($chapterIndex+count($pages))*50 . 'ms'}};">
-                @include('chapters/list-item', ['chapter' => $chapter, 'hidePages' => true])
+                @include('chapters.list-item', ['chapter' => $chapter, 'hidePages' => true])
                 <hr>
             </div>
         @endforeach
diff --git a/resources/views/settings/maintenance.blade.php b/resources/views/settings/maintenance.blade.php
index 74a8dbb75..50f30c54b 100644
--- a/resources/views/settings/maintenance.blade.php
+++ b/resources/views/settings/maintenance.blade.php
@@ -5,7 +5,7 @@
 
     <div class="grid left-focus v-center">
         <div class="py-m">
-            @include('settings/navbar', ['selected' => 'maintenance'])
+            @include('settings.navbar', ['selected' => 'maintenance'])
         </div>
         <div class="text-right mb-l px-m">
             <br>
diff --git a/resources/views/settings/roles/delete.blade.php b/resources/views/settings/roles/delete.blade.php
index 29087c471..a2ea0d728 100644
--- a/resources/views/settings/roles/delete.blade.php
+++ b/resources/views/settings/roles/delete.blade.php
@@ -19,7 +19,7 @@
                 @if($role->users->count() > 0)
                     <div class="form-group">
                         <p>{{ trans('settings.role_delete_users_assigned', ['userCount' => $role->users->count()]) }}</p>
-                        @include('form/role-select', ['options' => $roles, 'name' => 'migration_role_id'])
+                        @include('form.role-select', ['options' => $roles, 'name' => 'migration_role_id'])
                     </div>
                 @endif
 
diff --git a/resources/views/settings/roles/index.blade.php b/resources/views/settings/roles/index.blade.php
index 6cfef7c67..8eae235da 100644
--- a/resources/views/settings/roles/index.blade.php
+++ b/resources/views/settings/roles/index.blade.php
@@ -5,7 +5,7 @@
     <div class="container small">
 
         <div class="py-m">
-            @include('settings/navbar', ['selected' => 'roles'])
+            @include('settings.navbar', ['selected' => 'roles'])
         </div>
 
         <div class="card content-wrap auto-height">
diff --git a/resources/views/shelves/edit.blade.php b/resources/views/shelves/edit.blade.php
index 81f4846a3..8b99e8b51 100644
--- a/resources/views/shelves/edit.blade.php
+++ b/resources/views/shelves/edit.blade.php
@@ -18,7 +18,7 @@
             <h1 class="list-heading">{{ trans('entities.shelves_edit') }}</h1>
             <form action="{{ $shelf->getUrl() }}" method="POST">
                 <input type="hidden" name="_method" value="PUT">
-                @include('shelves/form', ['model' => $shelf])
+                @include('shelves.form', ['model' => $shelf])
             </form>
         </div>
     </div>
diff --git a/resources/views/shelves/form.blade.php b/resources/views/shelves/form.blade.php
index 32392e18b..8a270a894 100644
--- a/resources/views/shelves/form.blade.php
+++ b/resources/views/shelves/form.blade.php
@@ -2,12 +2,12 @@
 
 <div class="form-group title-input">
     <label for="name">{{ trans('common.name') }}</label>
-    @include('form/text', ['name' => 'name'])
+    @include('form.text', ['name' => 'name'])
 </div>
 
 <div class="form-group description-input">
     <label for="description">{{ trans('common.description') }}</label>
-    @include('form/textarea', ['name' => 'description'])
+    @include('form.textarea', ['name' => 'description'])
 </div>
 
 <div shelf-sort class="grid half gap-xl">
diff --git a/resources/views/shelves/show.blade.php b/resources/views/shelves/show.blade.php
index d7f604a63..a4200b993 100644
--- a/resources/views/shelves/show.blade.php
+++ b/resources/views/shelves/show.blade.php
@@ -15,7 +15,7 @@
             @if(count($books) > 0)
                 <div class="entity-list">
                     @foreach($books as $book)
-                        @include('books/list-item', ['book' => $book])
+                        @include('books.list-item', ['book' => $book])
                     @endforeach
                 </div>
             @else
diff --git a/resources/views/users/form.blade.php b/resources/views/users/form.blade.php
index 16a7ebdeb..96beb7b2f 100644
--- a/resources/views/users/form.blade.php
+++ b/resources/views/users/form.blade.php
@@ -42,7 +42,7 @@
         <label for="role" class="setting-list-label">{{ trans('settings.users_role') }}</label>
         <p class="small">{{ trans('settings.users_role_desc') }}</p>
         <div class="mt-m">
-            @include('form/role-checkboxes', ['name' => 'roles', 'roles' => $roles])
+            @include('form.role-checkboxes', ['name' => 'roles', 'roles' => $roles])
         </div>
     </div>
 @endif