From ff2c819ed3df2daa7c1cc8827e34b738188ff108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 27 Jun 2018 19:59:17 +0200
Subject: [PATCH] Move social buttons to the personal settings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 lib/private/Settings/Manager.php                          | 4 ++--
 .../Settings/{Admin => Personal}/ServerDevNotice.php      | 8 ++++----
 settings/css/settings.scss                                | 6 +++---
 .../settings/admin/server.development.notice.php          | 3 ---
 .../personal/development.notice.php}                      | 2 ++
 5 files changed, 11 insertions(+), 12 deletions(-)
 rename lib/private/Settings/{Admin => Personal}/ServerDevNotice.php (86%)
 delete mode 100644 settings/templates/settings/admin/server.development.notice.php
 rename settings/templates/{settings.development.notice.php => settings/personal/development.notice.php} (98%)

diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php
index 4ee594c090..7040f87261 100644
--- a/lib/private/Settings/Manager.php
+++ b/lib/private/Settings/Manager.php
@@ -262,8 +262,6 @@ class Manager implements IManager {
 			/** @var ISettings $form */
 			$form = new Admin\Overview($this->config);
 			$forms[$form->getPriority()] = [$form];
-			$form = new Admin\ServerDevNotice();
-			$forms[$form->getPriority()] = [$form];
 		}
 		if ($section === 'server') {
 			/** @var ISettings $form */
@@ -305,6 +303,8 @@ class Manager implements IManager {
 				$this->l
 			);
 			$forms[$form->getPriority()] = [$form];
+			$form = new Personal\ServerDevNotice();
+			$forms[$form->getPriority()] = [$form];
 		}
 		if($section === 'security') {
 			/** @var ISettings $form */
diff --git a/lib/private/Settings/Admin/ServerDevNotice.php b/lib/private/Settings/Personal/ServerDevNotice.php
similarity index 86%
rename from lib/private/Settings/Admin/ServerDevNotice.php
rename to lib/private/Settings/Personal/ServerDevNotice.php
index 22637729b0..fa5a736cde 100644
--- a/lib/private/Settings/Admin/ServerDevNotice.php
+++ b/lib/private/Settings/Personal/ServerDevNotice.php
@@ -18,10 +18,10 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-namespace OC\Settings\Admin;
+namespace OC\Settings\Personal;
 
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\Settings\ISettings;
@@ -31,14 +31,14 @@ class ServerDevNotice implements ISettings {
 	 * @return TemplateResponse
 	 */
 	public function getForm() {
-		return new TemplateResponse('settings', 'settings/admin/server.development.notice');
+		return new TemplateResponse('settings', 'settings/personal/development.notice');
 	}
 
 	/**
 	 * @return string the section ID, e.g. 'sharing'
 	 */
 	public function getSection() {
-		return 'server';
+		return 'personal-info';
 	}
 
 	/**
diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index cfca22d5bb..a573f94d49 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -96,14 +96,14 @@ input {
 #personal-settings-avatar-container {
 	display: inline-grid;
 	grid-template-columns: 1fr;
-	grid-template-rows: 2fr 1fr 1fr;
+	grid-template-rows: 2fr 1fr;
 	vertical-align: top;
 }
 
 .profile-settings-container {
 	display: inline-grid;
 	grid-template-columns: 1fr;
-	grid-template-rows: 1fr 1fr 1fr 1fr;
+	grid-template-rows: 1fr 2fr;
 }
 
 .personal-show-container {
@@ -216,7 +216,7 @@ input {
 .personal-settings-container {
 	display: inline-grid;
 	grid-template-columns: 1fr 1fr;
-	grid-template-rows: 1fr 1fr 1fr 1fr;
+	grid-template-rows: 1fr 1fr 1fr;
 	&:after {
 		clear: both;
 	}
diff --git a/settings/templates/settings/admin/server.development.notice.php b/settings/templates/settings/admin/server.development.notice.php
deleted file mode 100644
index 42599c5445..0000000000
--- a/settings/templates/settings/admin/server.development.notice.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="section">
-	<p><?php include __DIR__ . '/../../settings.development.notice.php'; ?></p>
-</div>
diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings/personal/development.notice.php
similarity index 98%
rename from settings/templates/settings.development.notice.php
rename to settings/templates/settings/personal/development.notice.php
index 855c4dc26c..41f70c0a82 100644
--- a/settings/templates/settings.development.notice.php
+++ b/settings/templates/settings/personal/development.notice.php
@@ -1,3 +1,4 @@
+<div class="followupsection">
 	<p>
 		<?php print_unescaped(str_replace(
 			[
@@ -62,3 +63,4 @@
 {newsletteropen}<img width="50" src="{mailimage}" title="{mailtext}" alt="{mailtext}">{linkclose}'
 		)); ?>
 	</p>
+</div>
\ No newline at end of file