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

This commit is contained in:
Arthur Schiwon 2016-08-13 00:29:39 +02:00 committed by Lukas Reschke
parent d056f575c9
commit c93453e878
No known key found for this signature in database
GPG Key ID: B9F6980CF6E759B1
4 changed files with 11 additions and 4 deletions

View File

@ -168,6 +168,6 @@ class AdminController extends Controller implements ISettings {
* E.g.: 70
*/
public function getPriority() {
return 5;
return 1;
}
}

View File

@ -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')) ?>">

View File

@ -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;

View File

@ -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>