From bc69ce1ee27229f7054147526a76aa0cd6980c8c Mon Sep 17 00:00:00 2001
From: Matt Selsky <selsky@columbia.edu>
Date: Fri, 30 Jan 2015 13:58:17 +0000
Subject: Bug 488942: The term "bookmarkable template" is meaningless to new
 users, change to "Make Template". r=gerv, a=glob.

---
 js/field.js                                            |  2 +-
 template/en/default/bug/create/create.html.tmpl        |  3 ++-
 template/en/default/bug/create/make-template.html.tmpl | 17 ++++++-----------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/js/field.js b/js/field.js
index c24603988..c0a2218a8 100644
--- a/js/field.js
+++ b/js/field.js
@@ -11,7 +11,7 @@
 
 var bz_no_validate_enter_bug = false;
 function validateEnterBug(theform) {
-    // This is for the "bookmarkable templates" button.
+    // This is for the "Make Template" button.
     if (bz_no_validate_enter_bug) {
         // Set it back to false for people who hit the "back" button
         bz_no_validate_enter_bug = false;
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 0815f3600..d8abec6a1 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -615,8 +615,9 @@ TUI_hide_default('attachment_text_field');
       <input type="submit" id="commit" value="Submit [% terms.Bug %]">
       &nbsp;&nbsp;&nbsp;&nbsp;
       <input type="submit" name="maketemplate" id="maketemplate"
-             value="Remember values as bookmarkable template"
+             value="Make Template"
              onclick="bz_no_validate_enter_bug=true" class="expert_fields">
+      (useful for filing several similar bugs)
     </td>
   </tr>
 </tbody>
diff --git a/template/en/default/bug/create/make-template.html.tmpl b/template/en/default/bug/create/make-template.html.tmpl
index 31f255f81..b3b95531d 100644
--- a/template/en/default/bug/create/make-template.html.tmpl
+++ b/template/en/default/bug/create/make-template.html.tmpl
@@ -8,24 +8,19 @@
 
 [%# INTERFACE:
   # url: URL to a pre-filled bug entry form.
-  # short_desc: Bug summary as entered in the form.
   #%]
 
 [% PROCESS global/header.html.tmpl
-  title = "Bookmark For $terms.Bug Entry"
+  title = "Template For $terms.Bug Entry"
   header = "Template constructed"
 %]
 
 <p>
-  You can bookmark this link:
-  &ldquo;<a href="enter_bug.cgi?[% url FILTER html %]">
-  [% IF short_desc %]
-    [% short_desc FILTER html %]
-  [% ELSE %]
-    [% terms.Bug %] entry template
-  [% END %]</a>&rdquo;.
-  This bookmark will bring up the <em>Enter [% terms.Bug %]</em> page with the
-  fields initialized as you've requested.
+  If you bookmark or right-click <a href="enter_bug.cgi?[% url FILTER html %]">
+  this link to the [% terms.Bug %] entry form</a>, and open it repeatedly
+  in a new window, you can bring up multiple copies of the <em>Enter
+  [%+ terms.Bug %]</em> page with the fields initialized in the way you just had
+  them completed. You can then customize each one as necessary.
 </p>
 
 [% PROCESS global/footer.html.tmpl %]
-- 
cgit v1.2.3-24-g4f1b