summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2008-04-21 23:14:57 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2008-04-21 23:14:57 +0000
commit3dfe78b3363fe9e058a98197eda9a856991cbc6f (patch)
tree4fe49470197216a2d1860e6dd327693f3636b084 /templates
parentae71f5deb42f3d526b5f35d2eed9241abb6405ba (diff)
Merge changes from CUPS 1.4svn-r7485.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@718 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'templates')
-rw-r--r--templates/jobs.tmpl3
1 files changed, 2 insertions, 1 deletions
diff --git a/templates/jobs.tmpl b/templates/jobs.tmpl
index 76ca4924f..948cd213b 100644
--- a/templates/jobs.tmpl
+++ b/templates/jobs.tmpl
@@ -19,7 +19,8 @@
<TD>{job_media_sheets_completed=0?Unknown:{?job_media_sheets_completed}}&nbsp;</TD>
<TD>{job_state=3?pending since<BR>{time_at_creation}:{job_state=4?held since<BR>{time_at_creation}:
{job_state=5?processing since<BR>{time_at_processing}:{job_state=6?stopped:
-{job_state=7?canceled at<BR>{time_at_completed}:{job_state=8?aborted:completed at<BR>{time_at_completed}}}}}}}&nbsp;</TD>
+{job_state=7?canceled at<BR>{time_at_completed}:{job_state=8?aborted:completed at<BR>{time_at_completed}}}}}}}&nbsp;{job_printer_state_message?<BR>
+<EM>"{job_printer_state_message}"</EM>:}</TD>
<TD>
{job_preserved>0?
<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">