From 2d130826da806cbb7bde0cfcf08a4a1f89e1339b Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 30 Jul 2015 17:34:09 +0200
Subject: correct order and capitalization of 'Server status' admin settings
 entry, fix #17395

---
 settings/admin.php           |  2 +-
 settings/templates/admin.php | 25 +++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'settings')

diff --git a/settings/admin.php b/settings/admin.php
index 551608b5d25..260e462db58 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -220,7 +220,7 @@ $formsAndMore = array_merge($formsAndMore, $formsMap);
 $formsAndMore[] = ['anchor' => 'backgroundjobs', 'section-name' => $l->t('Cron')];
 $formsAndMore[] = ['anchor' => 'mail_general_settings', 'section-name' => $l->t('Email server')];
 $formsAndMore[] = ['anchor' => 'log-section', 'section-name' => $l->t('Log')];
-$formsAndMore[] = ['anchor' => 'server-status', 'section-name' => $l->t('Server Status')];
+$formsAndMore[] = ['anchor' => 'server-status', 'section-name' => $l->t('Server status')];
 $formsAndMore[] = ['anchor' => 'admin-tips', 'section-name' => $l->t('Tips & tricks')];
 if ($updaterAppPanel) {
 	$formsAndMore[] = ['anchor' => 'updater', 'section-name' => $l->t('Updates')];
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index a55071bdf84..4203ee2cad7 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -507,6 +507,19 @@ if ($_['cronErrors']) {
 	<?php endif; ?>
 </div>
 
+<div class="section" id="server-status">
+	<h2><?php p($l->t('Server status'));?></h2>
+	<ul>
+		<li>
+			<?php if ($_['fileLockingEnabled']) {
+				p($l->t('Transactional File Locking is enabled.'));
+			} else {
+				p($l->t('Transactional File Locking is disabled.'));
+			} ?>
+		</li>
+	</ul>
+</div>
+
 <div class="section" id="admin-tips">
 	<h2><?php p($l->t('Tips & tricks'));?></h2>
 	<ul>
@@ -528,18 +541,6 @@ if ($_['cronErrors']) {
 		<li><a target="_blank" href="<?php p(link_to_docs('admin-security')); ?>"><?php p($l->t('Hardening and security guidance'));?> ↗</a></li>
 	</ul>
 </div>
-<div class="section" id="server-status">
-	<h2><?php p($l->t('Server Status'));?></h2>
-	<ul>
-		<li>
-			<?php if ($_['fileLockingEnabled']) {
-				p($l->t('Transactional File Locking is enabled.'));
-			} else {
-				p($l->t('Transactional File Locking is disabled.'));
-			} ?>
-		</li>
-	</ul>
-</div>
 
 <div class="section">
 	<h2><?php p($l->t('Version'));?></h2>
-- 
cgit v1.2.3