[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] SF.net SVN: squirrelmail:[13917]
From:       pdontthink () users ! sourceforge ! net
Date:       2010-02-20 19:31:44
Message-ID: E1Niv3I-0002M5-AX () sfp-svn-3 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 13917
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13917&view=rev
Author:   pdontthink
Date:     2010-02-20 19:31:44 +0000 (Sat, 20 Feb 2010)

Log Message:
-----------
Fix slip-up in link order (thanks to Fernando Gozalo for spotting).  Also fix some \
ancient HTML.

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/plugins/delete_move_next/setup.php

Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/delete_move_next/setup.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/plugins/delete_move_next/setup.php	2010-02-16 \
                20:20:57 UTC (rev 13916)
+++ branches/SM-1_4-STABLE/squirrelmail/plugins/delete_move_next/setup.php	2010-02-20 \
19:31:44 UTC (rev 13917) @@ -198,15 +198,15 @@
             }
         }
         if ($next > 0){
-            echo "<a \
href=\"read_body.php?passed_id=$next_if_del&amp;mailbox=$urlMailbox&amp;sort=$sort&amp \
;startMessage=$startMessage&amp;show_more=0&amp;unread_id=$passed_id&amp;smtoken=" . \
sm_generate_security_token() . "\">" . _("Unread &amp; Next") . "</a>";  if \
                ($delete_move_next_show_unread == 'on') {
-                echo "&nbsp;|&nbsp;<a \
href=\"read_body.php?passed_id=$next_if_del&amp;mailbox=$urlMailbox&amp;sort=$sort&amp \
;startMessage=$startMessage&amp;show_more=0&amp;delete_id=$passed_id&amp;smtoken=" . \
sm_generate_security_token() . "\">" . _("Delete &amp; Next") . "</a>"; +             \
echo "<a href=\"read_body.php?passed_id=$next_if_del&amp;mailbox=$urlMailbox&amp;sort= \
$sort&amp;startMessage=$startMessage&amp;show_more=0&amp;unread_id=$passed_id&amp;smtoken=" \
. sm_generate_security_token() . "\">" . _("Unread &amp; Next") . \
"</a>&nbsp;|&nbsp;";  }
+            echo "<a \
href=\"read_body.php?passed_id=$next_if_del&amp;mailbox=$urlMailbox&amp;sort=$sort&amp \
;startMessage=$startMessage&amp;show_more=0&amp;delete_id=$passed_id&amp;smtoken=" . \
sm_generate_security_token() . "\">" . _("Delete &amp; Next") . "</a>";  } else {
-            echo _("Delete &amp; Next");
             if ($delete_move_next_show_unread == 'on') {
-                echo "&nbsp;|&nbsp;" . _("Unread &amp; Next");
+                echo _("Unread &amp; Next") . "&nbsp;|&nbsp;";
             }
+            echo _("Delete &amp; Next");
         }
         echo '</small></td></tr>';
 
@@ -354,38 +354,37 @@
         $delete_move_next_t, $delete_move_next_formATtop,
         $delete_move_next_b, $delete_move_next_formATbottom;
 
-//FIXME: This HTML really needs to be fixed...
-    echo "<tr>" . html_tag('td',_("Delete/Unread/Move/Next \
                Buttons:"),'right','','valign=top') . "\n".
-         "<td><input type=checkbox name=delete_move_next_ti";
+    echo "<tr>" . html_tag('td',_("Delete/Unread/Move/Next \
Buttons:"),'right','','valign="top"') . "\n". +         '<td><input type="checkbox" \
name="delete_move_next_ti" id="delete_move_next_ti"';  
     if ($delete_move_next_t == 'on') {
-        echo " checked";
+        echo ' checked="checked"';
     }
-    echo '> ' . _("Display at top").
-         " <input type=checkbox name=delete_move_next_formATtopi";
+    echo '><label for="delete_move_next_ti"> ' . _("Display at top").
+         '</label> <input type="checkbox" name="delete_move_next_formATtopi" \
id="delete_move_next_formATtopi"';  
     if ($delete_move_next_formATtop == 'on') {
-        echo ' checked';
+        echo ' checked="checked"';
     }
-    echo '> ' . _("with move option") . '<br>';
+    echo '><label for="delete_move_next_formATtopi"> ' . _("with move option") . \
'</label><br>';  
-    echo '<input type=checkbox name=delete_move_next_bi';
+    echo '<input type="checkbox" name="delete_move_next_bi" \
id="delete_move_next_bi"';  if($delete_move_next_b != 'off') {
-        echo ' checked';
+        echo ' checked="checked"';
     }
-    echo '> ' . _("Display at bottom") .
-         '<input type=checkbox name=delete_move_next_formATbottomi';
+    echo '><label for="delete_move_next_bi"> ' . _("Display at bottom") .
+         '</label> <input type="checkbox" name="delete_move_next_formATbottomi" \
id="delete_move_next_formATbottomi"';  
     if ($delete_move_next_formATbottom != 'off') {
-        echo ' checked';
+        echo ' checked="checked"';
     }
-    echo '> ' . _("with move option") . '<br>'.
-         '<input type=checkbox name=delete_move_next_show_unread';
+    echo '><label for="delete_move_next_formATbottomi"> ' . _("with move option") . \
'</label><br>'. +         '<input type="checkbox" name="delete_move_next_show_unread" \
id="delete_move_next_show_unread"';  if($delete_move_next_show_unread != 'off') {
-        echo ' checked';
+        echo ' checked="checked"';
     }
-    echo '> ' . _("Show unread options") .
-         "</td></tr>\n";
+    echo '><label for="delete_move_next_show_unread"> ' . _("Show unread options") .
+         "</label></td></tr>\n";
 }
 
 function delete_move_next_display_save() {


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@lists.sourceforge.net
List info (subscribe/unsubscribe/change options): \
                https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn


[prev in list] [next in list] [prev in thread] [next in thread]