placeholder): ?>
- $text): ?>
+ $option): ?>
+
-
+
\ No newline at end of file
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index 28815dd3c..614cf0cb2 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -144,7 +144,7 @@ class ServiceProvider extends ModuleServiceProvider
],
'users' => [
'label' => 'backend::lang.user.menu_label',
- 'icon' => 'icon-user',
+ 'icon' => 'icon-users',
'url' => Backend::url('backend/users'),
'permissions' => ['backend.manage_users']
],
diff --git a/modules/system/classes/SettingsManager.php b/modules/system/classes/SettingsManager.php
index 5a4dc6b7d..69f9b5a52 100644
--- a/modules/system/classes/SettingsManager.php
+++ b/modules/system/classes/SettingsManager.php
@@ -36,7 +36,8 @@ class SettingsManager
'icon' => null,
'url' => null,
'permissions' => [],
- 'order' => 100
+ 'order' => 100,
+ 'context' => 'system',
];
/**
@@ -107,14 +108,42 @@ class SettingsManager
/**
* Returns a collection of all settings
*/
- public function listItems()
+ public function listItems($context = null)
{
if ($this->items === null)
$this->loadItems();
+ if ($context !== null)
+ return $this->filterByContext($this->items, $context);
+
return $this->items;
}
+ /**
+ * Filters a set of items by a given context.
+ * @param array $items
+ * @param string $context
+ * @return array
+ */
+ protected function filterByContext($items, $context)
+ {
+ $filteredItems = [];
+ foreach ($items as $categoryName => $category) {
+
+ $filteredCategory = [];
+ foreach ($category as $item) {
+ $itemContext = is_array($item->context) ? $item->context : [$item->context];
+ if (in_array($context, $itemContext))
+ $filteredCategory[] = $item;
+ }
+
+ if (count($filteredCategory))
+ $filteredItems[$categoryName] = $filteredCategory;
+ }
+
+ return $filteredItems;
+ }
+
/**
* Registers a callback function that defines setting items.
* The callback function should register setting items by calling the manager's
diff --git a/modules/system/controllers/Settings.php b/modules/system/controllers/Settings.php
index 796fad75c..9d2a68b15 100644
--- a/modules/system/controllers/Settings.php
+++ b/modules/system/controllers/Settings.php
@@ -38,8 +38,16 @@ class Settings extends Controller
public function index()
{
- $this->pageTitle = 'Settings';
- $this->vars['items'] = SettingsManager::instance()->listItems();
+ $this->pageTitle = Lang::get('backend::lang.settings.menu_label');
+ $this->vars['items'] = SettingsManager::instance()->listItems('system');
+ $this->bodyClass = 'compact-container';
+ }
+
+ public function mysettings()
+ {
+ BackendMenu::setContextSideMenu('mysettings');
+ $this->pageTitle = Lang::get('backend::lang.mysettings.menu_label');
+ $this->vars['items'] = SettingsManager::instance()->listItems('mysettings');
$this->bodyClass = 'compact-container';
}
diff --git a/modules/system/controllers/settings/mysettings.htm b/modules/system/controllers/settings/mysettings.htm
new file mode 100644
index 000000000..32d8c0220
--- /dev/null
+++ b/modules/system/controllers/settings/mysettings.htm
@@ -0,0 +1,24 @@
+
+
+ $items): ?>
+
+
diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php
index c907fe74f..82965752a 100644
--- a/modules/system/lang/en/lang.php
+++ b/modules/system/lang/en/lang.php
@@ -5,6 +5,16 @@ return [
'name' => 'October CMS',
'motto' => 'Getting back to basics',
],
+ 'locale' => [
+ 'en' => 'English',
+ 'nl' => 'Dutch',
+ 'ja' => 'Japanese',
+ 'sv' => 'Swedish',
+ 'tr' => 'Turkish',
+ 'br' => 'Brazilian Portuguese',
+ 'de' => 'Germen',
+ 'ru' => 'Russian',
+ ],
'directory' => [
'create_fail' => "Cannot create directory: :name",
],
+
+
+
+
+
+
+
+
+
+
+
+
+