Bug 65316: Typos on edit*.cgi. Change use of PutTrailer() (and the

default output, in certain cases) in the edit pages. Patch by Vlad
Dascalu <jocuri@softhome.net>, r=kiko, a=justdave

5 files changed, 37 insertions, 19 deletions

diff --git a/editcomponents.cgi b/editcomponents.cgi
index 018c89cdf..539da47a5 100755
--- a/editcomponents.cgi
+++ b/editcomponents.cgi
@@ -151,6 +151,10 @@ sub EmitFormElements ($$$$$)
 
 #
 # Displays a text like "a.", "a or b.", "a, b or c.", "a, b, c or d."
+# 
+# XXX This implementation of PutTrailer outputs a default link back to the
+# query page instead of the index, which is inconsistent with other
+# PutTrailer() implementations.
 #
 
 sub PutTrailer (@)
@@ -475,9 +479,14 @@ if ($action eq 'new') {
 
     print "OK, done.<p>\n";
     if ($product) {
-        PutTrailer("<A HREF=\"editcomponents.cgi?product=" . url_quote($product) . "\">edit</A> more components or <A HREF=\"editcomponents.cgi?product=". url_quote($product) . "&action=add\">Add</A> another component");
+        PutTrailer("<a href=\"editcomponents.cgi?product=" .
+            url_quote($product) . "\">edit</a> more components",
+            "<a href=\"editcomponents.cgi?product=". url_quote($product) .
+            "&action=add\">add</a> another component");
     } else {
-        PutTrailer("<A HREF=\"editcomponents.cgi\">edit</A> more components or <A HREF=\"editcomponents.cgi?action=add\">Add</A> another component");
+        PutTrailer("<a href=\"editcomponents.cgi\">edit</a> more components",
+            "<a href=\"editcomponents.cgi?action=add\">add</a>" .
+            "another component");
     }
     exit;
 }
diff --git a/editgroups.cgi b/editgroups.cgi
index a283d0501..e793f296a 100755
--- a/editgroups.cgi
+++ b/editgroups.cgi
@@ -73,7 +73,7 @@ sub ShowError ($)
 
 sub PutTrailer (@)
 {
-    my (@links) = ("<a href=\"./\">Back to the Main Bugs Page</a>", @_);
+    my (@links) = ("Back to the <a href=\"./\">index</a>", @_);
 
     my $count = $#links;
     my $num = 0;
@@ -271,7 +271,7 @@ if ($action eq 'changeform') {
 
 
 
-    PutTrailer("<a href=editgroups.cgi>Back to group list</a>");
+    PutTrailer("back to the <a href=\"editgroups.cgi\">group list</a>");
     exit;
 }
 
@@ -326,7 +326,7 @@ probably want it to be usable for bugs, in which case you should leave this chec
     print "products\" option will prevent this and make the group become ";
     print "visible only when its controls have been added to a product.<P>\n";
 
-    PutTrailer("<a href=editgroups.cgi>Back to the group list</a>");
+    PutTrailer("back to the <a href=\"editgroups.cgi\">group list</a>");
     exit;
 }
 
@@ -409,8 +409,8 @@ if ($action eq 'new') {
                 "FROM products");
     }
     print "OK, done.<p>\n";
-    PutTrailer("<a href=\"editgroups.cgi?action=add\">Add another group</a>",
-               "<a href=\"editgroups.cgi\">Back to the group list</a>");
+    PutTrailer("<a href=\"editgroups.cgi?action=add\">add</a> another group",
+               "back to the <a href=\"editgroups.cgi\">group list</a>");
     exit;
 }
 
@@ -558,9 +558,9 @@ if ($action eq 'delete') {
           "records in the database which refer to it.  All such records " .
           "must be removed or altered to remove the reference to this " .
           "group before the group can be deleted.");
-      print "<A HREF=\"editgroups.cgi?action=del&group=$gid\">" .
-            "View the list of which records are affected</A><BR>";
-      PutTrailer("<a href=editgroups.cgi>Back to group list</a>");
+      print "<a href=\"editgroups.cgi?action=del&group=$gid\">" .
+            "View</a> the list of which records are affected.<br>";
+      PutTrailer("back to the <a href=\"editgroups.cgi\">group list</a>");
       exit;
     }
 
@@ -572,7 +572,7 @@ if ($action eq 'delete') {
     print "<B>Group $gid has been deleted.</B><BR>";
 
 
-    PutTrailer("<a href=editgroups.cgi>Back to group list</a>");
+    PutTrailer("back to the <a href=\"editgroups.cgi\">group list</a>");
     exit;
 }
 
@@ -666,7 +666,7 @@ if ($action eq 'postchanges') {
         SendSQL("UPDATE groups SET last_changed = NOW() WHERE id = $gid");
         print "Done.<p>\n";
     }
-    PutTrailer("<a href=editgroups.cgi>Back to the group list</a>");
+    PutTrailer("back to the <a href=\"editgroups.cgi\">group list</a>");
     exit;
 }
 
diff --git a/editkeywords.cgi b/editkeywords.cgi
index 8ef11aee0..073dfbb9d 100755
--- a/editkeywords.cgi
+++ b/editkeywords.cgi
@@ -30,6 +30,10 @@ my $localtrailer = "<A HREF=\"editkeywords.cgi\">edit</A> more keywords";
 
 #
 # Displays a text like "a.", "a or b.", "a, b or c.", "a, b, c or d."
+# 
+# XXX This implementation of PutTrailer outputs a default link back to
+# the query page instead of the index, which is inconsistent with other
+# PutTrailer() implementations.
 #
 
 sub PutTrailer (@)
@@ -242,7 +246,8 @@ if ($action eq 'new') {
     unlink "data/versioncache";
 
     print "OK, done.<p>\n";
-    PutTrailer("<A HREF=\"editkeywords.cgi\">edit</A> more keywords or <A HREF=\"editkeywords.cgi?action=add\">add</a> another keyword");
+    PutTrailer("<a href=\"editkeywords.cgi\">edit</a> more keywords",
+        "<a href=\"editkeywords.cgi?action=add\">add</a> another keyword");
     exit;
 }
 
diff --git a/editproducts.cgi b/editproducts.cgi
index 55089d9ae..1782a74b8 100755
--- a/editproducts.cgi
+++ b/editproducts.cgi
@@ -433,7 +433,9 @@ if ($action eq 'new') {
     unlink "data/versioncache";
 
     print "OK, done.<p>\n";
-    PutTrailer($localtrailer, "<a href=\"editcomponents.cgi?action=add&product=" . url_quote($product) . "\">add</a> components to this new product.");
+    PutTrailer($localtrailer,
+        "<a href=\"editcomponents.cgi?action=add&product=" .
+        url_quote($product) . "\">add</a> components to this new product");
     exit;
 }
 
diff --git a/editusers.cgi b/editusers.cgi
index ecd179793..823035fe5 100755
--- a/editusers.cgi
+++ b/editusers.cgi
@@ -207,9 +207,10 @@ sub EmitFormElements ($$$$)
 
 sub PutTrailer (@)
 {
-    my (@links) = ("Back to the <A HREF=\"./\">index</A>");
+    my (@links) = ("Back to the <a href=\"./\">index</a>");
     if($editall && Bugzilla::Auth->can_edit) {
-          push(@links, "<A HREF=\"editusers.cgi?action=add\">Add a new user</A>");
+          push(@links,
+              "<a href=\"editusers.cgi?action=add\">add</a> a new user");
     }
     push(@links, @_);
 
@@ -489,10 +490,11 @@ if ($action eq 'new') {
     SendSQL("SELECT last_insert_id()");
     my ($newuserid) = FetchSQLData();
 
-    print "To change ${user}'s permissions, go back and <a href=\"editusers.cgi?action=edit&user=" . url_quote($user)."\">edit this user</A>";
+    print "To change ${user}'s permissions, go back and " .
+        "<a href=\"editusers.cgi?action=edit&user=" . url_quote($user) .
+        "\">edit</a> this user.";
     print "<p>\n";
-    PutTrailer($localtrailer,
-        "<a href=\"editusers.cgi?action=add\">add</a> another user.");
+    PutTrailer($localtrailer);
     exit;
 
 }