diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-03-30 05:59:14 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-03-30 05:59:14 +0000 |
| commit | 82cc1f9ac32564e92bfbbe7a1de416f4ebcc8584 (patch) | |
| tree | af43377451e06dac91d6639e35b1b5bf41d14d4e /templates | |
| parent | 3e7fe0ca760ad0054cf5c9ec7c90ca415cf6eb06 (diff) | |
| download | cups-82cc1f9ac32564e92bfbbe7a1de416f4ebcc8584.tar.gz | |
Merge changes from CUPS 1.6svn-r10390.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3755 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/admin.tmpl | 9 | ||||
| -rw-r--r-- | templates/help-header.tmpl | 2 | ||||
| -rw-r--r-- | templates/jobs.tmpl | 2 | ||||
| -rw-r--r-- | templates/trailer.tmpl | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/templates/admin.tmpl b/templates/admin.tmpl index c76eb9c5e..ee6b5af9d 100644 --- a/templates/admin.tmpl +++ b/templates/admin.tmpl @@ -53,10 +53,13 @@ <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> - Number of jobs\: +<INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> Preserve job history<BR> + Maximum jobs (0 for no limit)\: <INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR> - <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOB_FILES" {?preserve_job_files}> Preserve job print files<BR> + Retain Metadata\: +<INPUT TYPE="TEXT" NAME="PRESERVE_JOB_HISTORY" VALUE="{?preserve_job_history}" SIZE="6"><BR> + Retain Documents\: +<INPUT TYPE="TEXT" NAME="PRESERVE_JOB_FILES" VALUE="{?preserve_job_files}" SIZE="6"><BR> <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Save debugging information for troubleshooting<BR> Max log file size\: <INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P> diff --git a/templates/help-header.tmpl b/templates/help-header.tmpl index 17afce738..09741b54f 100644 --- a/templates/help-header.tmpl +++ b/templates/help-header.tmpl @@ -43,7 +43,7 @@ online help information.</P> <P>If you are new to CUPS, read the "<a href="/help/overview.html">Overview of CUPS</a>" page. Veteran users should read the "<a href="/help/whatsnew.html">What's New in CUPS -1.4</a>" page.</P> +1.6</a>" page.</P> <P>The <A HREF="http://www.cups.org/">CUPS home page</A> also provides many resources including user discussion forums, answers diff --git a/templates/jobs.tmpl b/templates/jobs.tmpl index 625059f62..142fbb243 100644 --- a/templates/jobs.tmpl +++ b/templates/jobs.tmpl @@ -6,7 +6,7 @@ <TBODY> {[job_id] <TR VALIGN="TOP"> -<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id} </TD> +<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}{?phone? ({phone})} </TD> <TD>{?job_name=?Unknown:{job_name}} </TD> <TD>{?job_originating_user_name=?Withheld:{job_originating_user_name}} </TD> <TD>{job_k_octets}k </TD> diff --git a/templates/trailer.tmpl b/templates/trailer.tmpl index 100d9f7ad..123a19722 100644 --- a/templates/trailer.tmpl +++ b/templates/trailer.tmpl @@ -1,7 +1,7 @@ </TD></TR> <TR><TD> </TD></TR> <TR><TD CLASS="trailer">CUPS and the CUPS logo are trademarks of -<A HREF="http://www.apple.com">Apple Inc.</A> CUPS is copyright 2007-2011 Apple +<A HREF="http://www.apple.com">Apple Inc.</A> CUPS is copyright 2007-2012 Apple Inc. All rights reserved.</TD></TR> </TABLE> </BODY> |