Make "Cancel All Jobs" use the Cancel-Jobs operation instead of Purge-Jobs

(STR #1914)


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11928 a1ca3aef-8c08-0410-bb20-df032aa958be

4 files changed, 15 insertions, 15 deletions

diff --git a/templates/Makefile b/templates/Makefile
index 0abd47d9d..503fe6e1b 100644
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -1,16 +1,16 @@
 #
 # "$Id$"
 #
-#   Template makefile for CUPS.
+# Template makefile for CUPS.
 #
-#   Copyright 2007-2011 by Apple Inc.
-#   Copyright 1993-2007 by Easy Software Products.
+# Copyright 2007-2014 by Apple Inc.
+# Copyright 1993-2007 by Easy Software Products.
 #
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs
@@ -67,13 +67,13 @@ FILES	=	\
 		printer.tmpl \
 		printer-accept.tmpl \
 		printer-added.tmpl \
+		printer-cancel-jobs.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 \
 		printer-stop.tmpl \
diff --git a/templates/printer-cancel-jobs.tmpl b/templates/printer-cancel-jobs.tmpl
new file mode 100644
index 000000000..4376646a4
--- /dev/null
+++ b/templates/printer-cancel-jobs.tmpl
@@ -0,0 +1,5 @@
+<H2 CLASS="title">Cancel Jobs On {is_class?Class:Printer} {printer_name}</H2>
+
+<P>All jobs on {is_class?class:printer} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+have been canceled.</P>
diff --git a/templates/printer-purge.tmpl b/templates/printer-purge.tmpl
deleted file mode 100644
index 00819bc84..000000000
--- a/templates/printer-purge.tmpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<H2 CLASS="title">Purge Jobs On {is_class?Class:Printer} {printer_name}</H2>
-
-<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.tmpl b/templates/printer.tmpl
index 617d8e168..ee8d77460 100644
--- a/templates/printer.tmpl
+++ b/templates/printer.tmpl
@@ -13,7 +13,7 @@
 {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>
+<OPTION VALUE="cancel-jobs">Cancel All Jobs</OPTION>
 </SELECT>
 <NOSCRIPT><INPUT TYPE="SUBMIT" VALUE="Go"></NOSCRIPT>
 </FORM>