From c5440fa13305799e1af663993220d200373efc4e Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Wed, 12 Mar 2014 17:29:26 +0100
Subject: Move cron status to the right of the heading

---
 settings/css/settings.css    |  4 ++++
 settings/templates/admin.php | 36 ++++++++++++++++++------------------
 2 files changed, 22 insertions(+), 18 deletions(-)

(limited to 'settings')

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 37c2c47ed20..249ee1949f0 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -167,6 +167,10 @@ table.shareAPI td { padding-bottom: 0.8em; }
 	width: 40px;
 }
 
+.cronlog {
+	margin-left: 10px;
+}
+
 .cronstatus {
 	display: inline-block;
 	height: 16px;
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index a2775439cae..08a0a8f5e68 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -153,7 +153,24 @@ if (!$_['internetconnectionworking']) {
 ;?>
 
 <fieldset class="personalblock" id="backgroundjobs">
-	<h2><?php p($l->t('Cron'));?></h2>
+	<h2 class="inlineblock"><?php p($l->t('Cron'));?></h2>
+	<?php if ($_['cron_log']): ?>
+	<p class="cronlog inlineblock">
+		<?php if ($_['lastcron'] !== false):
+			$human_time = date('Y-m-d H:i', $_['lastcron']) . " UTC";
+			if (time() - $_['lastcron'] <= 3600): ?>
+				<span class="cronstatus success"></span>
+				<?php p($l->t("Last cron was executed at %s.", array($human_time)));
+			else: ?>
+				<span class="cronstatus error"></span>
+				<?php p($l->t("Last cron was executed at %s. This is more than an hour ago, something seems wrong.", array($human_time)));
+			endif;
+		else: ?>
+			<span class="cronstatus error"></span>
+			<?php p($l->t("Cron was not executed yet!"));
+		endif; ?>
+	</p>
+	<?php endif; ?>
 	<p>
 				<input type="radio" name="mode" value="ajax"
 					   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
@@ -178,23 +195,6 @@ if (!$_['internetconnectionworking']) {
 				<label for="backgroundjobs_cron">Cron</label><br/>
 				<em><?php p($l->t("Use systems cron service to call the cron.php file every 15 minutes.")); ?></em>
 	</p>
-	<?php if ($_['cron_log']): ?>
-	<p>
-		<?php if ($_['lastcron'] !== false):
-			$human_time = date('Y-m-d H:i', $_['lastcron']) . " UTC";
-			if (time() - $_['lastcron'] <= 3600): ?>
-				<span class="cronstatus success"></span>
-				<?php p($l->t("Last cron was executed at %s.", array($human_time)));
-			else: ?>
-				<span class="cronstatus error"></span>
-				<?php p($l->t("Last cron was executed at %s. This is more than an hour ago, something seems wrong.", array($human_time)));
-			endif;
-		else: ?>
-			<span class="cronstatus error"></span>
-			<?php p($l->t("Cron was not executed yet!"));
-		endif; ?>
-	</p>
-	<?php endif; ?>
 </fieldset>
 
 <fieldset class="personalblock" id="shareAPI">
-- 
cgit v1.2.3