diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile | 7 | ||||
| -rw-r--r-- | templates/admin.tmpl | 19 | ||||
| -rw-r--r-- | templates/class-jobs-header.tmpl | 2 | ||||
| -rw-r--r-- | templates/class.tmpl | 41 | ||||
| -rw-r--r-- | templates/classes.tmpl | 50 | ||||
| -rw-r--r-- | templates/help-header.tmpl | 6 | ||||
| -rw-r--r-- | templates/help-trailer.tmpl | 1 | ||||
| -rw-r--r-- | templates/jobs-header.tmpl | 4 | ||||
| -rw-r--r-- | templates/jobs.tmpl | 20 | ||||
| -rw-r--r-- | templates/pager.tmpl | 7 | ||||
| -rw-r--r-- | templates/printer-jobs-header.tmpl | 2 | ||||
| -rw-r--r-- | templates/printer.tmpl | 44 | ||||
| -rw-r--r-- | templates/printers.tmpl | 59 | ||||
| -rw-r--r-- | templates/search.tmpl | 2 |
14 files changed, 142 insertions, 122 deletions
diff --git a/templates/Makefile b/templates/Makefile index 34712e5b4..4250ccc92 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $" +# "$Id: Makefile 7940 2008-09-16 00:45:16Z mike $" # # Template makefile for the Common UNIX Printing System (CUPS). # @@ -29,6 +29,7 @@ FILES = \ choose-model.tmpl \ choose-serial.tmpl \ choose-uri.tmpl \ + class.tmpl \ class-added.tmpl \ class-confirm.tmpl \ class-deleted.tmpl \ @@ -41,6 +42,7 @@ FILES = \ error-op.tmpl \ header.tmpl \ help-header.tmpl \ + help-trailer.tmpl \ help-printable.tmpl \ job-cancel.tmpl \ job-hold.tmpl \ @@ -62,6 +64,7 @@ FILES = \ option-pickone.tmpl \ option-trailer.tmpl \ pager.tmpl \ + printer.tmpl \ printer-accept.tmpl \ printer-added.tmpl \ printer-configured.tmpl \ @@ -194,5 +197,5 @@ uninstall-languages: # -# End of "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $". +# End of "$Id: Makefile 7940 2008-09-16 00:45:16Z mike $". # diff --git a/templates/admin.tmpl b/templates/admin.tmpl index 03b9b11fc..2e27facd7 100644 --- a/templates/admin.tmpl +++ b/templates/admin.tmpl @@ -1,4 +1,4 @@ -<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="Administration Tasks"> +<TABLE CLASS="indent" SUMMARY="Administration Tasks"> <TR><TD VALIGN="TOP"> <H2 CLASS="title">Printers</H2> @@ -6,7 +6,7 @@ <P> <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Add Printer"></FORM> <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Find New Printers"></FORM> -<FORM ACTION="/printers/" METHOD="POST"><INPUT TYPE="SUBMIT" VALUE="Manage Printers"></FORM> +<FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Manage Printers"></FORM> {have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Export Printers to Samba"></FORM>:} </P> @@ -14,7 +14,7 @@ <P> <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Add Class"></FORM> -<FORM ACTION="/classes/" METHOD="POST"><INPUT TYPE="SUBMIT" VALUE="Manage Classes"></FORM> +<FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Manage Classes"></FORM> </P> <H2 CLASS="title">Jobs</H2> @@ -57,15 +57,20 @@ </TD></TR> </TABLE> -<H2 CLASS="title">Subscriptions</H2> +<DIV CLASS="indent"> + +<H2 CLASS="title">RSS Subscriptions</H2> <P> <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Add RSS Subscription"></FORM> </P> -{notify_subscription_id?<TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0" SUMMARY="RSS Subscriptions"> -<THEAD><TR CLASS="data"><TH>ID</TH><TH>Name</TH><TH>Events</TH><TH>Queue</TH></TR></THEAD> +</DIV> + +{notify_subscription_id?<TABLE CLASS="list" SUMMARY="RSS Subscriptions"> +<THEAD><TR><TH>Name</TH><TH>Events</TH><TH>Queue Name</TH></TR></THEAD> <TBODY>{[notify_subscription_id] -<TR><TD><A HREF="{notify_recipient_uri}">{notify_subscription_id}</A></TD><TD NOWRAP><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A> <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Cancel RSS Subscription"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:All Queues}</TD></TR>} +<TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Cancel RSS Subscription"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:All Queues}</TD></TR>} </TBODY> </TABLE>:} diff --git a/templates/class-jobs-header.tmpl b/templates/class-jobs-header.tmpl index 61e5151d2..ba46f1026 100644 --- a/templates/class-jobs-header.tmpl +++ b/templates/class-jobs-header.tmpl @@ -1 +1,3 @@ +<DIV CLASS="indent"> <H3 CLASS="title">Jobs</H3> +</DIV> diff --git a/templates/class.tmpl b/templates/class.tmpl new file mode 100644 index 000000000..a344d4b66 --- /dev/null +++ b/templates/class.tmpl @@ -0,0 +1,41 @@ +<DIV CLASS="indent"> +<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A> +({printer_state=3?Idle:{printer_state=4?Processing:Paused}}, +{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:})</H2> + +<FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> +<SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> +<OPTION VALUE="">Maintenance</OPTION> +<OPTION VALUE="print-test-page">Print Test Page</OPTION> +{printer_state=5?<OPTION VALUE="start-printer">Resume Class</OPTION>:<OPTION VALUE="stop-printer">Pause Class</OPTION>} +{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Accept Jobs</OPTION>:<OPTION VALUE="reject-jobs">Reject Jobs</OPTION>} +<OPTION VALUE="move-jobs">Move All Jobs</OPTION> +<OPTION VALUE="purge-jobs">Cancel All Jobs</OPTION> +</SELECT> +<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;"> +</FORM> + +<FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration"> +<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"> +<SELECT NAME="OP" ONCHANGE="document.administration.submit();"> +<OPTION VALUE="">Administration</OPTION> +<OPTION VALUE="modify-class">Modify Class</OPTION> +<OPTION VALUE="delete-class">Delete Class</OPTION> +<OPTION VALUE="set-class-options">Set Default Options</OPTION> +<OPTION VALUE="set-as-default">Set As Server Default</OPTION> +<OPTION VALUE="set-allowed-users">Set Allowed Users</OPTION> +</SELECT> +<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;"> +</FORM> + +<TABLE SUMMARY="{printer_name}"> +<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">Members:</TH><TD>{?member_uris=?None:{member_uris}}</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> +</TABLE> + +</DIV> diff --git a/templates/classes.tmpl b/templates/classes.tmpl index e75dfb7a8..51e454fb1 100644 --- a/templates/classes.tmpl +++ b/templates/classes.tmpl @@ -1,45 +1,11 @@ {#printer_name=0?: +<TABLE CLASS="list" SUMMARY="Class List"> +<THEAD> +<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> Queue Name <SMALL>▲</SMALL>:<SMALL>▼</SMALL> Queue Name <SMALL>▼</SMALL>}</A></TH><TH>Description</TH><TH>Location</TH><TH>Members</TH><TH>Status</TH></TR> +</THEAD> +<TBODY> {[printer_name] -{_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> -<TD VALIGN=TOP><A HREF="{printer_uri_supported}"> -<IMG SRC="/images/classes.png" WIDTH="128" HEIGHT="128" ALT=""></A> </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}}{?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><B>Members:</B> {member_uris}} - -<P><TABLE CLASS="inset" WIDTH="100%" SUMMARY="Maintenance Commands"> -<CAPTION>Maintenance Commands</CAPTION> -<TR><TD><FORM ACTION="{printer_uri_supported}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="print-test-page"><INPUT TYPE="SUBMIT" VALUE="Print Test Page"></FORM> -{printer_state=5? -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="start-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Resume Class"></FORM> -:<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="stop-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Pause Class"></FORM> +<TR><TD><A HREF="{printer_uri_supported}">{printer_name}</A></TD><TD>{printer_info}</TD><TD>{printer_location}</TD><TD>{?member_uris=?None:{member_uris}}</TD><TD>{printer_state=3?Idle:{printer_state=4?Processing:Paused}}{printer_state_message? - "{printer_state_message}":}</TD></TR> } -{printer_is_accepting_jobs=0? -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="accept-jobs"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Accept Jobs"></FORM> -:<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="reject-jobs"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Reject Jobs"></FORM> -} -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="purge-jobs"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Cancel All Jobs"></FORM></TD></TR> -</TABLE> - -<P><TABLE CLASS="inset" WIDTH="100%" SUMMARY="Administration Commands"> -<CAPTION>Administration Commands</CAPTION> -<TR><TD>{server_is_sharing_printers=0?:{printer_is_shared=0? -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-sharing"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}&shared=1<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Share Class"></FORM> -:<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-sharing"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}&shared=0<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Unshare Class"></FORM> -}} -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="modify-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Modify Class"></FORM> -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-class-options"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Set Printer Options"></FORM> -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Delete Class"></FORM> -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-as-default"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Set As Server Default"></FORM> -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-allowed-users"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}<INPUT TYPE="HIDDEN" NAME="is_class" VALUE="Y"><INPUT TYPE="SUBMIT" VALUE="Set Allowed Users"></FORM></TD></TR> -</TABLE> -</TD> -</TR> -</TABLE> -} -<BR> +</TBODY> +</TABLE></DIV>} diff --git a/templates/help-header.tmpl b/templates/help-header.tmpl index 3a70c9c51..1582908a2 100644 --- a/templates/help-header.tmpl +++ b/templates/help-header.tmpl @@ -1,3 +1,4 @@ +<DIV CLASS="indent"> <FORM ACTION="/help/{?HELPFILE}" METHOD="GET"> {TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:} @@ -30,7 +31,10 @@ AUTOSAVE="org.cups.help" RESULTS="20"> {QTEXT?</UL>:} :<P>No matches found.</P>} <HR NOSHADE>:} -{HELPTITLE?<FORM ACTION="/help/{?HELPFILE}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="PRINTABLE" VALUE="YES"><INPUT TYPE="SUBMIT" VALUE="View Printable Version"></FORM>: +{HELPTITLE?<H1>{HELPTITLE}</H1> +<FORM ACTION="/help/{?HELPFILE}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="PRINTABLE" VALUE="YES"><INPUT TYPE="SUBMIT" VALUE="View Printable Version"></FORM>: + +<H1>Online Help</H1> <P>This is the CUPS online help interface. Enter search words above or click on any of the documentation links to display diff --git a/templates/help-trailer.tmpl b/templates/help-trailer.tmpl new file mode 100644 index 000000000..4c1ebed85 --- /dev/null +++ b/templates/help-trailer.tmpl @@ -0,0 +1 @@ +</DIV> diff --git a/templates/jobs-header.tmpl b/templates/jobs-header.tmpl index 8a9043840..e7547ba7b 100644 --- a/templates/jobs-header.tmpl +++ b/templates/jobs-header.tmpl @@ -1,5 +1,5 @@ -<P>{?which_jobs=?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Show Active Jobs"></FORM>} +<DIV CLASS="indent">{?which_jobs=?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Show Active Jobs"></FORM>} {?which_jobs=completed?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="completed"><INPUT TYPE="SUBMIT" VALUE="Show Completed Jobs"></FORM>} -{?which_jobs=all?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="all"><INPUT TYPE="SUBMIT" VALUE="Show All Jobs"></FORM>}</P> +{?which_jobs=all?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="all"><INPUT TYPE="SUBMIT" VALUE="Show All Jobs"></FORM>}</DIV> <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 948cd213b..f68eea01e 100644 --- a/templates/jobs.tmpl +++ b/templates/jobs.tmpl @@ -1,17 +1,11 @@ {#job_id=0?: -<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="Job List"> -<TR CLASS="data"> -<TH>ID </TH> -<TH>Name </TH> -<TH>User </TH> -<TH>Size </TH> -<TH>Pages </TH> -<TH>State </TH> -<TH>Control </TH> -</TR> - +<TABLE CLASS="list" SUMMARY="Job List"> +<THEAD> +<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> ID <SMALL>▲</SMALL>:<SMALL>▼</SMALL> ID <SMALL>▼</SMALL>}</A></TH><TH>Name</TH><TH>User</TH><TH>Size</TH><TH>Pages</TH><TH>State</TH><TH>Control</TH></TR> +</THEAD> +<TBODY> {[job_id] -<TR CLASS="data" VALIGN="TOP"> +<TR VALIGN="TOP"> <TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id} </TD> <TD>{?job_name=?Unknown:{job_name}} </TD> <TD>{job_originating_user_name} </TD> @@ -38,6 +32,6 @@ </TD> </TR> } +</TBODY> </TABLE> } -<BR> diff --git a/templates/pager.tmpl b/templates/pager.tmpl index 1c870943c..ebd688d51 100644 --- a/templates/pager.tmpl +++ b/templates/pager.tmpl @@ -1,7 +1,6 @@ -<TABLE WIDTH="100%" CLASS="inset" SUMMARY="Paging Bar"> +<TABLE CLASS="inset" SUMMARY="Paging Bar"> <TR> - <TD WIDTH="33%">{PREV?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="◀ Show Previous"></FORM>: }</TD> - <TD WIDTH="34%" ALIGN="CENTER"><FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{FIRST}"><INPUT TYPE="HIDDEN" NAME="ORDER" {ORDER=dec?VALUE="asc"><INPUT TYPE="SUBMIT" VALUE="▲ Sort Ascending ▲">:VALUE="dec"><INPUT TYPE="SUBMIT" VALUE="▼ Sort Descending ▼">}</FORM></TD> - <TD WIDTH="33%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Show Next ▶"></FORM>: }</TD> + <TD WIDTH="50%">{PREV?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="◀ Show Previous"></FORM>: }</TD> + <TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Show Next ▶"></FORM>: }</TD> </TR> </TABLE> diff --git a/templates/printer-jobs-header.tmpl b/templates/printer-jobs-header.tmpl index 61e5151d2..ba46f1026 100644 --- a/templates/printer-jobs-header.tmpl +++ b/templates/printer-jobs-header.tmpl @@ -1 +1,3 @@ +<DIV CLASS="indent"> <H3 CLASS="title">Jobs</H3> +</DIV> diff --git a/templates/printer.tmpl b/templates/printer.tmpl new file mode 100644 index 000000000..14f107d13 --- /dev/null +++ b/templates/printer.tmpl @@ -0,0 +1,44 @@ +<DIV CLASS="indent"> +<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A> +({printer_state=3?Idle:{printer_state=4?Processing:Paused}}, +{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:})</H2> + +<FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> +<SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> +<OPTION VALUE="">Maintenance</OPTION> +<OPTION VALUE="print-test-page">Print Test Page</OPTION> +{?cupscommand=1?<OPTION VALUE="clean-print-heads">Clean Print Heads</OPTION> +<OPTION VALUE="print-self-test-page">Print Self Test Page</OPTION>:} +{printer_state=5?<OPTION VALUE="start-printer">Resume Printer</OPTION>:<OPTION VALUE="stop-printer">Pause Printer</OPTION>} +{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Accept Jobs</OPTION>:<OPTION VALUE="reject-jobs">Reject Jobs</OPTION>} +<OPTION VALUE="move-jobs">Move All Jobs</OPTION> +<OPTION VALUE="purge-jobs">Cancel All Jobs</OPTION> +</SELECT> +<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;"> +</FORM> + +<FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration"> +<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"> +<SELECT NAME="OP" ONCHANGE="document.administration.submit();"> +<OPTION VALUE="">Administration</OPTION> +<OPTION VALUE="modify-printer">Modify Printer</OPTION> +<OPTION VALUE="delete-printer">Delete Printer</OPTION> +<OPTION VALUE="set-printer-options">Set Default Options</OPTION> +<OPTION VALUE="set-as-default">Set As Server Default</OPTION> +<OPTION VALUE="set-allowed-users">Set Allowed Users</OPTION> +</SELECT> +<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;"> +</FORM> + +<TABLE SUMMARY="{printer_name}"> +<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">Defaults:</TH><TD>job-sheets={job_sheets_default} +media={media_default?{media_default}:unknown} +{sides_default?sides={sides_default}:}</TD></TR> +</TABLE> + +</DIV>
\ No newline at end of file diff --git a/templates/printers.tmpl b/templates/printers.tmpl index 0b05f4318..e0a3228d0 100644 --- a/templates/printers.tmpl +++ b/templates/printers.tmpl @@ -1,52 +1,11 @@ -{printer_type?:}{#printer_name=0?: +{#printer_name=0?: +<TABLE CLASS="list" SUMMARY="Printer List"> +<THEAD> +<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> Queue Name <SMALL>▲</SMALL>:<SMALL>▼</SMALL> Queue Name <SMALL>▼</SMALL>}</A></TH><TH>Description</TH><TH>Location</TH><TH>Make and Model</TH><TH>Status</TH></TR> +</THEAD> +<TBODY> {[printer_name] -{_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> -<TD VALIGN="TOP"><A HREF="{printer_uri_supported}"> -<IMG SRC="/images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.png" WIDTH="128" HEIGHT="128" ALT=""></A> </TD> -<TD VALIGN="TOP"><B>Description:</B> {printer_info}<BR> -<B>Location:</B> {printer_location}<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: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:}.<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"> -<CAPTION>Maintenance Commands</CAPTION> -<TR><TD><FORM ACTION="{printer_uri_supported}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="print-test-page"><INPUT TYPE="SUBMIT" VALUE="Print Test Page"></FORM> -{?cupscommand=1?<FORM ACTION="{printer_uri_supported}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="clean-print-heads"><INPUT TYPE="SUBMIT" VALUE="Clean Print Heads"></FORM> -<FORM ACTION="{printer_uri_supported}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="print-self-test-page"><INPUT TYPE="SUBMIT" VALUE="Print Self Test Page"></FORM>:} -{printer_state=5? -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="start-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Resume Printer"></FORM> -:<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="stop-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Pause Printer"></FORM> +<TR><TD><A HREF="{printer_uri_supported}">{printer_name}</A></TD><TD>{printer_info}</TD><TD>{printer_location}</TD><TD>{printer_make_and_model}</TD><TD>{printer_state=3?Idle:{printer_state=4?Processing:Paused}}{printer_state_message? - "{printer_state_message}":}</TD></TR> } -{printer_is_accepting_jobs=0? -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="accept-jobs"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Accept Jobs"></FORM> -:<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="reject-jobs"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Reject Jobs"></FORM> -} -<FORM ACTION="{printer_uri_supported}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-jobs"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Move All Jobs"></FORM> -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="purge-jobs"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Cancel All Jobs"></FORM> -</TABLE> - -<P><TABLE CLASS="inset" WIDTH="100%" SUMMARY="Administration Commands"> -<CAPTION>Administration Commands</CAPTION> -<TR><TD>{server_is_sharing_printers=0?:{printer_is_shared=0? -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-sharing"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}&shared=1"><INPUT TYPE="SUBMIT" VALUE="Share Printer"></FORM> -:<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-sharing"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}&shared=0"><INPUT TYPE="SUBMIT" VALUE="Unshare Printer"></FORM> -}} -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="modify-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Modify Printer"></FORM> -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-printer-options"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Set Printer Options"></FORM> -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Delete Printer"></FORM> -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-as-default"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Set As Server Default"></FORM> -<FORM ACTION="{admin_uri}" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="set-allowed-users"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{%printer_name}"><INPUT TYPE="SUBMIT" VALUE="Set Allowed Users"></FORM></TD></TR> -</TABLE> -</TD> -</TR> -</TABLE> -}} -<BR> +</TBODY> +</TABLE></DIV>} diff --git a/templates/search.tmpl b/templates/search.tmpl index 0fcc43861..9e05e6ecb 100644 --- a/templates/search.tmpl +++ b/templates/search.tmpl @@ -4,7 +4,7 @@ <P ALIGN="CENTER"><B>Search in {SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?Classes:{SECTION=jobs?Jobs:Printers}}}:</B> -<INPUT TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="60" PLACEHOLDER="" AUTOSAVE="org.cups.{SECTION}" RESULTS="20"> <INPUT +<INPUT TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="40" PLACEHOLDER="" AUTOSAVE="org.cups.{SECTION}" RESULTS="20"> <INPUT TYPE="SUBMIT" VALUE="Search"> <INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Clear"></P> </FORM> |