make updatenotification settings appear as if it is part of the version part in serve...

diff --git a/apps/updatenotification/lib/Controller/AdminController.php b/apps/updatenotification/lib/Controller/AdminController.php
index 3c6ab4630599a1bc16fa3cad4e660e23313b936b..ebb3fa642f1e3ac92f3bd28600052e545db2da45 100644 (file)
--- 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 b1cc76534e3571276e69c276afcd4d3b607eacaf..3c3d6cbd4cd8bac61779582397c9ec72e3b901f4 100644 (file)
--- 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 b6d0e57995bd4cc29b70108598c1080fd1b7fab5..589373e14f94724ccd5797d70e4d28cb2df08828 100644 (file)
--- 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 43df787d519e10b8330a354b38b8f0760e8e3d89..1e24043b3dc13053d41938e34ba9b462e1420b84 100644 (file)
--- 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>