TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add backend and notifications settings category 

URL -> url
Move mail settings below mail templates
This commit is contained in:
Samuel Georges 2017-06-05 17:36:44 +10:00
parent bda98e7353
commit f3de51e992
6 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/system/ServiceProvider.php
View File

@ -338,7 +338,7 @@ class ServiceProvider extends ModuleServiceProvider
protected function registerBackendReportWidgets()
{
WidgetManager::instance()->registerReportWidgets(function ($manager) {
$manager->registerReportWidget('System\ReportWidgets\Status', [
$manager->registerReportWidget(\System\ReportWidgets\Status::class, [
'label' => 'backend::lang.dashboard.status.widget_title_default',
'context' => 'dashboard'
]);
@ -401,15 +401,6 @@ class ServiceProvider extends ModuleServiceProvider
'permissions' => ['backend.manage_users'],
'order' => 400
],
'mail_settings' => [
'label' => 'system::lang.mail.menu_label',
'description' => 'system::lang.mail.menu_description',
'category' => SettingsManager::CATEGORY_MAIL,
'icon' => 'icon-envelope',
'class' => 'System\Models\MailSetting',
'permissions' => ['system.manage_mail_settings'],
'order' => 600
],
'mail_templates' => [
'label' => 'system::lang.mail_templates.menu_label',
'description' => 'system::lang.mail_templates.menu_description',
@ -419,6 +410,15 @@ class ServiceProvider extends ModuleServiceProvider
'permissions' => ['system.manage_mail_templates'],
'order' => 610
],
'mail_settings' => [
'label' => 'system::lang.mail.menu_label',
'description' => 'system::lang.mail.menu_description',
'category' => SettingsManager::CATEGORY_MAIL,
'icon' => 'icon-envelope',
'class' => 'System\Models\MailSetting',
'permissions' => ['system.manage_mail_settings'],
'order' => 620
],
'event_logs' => [
'label' => 'system::lang.event_log.menu_label',
'description' => 'system::lang.event_log.menu_description',

14
modules/system/classes/PluginBase.php
View File

@ -157,7 +157,8 @@ class PluginBase extends ServiceProviderBase
/**
* Registers any report widgets provided by this plugin.
* The widgets must be returned in the following format:
* [
*
* return [
* 'className1'=>[
* 'label' => 'My widget 1',
* 'context' => ['context-1', 'context-2'],
@ -166,7 +167,8 @@ class PluginBase extends ServiceProviderBase
* 'label' => 'My widget 2',
* 'context' => 'context-1'
* ]
* ]
* ];
*
* @return array
*/
public function registerReportWidgets()
@ -177,8 +179,12 @@ class PluginBase extends ServiceProviderBase
/**
* Registers any form widgets implemented in this plugin.
* The widgets must be returned in the following format:
*
* return [
* ['className1' => 'alias'],
* ['className2' => 'anotherAlias']
* ];
*
* @return array
*/
public function registerFormWidgets()
@ -199,8 +205,12 @@ class PluginBase extends ServiceProviderBase
/**
* Registers any mail templates implemented by this plugin.
* The templates must be returned in the following format:
*
* return [
* ['acme.blog::mail.welcome' => 'This is a description of the welcome template'],
* ['acme.blog::mail.forgot_password' => 'This is a description of the forgot password template'],
* ];
*
* @return array
*/
public function registerMailTemplates()

2
modules/system/classes/SettingsManager.php
View File

@ -29,8 +29,10 @@ class SettingsManager
const CATEGORY_SOCIAL = 'system::lang.system.categories.social';
const CATEGORY_SYSTEM = 'system::lang.system.categories.system';
const CATEGORY_EVENTS = 'system::lang.system.categories.events';
const CATEGORY_BACKEND = 'system::lang.system.categories.backend';
const CATEGORY_CUSTOMERS = 'system::lang.system.categories.customers';
const CATEGORY_MYSETTINGS = 'system::lang.system.categories.my_settings';
const CATEGORY_NOTIFICATIONS = 'system::lang.system.categories.notifications';
/**
* @var array Cache of registration callbacks.

4
modules/system/classes/UpdateManager.php
View File

@ -2,7 +2,7 @@
use Db;
use App;
use URL;
use Url;
use File;
use Lang;
use Http;
@ -874,7 +874,7 @@ class UpdateManager
*/
protected function applyHttpAttributes($http, $postData)
{
$postData['server'] = base64_encode(serialize(['php' => PHP_VERSION, 'url' => URL::to('/')]));
$postData['server'] = base64_encode(serialize(['php' => PHP_VERSION, 'url' => Url::to('/')]));
if ($projectId = Parameter::get('system::project.id')) {
$postData['project'] = $projectId;

4
modules/system/lang/en/lang.php
View File

@ -61,9 +61,11 @@ return [
'users' => 'Users',
'system' => 'System',
'social' => 'Social',
'backend' => 'Backend',
'events' => 'Events',
'customers' => 'Customers',
'my_settings' => 'My Settings'
'my_settings' => 'My Settings',
'notifications' => 'Notifications'
]
],
'theme' => [

8
modules/system/traits/PropertyContainer.php
View File

@ -27,16 +27,18 @@ trait PropertyContainer
{
$definedProperties = $this->defineProperties() ?: [];
// Determine and implement default values
/*
* Determine and implement default values
*/
$defaultProperties = [];
foreach ($definedProperties as $name => $information) {
if (array_key_exists('default', $information)) {
$defaultProperties[$name] = $information['default'];
}
}
$properties = array_merge($defaultProperties, $properties);
// @todo Check required properties
$properties = array_merge($defaultProperties, $properties);
return $properties;
}