Shortened some labels

diff --git a/maps/bin/add2blacklist.cgi b/maps/bin/add2blacklist.cgi
index f7c29d5..194932d 100755 (executable)
--- a/maps/bin/add2blacklist.cgi
+++ b/maps/bin/add2blacklist.cgi
@@ -100,7 +100,7 @@ print '<p></p><center>',
   hidden ({-name => 'type',
      -default    => $type}),
   submit ({-name => 'action',
-     -value      => 'Add New Entry'}),
+     -value      => 'Add'}),
   '</center>';
 
 Footing;

diff --git a/maps/bin/add2nulllist.cgi b/maps/bin/add2nulllist.cgi
index 65f302a..da698dd 100755 (executable)
--- a/maps/bin/add2nulllist.cgi
+++ b/maps/bin/add2nulllist.cgi
@@ -105,7 +105,7 @@ print '<p></p><center>',
   hidden ({-name    => 'type',
            -default => $type}),
   submit ({-name    => 'action',
-           -value   => 'Add New Entry'}),
+           -value   => 'Add'}),
   '</center>';
 
 Footing;

diff --git a/maps/bin/add2whitelist.cgi b/maps/bin/add2whitelist.cgi
index 46a5fff..dd7068b 100755 (executable)
--- a/maps/bin/add2whitelist.cgi
+++ b/maps/bin/add2whitelist.cgi
@@ -114,7 +114,7 @@ print '<p></p><center>',
   hidden ({-name    => 'type',
            -default => $type}),
   submit ({-name    => 'action',
-           -value   => 'Add New Entry'}),
+           -value   => 'Add'}),
   '</center>';
 
 Footing;

diff --git a/maps/bin/detail.cgi b/maps/bin/detail.cgi
index 1d39097..ed7efca 100755 (executable)
--- a/maps/bin/detail.cgi
+++ b/maps/bin/detail.cgi
@@ -90,49 +90,49 @@ sub MakeButtons {
   if ($type eq 'whitelist') {
     $buttons = $buttons .
       submit ({-name    => 'action',
-               -value   => 'Blacklist Marked',
+               -value   => 'Blacklist',
                -onClick => 'return CheckAtLeast1Checked (document.detail);'}) .
       submit ({-name    => 'action',
-               -value   => 'Nulllist Marked',
+               -value   => 'Nulllist',
                -onClick => 'return CheckAtLeast1Checked (document.detail);'}) .
       submit ({-name    => 'action',
-               -value   => 'Reset Marks',
+               -value   => 'Reset',
                -onClick => 'return ClearAll (document.detail);'});
   } elsif ($type eq 'blacklist') {
     $buttons = $buttons .
       submit ({-name    => 'action',
-               -value   => 'Whitelist Marked',
+               -value   => 'Whitelist',
                -onClick => 'return CheckAtLeast1Checked (document.detail);'}) .
       submit ({-name    => 'action',
-               -value   => 'Nulllist Marked',
+               -value   => 'Nulllist',
                -onClick => 'return CheckAtLeast1Checked (document.detail);'}) .
       submit ({-name    => 'action',
-               -value   => 'Reset Marks',
+               -value   => 'Reset',
                -onClick => 'return ClearAll (document.detail);'});
   } elsif ($type eq 'nulllist') {
     $buttons = $buttons .
       submit ({-name    => 'action',
-               -value   => 'Whitelist Marked',
+               -value   => 'Whitelist',
                -onClick => 'return CheckAtLeast1Checked (document.detail);'}) .
       submit ({-name    => 'action',
-               -value   => 'Blacklist Marked',
+               -value   => 'Blacklist',
                -onClick => 'return CheckAtLeast1Checked (document.detail);'}) .
       submit ({-name    => 'action',
-               -value   => 'Reset Marks',
+               -value   => 'Reset',
                -onClick => 'return ClearAll (document.detail);'});
   } else {
     $buttons = $buttons .
       submit ({-name    => 'action',
-               -value   => 'Whitelist Marked',
+               -value   => 'Whitelist',
                -onClick => 'return CheckAtLeast1Checked (document.detail);'}) .
       submit ({-name    => 'action',
-               -value   => 'Blacklist Marked',
+               -value   => 'Blacklist',
                -onClick => 'return CheckAtLeast1Checked (document.detail);'}) .
       submit ({-name    => 'action',
-               -value   => 'Nulllist Marked',
+               -value   => 'Nulllist',
                -onClick => 'return CheckAtLeast1Checked (document.detail);'}) .
       submit ({-name    => 'action',
-               -value   => 'Reset Marks',
+               -value   => 'Reset',
                -onClick => 'return ClearAll (document.detail);'});
   } # if
 

diff --git a/maps/bin/processaction.cgi b/maps/bin/processaction.cgi
index c9f0f58..082be8a 100755 (executable)
--- a/maps/bin/processaction.cgi
+++ b/maps/bin/processaction.cgi
@@ -426,17 +426,17 @@ $lines = $options{'Page'};
 
 $total = count('list', "userid = \"$userid\" and type = \"$type\"") if $type;
 
-if ($action eq 'Add New Entry') {
+if ($action eq 'Add') {
   AddNewEntry($type);
-} elsif ($action eq 'Delete Marked') {
+} elsif ($action eq 'Delete') {
   DeleteEntries($type);
-} elsif ($action eq 'Modify Marked') {
+} elsif ($action eq 'Modify') {
   ModifyEntries($type);
-} elsif ($action eq 'Whitelist Marked') {
+} elsif ($action eq 'Whitelist') {
   WhitelistMarked;
-} elsif ($action eq 'Blacklist Marked') {
+} elsif ($action eq 'Blacklist') {
   BlacklistMarked;
-} elsif ($action eq 'Nulllist Marked') {
+} elsif ($action eq 'Nulllist') {
   NulllistMarked;
 } else {
   Heading(

diff --git a/maps/php/list.php b/maps/php/list.php
index 8edb44a..672f09d 100755 (executable)
--- a/maps/php/list.php
+++ b/maps/php/list.php
@@ -93,13 +93,13 @@ $this_page = $next / $lines + 1;
       "<a href=list.php?type=$type&next=" . ($next + $lines) . "><img src=/maps/images/next.gif border=0 alt=Next align=middle accesskey=n></a>" : "";
     print $prev_button;
     ?>
-    <input type="submit" name="action" value="Add New Entry"
+    <input type="submit" name="action" value="Add"
       onclick="return NoneChecked (document.list);">
-    <input type="submit" name="action" value="Delete Marked"
+    <input type="submit" name="action" value="Delete"
       onclick="return CheckAtLeast1Checked (document.list) && AreYouSure ('Are you sure you want to delete these entries?');">
-    <input type="submit" name="action" value="Modify Marked"
+    <input type="submit" name="action" value="Modify"
       onclick="return CheckAtLeast1Checked (document.list);">
-    <input type="submit" name="action" value="Reset Marks"
+    <input type="submit" name="action" value="Reset"
       onclick="return ClearAll (document.list);">
     <?php print $next_button?>
   </div>