diff --git a/modules/StaticPages/Http/Controllers/Admin/CreateNewStaticPage.php b/modules/StaticPages/Http/Controllers/Admin/CreateNewStaticPage.php index 75a6fb05..5ea6e88a 100644 --- a/modules/StaticPages/Http/Controllers/Admin/CreateNewStaticPage.php +++ b/modules/StaticPages/Http/Controllers/Admin/CreateNewStaticPage.php @@ -2,7 +2,9 @@ namespace Modules\StaticPages\Http\Controllers\Admin; use App\Enumerations\ContentStatuses; +use App\Enumerations\ModulesHandlerToId; use App\Models\Content; +use App\Models\Template; use Illuminate\Support\Facades\Event; use Modules\StaticPages\Http\Requests\CreateNewStaticPageRequest; @@ -20,9 +22,16 @@ class CreateNewStaticPage extends Controller // we do not want to create deleted page unset($statuses[Content::STATUS_DELETED]); + $allModules = ModulesHandlerToId::getWithTranslations(); + $moduleId = $allModules[config('staticpages.handler')]; + $templates = Template::where('module_id', $moduleId) + ->select(['template_name', 'name', 'description']) + ->get(); + // render view return view('staticpages::admin.new', [ 'contentStatuses' => $statuses, + 'templates' => $templates, 'selectedStatus' => Content::STATUS_DRAFT ]); } @@ -48,6 +57,7 @@ class CreateNewStaticPage extends Controller $page->content = $request->pageContent; $page->status = $request->status; $page->module_handler = config('staticpages.handler'); + $page->template = $request->template; $page->save(); diff --git a/modules/StaticPages/Http/Controllers/Admin/EditStaticPage.php b/modules/StaticPages/Http/Controllers/Admin/EditStaticPage.php index 17adae46..14f3c313 100644 --- a/modules/StaticPages/Http/Controllers/Admin/EditStaticPage.php +++ b/modules/StaticPages/Http/Controllers/Admin/EditStaticPage.php @@ -2,8 +2,10 @@ namespace Modules\StaticPages\Http\Controllers\Admin; use App\Enumerations\ContentStatuses; +use App\Enumerations\ModulesHandlerToId; use App\Models\Content; use App\Models\ContentHistory; +use App\Models\Template; use Illuminate\Support\Facades\Event; use Modules\StaticPages\Events\DeleteStaticPage; use Modules\StaticPages\Events\EditStaticPage as EditStaticPageEvent; @@ -40,12 +42,19 @@ class EditStaticPage extends Controller $page = Content::where('module_handler', config('staticpages.handler')) ->findOrFail($id); + $allModules = ModulesHandlerToId::getWithTranslations(); + $moduleId = $allModules[config('staticpages.handler')]; + $templates = Template::where('module_id', $moduleId) + ->select(['template_name', 'name', 'description']) + ->get(); + $history = $this->history->getStructuredHistoryOf($page); // render view return view('staticpages::admin.edit', [ 'contentStatuses' => $statuses, 'page' => $page, + 'templates' => $templates, 'historySize' => count($history['changesets']) ]); } @@ -75,6 +84,7 @@ class EditStaticPage extends Controller $fields = [ 'title' => 'title', 'url' => 'url', + 'template' => 'template', 'published_from' => 'publishedFrom', 'published_to' => 'publishedTo', 'meta_keywords' => 'metaKeywords', diff --git a/modules/StaticPages/Http/Requests/CreateNewStaticPageRequest.php b/modules/StaticPages/Http/Requests/CreateNewStaticPageRequest.php index 6db5f5d7..4d54e869 100644 --- a/modules/StaticPages/Http/Requests/CreateNewStaticPageRequest.php +++ b/modules/StaticPages/Http/Requests/CreateNewStaticPageRequest.php @@ -15,6 +15,7 @@ class CreateNewStaticPageRequest extends Request return [ 'title' => 'required', 'url' => 'required|unique:contents,url', + 'template' => 'required|exists:templates,template_name', 'published_from' => 'date', 'published_to' => 'date', 'title_photo' => 'exists:files,id', diff --git a/modules/StaticPages/Http/Requests/EditStaticPageRequest.php b/modules/StaticPages/Http/Requests/EditStaticPageRequest.php index bf5523ba..8e7ecb18 100644 --- a/modules/StaticPages/Http/Requests/EditStaticPageRequest.php +++ b/modules/StaticPages/Http/Requests/EditStaticPageRequest.php @@ -20,6 +20,7 @@ class EditStaticPageRequest extends Request return [ 'title' => 'required', 'url' => 'required|unique:contents,url,'.$this->id, + 'template' => 'required|exists:templates,template_name', 'published_from' => 'date', 'published_to' => 'date', 'title_photo' => 'exists:files,id', diff --git a/modules/StaticPages/Resources/lang/en/admin.php b/modules/StaticPages/Resources/lang/en/admin.php index fa7ddca3..a799cdfa 100644 --- a/modules/StaticPages/Resources/lang/en/admin.php +++ b/modules/StaticPages/Resources/lang/en/admin.php @@ -27,6 +27,9 @@ return [ 'pageDeleted' => 'Page :name (:url) successfully deleted.', 'nothingToEdit' => 'You did not submit any changes. Nothing was edited.', 'successfullyEdited' => 'Edit successfull', - 'showHistory' => 'History (:count)' + 'showHistory' => 'History (:count)', + 'templatePath' => 'Static pages', + 'appearance' => 'Appearance', + 'template' => 'Template of this page' ]; \ No newline at end of file diff --git a/modules/StaticPages/Resources/views/admin/editForm.blade.php b/modules/StaticPages/Resources/views/admin/editForm.blade.php index e52dc75c..33db8c49 100644 --- a/modules/StaticPages/Resources/views/admin/editForm.blade.php +++ b/modules/StaticPages/Resources/views/admin/editForm.blade.php @@ -24,6 +24,9 @@
  • @lang('staticpages::admin.publicationOptions')
    • +
  • + @lang('staticpages::admin.appearance') +
    • @@ -141,6 +144,31 @@
    + +
    +
    +
    + +
    +
    + +
    + diff --git a/modules/StaticPages/Resources/views/admin/newForm.blade.php b/modules/StaticPages/Resources/views/admin/newForm.blade.php index 90235fb0..eac85c45 100644 --- a/modules/StaticPages/Resources/views/admin/newForm.blade.php +++ b/modules/StaticPages/Resources/views/admin/newForm.blade.php @@ -23,6 +23,9 @@
  • @lang('staticpages::admin.publicationOptions')
    • +
  • + @lang('staticpages::admin.appearance') +
    • @@ -57,9 +60,9 @@ @@ -141,6 +144,37 @@
    + +
    +
    +
    + +
    +
    + +
    +
    @@ -154,6 +188,6 @@ @stop \ No newline at end of file