Move social buttons to bottom on admin page

For #2134

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/lib/private/Settings/Admin/ServerDevNotice.php b/lib/private/Settings/Admin/ServerDevNotice.php
new file mode 100644 (file)
index 0000000..1d7f34f
--- /dev/null
+++ b/lib/private/Settings/Admin/ServerDevNotice.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @copyright 2016, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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/>.
+ *
+ */
+namespace OC\Settings\Admin;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Platforms\SqlitePlatform;
+use OC\Lock\DBLockingProvider;
+use OC\Lock\NoopLockingProvider;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IConfig;
+use OCP\IDBConnection;
+use OCP\IL10N;
+use OCP\Lock\ILockingProvider;
+use OCP\Settings\ISettings;
+
+class ServerDevNotice implements ISettings {
+       /**
+        * @return TemplateResponse
+        */
+       public function getForm() {
+               return new TemplateResponse('settings', 'admin/server.development.notice');
+       }
+
+       /**
+        * @return string the section ID, e.g. 'sharing'
+        */
+       public function getSection() {
+               return 'server';
+       }
+
+       /**
+        * @return int whether the form should be rather on the top or bottom of
+        * the admin section. The forms are arranged in ascending order of the
+        * priority values. It is required to return a value between 0 and 100.
+        *
+        * E.g.: 70
+        */
+       public function getPriority() {
+               return 1000;
+       }
+}

diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php
index e7be3d4e77de7ee747d86ba3f52475449428b7b2..a6f9aacccb25f09aae8eb4ea4b504478daf2adc1 100644 (file)
--- a/lib/private/Settings/Manager.php
+++ b/lib/private/Settings/Manager.php
@@ -369,6 +369,8 @@ class Manager implements IManager {
                                /** @var ISettings $form */
                                $form = new Admin\Server($this->dbc, $this->config, $this->lockingProvider, $this->l);
                                $forms[$form->getPriority()] = [$form];
+                               $form = new Admin\ServerDevNotice();
+                               $forms[$form->getPriority()] = [$form];
                        }
                        if($section === 'encryption') {
                                /** @var ISettings $form */

diff --git a/settings/templates/admin/server.development.notice.php b/settings/templates/admin/server.development.notice.php
new file mode 100644 (file)
index 0000000..f58258f
--- /dev/null
+++ b/settings/templates/admin/server.development.notice.php
@@ -0,0 +1,3 @@
+<div class="section">
+       <p><?php include(__DIR__ . '/../settings.development.notice.php'); ?></p>
+</div>

diff --git a/settings/templates/admin/server.php b/settings/templates/admin/server.php
index 430ca6ac8e25467d31e69d0fea22ae2a2d756ba0..d87fa81729fd649341c76ee3b201919759a73f08 100644 (file)
--- a/settings/templates/admin/server.php
+++ b/settings/templates/admin/server.php
@@ -224,5 +224,4 @@
        <!-- should be the last part, so Updater can follow if enabled (it has no heading therefore). -->
        <h2><?php p($l->t('Version'));?></h2>
        <p><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" rel="noreferrer" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></p>
-       <p><?php include(__DIR__ . '/../settings.development.notice.php'); ?></p>
 </div>