diff options
| author | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-01-26 21:39:43 +0000 |
|---|---|---|
| committer | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-01-26 21:39:43 +0000 |
| commit | fa73b22906f71080fa5056485d8204612717adac (patch) | |
| tree | f2f23b68c20d1fc9a85301527690aca5efa382df /templates | |
| parent | 4a09f02d10d679af0b04d36c25f0dcb518e432a4 (diff) | |
Load cups into easysw/current.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@13 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'templates')
28 files changed, 129 insertions, 90 deletions
diff --git a/templates/Makefile b/templates/Makefile index 4225d336c..31f7d7dce 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 4881 2005-12-15 22:03:40Z mike $" +# "$Id: Makefile 4950 2006-01-19 16:07:57Z mike $" # # Template makefile for the Common UNIX Printing System (CUPS). # @@ -28,9 +28,9 @@ include ../Makedefs # Template files... # -FILES = add-class.tmpl \ +FILES = \ + add-class.tmpl \ add-printer.tmpl \ - admin-op.tmpl \ admin.tmpl \ choose-device.tmpl \ choose-make.tmpl \ @@ -40,18 +40,23 @@ FILES = add-class.tmpl \ class-added.tmpl \ class-confirm.tmpl \ class-deleted.tmpl \ - classes.tmpl \ + class-jobs-header.tmpl \ class-modified.tmpl \ + classes.tmpl \ + classes-header.tmpl \ edit-config.tmpl \ error.tmpl \ + error-op.tmpl \ header.tmpl \ help-header.tmpl \ job-cancel.tmpl \ job-hold.tmpl \ - job-op.tmpl \ + job-move.tmpl \ + job-moved.tmpl \ job-release.tmpl \ job-restart.tmpl \ jobs.tmpl \ + jobs-header.tmpl \ modify-class.tmpl \ modify-printer.tmpl \ option-boolean.tmpl \ @@ -60,19 +65,23 @@ FILES = add-class.tmpl \ option-pickmany.tmpl \ option-pickone.tmpl \ option-trailer.tmpl \ + pager.tmpl \ printer-accept.tmpl \ printer-added.tmpl \ printer-configured.tmpl \ printer-confirm.tmpl \ printer-default.tmpl \ printer-deleted.tmpl \ + printer-jobs-header.tmpl \ printer-modified.tmpl \ printer-purge.tmpl \ printer-reject.tmpl \ printer-start.tmpl \ - printers.tmpl \ printer-stop.tmpl \ + printers.tmpl \ + printers-header.tmpl \ restart.tmpl \ + search.tmpl \ set-printer-options-header.tmpl \ set-printer-options-trailer.tmpl \ test-page.tmpl \ @@ -98,7 +107,7 @@ clean: # Install files... # -install: +install: all $(INSTALL_DIR) $(DATADIR)/templates for file in $(FILES); do \ $(INSTALL_DATA) $$file $(DATADIR)/templates; \ @@ -106,5 +115,5 @@ install: # -# End of "$Id: Makefile 4881 2005-12-15 22:03:40Z mike $". +# End of "$Id: Makefile 4950 2006-01-19 16:07:57Z mike $". # diff --git a/templates/add-class.tmpl b/templates/add-class.tmpl index ec13434e9..a1b1689ee 100644 --- a/templates/add-class.tmpl +++ b/templates/add-class.tmpl @@ -26,7 +26,7 @@ </TR> <TR> <TD></TD> -<TD><INPUT TYPE="IMAGE" SRC="/images/continue.gif" ALT="Continue"></TD> +<TD><INPUT TYPE="IMAGE" SRC="/images/add-class.gif" ALT="Add Class"></TD> </TR> </TABLE> diff --git a/templates/admin-op.tmpl b/templates/admin-op.tmpl deleted file mode 100644 index 16699f815..000000000 --- a/templates/admin-op.tmpl +++ /dev/null @@ -1 +0,0 @@ -<P>Unsupported administration operation "{op}". diff --git a/templates/admin.tmpl b/templates/admin.tmpl index af88e33b3..989c46be2 100644 --- a/templates/admin.tmpl +++ b/templates/admin.tmpl @@ -1,22 +1,6 @@ <TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%"> <TR><TD VALIGN="TOP" NOWRAP> -<H2 CLASS="title">Classes</H2> - -<P> -<A HREF="/admin?op=add-class"><IMG SRC="/images/add-class.gif" -ALT="Add Class" CLASS="button"></A> -<A HREF="/classes/"><IMG SRC="/images/manage-classes.gif" -ALT="Manage Classes" CLASS="button"></A> -</P> - -<H2 CLASS="title">Jobs</H2> - -<P> -<A HREF="/jobs/"><IMG SRC="/images/manage-jobs.gif" ALT="Manage -Jobs" CLASS="button"></A> -</P> - <H2 CLASS="title">Printers</H2> <P> @@ -24,6 +8,9 @@ Jobs" CLASS="button"></A> SRC="/images/add-printer.gif" ALT="Add Printer" CLASS="button"></A> <A HREF="/printers/"><IMG SRC="/images/manage-printers.gif" ALT="Manage Printers" CLASS="button"></A> +{have_samba?<A HREF="/admin/?op=export-samba"><IMG +SRC="/images/export-samba.gif" ALT="Export Printers to Samba" +CLASS="button"></A>:} </P> {#device_uri=0?:<P><B>New Printers Found:</B></P><UL>{[device_uri] @@ -33,6 +20,22 @@ SRC="/images/add-this-printer.gif" ALT="Add This Printer" CLASS="button" ALIGN="MIDDLE"></A></LI> }</UL>} +<H2 CLASS="title">Classes</H2> + +<P> +<A HREF="/admin?op=add-class"><IMG SRC="/images/add-class.gif" +ALT="Add Class" CLASS="button"></A> +<A HREF="/classes/"><IMG SRC="/images/manage-classes.gif" +ALT="Manage Classes" CLASS="button"></A> +</P> + +<H2 CLASS="title">Jobs</H2> + +<P> +<A HREF="/jobs/"><IMG SRC="/images/manage-jobs.gif" ALT="Manage +Jobs" CLASS="button"></A> +</P> + </TD><TD> </TD><TD VALIGN="TOP"> <H2 CLASS="title">Server</H2> diff --git a/templates/class-jobs-header.tmpl b/templates/class-jobs-header.tmpl new file mode 100644 index 000000000..61e5151d2 --- /dev/null +++ b/templates/class-jobs-header.tmpl @@ -0,0 +1 @@ +<H3 CLASS="title">Jobs</H3> diff --git a/templates/classes-header.tmpl b/templates/classes-header.tmpl new file mode 100644 index 000000000..7ac98fbdd --- /dev/null +++ b/templates/classes-header.tmpl @@ -0,0 +1 @@ +<P ALIGN="CENTER">{total=0?No classes:Showing {#printer_name} of {total} class{total=1?:es}}.</P> diff --git a/templates/classes.tmpl b/templates/classes.tmpl index 2f582ea23..4a5a92f04 100644 --- a/templates/classes.tmpl +++ b/templates/classes.tmpl @@ -1,9 +1,4 @@ -<P><A HREF="/admin?op=add-class"><IMG -SRC="/images/add-class.gif" ALT="Add Class" -CLASS="button"></A></P> - -{#printer_name=0?No classes: -<P><B>Server Default Destination:</B> {default_name?<A HREF="{default_uri}">{default_name}</A>:none}</P> +{#printer_name=0?: {[printer_name] <H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Default Printer):}</H2> @@ -11,9 +6,9 @@ CLASS="button"></A></P> <TR> <TD VALIGN=TOP><A HREF="{printer_uri_supported}"> <IMG SRC="/images/classes.gif" CLASS="button" ALT=""></A></TD> -<TD VALIGN=TOP>Description: {printer_info}<BR> -Location: {printer_location}<BR> -Class State: {printer_state=3?idle:{printer_state=4?processing:stopped}}, +<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:stopped}}, {printer_is_accepting_jobs=0?rejecting jobs:accepting jobs}, {printer_is_shared=0?not:} published. {?printer_state_message=?:<BR><I>"{printer_state_message}"</I>} {?member_uris=?:<BR>Members: {member_uris}} @@ -22,39 +17,38 @@ Class State: {printer_state=3?idle:{printer_state=4?processing:stopped}}, <A HREF="{printer_uri_supported}?op=print-test-page"> <IMG SRC="/images/print-test-page.gif" ALT="Print Test Page" CLASS="button"></A> {printer_state=5? -<A HREF="{admin_uri}?op=start-class&printer_name={printer_name}"> +<A HREF="{admin_uri}?op=start-class&printer_name={printer_name}&is_class=Y"> <IMG SRC="/images/start-class.gif" ALT="Start Class" CLASS="button"></A> : -<A HREF="{admin_uri}?op=stop-class&printer_name={printer_name}"> +<A HREF="{admin_uri}?op=stop-class&printer_name={printer_name}&is_class=Y"> <IMG SRC="/images/stop-class.gif" ALT="Stop Class" CLASS="button"></A> } {printer_is_accepting_jobs=0? -<A HREF="{admin_uri}?op=accept-jobs&printer_name={printer_name}"> +<A HREF="{admin_uri}?op=accept-jobs&printer_name={printer_name}&is_class=Y"> <IMG SRC="/images/accept-jobs.gif" ALT="Accept Jobs" CLASS="button"></A> : -<A HREF="{admin_uri}?op=reject-jobs&printer_name={printer_name}"> +<A HREF="{admin_uri}?op=reject-jobs&printer_name={printer_name}&is_class=Y"> <IMG SRC="/images/reject-jobs.gif" ALT="Reject Jobs" CLASS="button"></A> } -<A HREF="{admin_uri}?op=purge-jobs&printer_name={printer_name}"> +<A HREF="{admin_uri}?op=purge-jobs&printer_name={printer_name}&is_class=Y"> <IMG SRC="/images/cancel-all-jobs.gif" ALT="Cancel All Jobs" CLASS="button"></A> {printer_is_shared=0? -<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=1"> +<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=1&is_class=Y"> <IMG SRC="/images/publish-printer.gif" ALT="Publish Printer" CLASS="button"></A> : -<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=0"> +<A HREF="{admin_uri}?op=set-sharing&printer_name={printer_name}&shared=0&is_class=Y"> <IMG SRC="/images/unpublish-printer.gif" ALT="Unpublish Printer" CLASS="button"></A> } <A HREF="{admin_uri}?op=modify-class&printer_name={printer_name}"> <IMG SRC="/images/modify-class.gif" ALT="Modify Class" CLASS="button"></A> <A HREF="{admin_uri}?op=delete-class&printer_name={printer_name}"> <IMG SRC="/images/delete-class.gif" ALT="Delete Class" CLASS="button"></A> -<A HREF="{admin_uri}?op=set-as-default&printer_name={printer_name}"> +<A HREF="{admin_uri}?op=set-as-default&printer_name={printer_name}&is_class=Y"> <IMG SRC="/images/set-as-default.gif" ALT="Set As Default" CLASS="button"></A> -<A HREF="{admin_uri}?op=set-allowed-users&printer_name={printer_name}"> +<A HREF="{admin_uri}?op=set-allowed-users&printer_name={printer_name}&is_class=Y"> <IMG SRC="/images/set-allowed-users.gif" ALT="Set Allowed Users" CLASS="button"></A> </P> </TD> </TR> </TABLE> - }} diff --git a/templates/error-op.tmpl b/templates/error-op.tmpl new file mode 100644 index 000000000..6950831a0 --- /dev/null +++ b/templates/error-op.tmpl @@ -0,0 +1,3 @@ +<P>Error:</P> + +<BLOCKQUOTE>Unknown operation "{op}"!</BLOCKQUOTE> diff --git a/templates/error.tmpl b/templates/error.tmpl index eb15a06ff..bf0530cbd 100644 --- a/templates/error.tmpl +++ b/templates/error.tmpl @@ -1,3 +1,3 @@ -<P>Error: +<P>{?message?{message}:Error:}</P> <BLOCKQUOTE>{error}</BLOCKQUOTE> diff --git a/templates/job-move.tmpl b/templates/job-move.tmpl new file mode 100644 index 000000000..65d8e9821 --- /dev/null +++ b/templates/job-move.tmpl @@ -0,0 +1,22 @@ +<FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}"> +<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> +{job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:} + +<H2 CLASS="title">{job_id?Move Job {job_id}:Move All Jobs}</H2> + +<TABLE> +<TR> +<TH CLASS="label">New Destination:</TH> +<TD> +<SELECT NAME="JOB_PRINTER_URI" SIZE="10"> +{[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}} +</SELECT> +</TD> +</TR> +<TR> +<TD></TD> +<TD><INPUT TYPE="IMAGE" SRC="/images/move-job{job_id?:s}.gif" ALT="Move Job{job_id?:s}"></TD> +</TR> +</TABLE> + +</FORM> diff --git a/templates/job-moved.tmpl b/templates/job-moved.tmpl new file mode 100644 index 000000000..df7ea1d34 --- /dev/null +++ b/templates/job-moved.tmpl @@ -0,0 +1,2 @@ +<P>{job_id?<A HREF="/jobs/{job_id}">Job {job_id}</A>:All jobs} moved to +<A HREF="{job_printer_uri}">{job_printer_name}</A>.</P> diff --git a/templates/job-op.tmpl b/templates/job-op.tmpl deleted file mode 100644 index 19520367f..000000000 --- a/templates/job-op.tmpl +++ /dev/null @@ -1 +0,0 @@ -<P>Unsupported job operation "{op}". diff --git a/templates/jobs-header.tmpl b/templates/jobs-header.tmpl index fef904715..45743a18a 100644 --- a/templates/jobs-header.tmpl +++ b/templates/jobs-header.tmpl @@ -1,5 +1,3 @@ -{?printer_name=?:<H3 CLASS="title">Jobs</H3>} - <P>{?which_jobs=?<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG SRC="/images/show-completed.gif" CLASS="button" ALT="Show Completed Jobs"></A> @@ -14,4 +12,4 @@ SRC="/images/show-active.gif" CLASS="button" ALT="Show Active Jobs"></A> <A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG SRC="/images/show-all.gif" CLASS="button" ALT="Show All Jobs">}}</A></P> -<P>Showing {#job_id} of {total} {?which_jobs=?active:{which_jobs=all?:completed}} job{total=1?:s}.</P> +<P ALIGN="CENTER">{total=0?No jobs:Showing {#job_id} of {total} {?which_jobs=?active:{which_jobs=all?:completed}} job{total=1?:s}}.</P> diff --git a/templates/jobs.tmpl b/templates/jobs.tmpl index aeac2002c..76d8ac877 100644 --- a/templates/jobs.tmpl +++ b/templates/jobs.tmpl @@ -21,22 +21,20 @@ {job_state=5?processing since<BR>{time_at_processing}:{job_state=6?stopped at<BR>{time_at_completed}: {job_state=7?cancelled at<BR>{time_at_completed}:{job_state=8?aborted:completed at<BR>{time_at_completed}}}}}}} </TD> <TD> -{job_state>5? -{job_k_octets>0? +{job_preserved>0? <A HREF="/jobs/?op=restart-job&job_id={job_id}&job_printer_uri={job_printer_uri}"> -<IMG SRC="/images/restart-job.gif" ALT="Reprint Job" CLASS="button"></A> -:}:} -{job_state>6?: +<IMG SRC="/images/restart-job.gif" ALT="Reprint Job" CLASS="button"></A>:} {job_state=4? <A HREF="/jobs/?op=release-job&job_id={job_id}&job_printer_uri={job_printer_uri}"> -<IMG SRC="/images/release-job.gif" ALT="Release Job" CLASS="button"></A> -: +<IMG SRC="/images/release-job.gif" ALT="Release Job" CLASS="button"></A>:} +{job_state=3? <A HREF="/jobs/?op=hold-job&job_id={job_id}&job_printer_uri={job_printer_uri}"> -<IMG SRC="/images/hold-job.gif" ALT="Hold Job" CLASS="button"></A> -} +<IMG SRC="/images/hold-job.gif" ALT="Hold Job" CLASS="button"></A>:} +{job_state<7? <A HREF="/jobs/?op=cancel-job&job_id={job_id}&job_printer_uri={job_printer_uri}"> <IMG SRC="/images/cancel-job.gif" ALT="Cancel Job" CLASS="button"></A> -} +<A HREF="/jobs/?op=move-job&job_id={job_id}"><IMG +SRC="/images/move-job.gif" ALT="Move Job" CLASS="button"></A>:} </TD> </TR> } diff --git a/templates/modify-class.tmpl b/templates/modify-class.tmpl index 6a35cce94..4cacc2654 100644 --- a/templates/modify-class.tmpl +++ b/templates/modify-class.tmpl @@ -27,7 +27,7 @@ </TR> <TR> <TD></TD> -<TD><INPUT TYPE="IMAGE" SRC="/images/continue.gif" ALT="Continue"></TD> +<TD><INPUT TYPE="IMAGE" SRC="/images/modify-class.gif" ALT="Modify Class"></TD> </TR> </TABLE> diff --git a/templates/page.tmpl b/templates/pager.tmpl index a949fe8c5..c95f0c559 100644 --- a/templates/page.tmpl +++ b/templates/pager.tmpl @@ -1,7 +1,7 @@ -<TABLE WIDTH="100%"> +<TABLE WIDTH="100%" CLASS="pager"> <TR> <TD WIDTH="33%">{PREVURL?<A HREF="{PREVURL}"><IMG SRC="/images/show-previous.gif" ALT="Show Previous" CLASS="button"></A>: }</TD> - <TD WIDTH="34%" ALIGN="CENTER">{ORDER=dec?<A HREF="{THISURL}&ORDER=asc"><IMG SRC="/images/show-ascending.gif" ALT="Show Ascending" CLASS="button"></A>:<A HREF="{THISURL}&ORDER=dec"><IMG SRC="/images/show-descending.gif" ALT="Show Descending" CLASS="button"></A>}</TD> + <TD WIDTH="34%" ALIGN="CENTER">{ORDER=dec?<A HREF="{THISURL}&ORDER=asc"><IMG SRC="/images/sort-ascending.gif" ALT="Sort Ascending" CLASS="button"></A>:<A HREF="{THISURL}&ORDER=dec"><IMG SRC="/images/sort-descending.gif" ALT="Sort Descending" CLASS="button"></A>}</TD> <TD WIDTH="33%" ALIGN="RIGHT">{NEXTURL?<A HREF="{NEXTURL}"><IMG SRC="/images/show-next.gif" ALT="Show Next" CLASS="button"></A>: }</TD> </TR> </TABLE> diff --git a/templates/printer-accept.tmpl b/templates/printer-accept.tmpl index 3a269eb0d..15e8b15ff 100644 --- a/templates/printer-accept.tmpl +++ b/templates/printer-accept.tmpl @@ -1 +1,3 @@ -<P>Printer <A HREF="/printers/{printer_name}">{printer_name}</A> is now accepting jobs. +<P>{is_class?Class:Printer} <A +HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A> +is now accepting jobs.</P> diff --git a/templates/printer-default.tmpl b/templates/printer-default.tmpl index e5dd0b08c..7bb6bc41d 100644 --- a/templates/printer-default.tmpl +++ b/templates/printer-default.tmpl @@ -1,4 +1,7 @@ -<P>Printer <A HREF="/printers/{printer_name}">{printer_name}</A> has been -made the default printer on the server. Please note that any user default -that has been set via the <TT>lpoptions</TT> command will override this -default setting. +<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> + +<BLOCKQUOTE><B>Note:</B> Any user default that has been set via +the <TT>lpoptions</TT> command will override this default +setting.</BLOCKQUOTE> diff --git a/templates/printer-jobs-header.tmpl b/templates/printer-jobs-header.tmpl new file mode 100644 index 000000000..61e5151d2 --- /dev/null +++ b/templates/printer-jobs-header.tmpl @@ -0,0 +1 @@ +<H3 CLASS="title">Jobs</H3> diff --git a/templates/printer-purge.tmpl b/templates/printer-purge.tmpl index 863d33916..8226d6040 100644 --- a/templates/printer-purge.tmpl +++ b/templates/printer-purge.tmpl @@ -1 +1,3 @@ -<P>Printer <A HREF="/printers/{printer_name}">{printer_name}</A> has been purged of all jobs. +<P>{is_class?Class:Printer} <A +HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A> +has been purged of all jobs.</P> diff --git a/templates/printer-reject.tmpl b/templates/printer-reject.tmpl index e73d87380..aca24a576 100644 --- a/templates/printer-reject.tmpl +++ b/templates/printer-reject.tmpl @@ -1 +1,3 @@ -<P>Printer <A HREF="/printers/{printer_name}">{printer_name}</A> is no longer accepting jobs. +<P>{is_class?Class:Printer} <A +HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A> +is no longer accepting jobs.</P> diff --git a/templates/printer-start.tmpl b/templates/printer-start.tmpl index e8d9f497f..d3b95d3df 100644 --- a/templates/printer-start.tmpl +++ b/templates/printer-start.tmpl @@ -1,2 +1,3 @@ -<P>Printer <A HREF="/printers/{printer_name}">{printer_name}</A> has been -started. +<P>{is_class?Class:Printer} <A +HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A> +has been started.</P> diff --git a/templates/printer-stop.tmpl b/templates/printer-stop.tmpl index e01b82677..bdccd88f8 100644 --- a/templates/printer-stop.tmpl +++ b/templates/printer-stop.tmpl @@ -1,2 +1,3 @@ -<P>Printer <A HREF="/printers/{printer_name}">{printer_name}</A> has been -stopped. +<P>{is_class?Class:Printer} <A +HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A> +has been stopped.</P> diff --git a/templates/printers-header.tmpl b/templates/printers-header.tmpl new file mode 100644 index 000000000..5196be1d8 --- /dev/null +++ b/templates/printers-header.tmpl @@ -0,0 +1 @@ +<P ALIGN="CENTER">{total=0?No printers:Showing {#printer_name} of {total} printer{total=1?:s}}.</P> diff --git a/templates/printers.tmpl b/templates/printers.tmpl index 44d28dfb3..d13997f48 100644 --- a/templates/printers.tmpl +++ b/templates/printers.tmpl @@ -1,9 +1,4 @@ -<P><A HREF="/admin?op=add-printer"><IMG -SRC="/images/add-printer.gif" ALT="Add Printer" -CLASS="button"></A></P> - -{#printer_name=0?No printers: -<P><B>Server Default Destination:</B> {default_name?<A HREF="{default_uri}">{default_name}</A>:none}</P> +{#printer_name=0?: {[printer_name] <H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Default Printer):}</H2> @@ -12,17 +7,17 @@ CLASS="button"></A></P> <TD VALIGN="TOP"><A HREF="{printer_uri_supported}"> <IMG SRC="/images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.gif" CLASS="button" ALT=""></A> </TD> -<TD VALIGN="TOP">Description: {printer_info}<BR> -Location: {printer_location}<BR> -Make and Model: {printer_make_and_model}<BR> -Printer State: {printer_state=3?idle:{printer_state=4?processing:stopped}}, +<TD VALIGN="TOP"><B>Description:</B> {printer_info}<BR> +<B>Location:</B> {printer_location}<BR> +<B>Make and Model:</B> {printer_make_and_model}<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. {?printer_state_message=?:<BR><I>"{printer_state_message}"</I>} {?printer_state_history2.printer_state_message=?:<BR><I>"{printer_state_history2.printer_state_message}"</I>} {?printer_state_history3.printer_state_message=?:<BR><I>"{printer_state_history3.printer_state_message}"</I>} {?printer_state_history4.printer_state_message=?:<BR><I>"{printer_state_history4.printer_state_message}"</I>} {?printer_state_history5.printer_state_message=?:<BR><I>"{printer_state_history5.printer_state_message}"</I>} -{?device_uri=?:<BR>Device URI: {device_uri}} +{?device_uri=?:<BR><B>Device URI:</B> {device_uri}} <P> <A HREF="{printer_uri_supported}?op=print-test-page"> @@ -41,6 +36,8 @@ Printer State: {printer_state=3?idle:{printer_state=4?processing:stopped}}, <A HREF="{admin_uri}?op=reject-jobs&printer_name={printer_name}"> <IMG SRC="/images/reject-jobs.gif" ALT="Reject Jobs" CLASS="button"></A> } +<A HREF="{printer_uri_supported}?op=move-jobs&printer_name={printer_name}"> +<IMG SRC="/images/move-jobs.gif" ALT="Move All Jobs" CLASS="button"></A> <A HREF="{admin_uri}?op=purge-jobs&printer_name={printer_name}"> <IMG SRC="/images/cancel-all-jobs.gif" ALT="Cancel All Jobs" CLASS="button"></A> {printer_is_shared=0? @@ -64,5 +61,4 @@ Printer State: {printer_state=3?idle:{printer_state=4?processing:stopped}}, </TD> </TR> </TABLE> - }} diff --git a/templates/search.tmpl b/templates/search.tmpl index ee4e48c00..8fc2ac7c6 100644 --- a/templates/search.tmpl +++ b/templates/search.tmpl @@ -1,9 +1,9 @@ -<FORM ACTION="/{SECTION}/" METHOD="GET"> +<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET"> {WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:} {ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:} <P ALIGN="CENTER"><B>Search in -{SECTION=classes?Classes:{SECTION=jobs?Jobs:Printers}}:</B> +{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?Classes:{SECTION=jobs?Jobs:Printers}}}:</B> <INPUT TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT TYPE="IMAGE" SRC="/images/search.gif" ALT="Search"></P> diff --git a/templates/test-page.tmpl b/templates/test-page.tmpl index 5c5005438..bbca2dcc9 100644 --- a/templates/test-page.tmpl +++ b/templates/test-page.tmpl @@ -1,2 +1,2 @@ -<P>Test page sent; job ID is <A HREF="/printers/{printer_name}"> +<P>Test page sent; job ID is <A HREF="/{SECTION}/{printer_name}"> {printer_name}-{job_id}</A>. diff --git a/templates/users.tmpl b/templates/users.tmpl index a5734416a..61c6e474b 100644 --- a/templates/users.tmpl +++ b/templates/users.tmpl @@ -1,6 +1,7 @@ <FORM METHOD="POST" ACTION="/admin"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> +{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:} <H2 CLASS="title">Allowed Users For {printer_name}</H2> @@ -17,7 +18,7 @@ <TR> <TD></TD> <TD> -<INPUT TYPE="IMAGE" SRC="/images/continue.gif" ALT="Continue"> +<INPUT TYPE="IMAGE" SRC="/images/set-allowed-users.gif" ALT="Set Allowed Users"> </TD> </TR> </TABLE> |