minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'module_contact_form' into dev

Browse Source
This commit is contained in:
Michal Kváček
2016-04-03 02:37:04 +02:00
parent 9b2451fd98 90b6979237
commit d4ad1406bf
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ContactForm/Handlers/ContactForm.php
+1 -1
View File
@@ -146,7 +146,7 @@ class ContactForm extends Handler
$menu->dropdown(trans('contactform::admin/adminMenu.contactForm'), function ($submenu) use ($user) { $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.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('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']); }, 25, ['icon' => 'fa fa-envelope-o']);
} }
modules/ContactForm/Providers/ContactFormServiceProvider.php
+2 -4
View File
@@ -61,9 +61,7 @@ class ContactFormServiceProvider extends ServiceProvider
$sourcePath = __DIR__ . '/../Resources/views'; $sourcePath = __DIR__ . '/../Resources/views';
$this->publishes([ $this->publishes([$sourcePath => $viewPath]);
$sourcePath => $viewPath
]);
$this->loadViewsFrom(array_merge(array_map(function ($path) { $this->loadViewsFrom(array_merge(array_map(function ($path) {
return $path . '/modules/contactform'; return $path . '/modules/contactform';
@@ -80,7 +78,7 @@ class ContactFormServiceProvider extends ServiceProvider
$registrator->setModuleId(call_user_func([config('contactform.handler'), 'getModuleId'])); $registrator->setModuleId(call_user_func([config('contactform.handler'), 'getModuleId']));
// register path with current template name // 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) { } catch (InvalidArgumentException $e) {
// ignore this exception // ignore this exception
} }
modules/ContactForm/Resources/lang/en/admin/adminMenu.php
+5 -4
View File
@@ -1,7 +1,8 @@
<?php <?php
return [ return [
'contactForm' => 'Contact form', 'contactForm' => 'Contact form',
'new' => 'New', 'new' => 'New',
'overview' => 'All contact forms', 'overview' => 'All contact forms',
'sentMessages' => 'Messages' 'sentMessages' => 'Messages',
'templatePath' => 'Contact form'
]; ];