Merge pull request #9029 from nextcloud/settings-restructure

Restructure server settings

1 files changed, 10 insertions, 7 deletions

diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php
index 49f699223f6..becc670c6f9 100644
--- a/lib/private/Settings/Manager.php
+++ b/lib/private/Settings/Manager.php
@@ -226,7 +226,8 @@ class Manager implements IManager {
 	public function getAdminSections(): array {
 		// built-in sections
 		$sections = [
-			0 => [new Section('server', $this->l->t('Basic settings'), 0, $this->url->imagePath('settings', 'admin.svg'))],
+			0 => [new Section('overview', $this->l->t('Overview'), 0, $this->url->imagePath('settings', 'admin.svg'))],
+			1 => [new Section('server', $this->l->t('Basic settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
 			5 => [new Section('sharing', $this->l->t('Sharing'), 0, $this->url->imagePath('core', 'actions/share.svg'))],
 			10 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
 			45 => [new Section('encryption', $this->l->t('Encryption'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
@@ -257,11 +258,18 @@ class Manager implements IManager {
 	private function getBuiltInAdminSettings($section): array {
 		$forms = [];
 
+		if ($section === 'overview') {
+			/** @var ISettings $form */
+			$form = new Admin\Overview($this->dbc, $this->request, $this->config, $this->lockingProvider, $this->l);
+			$forms[$form->getPriority()] = [$form];
+			$form = new Admin\ServerDevNotice();
+			$forms[$form->getPriority()] = [$form];
+		}
 		if ($section === 'server') {
 			/** @var ISettings $form */
 			$form = new Admin\Server($this->dbc, $this->request, $this->config, $this->lockingProvider, $this->l);
 			$forms[$form->getPriority()] = [$form];
-			$form = new Admin\ServerDevNotice();
+			$form = new Admin\Mail($this->config);
 			$forms[$form->getPriority()] = [$form];
 		}
 		if ($section === 'encryption') {
@@ -274,11 +282,6 @@ class Manager implements IManager {
 			$form = new Admin\Sharing($this->config, $this->l);
 			$forms[$form->getPriority()] = [$form];
 		}
-		if ($section === 'additional') {
-			/** @var ISettings $form */
-			$form = new Admin\Additional($this->config);
-			$forms[$form->getPriority()] = [$form];
-		}
 		if ($section === 'tips-tricks') {
 			/** @var ISettings $form */
 			$form = new Admin\TipsTricks($this->config);