From 6e906fc4d4ea9ae09d2223077760f6efba2b2875 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Sat, 28 Feb 2015 21:09:25 +0100
Subject: [PATCH 1/4] Use relative time for cron status

---
 settings/templates/admin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index a82d5ee8545..1de1e2851b7 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -236,13 +236,13 @@ if ($_['suggestedOverwriteCliUrl']) {
 	<?php if ($_['cron_log']): ?>
 	<p class="cronlog inlineblock">
 		<?php if ($_['lastcron'] !== false):
-			$human_time = OC_Util::formatDate($_['lastcron']);
+			$human_time = relative_modified_date($_['lastcron']);
 			if (time() - $_['lastcron'] <= 3600): ?>
 				<span class="cronstatus success"></span>
-				<?php p($l->t("Last cron was executed at %s.", array($human_time)));
+				<?php p($l->t("Last cron was executed %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)));
+				<?php p($l->t("Last cron was executed %s. Something seems wrong.", array($human_time)));
 			endif;
 		else: ?>
 			<span class="cronstatus error"></span>

From 0efed5c216315e9feae45f3193c510d9007f682a Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Sat, 28 Feb 2015 21:48:19 +0100
Subject: [PATCH 2/4] Add absolute time of last cronjob as hover tip

---
 settings/js/admin.js         |  2 ++
 settings/templates/admin.php | 13 +++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/settings/js/admin.js b/settings/js/admin.js
index face18beef0..34bc2466048 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -39,6 +39,8 @@ $(document).ready(function(){
 		} );
 	});
 
+	$('#backgroundjobs span.crondate').tipsy({fade: true, gravity: 's', live: true});
+
 	$('#backgroundjobs input').change(function(){
 		if($(this).attr('checked')){
 			var mode = $(this).val();
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 1de1e2851b7..7ed1afbd26e 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -237,13 +237,18 @@ if ($_['suggestedOverwriteCliUrl']) {
 	<p class="cronlog inlineblock">
 		<?php if ($_['lastcron'] !== false):
 			$human_time = relative_modified_date($_['lastcron']);
+			$absolute_time = OC_Util::formatDate($_['lastcron']);
 			if (time() - $_['lastcron'] <= 3600): ?>
 				<span class="cronstatus success"></span>
-				<?php p($l->t("Last cron was executed %s.", array($human_time)));
-			else: ?>
+				<span class="crondate" original-title="<?php p($absolute_time);?>">
+					<?php p($l->t("Last cron was executed %s.", array($human_time)));?>
+				</span>
+			<?php else: ?>
 				<span class="cronstatus error"></span>
-				<?php p($l->t("Last cron was executed %s. Something seems wrong.", array($human_time)));
-			endif;
+				<span class="crondate" original-title="<?php p($absolute_time);?>">
+					<?php p($l->t("Last cron was executed %s. Something seems wrong.", array($human_time)));?>
+				</span>
+			<?php endif;
 		else: ?>
 			<span class="cronstatus error"></span>
 			<?php p($l->t("Cron was not executed yet!"));

From 7a84c90d71e4fb45d551c4d72f81312e19f245ab Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Sat, 28 Feb 2015 21:49:23 +0100
Subject: [PATCH 3/4] Rename $human_time to $relative_time in cron settings

---
 settings/templates/admin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 7ed1afbd26e..ea91fca499e 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -236,17 +236,17 @@ if ($_['suggestedOverwriteCliUrl']) {
 	<?php if ($_['cron_log']): ?>
 	<p class="cronlog inlineblock">
 		<?php if ($_['lastcron'] !== false):
-			$human_time = relative_modified_date($_['lastcron']);
+			$relative_time = relative_modified_date($_['lastcron']);
 			$absolute_time = OC_Util::formatDate($_['lastcron']);
 			if (time() - $_['lastcron'] <= 3600): ?>
 				<span class="cronstatus success"></span>
 				<span class="crondate" original-title="<?php p($absolute_time);?>">
-					<?php p($l->t("Last cron was executed %s.", array($human_time)));?>
+					<?php p($l->t("Last cron was executed %s.", array($relative_time)));?>
 				</span>
 			<?php else: ?>
 				<span class="cronstatus error"></span>
 				<span class="crondate" original-title="<?php p($absolute_time);?>">
-					<?php p($l->t("Last cron was executed %s. Something seems wrong.", array($human_time)));?>
+					<?php p($l->t("Last cron was executed %s. Something seems wrong.", array($relative_time)));?>
 				</span>
 			<?php endif;
 		else: ?>

From 97a624dba5f5b0d81f02f7942f72daee4282a6d1 Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Sun, 1 Mar 2015 11:51:40 +0100
Subject: [PATCH 4/4] Improve language on backgroundjob admin page

---
 settings/templates/admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index ea91fca499e..b7ea77a993b 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -241,12 +241,12 @@ if ($_['suggestedOverwriteCliUrl']) {
 			if (time() - $_['lastcron'] <= 3600): ?>
 				<span class="cronstatus success"></span>
 				<span class="crondate" original-title="<?php p($absolute_time);?>">
-					<?php p($l->t("Last cron was executed %s.", array($relative_time)));?>
+					<?php p($l->t("Last cron job execution: %s.", array($relative_time)));?>
 				</span>
 			<?php else: ?>
 				<span class="cronstatus error"></span>
 				<span class="crondate" original-title="<?php p($absolute_time);?>">
-					<?php p($l->t("Last cron was executed %s. Something seems wrong.", array($relative_time)));?>
+					<?php p($l->t("Last cron job execution: %s. Something seems wrong.", array($relative_time)));?>
 				</span>
 			<?php endif;
 		else: ?>