Additional fix for bug 87770: attachment.cgi should work with no

parameters. Use <button> tags to allow for localization of the labels.
r=myk, a=myk.

I padded the Edit button with &nbsp;s to ensure it has the same width as
the View button; it may not be kosher but passes as visually agreeable,
at least.

diff --git a/attachment.cgi b/attachment.cgi
index d851e537ee07cdc9a88fdc8de227e541cae626c1..67e8559c407c55c1e7fa47620d1f21a1d11e3861 100755 (executable)
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -76,15 +76,6 @@ my $cgi = Bugzilla->cgi;
 # Determine whether to use the action specified by the user or the default.
 my $action = $::FORM{'action'} || 'view';
 
-# Slight awkward extra checks for the case when we came here from the
-# attachment/choose.html.tmpl page
-if ($action eq 'View') {
-    $action = 'view';
-}
-elsif ($action eq 'Edit') {
-    $action = 'edit';
-}
-
 if ($action eq "view")  
 {
   validateID();

diff --git a/template/en/default/attachment/choose.html.tmpl b/template/en/default/attachment/choose.html.tmpl
index b4866465344151715cc5133062af4070351554bf..628dafb96926ccaa19de60598f74041253c8f658 100644 (file)
--- a/template/en/default/attachment/choose.html.tmpl
+++ b/template/en/default/attachment/choose.html.tmpl
@@ -28,8 +28,8 @@
 <form method="get" action="attachment.cgi">
   <p>Access an attachment by entering its ID into the form below:</p>
   <p>Attachment ID: <input name="id" size="6">
-  <input type="submit" name="action" value="Edit">
-  <input type="submit" name="action" value="View">
+  <button name="action" value="edit">&nbsp;Edit&nbsp;</button>
+  <button name="action" value="view">View</button>
   </p>
 </form>