[mb-commits] r8383 - in mb_server/branches/RELEASE_20060712-BRANCH/htdocs: comp mod

Author: keschte
Date: 2006-08-10 20:47:29 +0000 (Thu, 10 Aug 2006)
New Revision: 8383

Modified:
   mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/showmod
   mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/showmoddetail
   mb_server/branches/RELEASE_20060712-BRANCH/htdocs/mod/remove.html
Log:
change 'remove edit' to 'cancel edit' (fixes #2011)


Modified: mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/showmod
===================================================================
--- mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/showmod      
2006-08-10 20:43:43 UTC (rev 8382)
+++ mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/showmod      
2006-08-10 20:47:29 UTC (rev 8383)
@@ -22,12 +22,12 @@
 
        # Rough sketch of the layout of a moderation row:
 
-       # 
======orange===bar============================================================================+
-       # By: modname   ID: ##### (am)| Type: mod type...        |              
1 yes, 1 no                                       |
-       # Expire[sd]: yyyymmdd.....   | Artist: name...    | [ Add note | Send 
email | Remove edit ]  |
-       # 
----------------------------+-----------------------+-----------------------------------------+
-       # previous value shown here   | New value shown here  |  [X] Yes [X] No 
[X] Abstain                      |
-       # 
======orange===bar============================================================================+
+       # 
======orange===bar=============================================================================+
+       # By: modname   ID: ##### (am)| Type: mod type...         |             
1 yes, 1 no                                              |
+       # Expire[sd]: yyyymmdd.....   | Artist: name...       | [ Add note | 
Send email | Cancel edit ]  |
+       # 
----------------------------+-----------------------+------------------------------------------+
+       # previous value shown here   | New value shown here  |  [X] Yes [X] No 
[X] Abstain                          |
+       # 
======orange===bar=============================================================================+
 
        # The bottom right cell may contain:
        #       Your vote: Yes
@@ -117,7 +117,7 @@
 %      if ($is_mine and $is_open)
 %      {
 
-                               | <a href="/mod/remove.html?editid=<% 
$edit->GetId %>&amp;url=<% $url %>">Remove edit</a>
+                               | <a href="/mod/remove.html?editid=<% 
$edit->GetId %>&amp;url=<% $url %>">Cancel edit</a>
 
 %      }
 

Modified: mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/showmoddetail
===================================================================
--- mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/showmoddetail        
2006-08-10 20:43:43 UTC (rev 8382)
+++ mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/showmoddetail        
2006-08-10 20:47:29 UTC (rev 8383)
@@ -32,7 +32,7 @@
                     UserStuff->IsAutoEditor($session{"privs"})) and
                    $edit->IsAutoEditType($edit->GetType));
 
-       push @statuslinks, qq!<a href="/mod/remove.html?editid=$id">Remove 
edit</a>!
+       push @statuslinks, qq!<a href="/mod/remove.html?editid=$id">Cancel 
edit</a>!
                if ($my_mod and $is_open);
 
 </%perl>

Modified: mb_server/branches/RELEASE_20060712-BRANCH/htdocs/mod/remove.html
===================================================================
--- mb_server/branches/RELEASE_20060712-BRANCH/htdocs/mod/remove.html   
2006-08-10 20:43:43 UTC (rev 8382)
+++ mb_server/branches/RELEASE_20060712-BRANCH/htdocs/mod/remove.html   
2006-08-10 20:47:29 UTC (rev 8383)
@@ -67,7 +67,7 @@
        # form was submitted, see which button it was.
        if ($submitvalue ne "")
        {
-               if ($submitvalue =~ m/Remove Edit/)
+               if ($submitvalue =~ m/Cancel edit/)
                {
                    my $sql = Sql->new($mb->{DBH});
                        eval
@@ -107,7 +107,7 @@
                        <tr>
                                <td colspan="2" class="instructions">
                                        <ul>
-                                               <li>Do you want to remove this 
edit?</li>
+                                               <li>Do you want to cancel this 
edit?</li>
                                        </ul>
                                </td>
                        </tr>
@@ -141,8 +141,8 @@
                        <tr class="spaced">
                                <td class="label">&nbsp;</td>
                                <td class="submitbuttons">
-                                       <input type="submit" class="button" 
name="submitvalue" value="Remove Edit &raquo;" />
-                                       <input type="submit" class="button" 
name="submitvalue" id="btn_cancel" value="Cancel" />
+                                       <input type="submit" class="button" 
name="submitvalue" value="Cancel edit &raquo;" />
+                                       <input type="submit" class="button" 
name="submitvalue" id="btn_cancel" value="No, keep it" />
 
                                        <& /comp/form/focusfield, "btn_cancel" 
&>
                                        <& /comp/args-to-hidden-fields.inc, 
%ARGS &>