Merge branch 'donald/web'

* donald/web:
  web: show some units and elapsed job time

web/pages/mxq/mxq.in

@@ -249,8 +249,8 @@ user_group     : $o{user_group}
 
 job_command    : $job_command
 job_threads    : $o{job_threads}
-job_memory     : $o{job_memory}
-job_time       : $o{job_time}
+job_memory     : $o{job_memory} MiB
+job_time       : $o{job_time} minutes
 
 job_max_per_node      : $o{job_max_per_node}
 
@@ -311,7 +311,7 @@ sub job {
 
 	$dbh or db_init();
 
-	my $sth=$dbh->prepare('SELECT * FROM mxq_job WHERE job_id=? LIMIT 1',undef);
+	my $sth=$dbh->prepare('SELECT *,timestampdiff(MINUTE,date_start,now()) as t FROM mxq_job WHERE job_id=? LIMIT 1',undef);
 	$sth->execute($job_id);
 	my %o=%{$sth->fetchrow_hashref('NAME_lc')};
 
@@ -325,6 +325,9 @@ sub job {
 	my $job_stdout=escapeHTML($o{job_stdout});
 	my $job_stderr=escapeHTML($o{job_stderr});
 
+
+	my $ago = defined $o{t} ? "($o{t} minutes ago)" : '';
+
 	defined $_ or $_='<null>' for values %o;
 
 	$out.=h2("Job Details $o{job_id}");
@@ -354,7 +357,7 @@ host_pid         : $o{host_pid}
 host_slots       : $o{host_slots}
 
 date_submit      : $o{date_submit}
-date_start       : $o{date_start}
+date_start       : $o{date_start} $ago
 date_end         : $o{date_end}
 
 job_id_new       : $o{job_id_new}