Move server info to theming section

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>

3 files changed, 10 insertions, 7 deletions

diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php
index e20afd44038..3f72557d8ec 100644
--- a/lib/private/Settings/Manager.php
+++ b/lib/private/Settings/Manager.php
@@ -192,6 +192,7 @@ class Manager implements IManager {
 			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'))],
+			30 => [new Section('theming', $this->l->t('Theming'), 0, $this->url->imagePath('settings', 'theming-dark.svg'))],
 			50 => [new Section('groupware', $this->l->t('Groupware'), 0, $this->url->imagePath('core', 'places/contacts.svg'))],
 			98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
 		];
@@ -231,14 +232,16 @@ class Manager implements IManager {
 			$forms[$form->getPriority()] = [$form];
 			$form = $this->container->query(Admin\Mail::class);
 			$forms[$form->getPriority()] = [$form];
-			$form = $this->container->query(Admin\ServerInfo::class);
-			$forms[$form->getPriority()] = [$form];
 		}
 		if ($section === 'security') {
 			/** @var ISettings $form */
 			$form = $this->container->query(Admin\Security::class);
 			$forms[$form->getPriority()] = [$form];
 		}
+		if ($section === 'theming') {
+			$form = $this->container->query(Theming\ServerInfo::class);
+			$forms[$form->getPriority()] = [$form];
+		}
 		if ($section === 'sharing') {
 			/** @var ISettings $form */
 			$form = $this->container->query(Admin\Sharing::class);
diff --git a/lib/private/Settings/Personal/PersonalInfo.php b/lib/private/Settings/Personal/PersonalInfo.php
index 444600f967a..f3163abff92 100644
--- a/lib/private/Settings/Personal/PersonalInfo.php
+++ b/lib/private/Settings/Personal/PersonalInfo.php
@@ -26,7 +26,7 @@
 namespace OC\Settings\Personal;
 
 use OC\Accounts\AccountManager;
-use OC\Settings\Admin\ServerInfo;
+use OC\Settings\Theming\ServerInfo;
 use OCA\FederatedFileSharing\AppInfo\Application;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Http\TemplateResponse;
@@ -217,7 +217,7 @@ class PersonalInfo implements ISettings {
 		$userLang = $languages['commonlanguages'][$userLangIndex];
 		// search in the other languages
 		if ($userLangIndex === false) {
-			$userLangIndex = array_search($userConfLang, array_column($languages['languages'], 'code'));		
+			$userLangIndex = array_search($userConfLang, array_column($languages['languages'], 'code'));
 			$userLang = $languages['languages'][$userLangIndex];
 		}
 		// if user language is not available but set somehow: show the actual code as name
diff --git a/lib/private/Settings/Admin/ServerInfo.php b/lib/private/Settings/Theming/ServerInfo.php
index 8ac4f890504..a5cfdd41f52 100644
--- a/lib/private/Settings/Admin/ServerInfo.php
+++ b/lib/private/Settings/Theming/ServerInfo.php
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace OC\Settings\Admin;
+namespace OC\Settings\Theming;
 
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
@@ -104,7 +104,7 @@ class ServerInfo implements ISettings {
 	 * @return string
 	 */
 	public function getSection() {
-		return 'server-info';
+		return 'theming';
 	}
 
 	/**
@@ -115,7 +115,7 @@ class ServerInfo implements ISettings {
 	 * priority values. It is required to return a value between 0 and 100.
 	 */
 	public function getPriority() {
-		return 20;
+		return 10;
 	}
 
 }