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() !!}
{{ trans('settings.role_delete_users_assigned', ['userCount' => $role->users->count()]) }}
- @include('form/role-select', ['options' => $roles, 'name' => 'migration_role_id']) + @include('form.role-select', ['options' => $roles, 'name' => 'migration_role_id']){{ trans('settings.users_role_desc') }}