wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14614 from jakobsack/master

Browse source 
Show time difference of last cron run instead of absolute time
This commit is contained in:
Morris Jobke 2015-03-01 12:22:39 +01:00
commit a6f5d3e1e8
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
settings/js/admin.js
View file

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

15
settings/templates/admin.php
View file

@ -236,14 +236,19 @@ if ($_['suggestedOverwriteCliUrl']) {
<?php if ($_['cron_log']): ?>
<p class="cronlog inlineblock">
<?php if ($_['lastcron'] !== false):
$human_time = OC_Util::formatDate($_['lastcron']);
$relative_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 at %s.", array($human_time)));
else: ?>
<span class="crondate" original-title="<?php p($absolute_time);?>">
<?php p($l->t("Last cron job execution: %s.", array($relative_time)));?>
</span>
<?php 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;
<span class="crondate" original-title="<?php p($absolute_time);?>">
<?php p($l->t("Last cron job execution: %s. Something seems wrong.", array($relative_time)));?>
</span>
<?php endif;
else: ?>
<span class="cronstatus error"></span>
<?php p($l->t("Cron was not executed yet!"));