Merge changes from CUPS 1.4svn-r7961.

[thirdparty/cups.git] / templates / jobs.tmpl

diff --git a/templates/jobs.tmpl b/templates/jobs.tmpl
index 76ca4924f7e4699b6b223a5f03282a8a50df2b12..f68eea01e90876c4d19851dc5063e95dc370d36c 100644 (file)
--- a/templates/jobs.tmpl
+++ b/templates/jobs.tmpl
@@ -1,17 +1,11 @@
 {#job_id=0?:
-<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="Job List">
-<TR CLASS="data">
-<TH>ID&nbsp;</TH>
-<TH>Name&nbsp;</TH>
-<TH>User&nbsp;</TH>
-<TH>Size&nbsp;</TH>
-<TH>Pages&nbsp;</TH>
-<TH>State&nbsp;</TH>
-<TH>Control&nbsp;</TH>
-</TR>
-
+<TABLE CLASS="list" SUMMARY="Job List">
+<THEAD>
+<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&amp;WHICH_JOBS={?WHICH_JOBS}&amp;FIRST={FIRST}&amp;ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>&#x25b2;</SMALL> ID <SMALL>&#x25b2;</SMALL>:<SMALL>&#x25bc;</SMALL> ID <SMALL>&#x25bc;</SMALL>}</A></TH><TH>Name</TH><TH>User</TH><TH>Size</TH><TH>Pages</TH><TH>State</TH><TH>Control</TH></TR>
+</THEAD>
+<TBODY>
 {[job_id]
-<TR CLASS="data" VALIGN="TOP">
+<TR VALIGN="TOP">
 <TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}&nbsp;</TD>
 <TD>{?job_name=?Unknown:{job_name}}&nbsp;</TD>
 <TD>{job_originating_user_name}&nbsp;</TD>
@@ -19,7 +13,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}">
@@ -37,6 +32,6 @@
 &nbsp;</TD>
 </TR>
 }
+</TBODY>
 </TABLE>
 }
-<BR>