Merge changes from 1.4svn-r7979.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@983 a1ca3aef-8c08-0410-bb20-df032aa958be

35 files changed, 220 insertions, 46 deletions

diff --git a/templates/add-class.tmpl b/templates/add-class.tmpl
index 6cec19910..0bb15f18d 100644
--- a/templates/add-class.tmpl
+++ b/templates/add-class.tmpl
@@ -1,18 +1,25 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Add Class</H2>
+
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
 
 <TABLE>
 <TR>
 <TH CLASS="label">Name:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"></TD>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(May contain any printable characters except "/", "#", and space)</SMALL></TD>
 </TR>
 <TR>
-<TH CLASS="label">Location:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"></TD>
+<TH CLASS="label">Description:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Human-readable description such as "HP LaserJet with Duplexer")</SMALL></TD>
 </TR>
 <TR>
-<TH CLASS="label">Description:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"></TD>
+<TH CLASS="label">Location:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Human-readable location such as "Lab 1")</SMALL></TD>
 </TR>
 <TR>
 <TH CLASS="label">Members:</TH>
@@ -29,3 +36,4 @@
 </TABLE>
 
 </FORM>
+</DIV>
\ No newline at end of file
diff --git a/templates/add-printer.tmpl b/templates/add-printer.tmpl
index 804e18921..bf100f0c0 100644
--- a/templates/add-printer.tmpl
+++ b/templates/add-printer.tmpl
@@ -1,3 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Add Printer</H2>
+
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
@@ -5,10 +9,6 @@
 
 <TABLE>
 <TR>
-<TH CLASS="label">Connection:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
-</TR>
-<TR>
 <TH CLASS="label">Name:</TH>
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
 <SMALL>(May contain any printable characters except "/", "#", and space)</SMALL></TD>
@@ -24,6 +24,10 @@
 <SMALL>(Human-readable location such as "Lab 1")</SMALL></TD>
 </TR>
 <TR>
+<TH CLASS="label">Connection:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
 <TH CLASS="label">Sharing:</TH>
 <TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
 Share This Printer</TD>
@@ -35,3 +39,4 @@ Share This Printer</TD>
 </TABLE>
 
 </FORM>
+</DIV>
\ No newline at end of file
diff --git a/templates/admin.tmpl b/templates/admin.tmpl
index 2e27facd7..78a2ddba6 100644
--- a/templates/admin.tmpl
+++ b/templates/admin.tmpl
@@ -39,7 +39,37 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 
-<P><B>Basic Server Settings:</B></P>
+{ADVANCEDSETTINGS?<P><B>Advanced Server Settings\:</B>
+(<A HREF="/admin/">Show Basic Settings</A>)</P>
+
+<P><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+<INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES">
+<INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> Show printers shared by other systems<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Protocols\:
+<INPUT TYPE="CHECKBOX" NAME="BROWSE_REMOTE_CUPS" {?browse_remote_cups}> CUPS
+{HAVE_LDAP?<INPUT TYPE="CHECKBOX" NAME="BROWSE_REMOTE_LDAP" {?browse_remote_ldap}> LDAP:}
+{HAVE_LIBSLP?<INPUT TYPE="CHECKBOX" NAME="BROWSE_REMOTE_SLP" {?browse_remote_slp}> SLP:}<BR>
+<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Share printers connected to this system<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Protocols\:
+<INPUT TYPE="CHECKBOX" NAME="BROWSE_LOCAL_CUPS" {?browse_local_cups}> CUPS
+{HAVE_DNSSD?<INPUT TYPE="CHECKBOX" NAME="BROWSE_LOCAL_DNSSD" {?browse_local_dnssd}> DNS-SD:}
+{HAVE_LDAP?<INPUT TYPE="CHECKBOX" NAME="BROWSE_LOCAL_LDAP" {?browse_local_ldap}> LDAP:}
+{HAVE_LIBSLP?<INPUT TYPE="CHECKBOX" NAME="BROWSE_LOCAL_SLP" {?browse_local_slp}> SLP:}<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Allow printing from the Internet<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Advertise web interface<BR>
+<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Allow remote administration<BR>
+{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Use Kerberos authentication (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
+<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Allow users to cancel any job (not just their own)<BR>
+<INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOB_HISTORY" {?preserve_job_history}> Preserve job history<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Number of jobs\:
+<INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOB_FILES" {?preserve_job_files}> Preserve job print files<BR>
+<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Save debugging information for troubleshooting<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Max log file size\:
+<INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P>
+
+:<P><B>Basic Server Settings:</B>
+(<A HREF="/admin/?ADVANCEDSETTINGS=YES">Show Advanced Settings</A>)</P>
 
 <P><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
 <INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> Show printers shared by other systems<BR>
@@ -50,6 +80,7 @@
 <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Allow users to cancel any job (not just their own)<BR>
 <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Save debugging information for troubleshooting</P>
 
+}
 <P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Change Settings"></P>
 
 </FORM>}
diff --git a/templates/choose-device.tmpl b/templates/choose-device.tmpl
index 52e89e557..17e0ac011 100644
--- a/templates/choose-device.tmpl
+++ b/templates/choose-device.tmpl
@@ -1,11 +1,22 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2>
+
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
 
 <TABLE>
+{op=add-printer?:<TR>
+<TH CLASS="label">Current Connection:</TH>
+<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" VALUE="{current_device_uri}" CHECKED>
+{current_device_uri}</TD>
+</TR>:}
+<TR>
 <TH CLASS="label">Local Printers:</TH>
 <TD>
-{[device_uri]{device_class!network?<INPUT TYPE="radio" NAME="DEVICE_URI"
-VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?CHECKED:{current_device_scheme={device_uri}?CHECKED:}}>
+{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI"
+VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
 {device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR>
 :}}
 </TD>
@@ -13,8 +24,8 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {
 <TR>
 <TH CLASS="label">Discovered Network Printers:</TH>
 <TD>
-{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="radio" NAME="DEVICE_URI"
-VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?CHECKED:{current_device_scheme={device_uri}?CHECKED:}}>
+{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI"
+VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
 {device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR>
 :}:}}
 </TD>
@@ -23,8 +34,8 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {
 <TR>
 <TH CLASS="label">Other Network Printers:</TH>
 <TD>
-{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="radio" NAME="DEVICE_URI"
-VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?CHECKED:{current_device_scheme={device_uri}?CHECKED:}}>
+{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI"
+VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
 {device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR>
 }:}}
 </TD>
@@ -36,3 +47,4 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {
 </TABLE>
 
 </FORM>
+</DIV>
\ No newline at end of file
diff --git a/templates/choose-make.tmpl b/templates/choose-make.tmpl
index 2d5a1fac4..e2731dea3 100644
--- a/templates/choose-make.tmpl
+++ b/templates/choose-make.tmpl
@@ -1,19 +1,20 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2>
+
 <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
 <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
 <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
 <INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
 <INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 
 <TABLE>
-<TR>
-<TH CLASS="label">Connection:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
-</TR>
-<TR>
+{op=modify-printer?:<TR>
 <TH CLASS="label">Name:</TH>
 <TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
-</TR>
+</TR>}
 <TR>
 <TH CLASS="label">Description:</TH>
 <TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD>
@@ -23,6 +24,10 @@
 <TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD>
 </TR>
 <TR>
+<TH CLASS="label">Connection:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
 <TH CLASS="label">Sharing:</TH>
 <TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}">
 {?printer_is_shared=?Do Not:{?printer_is_shared=0?Do Not:}} Share This Printer</TD>
@@ -55,3 +60,4 @@ TYPE="FILE" NAME="PPD_FILE"></TD>
 </TABLE>
 
 </FORM>
+</DIV>
\ No newline at end of file
diff --git a/templates/choose-model.tmpl b/templates/choose-model.tmpl
index e49d7cf39..33282fb15 100644
--- a/templates/choose-model.tmpl
+++ b/templates/choose-model.tmpl
@@ -1,18 +1,19 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2>
+
 <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
 <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
 <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
 <INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
 <INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <TABLE>
-<TR>
-<TH CLASS="label">Connection:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
-</TR>
-<TR>
+{op=modify-printer?:<TR>
 <TH CLASS="label">Name:</TH>
 <TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
-</TR>
+</TR>}
 <TR>
 <TH CLASS="label">Description:</TH>
 <TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD>
@@ -22,6 +23,10 @@
 <TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD>
 </TR>
 <TR>
+<TH CLASS="label">Connection:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
 <TH CLASS="label">Sharing:</TH>
 <TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}">
 {?printer_is_shared=?Do Not:{?printer_is_shared=0?Do Not:}} Share This Printer</TD>
@@ -34,7 +39,8 @@
 <TH CLASS="label">Model:</TH>
 <TD>
 <SELECT NAME="PPD_NAME" SIZE="10">
-{[ppd_name]<OPTION VALUE="{ppd_name}" {?current_make_and_model={ppd_make_and_model}?SELECTED:}>{ppd_make_and_model} ({ppd_natural_language})
+{op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Current Driver - {current_make_and_model}</OPTION>:}
+{[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language})
 }</SELECT>
 </TD>
 </TR>
@@ -50,3 +56,4 @@ TYPE="FILE" NAME="PPD_FILE"></TD>
 </TABLE>
 
 </FORM>
+</DIV>
\ No newline at end of file
diff --git a/templates/choose-serial.tmpl b/templates/choose-serial.tmpl
index 25a4931fb..d714779b3 100644
--- a/templates/choose-serial.tmpl
+++ b/templates/choose-serial.tmpl
@@ -1,5 +1,10 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2>
+
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
 
 <TABLE>
 <TR>
@@ -43,3 +48,4 @@
 </TABLE>
 
 </FORM>
+</DIV>
\ No newline at end of file
diff --git a/templates/choose-uri.tmpl b/templates/choose-uri.tmpl
index 765a32e15..8b4f4a851 100644
--- a/templates/choose-uri.tmpl
+++ b/templates/choose-uri.tmpl
@@ -1,11 +1,16 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2>
+
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
 <INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
 
 <TABLE>
 <TR>
 <TH CLASS="label">Connection:</TH>
-<TD><INPUT TYPE="TEXT" SIZE="60" MAXLENGTH="1024" NAME="DEVICE_URI" VALUE="{device_uri}"></TD>
+<TD><INPUT TYPE="TEXT" SIZE="60" MAXLENGTH="1024" NAME="DEVICE_URI" VALUE="{current_device_uri?{current_device_uri}:{device_uri}}"></TD>
 </TR>
 <TR>
 <TD></TD>
@@ -35,3 +40,4 @@ Printers"</A> for the correct URI to use with your printer.</P>
 </TABLE>
 
 </FORM>
+</DIV>
\ No newline at end of file
diff --git a/templates/class-added.tmpl b/templates/class-added.tmpl
index f740581ad..64de61a18 100644
--- a/templates/class-added.tmpl
+++ b/templates/class-added.tmpl
@@ -1,2 +1,6 @@
+<DIV CLASS="indent">
+
 <P>Class <A HREF="/classes/{printer_name}">{printer_name}</A> has been added
 successfully.
+
+</DIV>
diff --git a/templates/class-confirm.tmpl b/templates/class-confirm.tmpl
index 77debf12a..d5641498c 100644
--- a/templates/class-confirm.tmpl
+++ b/templates/class-confirm.tmpl
@@ -1,4 +1,8 @@
+<DIV CLASS="indent">
+
 <P><B>Warning:</B> Are you sure you want to delete class
 {printer_name}?</P>
 
 <P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Delete Class"></FORM></P>
+
+</DIV>
diff --git a/templates/class-deleted.tmpl b/templates/class-deleted.tmpl
index 269ddd87a..f2bb4d610 100644
--- a/templates/class-deleted.tmpl
+++ b/templates/class-deleted.tmpl
@@ -1 +1,5 @@
+<DIV CLASS="indent">
+
 <P>Class {printer_name} has been deleted successfully.
+
+</DIV>
\ No newline at end of file
diff --git a/templates/class-modified.tmpl b/templates/class-modified.tmpl
index 861790732..ddbbbc019 100644
--- a/templates/class-modified.tmpl
+++ b/templates/class-modified.tmpl
@@ -1,2 +1,6 @@
+<DIV CLASS="indent">
+
 <P>Class <A HREF="/classes/{printer_name}">{printer_name}</A> has been
 modified successfully.
+
+</DIV>
\ No newline at end of file
diff --git a/templates/error-op.tmpl b/templates/error-op.tmpl
index 6950831a0..5cba90123 100644
--- a/templates/error-op.tmpl
+++ b/templates/error-op.tmpl
@@ -1,3 +1,7 @@
+<DIV CLASS="indent">
+
 <P>Error:</P>
 
 <BLOCKQUOTE>Unknown operation "{op}"!</BLOCKQUOTE>
+
+</DIV>
diff --git a/templates/error.tmpl b/templates/error.tmpl
index bf0530cbd..0d29665b9 100644
--- a/templates/error.tmpl
+++ b/templates/error.tmpl
@@ -1,3 +1,7 @@
+<DIV CLASS="indent">
+
 <P>{?message?{message}:Error:}</P>
 
 <BLOCKQUOTE>{error}</BLOCKQUOTE>
+
+</DIV>
diff --git a/templates/list-available-printers.tmpl b/templates/list-available-printers.tmpl
index 4ff6d0e3d..8b325fdac 100644
--- a/templates/list-available-printers.tmpl
+++ b/templates/list-available-printers.tmpl
@@ -1,3 +1,5 @@
+<DIV CLASS="indent">
+
 <H2 CLASS="title">Available Printers</H2>
 
 {#device_uri=0?<P>No printers found.</P>
@@ -5,3 +7,5 @@
 <LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Local Printer"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Add This Printer"></FORM>
 {device_make_and_model} ({device_info})</LI>
 }</UL>}
+
+</DIV>
diff --git a/templates/maintenance.tmpl b/templates/maintenance.tmpl
index ab57fb108..379c001cb 100644
--- a/templates/maintenance.tmpl
+++ b/templates/maintenance.tmpl
@@ -1,2 +1,6 @@
+<DIV CLASS="indent">
+
 <P>Maintenance commands sent; job ID is <A HREF="/printers/{printer_name}">
 {printer_name}-{job_id}</A>.</P>
+
+</DIV>
diff --git a/templates/modify-class.tmpl b/templates/modify-class.tmpl
index 2255b2bb4..e36bb6b49 100644
--- a/templates/modify-class.tmpl
+++ b/templates/modify-class.tmpl
@@ -1,21 +1,20 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Modify Class {printer_name}</H2>
+
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
 
 <TABLE>
 <TR>
-<TH CLASS="label">Name:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
-{printer_name}</TD>
+<TH CLASS="label">Description:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
 </TR>
 <TR>
 <TH CLASS="label">Location:</TH>
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD>
 </TR>
 <TR>
-<TH CLASS="label">Description:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
-</TR>
-<TR>
 <TH CLASS="label">Members:</TH>
 <TD>
 <SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
@@ -30,3 +29,4 @@
 </TABLE>
 
 </FORM>
+</DIV>
\ No newline at end of file
diff --git a/templates/modify-printer.tmpl b/templates/modify-printer.tmpl
index c670ca7a0..924d0ee57 100644
--- a/templates/modify-printer.tmpl
+++ b/templates/modify-printer.tmpl
@@ -1,16 +1,13 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Modify {printer_name}</H2>
+
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{?printer_make_and_model=?{?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}:<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{printer_make_and_model}">}
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
 <TR>
-<TH CLASS="label">Connection:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Name:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
-</TR>
 <TH CLASS="label">Description:</TH>
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
 <SMALL>(Human-readable description such as "HP LaserJet with Duplexer")</SMALL></TD>
@@ -21,6 +18,10 @@
 <SMALL>(Human-readable location such as "Lab 1")</SMALL></TD>
 </TR>
 <TR>
+<TH CLASS="label">Connection:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
 <TH CLASS="label">Sharing:</TH>
 <TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
 Share This Printer</TD>
@@ -33,3 +34,4 @@ Share This Printer</TD>
 </TABLE>
 
 </FORM>
+</DIV>
diff --git a/templates/printer-accept.tmpl b/templates/printer-accept.tmpl
index 15e8b15ff..7aa91f3dd 100644
--- a/templates/printer-accept.tmpl
+++ b/templates/printer-accept.tmpl
@@ -1,3 +1,7 @@
+<DIV CLASS="indent">
+
 <P>{is_class?Class:Printer} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
 is now accepting jobs.</P>
+
+</DIV>
diff --git a/templates/printer-added.tmpl b/templates/printer-added.tmpl
index ba5f550c2..2b819954f 100644
--- a/templates/printer-added.tmpl
+++ b/templates/printer-added.tmpl
@@ -1,2 +1,6 @@
+<DIV CLASS="indent">
+
 <P>Printer <A HREF="/printers/{printer_name}">{printer_name}</A> has been added
 successfully.
+
+</DIV>
diff --git a/templates/printer-configured.tmpl b/templates/printer-configured.tmpl
index 3f6b08b70..b80db4569 100644
--- a/templates/printer-configured.tmpl
+++ b/templates/printer-configured.tmpl
@@ -1,2 +1,6 @@
+<DIV CLASS="indent">
+
 <P>{OP=set-class-options?Class <A HREF="/classes/{printer_name}">:Printer <A HREF="/printers/{printer_name}">}{printer_name}</A> has
 been configured successfully.
+
+</DIV>
diff --git a/templates/printer-confirm.tmpl b/templates/printer-confirm.tmpl
index 516aeea38..4cac6c366 100644
--- a/templates/printer-confirm.tmpl
+++ b/templates/printer-confirm.tmpl
@@ -1,4 +1,8 @@
+<DIV CLASS="indent">
+
 <P><B>Warning:</B> Are you sure you want to delete printer
 {printer_name}?</P>
 
 <P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Delete Printer"></FORM></P>
+
+</DIV>
diff --git a/templates/printer-default.tmpl b/templates/printer-default.tmpl
index 7bb6bc41d..b18e45047 100644
--- a/templates/printer-default.tmpl
+++ b/templates/printer-default.tmpl
@@ -1,3 +1,5 @@
+<DIV CLASS="indent">
+
 <P>{is_class?Class:Printer} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
 has been made the default printer on the server.</P>
@@ -5,3 +7,5 @@ has been made the default printer on the server.</P>
 <BLOCKQUOTE><B>Note:</B> Any user default that has been set via
 the <TT>lpoptions</TT> command will override this default
 setting.</BLOCKQUOTE>
+
+</DIV>
diff --git a/templates/printer-deleted.tmpl b/templates/printer-deleted.tmpl
index f1336b037..0928955e2 100644
--- a/templates/printer-deleted.tmpl
+++ b/templates/printer-deleted.tmpl
@@ -1 +1,5 @@
+<DIV CLASS="indent">
+
 <P>Printer {printer_name} has been deleted successfully.
+
+</DIV>
diff --git a/templates/printer-modified.tmpl b/templates/printer-modified.tmpl
index a16abd169..f6fb6e2a1 100644
--- a/templates/printer-modified.tmpl
+++ b/templates/printer-modified.tmpl
@@ -1,2 +1,6 @@
+<DIV CLASS="indent">
+
 <P>Printer <A HREF="/printers/{printer_name}">{printer_name}</A> has been
 modified successfully.
+
+</DIV>
\ No newline at end of file
diff --git a/templates/printer-purge.tmpl b/templates/printer-purge.tmpl
index 8226d6040..4cba910e2 100644
--- a/templates/printer-purge.tmpl
+++ b/templates/printer-purge.tmpl
@@ -1,3 +1,7 @@
+<DIV CLASS="indent">
+
 <P>{is_class?Class:Printer} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
 has been purged of all jobs.</P>
+
+</DIV>
\ No newline at end of file
diff --git a/templates/printer-reject.tmpl b/templates/printer-reject.tmpl
index aca24a576..4a52c24c6 100644
--- a/templates/printer-reject.tmpl
+++ b/templates/printer-reject.tmpl
@@ -1,3 +1,7 @@
+<DIV CLASS="indent">
+
 <P>{is_class?Class:Printer} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
 is no longer accepting jobs.</P>
+
+</DIV>
diff --git a/templates/printer-start.tmpl b/templates/printer-start.tmpl
index d3b95d3df..d89d89c05 100644
--- a/templates/printer-start.tmpl
+++ b/templates/printer-start.tmpl
@@ -1,3 +1,7 @@
+<DIV CLASS="indent">
+
 <P>{is_class?Class:Printer} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
 has been started.</P>
+
+</DIV>
\ No newline at end of file
diff --git a/templates/printer-stop.tmpl b/templates/printer-stop.tmpl
index bdccd88f8..75ad8ac16 100644
--- a/templates/printer-stop.tmpl
+++ b/templates/printer-stop.tmpl
@@ -1,3 +1,7 @@
+<DIV CLASS="indent">
+
 <P>{is_class?Class:Printer} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
 has been stopped.</P>
+
+</DIV>
\ No newline at end of file
diff --git a/templates/printer.tmpl b/templates/printer.tmpl
index 14f107d13..f069b8513 100644
--- a/templates/printer.tmpl
+++ b/templates/printer.tmpl
@@ -35,7 +35,7 @@
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Description:</TH><TD>{printer_info}</TD></TR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Location:</TH><TD>{printer_location}</TD></TR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Driver:</TH><TD>{printer_make_and_model} ({color_supported=1?color:grayscale}{sides_supported?, 2-sided printing:})<BR>
-<TR><TH ALIGN="RIGHT" VALIGN="TOP">URI:</TH><TD>{device_uri}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Connection:</TH><TD>{device_uri}</TD></TR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Defaults:</TH><TD>job-sheets={job_sheets_default}
 media={media_default?{media_default}:unknown}
 {sides_default?sides={sides_default}:}</TD></TR>
diff --git a/templates/set-printer-options-header.tmpl b/templates/set-printer-options-header.tmpl
index 56d2bb766..fb59e65d4 100644
--- a/templates/set-printer-options-header.tmpl
+++ b/templates/set-printer-options-header.tmpl
@@ -1,3 +1,5 @@
+<DIV CLASS="indent">
+
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
diff --git a/templates/set-printer-options-trailer.tmpl b/templates/set-printer-options-trailer.tmpl
index ac07cc9e1..f52d8947f 100644
--- a/templates/set-printer-options-trailer.tmpl
+++ b/templates/set-printer-options-trailer.tmpl
@@ -10,3 +10,5 @@ for (var i = 0; i < paramtables.length; i++)
 }
 --></SCRIPT>
 </FORM>
+
+</DIV>
diff --git a/templates/subscription-added.tmpl b/templates/subscription-added.tmpl
index 6153d7950..c288b3649 100644
--- a/templates/subscription-added.tmpl
+++ b/templates/subscription-added.tmpl
@@ -1 +1,5 @@
+<DIV CLASS="indent">
+
 <P>Subscription {subscription_name} has been added successfully.</P>
+
+</DIV>
diff --git a/templates/subscription-canceled.tmpl b/templates/subscription-canceled.tmpl
index 46662ccdb..86f2c1069 100644
--- a/templates/subscription-canceled.tmpl
+++ b/templates/subscription-canceled.tmpl
@@ -1 +1,5 @@
+<DIV CLASS="indent">
+
 <P>Subscription #{notify_subscription_id} has been canceled.</P>
+
+</DIV>
diff --git a/templates/users.tmpl b/templates/users.tmpl
index 369e30b11..5f9f71f8d 100644
--- a/templates/users.tmpl
+++ b/templates/users.tmpl
@@ -1,3 +1,5 @@
+<DIV CLASS="indent">
+
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
@@ -24,3 +26,4 @@
 </TABLE>
 
 </FORM>
+</DIV>