Only show activity image when job is active.

Only show job-printer-state-message when job-state != completed.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@8017 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/templates/command.tmpl b/templates/command.tmpl
index 31f8926fecb3eba6c1a088d07e33f5a4c59eb1b0..9a87439ca5dc86cd94b91acb05ba71bcad8d6839 100644 (file)
--- a/templates/command.tmpl
+++ b/templates/command.tmpl
@@ -2,11 +2,11 @@
 
 <H2 CLASS="title">{title} On {printer_name}</H2>
 
-<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
-ALT="Busy Indicator"> Printer command job
+<P>{job_state>5?:<IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16"
+ALIGN="ABSMIDDLE" ALT="Busy Indicator"> }Printer command job
 {job_state=3?pending:{job_state=4?held:
 {job_state=5?processing:{job_state=6?stopped:
-{job_state=7?canceled:{job_state=8?aborted:completed}}}}}}{job_printer_state_message?,
-<EM>"{job_printer_state_message}"</EM>:}</P>
+{job_state=7?canceled:{job_state=8?aborted:completed}}}}}}{job_state=9?:{job_printer_state_message?,
+<EM>"{job_printer_state_message}"</EM>:}}</P>
 
 </DIV>