diff --git a/app/Http/Controllers/Admin/ActionLogOverview.php b/app/Http/Controllers/Admin/ActionLog/Overview.php similarity index 77% rename from app/Http/Controllers/Admin/ActionLogOverview.php rename to app/Http/Controllers/Admin/ActionLog/Overview.php index 1f5d5f08..5e2e0c5d 100644 --- a/app/Http/Controllers/Admin/ActionLogOverview.php +++ b/app/Http/Controllers/Admin/ActionLog/Overview.php @@ -1,12 +1,11 @@ log = $log; } diff --git a/app/Http/Controllers/Admin/ContentOverview.php b/app/Http/Controllers/Admin/Contents/ContentOverview.php similarity index 95% rename from app/Http/Controllers/Admin/ContentOverview.php rename to app/Http/Controllers/Admin/Contents/ContentOverview.php index f026f209..6e96e6d5 100644 --- a/app/Http/Controllers/Admin/ContentOverview.php +++ b/app/Http/Controllers/Admin/Contents/ContentOverview.php @@ -1,7 +1,8 @@ where('enabled', true) ->first(); - + // get module ID - $module = Module::where('handler', $page->module_handler)->firstOrFail(); + $module = Module::where('handler', $page->module_handler) + ->firstOrFail(); // get all Blade templates for rendering page $templates = Template::where('module_id', $module->id) @@ -81,7 +82,7 @@ class EditContent extends Controller // modify data for edit form according to installed template call_user_func_array([$template->handler, 'beforePopulatingEditForm'], [&$page]); - + $history = $this->history->getStructuredHistoryOf($page); // render view @@ -142,7 +143,6 @@ class EditContent extends Controller $request->titlePhotoFilename = $file ? $file['filename'] : null; - // array of fields in database and fields from request $fields = [ 'title' => 'title', diff --git a/app/Http/Controllers/Admin/History.php b/app/Http/Controllers/Admin/Contents/History.php similarity index 92% rename from app/Http/Controllers/Admin/History.php rename to app/Http/Controllers/Admin/Contents/History.php index f7ad6d86..a58cdbcf 100644 --- a/app/Http/Controllers/Admin/History.php +++ b/app/Http/Controllers/Admin/Contents/History.php @@ -1,6 +1,7 @@ route('content.overview'); - -// return view('admin.dashboard'); - } -} diff --git a/app/Http/Controllers/Admin/Dashboard/Dashboard.php b/app/Http/Controllers/Admin/Dashboard/Dashboard.php new file mode 100644 index 00000000..3e666127 --- /dev/null +++ b/app/Http/Controllers/Admin/Dashboard/Dashboard.php @@ -0,0 +1,14 @@ +route('content.overview'); + } +} diff --git a/app/Http/Controllers/Admin/CreateNewDirectory.php b/app/Http/Controllers/Admin/FileManager/CreateNewDirectory.php similarity index 93% rename from app/Http/Controllers/Admin/CreateNewDirectory.php rename to app/Http/Controllers/Admin/FileManager/CreateNewDirectory.php index 31e960fa..8f6bfc00 100644 --- a/app/Http/Controllers/Admin/CreateNewDirectory.php +++ b/app/Http/Controllers/Admin/FileManager/CreateNewDirectory.php @@ -1,8 +1,8 @@ route('upload.overview', ['id' => $request->parentDirectory]) - ->with('error', trans('admin/fileManager.subdirectoryExists')) - ->withInput(); + ->withInput() + ->with('error', trans('admin/fileManager.subdirectoryExists')); } } diff --git a/app/Http/Controllers/Admin/EditDirectory.php b/app/Http/Controllers/Admin/FileManager/EditDirectory.php similarity index 88% rename from app/Http/Controllers/Admin/EditDirectory.php rename to app/Http/Controllers/Admin/FileManager/EditDirectory.php index 7992a7cb..d3fd42d2 100644 --- a/app/Http/Controllers/Admin/EditDirectory.php +++ b/app/Http/Controllers/Admin/FileManager/EditDirectory.php @@ -1,8 +1,8 @@ route('upload.overview', ['id' => $directoryId]) - ->with('error', trans('admin/fileManager.subdirectoryExists')) - ->withInput(); + ->withInput() + ->with('error', trans('admin/fileManager.subdirectoryExists')); } } diff --git a/app/Http/Controllers/Admin/EditUploadedFile.php b/app/Http/Controllers/Admin/FileManager/EditUploadedFile.php similarity index 96% rename from app/Http/Controllers/Admin/EditUploadedFile.php rename to app/Http/Controllers/Admin/FileManager/EditUploadedFile.php index dc923eba..c29bb82a 100644 --- a/app/Http/Controllers/Admin/EditUploadedFile.php +++ b/app/Http/Controllers/Admin/FileManager/EditUploadedFile.php @@ -1,10 +1,10 @@ file = $file; } - /** * Uploads any file * - * @return \Illuminate\Http\RedirectResponse + * @param Request $request + * + * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse */ public function postFile(Request $request) { @@ -38,12 +40,6 @@ class UploadFile extends Controller $uploadedFiles[] = $uploadedFile; } - // we do not want to redirect - if ($request->ajax()) { - return $this->jsonResponse($uploadedFiles); - } - - // upload was not performed via ajax, redirect user return redirect() ->route('upload.overview', ['directory' => $request->directoryId]) ->with('success', trans_choice('admin/fileManager.uploadSuccessfull', $successfullUploads)); @@ -52,31 +48,17 @@ class UploadFile extends Controller } } + /** + * Send message and redirect to upload.overview when upload failed + * + * @param $message + * + * @return \Illuminate\Http\RedirectResponse + */ protected function invalidUpload($message) { return redirect() ->route('upload.overview') ->with('error', trans('admin/fileManager.' . $message)); } - - /** - * Send response about uploaded file as JSON - * - * @param $uploadedFile - * - * @return \Illuminate\Http\JsonResponse - */ - private function jsonResponse($uploadedFile) - { - $filename = $uploadedFile['file']->getFilename(); - $url = config('app.upload_path') . DIRECTORY_SEPARATOR . $filename; - - $data = [ - 'filename' => $filename, - 'url' => $url, - 'id' => $uploadedFile['id'] - ]; - - return response()->json($data); - } } \ No newline at end of file diff --git a/app/Http/Controllers/Admin/UploadedFilesOverview.php b/app/Http/Controllers/Admin/FileManager/UploadedFilesOverview.php similarity index 93% rename from app/Http/Controllers/Admin/UploadedFilesOverview.php rename to app/Http/Controllers/Admin/FileManager/UploadedFilesOverview.php index 6b5c0a21..c8d1def9 100644 --- a/app/Http/Controllers/Admin/UploadedFilesOverview.php +++ b/app/Http/Controllers/Admin/FileManager/UploadedFilesOverview.php @@ -1,9 +1,7 @@ loginFailed(); } + /** + * Logs out user + * + * @return \Illuminate\Http\RedirectResponse + */ + public function logout() + { + + // remove user information + \Auth::logout(); + + // redirect to login form with info about successfull logout + return redirect() + ->route('login') + ->with('success', trans('admin/common.logoutSuccessfull')); + } + private function loginFailed() { return redirect() diff --git a/app/Http/Controllers/Admin/CopyTemplate.php b/app/Http/Controllers/Admin/Templates/CopyTemplate.php similarity index 93% rename from app/Http/Controllers/Admin/CopyTemplate.php rename to app/Http/Controllers/Admin/Templates/CopyTemplate.php index f4598804..1a407547 100644 --- a/app/Http/Controllers/Admin/CopyTemplate.php +++ b/app/Http/Controllers/Admin/Templates/CopyTemplate.php @@ -1,12 +1,10 @@ template_name, '::')) { list($namespace) = explode('::', $template->template_name); diff --git a/app/Http/Controllers/Admin/EditTemplate.php b/app/Http/Controllers/Admin/Templates/EditTemplate.php similarity index 98% rename from app/Http/Controllers/Admin/EditTemplate.php rename to app/Http/Controllers/Admin/Templates/EditTemplate.php index d5256c01..fb372b83 100644 --- a/app/Http/Controllers/Admin/EditTemplate.php +++ b/app/Http/Controllers/Admin/Templates/EditTemplate.php @@ -1,6 +1,6 @@ getPath(); diff --git a/app/Http/Controllers/Admin/TemplateOverview.php b/app/Http/Controllers/Admin/Templates/TemplateOverview.php similarity index 81% rename from app/Http/Controllers/Admin/TemplateOverview.php rename to app/Http/Controllers/Admin/Templates/TemplateOverview.php index f766b14e..8baf7300 100644 --- a/app/Http/Controllers/Admin/TemplateOverview.php +++ b/app/Http/Controllers/Admin/Templates/TemplateOverview.php @@ -1,11 +1,9 @@ id; } - // @todo add some authorization (e.g. via can/cannot methods) - // try to find given user $user = User::findOrFail($id); diff --git a/app/Http/Controllers/Admin/UserDetail.php b/app/Http/Controllers/Admin/Users/UserDetail.php similarity index 91% rename from app/Http/Controllers/Admin/UserDetail.php rename to app/Http/Controllers/Admin/Users/UserDetail.php index 46c4d461..8f7cf6d8 100644 --- a/app/Http/Controllers/Admin/UserDetail.php +++ b/app/Http/Controllers/Admin/Users/UserDetail.php @@ -1,10 +1,10 @@ paginate($perPage); return view('admin.userManagement.overview', [ - 'users' => $users, - 'roles' => UserRoles::getWithTranslations(), - 'statuses' => $statuses, + 'users' => $users, + 'roles' => UserRoles::getWithTranslations(), + 'statuses' => $statuses, 'currentStatus' => $status ]); } diff --git a/app/Http/Controllers/Admin/CreateNewWidgetArea.php b/app/Http/Controllers/Admin/Widgets/Areas/CreateNewWidgetArea.php similarity index 85% rename from app/Http/Controllers/Admin/CreateNewWidgetArea.php rename to app/Http/Controllers/Admin/Widgets/Areas/CreateNewWidgetArea.php index 9fe19ce6..91c22e35 100644 --- a/app/Http/Controllers/Admin/CreateNewWidgetArea.php +++ b/app/Http/Controllers/Admin/Widgets/Areas/CreateNewWidgetArea.php @@ -1,9 +1,8 @@ new WidgetArea()]); } /** diff --git a/app/Http/Controllers/Admin/EditWidgetArea.php b/app/Http/Controllers/Admin/Widgets/Areas/EditWidgetArea.php similarity index 90% rename from app/Http/Controllers/Admin/EditWidgetArea.php rename to app/Http/Controllers/Admin/Widgets/Areas/EditWidgetArea.php index 7f960984..819600e5 100644 --- a/app/Http/Controllers/Admin/EditWidgetArea.php +++ b/app/Http/Controllers/Admin/Widgets/Areas/EditWidgetArea.php @@ -1,8 +1,8 @@ 'admin' ], function () { - // these routes are available only for user with role admin - Route::group(['middleware' => 'onlyAdmin'], function () { - // display form for creating new user - Route::get('users/new', 'CreateNewUser@getNewUser') - ->name('users.new'); - - // POST methods - // display form for creating new user - Route::post('users/new', 'CreateNewUser@postRegistration') - ->name('users.newPost'); - - // display form for edit of existing user - Route::get('users/edit/{id}', 'EditUser@getEditUser') - ->name('users.edit'); - - // form for adding new custom field - Route::get('customfields/new', 'CreateNewCustomField@getNew') - ->name('customfields.new'); - - // form for editing custom field - Route::get('customfields/edit/{id}', 'EditCustomField@getEditCustomField') - ->name('customfields.edit'); - - // form for adding new custom field - Route::post('customfields/new', 'CreateNewCustomField@postNew') - ->name('customfields.newPost'); - - // form for editing custom field - Route::post('customfields/edit/{id}', 'EditCustomField@postEditCustomField') - ->name('customfields.editPost'); - - Route::get('customfields/delete/{id}', 'EditCustomField@deleteCustomField') - ->name('customfields.delete'); - - Route::get('templates/overview/path/{id}', 'TemplateOverview@getPath') - ->name('templates.overview'); - - Route::post('templates/copy', 'CopyTemplate@createCopy') - ->name('templates.postCopy'); - - // Route::get('templates/new/{pathId}', 'TemplateOverview@getPath') - // ->name('templates.new'); - - Route::get('templates/edit/{id}', 'EditTemplate@getEdit') - ->name('templates.edit'); - - Route::post('templates/edit/{id}', 'EditTemplate@postEdit') - ->name('templates.postEdit'); - }); - - // list of all static pages - Route::get('content/overview/{moduleId?}/{status?}', 'ContentOverview@getOverview') - ->name('content.overview'); - - // form for creating new static page - Route::get('content/new/{moduleId}', 'CreateNewContent@getNew') - ->name('content.new'); - - // form for editing existing static page - Route::get('content/edit/{id}', 'EditContent@getEdit') - ->name('content.edit'); - - // post method for creating new static page - Route::post('content/new/{moduleId}', 'CreateNewContent@postNew') - ->name('content.newPost'); - - // post method for creating new static page - Route::post('content/edit/{id}', 'EditContent@postEdit') - ->name('content.editPost'); - - // routes for quick actions - - // change status of page (protected, public or draft) - Route::get('content/status/{id}/{status}', 'EditContent@changeStatus') - ->name('content.changeStatus'); - - // set homepage - Route::get('content/homepage/{id}', 'EditContent@setHomepage') - ->name('content.setHomepage'); - - // delete page - Route::get('content/delete/{id}', 'EditContent@deletePage') - ->name('content.delete'); - - // these routes are available for all logged (authenticated) users + // include all routes in routes/admin subfolder + $files = ['contents', 'fileManager', 'settings', 'templates', 'users', 'widgets']; + foreach ($files as $file) { + require_once __DIR__ . DIRECTORY_SEPARATOR . 'routes' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . $file . '.php'; + } // display dashboard with some usefull information Route::get('/', 'Dashboard@getIndex') ->name('admin.dashboard'); - // display user detail in admin - Route::get('users/detail/{id?}', 'UserDetail@getDetail') - ->name('users.detail'); - - // method for saving edited data of user - Route::post('users/edit/{id}', 'EditUser@postEdit') - ->name('users.editPost'); - - // display list of all users registered into our system - Route::get('users/overview/{state?}/{perPage?}', 'UsersOverview@getOverview') - ->name('users.overview'); - - // history of changes for specified page - Route::get('history/{id}', 'History@getOverview') - ->name('content.history'); - - // history of changes for specified page - Route::get('history/{revision}/{id}', 'History@getDiff') - ->name('history.diff'); - // list of all actions - Route::get('actions', 'ActionLogOverview@getOverview') + Route::get('actions', 'ActionLog\Overview@getOverview') ->name('log.overview'); - // routes for widget areas - Route::get('widgets/areas/overview', 'WidgetAreaOverview@getOverview') - ->name('widgetareas.overview'); - - // form for new widget area - Route::get('widgets/areas/new', 'CreateNewWidgetArea@getNew') - ->name('widgetareas.new'); - - // form for new widget area - Route::post('widgets/areas/new', 'CreateNewWidgetArea@postNew') - ->name('widgetareas.postNew'); - - // edit form for widget area - Route::get('widgets/areas/edit/{id}', 'EditWidgetArea@getEdit') - ->name('widgetareas.edit'); - - Route::post('widgets/areas/edit/{id}', 'EditWidgetArea@postEdit') - ->name('widgetareas.postEdit'); - - // edit form for widget area - Route::get('widgets/areas/delete/{id}', 'EditWidgetArea@deleteArea') - ->name('widgetareas.delete'); - - // list of all installed widget types - Route::get('widgets/overview', 'WidgetsOverview@getOverview') - ->name('widgets.overview'); - - // create new instance of widget of given type - Route::get('widgets/new/{type}', 'CreateNewWidget@getNew') - ->name('widgets.new'); - - Route::post('widgets/new/{type}', 'CreateNewWidget@postNew') - ->name('widgets.postNew'); - - // edit widget settings - Route::get('widgets/edit/{id}', 'EditWidget@getEdit') - ->name('widgets.edit'); - - // delete widget settings - Route::get('widgets/delete/{id}', 'EditWidget@deleteWidget') - ->name('widgets.delete'); - - Route::post('widgets/edit/{id}', 'EditWidget@postEdit') - ->name('widgets.postEdit'); - - // display form for association of widget and widget area - Route::get('widgets/associate/{widgetArea}', 'AssociateWidget@getList') - ->name('widgets.associate'); - - Route::get('widgets/deassociate/{widgetId}/{widgetArea}', 'AssociateWidget@deleteAssociation') - ->name('widgets.deleteAssociation'); - - Route::get('widgets/associate/{widgetId}/{widgetArea}', 'AssociateWidget@makeAssociation') - ->name('widgets.makeAssociation'); - - // uploader methods - Route::get('directories/new/{id?}', 'CreateNewDirectory@getNew') - ->name('upload.newDirectory'); - - Route::get('directories/edit/{id}', 'EditDirectory@getEdit') - ->name('upload.editDirectory'); - - Route::post('directories/edit/{id}', 'EditDirectory@postEdit') - ->name('upload.postEditDirectory'); - - Route::get('files/overview/{id?}/{type?}/{subtype?}', 'UploadedFilesOverview@getOverview') - ->name('upload.overview'); - - route::post('directories/new', 'CreateNewDirectory@postNew') - ->name('upload.postNewDirectory'); - - Route::get('upload/detail/{id}', 'EditUploadedFile@getDetail') - ->name('upload.detail'); - - Route::post('upload/detail/{id}', 'EditUploadedFile@postEdit') - ->name('upload.postEdit'); - - Route::get('upload/delete/{id}', 'EditUploadedFile@deleteFile') - ->name('upload.delete'); - - // uploader methods - Route::post('upload/file', 'UploadFile@postFile') - ->name('upload.postFile'); - - Route::post('upload/image', 'UploadFile@postImage') - ->name('upload.postImage'); - - // form with settings - Route::get('settings', 'Settings@getOverview') - ->name('settings.overview'); - - Route::post('settings', 'Settings@saveSettings') - ->name('settings.save'); - + // search form with results Route::get('search', 'Search@getSearch') ->name('search'); - // custom fields - // ------------------------------ - - // list of all custom fields - Route::get('customfields/overview', 'CustomFieldsOverview@getOverview') - ->name('customfields.overview'); - // logout method - Route::get('logout', function () { - - // remove user information - \Auth::logout(); - - // redirect to login form with info about successfull logout - return redirect() - ->route('login') - ->with('success', trans('admin/common.logoutSuccessfull')); - }) + Route::get('logout', 'Login@logout') ->name('logout'); }); @@ -264,13 +55,12 @@ Route::group([ Route::group(['middleware' => ['web']], function () { + // Homepage Route::get('/', 'Visitor\Homepage@getIndex') ->name('page.index'); // display login form - Route::get('admin/login', function () { - return view('admin.loginForm'); - }) + Route::get('admin/login', 'Admin\Login@getLogin') ->name('loginForm'); // handle login diff --git a/app/Http/routes/admin/contents.php b/app/Http/routes/admin/contents.php new file mode 100644 index 00000000..6e7b6a6a --- /dev/null +++ b/app/Http/routes/admin/contents.php @@ -0,0 +1,42 @@ + 'Contents'], function () { + // list of all static pages + Route::get('content/overview/{moduleId?}/{status?}', 'ContentOverview@getOverview') + ->name('content.overview'); + + // form for creating new static page + Route::get('content/new/{moduleId}', 'CreateNewContent@getNew') + ->name('content.new'); + + // form for editing existing static page + Route::get('content/edit/{id}', 'EditContent@getEdit') + ->name('content.edit'); + + // post method for creating new static page + Route::post('content/new/{moduleId}', 'CreateNewContent@postNew') + ->name('content.newPost'); + + // post method for creating new static page + Route::post('content/edit/{id}', 'EditContent@postEdit') + ->name('content.editPost'); + + // change status of page (protected, public or draft) + Route::get('content/status/{id}/{status}', 'EditContent@changeStatus') + ->name('content.changeStatus'); + + // set homepage + Route::get('content/homepage/{id}', 'EditContent@setHomepage') + ->name('content.setHomepage'); + + // delete page + Route::get('content/delete/{id}', 'EditContent@deletePage') + ->name('content.delete'); + + // history of changes for specified page + Route::get('history/{id}', 'History@getOverview') + ->name('content.history'); + + // history of changes for specified page + Route::get('history/{revision}/{id}', 'History@getDiff') + ->name('history.diff'); +}); \ No newline at end of file diff --git a/app/Http/routes/admin/fileManager.php b/app/Http/routes/admin/fileManager.php new file mode 100644 index 00000000..58eecfaf --- /dev/null +++ b/app/Http/routes/admin/fileManager.php @@ -0,0 +1,32 @@ + 'FileManager'], function () { + + Route::get('files/overview/{id?}/{type?}/{subtype?}', 'UploadedFilesOverview@getOverview') + ->name('upload.overview'); + + // uploader methods + Route::get('directories/new/{id?}', 'CreateNewDirectory@getNew') + ->name('upload.newDirectory'); + + Route::get('directories/edit/{id}', 'EditDirectory@getEdit') + ->name('upload.editDirectory'); + + Route::post('directories/edit/{id}', 'EditDirectory@postEdit') + ->name('upload.postEditDirectory'); + + route::post('directories/new', 'CreateNewDirectory@postNew') + ->name('upload.postNewDirectory'); + + Route::get('upload/detail/{id}', 'EditUploadedFile@getDetail') + ->name('upload.detail'); + + Route::post('upload/detail/{id}', 'EditUploadedFile@postEdit') + ->name('upload.postEdit'); + + Route::get('upload/delete/{id}', 'EditUploadedFile@deleteFile') + ->name('upload.delete'); + + // uploader methods + Route::post('upload', 'UploadFile@postFile') + ->name('upload.postFile'); +}); diff --git a/app/Http/routes/admin/settings.php b/app/Http/routes/admin/settings.php new file mode 100644 index 00000000..70b2b996 --- /dev/null +++ b/app/Http/routes/admin/settings.php @@ -0,0 +1,7 @@ +name('settings.overview'); + +Route::post('settings', 'Settings@saveSettings') + ->name('settings.save'); \ No newline at end of file diff --git a/app/Http/routes/admin/templates.php b/app/Http/routes/admin/templates.php new file mode 100644 index 00000000..bb265533 --- /dev/null +++ b/app/Http/routes/admin/templates.php @@ -0,0 +1,15 @@ + 'onlyAdmin', 'namespace' => 'Templates'], function () { + Route::get('templates/overview/path/{id}', 'TemplateOverview@getPath') + ->name('templates.overview'); + + Route::post('templates/copy', 'CopyTemplate@createCopy') + ->name('templates.postCopy'); + + Route::get('templates/edit/{id}', 'EditTemplate@getEdit') + ->name('templates.edit'); + + Route::post('templates/edit/{id}', 'EditTemplate@postEdit') + ->name('templates.postEdit'); +}); \ No newline at end of file diff --git a/app/Http/routes/admin/users.php b/app/Http/routes/admin/users.php new file mode 100644 index 00000000..69d643f7 --- /dev/null +++ b/app/Http/routes/admin/users.php @@ -0,0 +1,27 @@ + 'Users'], function () { + // display form for creating new user + Route::get('users/new', 'CreateNewUser@getNewUser') + ->name('users.new'); + + // POST methods + // display form for creating new user + Route::post('users/new', 'CreateNewUser@postRegistration') + ->name('users.newPost'); + + // display form for edit of existing user + Route::get('users/edit/{id}', 'EditUser@getEditUser') + ->name('users.edit'); + + // display user detail in admin + Route::get('users/detail/{id?}', 'UserDetail@getDetail') + ->name('users.detail'); + + // method for saving edited data of user + Route::post('users/edit/{id}', 'EditUser@postEdit') + ->name('users.editPost'); + + // display list of all users registered into our system + Route::get('users/overview/{state?}/{perPage?}', 'UsersOverview@getOverview') + ->name('users.overview'); +}); diff --git a/app/Http/routes/admin/widgets.php b/app/Http/routes/admin/widgets.php new file mode 100644 index 00000000..d10df3fd --- /dev/null +++ b/app/Http/routes/admin/widgets.php @@ -0,0 +1,60 @@ + 'Widgets'], function () { + + // list of all installed widget types + Route::get('widgets/overview', 'WidgetsOverview@getOverview') + ->name('widgets.overview'); + + // create new instance of widget of given type + Route::get('widgets/new/{type}', 'CreateNewWidget@getNew') + ->name('widgets.new'); + + Route::post('widgets/new/{type}', 'CreateNewWidget@postNew') + ->name('widgets.postNew'); + + // edit widget settings + Route::get('widgets/edit/{id}', 'EditWidget@getEdit') + ->name('widgets.edit'); + + // delete widget settings + Route::get('widgets/delete/{id}', 'EditWidget@deleteWidget') + ->name('widgets.delete'); + + Route::post('widgets/edit/{id}', 'EditWidget@postEdit') + ->name('widgets.postEdit'); + + // display form for association of widget and widget area + Route::get('widgets/associate/{widgetArea}', 'AssociateWidget@getList') + ->name('widgets.associate'); + + Route::get('widgets/deassociate/{widgetId}/{widgetArea}', 'AssociateWidget@deleteAssociation') + ->name('widgets.deleteAssociation'); + + Route::get('widgets/associate/{widgetId}/{widgetArea}', 'AssociateWidget@makeAssociation') + ->name('widgets.makeAssociation'); + + Route::group(['namespace' => 'Areas'], function () { + Route::get('widgets/areas/overview', 'WidgetAreaOverview@getOverview') + ->name('widgetareas.overview'); + + // form for new widget area + Route::get('widgets/areas/new', 'CreateNewWidgetArea@getNew') + ->name('widgetareas.new'); + + // form for new widget area + Route::post('widgets/areas/new', 'CreateNewWidgetArea@postNew') + ->name('widgetareas.postNew'); + + // edit form for widget area + Route::get('widgets/areas/edit/{id}', 'EditWidgetArea@getEdit') + ->name('widgetareas.edit'); + + Route::post('widgets/areas/edit/{id}', 'EditWidgetArea@postEdit') + ->name('widgetareas.postEdit'); + + // edit form for widget area + Route::get('widgets/areas/delete/{id}', 'EditWidgetArea@deleteArea') + ->name('widgetareas.delete'); + }); +}); diff --git a/resources/lang/cs/admin/mainMenu.php b/resources/lang/cs/admin/mainMenu.php index 08f58180..5fa6e0ac 100644 --- a/resources/lang/cs/admin/mainMenu.php +++ b/resources/lang/cs/admin/mainMenu.php @@ -1,30 +1,30 @@ "Záznam událostí", -"assignWidgets" => "Přidat widget", -"contentPageOverview" => "Přehled", -"contentPages" => "Stránky", -"customFields" => "Uživatelská pole", -"customFieldsNew" => "Nové pole", -"customFieldsOverview" => "Přehled", -"dashboard" => "Nástěnka", -"directories" => "Adresáře", -"fileManager" => "Správce souborů", -"newContentPage" => "Nová stránka", -"newUser" => "Nový uživatel", -"newWidget" => "Nový widget", -"newWidgetArea" => "Nová plocha", -"settings" => "Nastavení", -"system" => "Systém", -"templates" => "Šablony", -"uploadFile" => "Nový soubor", -"uploadImage" => "Nový obrázek", -"uploadedFiles" => "Přehled", -"userDetail" => "Můj profil", -"userManagement" => "Uživatelé", -"usersOverview" => "Přehled", -"widgetAreaOverview" => "Seznam všech ploch pro widgety", -"widgetAreas" => "Plochy pro widgety", -"widgets" => "Widgety", -"widgetsOverview" => "Všechny widgety", + "actionLog" => "Záznam událostí", + "assignWidgets" => "Přidat widget", + "contentPageOverview" => "Přehled", + "contentPages" => "Stránky", + "customFields" => "Uživatelská pole", + "customFieldsNew" => "Nové pole", + "customFieldsOverview" => "Přehled", + "dashboard" => "Nástěnka", + "directories" => "Adresáře", + "fileManager" => "Správce souborů", + "newContentPage" => "Nová stránka", + "newUser" => "Nový uživatel", + "newWidget" => "Nový widget", + "newWidgetArea" => "Nová plocha", + "settings" => "Nastavení", + "system" => "Systém", + "templates" => "Šablony", + "uploadFile" => "Nový soubor", + "uploadImage" => "Nový obrázek", + "uploadedFiles" => "Přehled", + "userDetail" => "Můj profil", + "userManagement" => "Uživatelé", + "usersOverview" => "Přehled", + "widgetAreaOverview" => "Všechny plochy", + "widgetAreas" => "Plochy pro widgety", + "widgets" => "Widgety", + "widgetsOverview" => "Všechny widgety", ]; diff --git a/resources/lang/cs/admin/widgetAreas.php b/resources/lang/cs/admin/widgetAreas.php index 9927bf61..c601cf81 100644 --- a/resources/lang/cs/admin/widgetAreas.php +++ b/resources/lang/cs/admin/widgetAreas.php @@ -1,23 +1,23 @@ "Akce", -"associateWidgets" => "Přiřadit widgety do této plochy", -"code" => "Unikátní kód (používá se v šablonách pro vykreslení)", -"createNew" => "Vytvořit novou plochu", -"delete" => "Smazat", -"description" => "Popis", -"edit" => "Upravuji plochu :name", -"editButton" => "Upravit", -"editSuccessfull" => "Změny úspěšně uloženy", -"editTooltip" => "Upravit plochu pro widgety", -"invalidArea" => "Zvolená plocha pro widgety není platná. Vyberte prosím nějakou jinou.", -"name" => "Jméno", -"new" => "Nová plocha pro widgety", -"noEntries" => "Zatím nebyla definována žádná plocha pro widgety.", -"notDeletableArea" => "Nelze smazat požadovanou plochu. Tato plocha je nezbytnou součástí nainstalované šablony a její odstranění by znefunkčnilo celou šablonu.", -"overview" => "Seznam všech ploch pro widgety", -"save" => "Uložit", -"successfullyCreated" => "Plocha pro widgety úspěšně vytvořena", -"successfullyDeleted" => "Úspěšně smazáno", -"uniqueCode" => "Unikátní kód", + "actions" => "Akce", + "associateWidgets" => "Přiřadit widgety do této plochy", + "code" => "Unikátní kód (používá se v šablonách pro vykreslení)", + "createNew" => "Vytvořit novou plochu", + "delete" => "Smazat", + "description" => "Popis", + "edit" => "Upravuji plochu :name", + "editButton" => "Upravit", + "editSuccessfull" => "Změny úspěšně uloženy", + "editTooltip" => "Upravit plochu pro widgety", + "invalidArea" => "Zvolená plocha pro widgety není platná. Vyberte prosím nějakou jinou.", + "name" => "Jméno", + "new" => "Nová plocha pro widgety", + "noEntries" => "Zatím nebyla definována žádná plocha pro widgety.", + "notDeletableArea" => "Nelze smazat požadovanou plochu. Tato plocha je nezbytnou součástí nainstalované šablony a její odstranění by znefunkčnilo celou šablonu.", + "overview" => "Všechny plochy", + "save" => "Uložit", + "successfullyCreated" => "Plocha pro widgety úspěšně vytvořena", + "successfullyDeleted" => "Úspěšně smazáno", + "uniqueCode" => "Unikátní kód", ]; diff --git a/resources/views/admin/widgets/area/form.blade.php b/resources/views/admin/widgets/area/form.blade.php index e83d6fef..157ff473 100644 --- a/resources/views/admin/widgets/area/form.blade.php +++ b/resources/views/admin/widgets/area/form.blade.php @@ -5,14 +5,15 @@ @lang('admin/widgetAreas.name') - - code) disabled @endif value="{{$area->code}}" + code) disabled + @endif value="{{old('code', $area->code)}}" placeholder="@lang('admin/widgetAreas.code')" /> + placeholder="@lang('admin/widgetAreas.description')">{{old('description', $area->description)}} \ No newline at end of file