Add default options and capabilities to the printer list.

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

diff --git a/CHANGES.txt b/CHANGES.txt
index a513fda049e2711b417cbf94cfc0a2efa93baed6..d3b46017e6fb15de1f58ccf3fdffc8d2442dfd61 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,12 @@
-CHANGES.txt - 2007-08-29
+CHANGES.txt - 2007-08-31
 ------------------------
 
 CHANGES IN CUPS V1.4b1
 
+       - The printer list now shows the default media, banner, and
+         duplex options as well as the color and duplex capabilities
+         of printers (STR #1175)
+       - The web interface look-n-feel has been updated (STR #2492)
        - The scheduler now supports a CUPS-Get-Document operation
          that returns the specified print job document (STR #118)
        - The cupsfilter utility now supports a "-J jobid" option

diff --git a/templates/printers.tmpl b/templates/printers.tmpl
index f8cc4d972c3105c544654fab4ae5854d85aed17d..0641aae0ecba12d9579d6a4425d16be2fea2c487 100644 (file)
--- a/templates/printers.tmpl
+++ b/templates/printers.tmpl
@@ -9,9 +9,12 @@
 <IMG SRC="/images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.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>Printer Driver:</B> {printer_make_and_model}<BR>
+<B>Printer Driver:</B> {printer_make_and_model} ({color_supported=1?color:grayscale}{sides_supported?, 2-sided printing:})<BR>
 <B>Printer State:</B> {printer_state=3?idle:{printer_state=4?processing:stopped}},
-{printer_is_accepting_jobs=0?rejecting jobs:accepting jobs}, {printer_is_shared=0?not:} published{default_name={printer_name}?, default printer:}.
+{printer_is_accepting_jobs=0?rejecting jobs:accepting jobs}, {printer_is_shared=0?not:} published{default_name={printer_name}?, default printer:}.<BR>
+<B>Default Options:</B> job-sheets={job_sheets_default}
+media={media_default?{media_default}:unknown}
+{sides_default?sides={sides_default}:}
 {?device_uri=?:<BR><B>Device URI:</B> {device_uri}}
 
 <P><TABLE CLASS="inset" WIDTH="100%" SUMMARY="Maintenance Commands">