From 97ba21df9876e4bdca4ef8c0cd02575d672f7da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Sun, 3 Apr 2016 02:35:14 +0200 Subject: [PATCH 1/2] FIX: remove link to non-existing controller --- modules/ContactForm/Handlers/ContactForm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ContactForm/Handlers/ContactForm.php b/modules/ContactForm/Handlers/ContactForm.php index b434c8ad..4cf594ae 100644 --- a/modules/ContactForm/Handlers/ContactForm.php +++ b/modules/ContactForm/Handlers/ContactForm.php @@ -146,7 +146,7 @@ class ContactForm extends Handler $menu->dropdown(trans('contactform::admin/adminMenu.contactForm'), function ($submenu) use ($user) { $submenu->route('content.new', trans('contactform::admin/adminMenu.new'), ['moduleId' => self::getModuleId()], 10, ['icon' => 'fa fa-plus']); $submenu->route('content.overview', trans('contactform::admin/adminMenu.overview'), ['moduleId' => self::getModuleId()], 20, ['icon' => 'fa fa-list']); - $submenu->route('emails.sent', trans('contactform::admin/adminMenu.sentMessages'), [], 30, ['icon' => 'fa fa-send']); +// $submenu->route('emails.sent', trans('contactform::admin/adminMenu.sentMessages'), [], 30, ['icon' => 'fa fa-send']); }, 25, ['icon' => 'fa fa-envelope-o']); } From 90b6979237e66a7a5cc3afb122223315cbfafbf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Sun, 3 Apr 2016 02:35:44 +0200 Subject: [PATCH 2/2] FIX: fix template path name for contact form --- .../ContactForm/Providers/ContactFormServiceProvider.php | 6 ++---- .../ContactForm/Resources/lang/en/admin/adminMenu.php | 9 +++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/ContactForm/Providers/ContactFormServiceProvider.php b/modules/ContactForm/Providers/ContactFormServiceProvider.php index 1cc4cbc2..395675b3 100644 --- a/modules/ContactForm/Providers/ContactFormServiceProvider.php +++ b/modules/ContactForm/Providers/ContactFormServiceProvider.php @@ -61,9 +61,7 @@ class ContactFormServiceProvider extends ServiceProvider $sourcePath = __DIR__ . '/../Resources/views'; - $this->publishes([ - $sourcePath => $viewPath - ]); + $this->publishes([$sourcePath => $viewPath]); $this->loadViewsFrom(array_merge(array_map(function ($path) { return $path . '/modules/contactform'; @@ -80,7 +78,7 @@ class ContactFormServiceProvider extends ServiceProvider $registrator->setModuleId(call_user_func([config('contactform.handler'), 'getModuleId'])); // register path with current template name - $registrator->register(config('app.theme'), 'contactform::admin.templatePath'); + $registrator->register(config('app.theme'), 'contactform::admin/adminMenu.templatePath'); } catch (InvalidArgumentException $e) { // ignore this exception } diff --git a/modules/ContactForm/Resources/lang/en/admin/adminMenu.php b/modules/ContactForm/Resources/lang/en/admin/adminMenu.php index 3f827bce..85833483 100644 --- a/modules/ContactForm/Resources/lang/en/admin/adminMenu.php +++ b/modules/ContactForm/Resources/lang/en/admin/adminMenu.php @@ -1,7 +1,8 @@ 'Contact form', - 'new' => 'New', - 'overview' => 'All contact forms', - 'sentMessages' => 'Messages' + 'contactForm' => 'Contact form', + 'new' => 'New', + 'overview' => 'All contact forms', + 'sentMessages' => 'Messages', + 'templatePath' => 'Contact form' ]; \ No newline at end of file