From fa73b22906f71080fa5056485d8204612717adac Mon Sep 17 00:00:00 2001 From: jlovell Date: Thu, 26 Jan 2006 21:39:43 +0000 Subject: Load cups into easysw/current. git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@13 a1ca3aef-8c08-0410-bb20-df032aa958be --- templates/Makefile | 25 +++++++++++++++++-------- templates/add-class.tmpl | 2 +- templates/admin-op.tmpl | 1 - templates/admin.tmpl | 35 +++++++++++++++++++---------------- templates/class-jobs-header.tmpl | 1 + templates/classes-header.tmpl | 1 + templates/classes.tmpl | 32 +++++++++++++------------------- templates/error-op.tmpl | 3 +++ templates/error.tmpl | 2 +- templates/job-move.tmpl | 22 ++++++++++++++++++++++ templates/job-moved.tmpl | 2 ++ templates/job-op.tmpl | 1 - templates/jobs-header.tmpl | 4 +--- templates/jobs.tmpl | 18 ++++++++---------- templates/modify-class.tmpl | 2 +- templates/page.tmpl | 7 ------- templates/pager.tmpl | 7 +++++++ templates/printer-accept.tmpl | 4 +++- templates/printer-default.tmpl | 11 +++++++---- templates/printer-jobs-header.tmpl | 1 + templates/printer-purge.tmpl | 4 +++- templates/printer-reject.tmpl | 4 +++- templates/printer-start.tmpl | 5 +++-- templates/printer-stop.tmpl | 5 +++-- templates/printers-header.tmpl | 1 + templates/printers.tmpl | 20 ++++++++------------ templates/search.tmpl | 4 ++-- templates/test-page.tmpl | 2 +- templates/users.tmpl | 3 ++- 29 files changed, 134 insertions(+), 95 deletions(-) delete mode 100644 templates/admin-op.tmpl create mode 100644 templates/class-jobs-header.tmpl create mode 100644 templates/classes-header.tmpl create mode 100644 templates/error-op.tmpl create mode 100644 templates/job-move.tmpl create mode 100644 templates/job-moved.tmpl delete mode 100644 templates/job-op.tmpl delete mode 100644 templates/page.tmpl create mode 100644 templates/pager.tmpl create mode 100644 templates/printer-jobs-header.tmpl create mode 100644 templates/printers-header.tmpl (limited to 'templates') 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 @@ - + 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 @@ -

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 @@ -
-

Classes

- -

- - -

- -

Jobs

- -

-Manage -Jobs -

-

Printers

@@ -24,6 +8,9 @@ Jobs" CLASS="button"> SRC="/images/add-printer.gif" ALT="Add Printer" CLASS="button"> Manage Printers +{have_samba?Export Printers to Samba:}

{#device_uri=0?:

New Printers Found:

    {[device_uri] @@ -33,6 +20,22 @@ SRC="/images/add-this-printer.gif" ALT="Add This Printer" CLASS="button" ALIGN="MIDDLE"> }
} +

Classes

+ +

+ + +

+ +

Jobs

+ +

+Manage +Jobs +

+ 		     

Server

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 @@ +

Jobs

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 @@ +

{total=0?No classes:Showing {#printer_name} of {total} class{total=1?:es}}.

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 @@ -

Add Class

- -{#printer_name=0?No classes: -

Server Default Destination: {default_name?{default_name}:none}

+{#printer_name=0?: {[printer_name]

{printer_name}{default_name={printer_name}? (Default Printer):}

@@ -11,9 +6,9 @@ CLASS="button">

Description: {printer_info}
-Location: {printer_location}
-Class State: {printer_state=3?idle:{printer_state=4?processing:stopped}}, +		Description: {printer_info}
+Location: {printer_location}
+Class State: {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=?:
"{printer_state_message}"} {?member_uris=?:
Members: {member_uris}} @@ -22,39 +17,38 @@ Class State: {printer_state=3?idle:{printer_state=4?processing:stopped}}, Print Test Page {printer_state=5? - + Start Class : - + Stop Class } {printer_is_accepting_jobs=0? - + Accept Jobs : - + Reject Jobs } - + Cancel All Jobs {printer_is_shared=0? - + Publish Printer : - + Unpublish Printer } Modify Class Delete Class - + Set As Default - + Set Allowed Users

- }} 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 @@ +

Error:

+ +
Unknown operation "{op}"!
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 @@ -

Error: +

{?message?{message}:Error:}

{error}
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 @@ +
+ +{job_id?:} + +

{job_id?Move Job {job_id}:Move All Jobs}

+ + + + + + + + + + +
New Destination: + +
+ +
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 @@ +

{job_id?Job {job_id}:All jobs} moved to +{job_printer_name}.

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 @@ -

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=?:

Jobs

} -

{?which_jobs=?Show Completed Jobs @@ -14,4 +12,4 @@ SRC="/images/show-active.gif" CLASS="button" ALT="Show Active Jobs"> Show All Jobs}}

-

Showing {#job_id} of {total} {?which_jobs=?active:{which_jobs=all?:completed}} job{total=1?:s}.

+

{total=0?No jobs:Showing {#job_id} of {total} {?which_jobs=?active:{which_jobs=all?:completed}} job{total=1?:s}}.

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
{time_at_processing}:{job_state=6?stopped at
{time_at_completed}: {job_state=7?cancelled at
{time_at_completed}:{job_state=8?aborted:completed at
{time_at_completed}}}}}}}  -{job_state>5? -{job_k_octets>0? +{job_preserved>0? -Reprint Job -:}:} -{job_state>6?: +Reprint Job:} {job_state=4? -Release Job -: +Release Job:} +{job_state=3? -Hold Job -} +Hold Job:} +{job_state<7? Cancel Job -} +Move Job:}   } 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 @@ - + diff --git a/templates/page.tmpl b/templates/page.tmpl deleted file mode 100644 index a949fe8c5..000000000 --- a/templates/page.tmpl +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - -
{PREVURL?Show Previous: }{ORDER=dec?Show Ascending:Show Descending}{NEXTURL?Show Next: }
diff --git a/templates/pager.tmpl b/templates/pager.tmpl new file mode 100644 index 000000000..c95f0c559 --- /dev/null +++ b/templates/pager.tmpl @@ -0,0 +1,7 @@ + + + + + + +
{PREVURL?Show Previous: }{ORDER=dec?Sort Ascending:Sort Descending}{NEXTURL?Show Next: }
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 @@ -

Printer {printer_name} is now accepting jobs. +

{is_class?Class:Printer} {printer_name} +is now accepting jobs.

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 @@ -

Printer {printer_name} has been -made the default printer on the server. Please note that any user default -that has been set via the lpoptions command will override this -default setting. +

{is_class?Class:Printer} {printer_name} +has been made the default printer on the server.

+ +
Note: Any user default that has been set via +the lpoptions command will override this default +setting.
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 @@ +

Jobs

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 @@ -

Printer {printer_name} has been purged of all jobs. +

{is_class?Class:Printer} {printer_name} +has been purged of all jobs.

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 @@ -

Printer {printer_name} is no longer accepting jobs. +

{is_class?Class:Printer} {printer_name} +is no longer accepting jobs.

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 @@ -

Printer {printer_name} has been -started. +

{is_class?Class:Printer} {printer_name} +has been started.

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 @@ -

Printer {printer_name} has been -stopped. +

{is_class?Class:Printer} {printer_name} +has been stopped.

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 @@ +

{total=0?No printers:Showing {#printer_name} of {total} printer{total=1?:s}}.

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 @@ -

Add Printer

- -{#printer_name=0?No printers: -

Server Default Destination: {default_name?{default_name}:none}

+{#printer_name=0?: {[printer_name]

{printer_name}{default_name={printer_name}? (Default Printer):}

@@ -12,17 +7,17 @@ CLASS="button">

-Description: {printer_info}
-Location: {printer_location}
-Make and Model: {printer_make_and_model}
-Printer State: {printer_state=3?idle:{printer_state=4?processing:stopped}}, +Description: {printer_info}
+Location: {printer_location}
+Make and Model: {printer_make_and_model}
+Printer State: {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=?:
"{printer_state_message}"} {?printer_state_history2.printer_state_message=?:
"{printer_state_history2.printer_state_message}"} {?printer_state_history3.printer_state_message=?:
"{printer_state_history3.printer_state_message}"} {?printer_state_history4.printer_state_message=?:
"{printer_state_history4.printer_state_message}"} {?printer_state_history5.printer_state_message=?:
"{printer_state_history5.printer_state_message}"} -{?device_uri=?:
Device URI: {device_uri}} +{?device_uri=?:
Device URI: {device_uri}}

@@ -41,6 +36,8 @@ Printer State: {printer_state=3?idle:{printer_state=4?processing:stopped}}, Reject Jobs } + +Move All Jobs Cancel All Jobs {printer_is_shared=0? @@ -64,5 +61,4 @@ Printer State: {printer_state=3?idle:{printer_state=4?processing:stopped}}, - }} 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 @@ -

+ {WHICH_JOBS?:} {ORDER?:}

Search in -{SECTION=classes?Classes:{SECTION=jobs?Jobs:Printers}}: +{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?Classes:{SECTION=jobs?Jobs:Printers}}}:

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 @@ -

Test page sent; job ID is +

Test page sent; job ID is {printer_name}-{job_id}. 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 @@ +{IS_CLASS?:}

Allowed Users For {printer_name}

@@ -17,7 +18,7 @@ - + -- cgit v1.2.3