diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2016-08-13 00:29:39 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2016-08-13 00:29:39 +0200 |
| commit | a133e7970d766d9bb54da678174ef3dd53270357 (patch) | |
| tree | 5f4a448df5a79473d9895eec45263ea57c15c6b0 | |
| parent | 7a2b96c7e65eaaf58e0ad77b91532df0a2b6da5d (diff) | |
| download | nextcloud-server-a133e7970d766d9bb54da678174ef3dd53270357.tar.gz nextcloud-server-a133e7970d766d9bb54da678174ef3dd53270357.zip | |
make updatenotification settings appear as if it is part of the version part in server settings
| -rw-r--r-- | apps/updatenotification/lib/Controller/AdminController.php | 2 | ||||
| -rw-r--r-- | apps/updatenotification/templates/admin.php | 4 | ||||
| -rw-r--r-- | settings/css/settings.css | 8 | ||||
| -rw-r--r-- | settings/templates/admin/server.php | 1 |
4 files changed, 11 insertions, 4 deletions
diff --git a/apps/updatenotification/lib/Controller/AdminController.php b/apps/updatenotification/lib/Controller/AdminController.php index 3c6ab463059..ebb3fa642f1 100644 --- a/apps/updatenotification/lib/Controller/AdminController.php +++ b/apps/updatenotification/lib/Controller/AdminController.php @@ -168,6 +168,6 @@ class AdminController extends Controller implements ISettings { * E.g.: 70 */ public function getPriority() { - return 5; + return 1; } } diff --git a/apps/updatenotification/templates/admin.php b/apps/updatenotification/templates/admin.php index b1cc76534e3..3c3d6cbd4cd 100644 --- a/apps/updatenotification/templates/admin.php +++ b/apps/updatenotification/templates/admin.php @@ -13,9 +13,7 @@ /** @var string $currentChannel */ $currentChannel = $_['currentChannel']; ?> -<form id="oca_updatenotification_section" class="section"> - <h2><?php p($l->t('Updater')); ?></h2> - +<form id="oca_updatenotification_section" class="followupsection"> <?php if($isNewVersionAvailable === true): ?> <strong><?php p($l->t('A new version is available: %s', [$newVersionString])); ?></strong> <input type="button" id="oca_updatenotification_button" value="<?php p($l->t('Open updater')) ?>"> diff --git a/settings/css/settings.css b/settings/css/settings.css index b006f1f5656..b40b7a17904 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -372,6 +372,14 @@ span.version { .section h2.app-name { margin-bottom: 8px; } +.followupsection { + display: block; + padding: 0 30px 30px 30px; + color: #555; + margin-bottom: 24px; + margin-top: -30px; + position: relative; +} .app-image { float: left; padding-right: 10px; diff --git a/settings/templates/admin/server.php b/settings/templates/admin/server.php index 43df787d519..1e24043b3dc 100644 --- a/settings/templates/admin/server.php +++ b/settings/templates/admin/server.php @@ -319,6 +319,7 @@ if ($_['mail_smtpmode'] == 'qmail') { </div> <div class="section"> + <!-- 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> |