Merge CUPS 1.4svn-r7319.

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

diff --git a/templates/classes.tmpl b/templates/classes.tmpl
index 08dda008ee02d0180f2b6f577854ca5f5150ecb5..e40103413fe7c43bc709d45533ae84f181afe5b6 100644 (file)
--- a/templates/classes.tmpl
+++ b/templates/classes.tmpl
@@ -1,7 +1,6 @@
 {#printer_name=0?:
 {[printer_name]
-{#printer_name=1?:<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Default Printer):}}
-{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
+{_SINGLE_DEST?:<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Default Printer):}</H2>}
 
 <TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
 <TR>
@@ -9,9 +8,9 @@
 <IMG SRC="/images/classes.png" WIDTH="128" HEIGHT="128" ALT=""></A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 <TD VALIGN=TOP><B>Description:</B> {printer_info}<BR>
 <B>Location:</B> {printer_location}<BR>
-<B>Class State:</B> {printer_state=3?idle:{printer_state=4?processing:paused}},
+<B>Class State:</B> {printer_state=3?Idle:{printer_state=4?Processing:Paused}}{?printer_state_message=?: ("{printer_state_message}")}},
 {printer_is_accepting_jobs=0?rejecting jobs:accepting jobs}, {server_is_sharing_printers=0?not:{printer_is_shared=0?not:}} shared{default_name={printer_name}?, server default:}.
-{?member_uris=?:<BR>Members: {member_uris}}
+{?member_uris=?:<BR><B>Members:</B> {member_uris}}
 
 <P><TABLE CLASS="inset" WIDTH="100%" SUMMARY="Maintenance Commands">
 <CAPTION>Maintenance Commands</CAPTION>