Merge pull request #9029 from nextcloud/settings-restructure

Restructure server settings

8 files changed, 20 insertions, 13 deletions

diff --git a/apps/dav/lib/Settings/CalDAVSettings.php b/apps/dav/lib/Settings/CalDAVSettings.php
index a419afa1c55..e4b4ca6452b 100644
--- a/apps/dav/lib/Settings/CalDAVSettings.php
+++ b/apps/dav/lib/Settings/CalDAVSettings.php
@@ -57,7 +57,7 @@ class CalDAVSettings implements ISettings {
 	 * @return string
 	 */
 	public function getSection() {
-		return 'additional';
+		return 'server';
 	}
 
 	/**
diff --git a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
index 8ee58107487..36e2aaa9ebb 100644
--- a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
+++ b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
@@ -49,7 +49,7 @@ class CalDAVSettingsTest extends TestCase {
 	}
 
 	public function testGetSection() {
-		$this->assertEquals('additional', $this->settings->getSection());
+		$this->assertEquals('server', $this->settings->getSection());
 	}
 
 	public function testGetPriority() {
diff --git a/apps/federatedfilesharing/templates/settings-admin.php b/apps/federatedfilesharing/templates/settings-admin.php
index 8d04169ea89..187d75f21ac 100644
--- a/apps/federatedfilesharing/templates/settings-admin.php
+++ b/apps/federatedfilesharing/templates/settings-admin.php
@@ -6,11 +6,14 @@ script('federatedfilesharing', 'settings-admin');
 
 <?php if($_['internalOnly'] === false): ?>
 
-<div id="fileSharingSettings" class="followupsection">
-	<h3><?php p($l->t('Federated Cloud Sharing'));?></h3>
-	<a target="_blank" rel="noreferrer noopener" class="icon-info svg"
-		title="<?php p($l->t('Open documentation'));?>"
-		href="<?php p(link_to_docs('admin-sharing-federated')); ?>"></a>
+<div id="fileSharingSettings" class="section">
+	<h2>
+		<?php p($l->t('Federated Cloud Sharing'));?>
+		<a target="_blank" rel="noreferrer noopener" class="icon-info svg"
+		   title="<?php p($l->t('Open documentation'));?>"
+		   href="<?php p(link_to_docs('admin-sharing-federated')); ?>"></a>
+	</h2>
+
 	<p class="settings-hint"><?php p($l->t('Adjust how people can share between servers.')); ?></p>
 
 	<p>
diff --git a/apps/federation/css/settings-admin.css b/apps/federation/css/settings-admin.css
index 3fd5f5aea6d..c4c846bd812 100644
--- a/apps/federation/css/settings-admin.css
+++ b/apps/federation/css/settings-admin.css
@@ -26,3 +26,7 @@
 	vertical-align: middle;
 	margin-left: 10px;
 }
+
+#ocFederationAddServer #serverUrl {
+	width: 300px;
+}
diff --git a/apps/files/lib/Settings/Admin.php b/apps/files/lib/Settings/Admin.php
index 2f4406c150b..11b66dab846 100644
--- a/apps/files/lib/Settings/Admin.php
+++ b/apps/files/lib/Settings/Admin.php
@@ -70,7 +70,7 @@ class Admin implements ISettings {
 	 * @return string the section ID, e.g. 'sharing'
 	 */
 	public function getSection() {
-		return 'additional';
+		return 'server';
 	}
 
 	/**
diff --git a/apps/files/tests/Settings/AdminTest.php b/apps/files/tests/Settings/AdminTest.php
index 071cef7d75f..027a37d7b2f 100644
--- a/apps/files/tests/Settings/AdminTest.php
+++ b/apps/files/tests/Settings/AdminTest.php
@@ -75,7 +75,7 @@ class AdminTest extends TestCase {
 	}
 
 	public function testGetSection() {
-		$this->assertSame('additional', $this->admin->getSection());
+		$this->assertSame('server', $this->admin->getSection());
 	}
 
 	public function testGetPriority() {
diff --git a/apps/updatenotification/lib/Settings/Admin.php b/apps/updatenotification/lib/Settings/Admin.php
index 5213eb905ee..bb12402aa07 100644
--- a/apps/updatenotification/lib/Settings/Admin.php
+++ b/apps/updatenotification/lib/Settings/Admin.php
@@ -130,7 +130,7 @@ class Admin implements ISettings {
 	 * @return string the section ID, e.g. 'sharing'
 	 */
 	public function getSection(): string {
-		return 'server';
+		return 'overview';
 	}
 
 	/**
@@ -141,6 +141,6 @@ class Admin implements ISettings {
 	 * E.g.: 70
 	 */
 	public function getPriority(): int {
-		return 1;
+		return 11;
 	}
 }
diff --git a/apps/updatenotification/tests/Settings/AdminTest.php b/apps/updatenotification/tests/Settings/AdminTest.php
index 4e2ac3a53d9..d5915a9c102 100644
--- a/apps/updatenotification/tests/Settings/AdminTest.php
+++ b/apps/updatenotification/tests/Settings/AdminTest.php
@@ -140,10 +140,10 @@ class AdminTest extends TestCase {
 
 
 	public function testGetSection() {
-		$this->assertSame('server', $this->admin->getSection());
+		$this->assertSame('overview', $this->admin->getSection());
 	}
 
 	public function testGetPriority() {
-		$this->assertSame(1, $this->admin->getPriority());
+		$this->assertSame(11, $this->admin->getPriority());
 	}
 }