Patch for bug 97868: Rename the "Edit" action (for attachments) to something else...

diff --git a/template/en/default/attachment/created.html.tmpl b/template/en/default/attachment/created.html.tmpl
index ef318f5759c1e4cc779dd0b3a74f3a548f5c9cb5..3114b2963cd7e98eec44b0414c851fec84d79014 100644 (file)
--- a/template/en/default/attachment/created.html.tmpl
+++ b/template/en/default/attachment/created.html.tmpl
@@ -55,7 +55,7 @@
           <b>Note:</b> [% terms.Bugzilla %] automatically detected the content type
           <em>[% contenttype %]</em> for this attachment.  If this is
           incorrect, correct the value by
-          <a href="attachment.cgi?id=[% attachid %]&amp;action=edit">editing the attachment</a>.
+          editing the attachment's <a href="attachment.cgi?id=[% attachid %]&amp;action=edit">details</a>.
         </p>
       [% END %]
     </td>

diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl
index f42d286efa37a469744e6e2494d51f338bcc38ca..45bf202a9a0a4f28e7383ecb154ac59e5f1777c1 100644 (file)
--- a/template/en/default/attachment/diff-header.html.tmpl
+++ b/template/en/default/attachment/diff-header.html.tmpl
@@ -242,7 +242,7 @@ tbody.file pre:empty {
   [%# HEADER %]
   [% IF headers %]
     <a href="[% PROCESS viewurl id=attachid %]">View</a>
-    | <a href="[% PROCESS editurl id=attachid %]">Edit</a>
+    | <a href="[% PROCESS editurl id=attachid %]">Details</a>
     | <a href="[% PROCESS diffurl id=attachid %]&amp;context=[% context FILTER url_quote %]&amp;collapsed=[% collapsed FILTER url_quote %]&amp;headers=[% headers FILTER url_quote %]&amp;format=raw">Raw&nbsp;Unified</a>
   [% END %]
   [% IF other_patches.size > 0 %]

diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 747675f01b05fdf942d37b6d2240e33f070ce2d5..eefe141f8044f1de32a45b9aa6dcc21470ba6081 100644 (file)
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -24,10 +24,10 @@
 
 [%# Define strings that will serve as the title and header of this page %]
 [% title = BLOCK %]
-  Edit Attachment [% attachment.id %] for [% terms.Bug %] [%+ attachment.bug_id %]
+  Attachment [% attachment.id %] Details for [% terms.Bug %] [%+ attachment.bug_id %]
 [% END %]
 [% h1 = BLOCK %]
-  Edit Attachment [% attachment.id %] for
+  Attachment [% attachment.id %] Details for
   [%+ GetBugLink(attachment.bug_id, "$terms.Bug ${attachment.bug_id}") %]
 [% END %]
 [% h2 = BLOCK %][% bugsummary FILTER html %][% END %]
@@ -267,7 +267,7 @@
           <textarea id="editFrame" name="comment" wrap="soft" cols="80"
                     style="height: 400px; width: 100%; display: none;"></textarea>
           <iframe id="viewFrame" src="attachment.cgi?id=[% attachment.id %]" style="height: 400px; width: 100%;">
-            <b>You cannot view the attachment while editing it because your browser does not support IFRAMEs.
+            <b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
             <a href="attachment.cgi?id=[% attachment.id %]">View the attachment on a separate page</a>.</b>
           </iframe>
           <script type="text/javascript">

diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl
index 7de5fb3714883edc3769d94828e51ca5032d6c1a..8734487a6e1aecf1931798a06da74913012adc6c 100644 (file)
--- a/template/en/default/attachment/list.html.tmpl
+++ b/template/en/default/attachment/list.html.tmpl
@@ -77,7 +77,7 @@
         [% END %]
 
         <td valign="top">
-          <a href="attachment.cgi?id=[% attachment.id %]&amp;action=edit">Edit</a>
+          <a href="attachment.cgi?id=[% attachment.id %]&amp;action=edit">Details</a>
           [% IF attachment.ispatch && patchviewerinstalled %]
             | <a href="attachment.cgi?id=[% attachment.id %]&amp;action=diff">Diff</a>
           [% END %]

diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl
index e7043a1420d3a8092f5d65470b0a9b68107eafb9..e2c918dbb6154448e2a3598749286ea7b71eac1d 100644 (file)
--- a/template/en/default/attachment/show-multiple.html.tmpl
+++ b/template/en/default/attachment/show-multiple.html.tmpl
@@ -78,7 +78,7 @@
       </td>
 
       <td valign="top">
-        <a href="attachment.cgi?id=[% a.attachid %]&amp;action=edit">Edit</a>
+        <a href="attachment.cgi?id=[% a.attachid %]&amp;action=edit">Details</a>
       </td>
     </tr>
   </table>