I don't remember why the login_form hook had to be moved up into the table (it was...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11680 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index c303cea1d108e6e7d0a73287ac8c2022c8fabb69..98d2b4609dac628affbf8af6475b0d7db3e32312 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -134,6 +134,7 @@ Version 1.5.2 - CVS
   - Provide View Unsafe Images link on viewing a text/html attachment.
   - Added APOP, TLS and STLS support to mail_fetch plugin (#575299).
   - Added Courier IMAP OUTBOX check to configtest utility.
+  - Moved login_form hook to its own table row on login page.
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

diff --git a/templates/default/login.tpl b/templates/default/login.tpl
index 010ab15d35618d622b4df6c62d3572e9913dabdc..dabb185a03ecb4247d9ee4ae329adc3c4a7c208b 100644 (file)
--- a/templates/default/login.tpl
+++ b/templates/default/login.tpl
@@ -53,6 +53,10 @@ extract($t);
   </td>
   <td class="sqm_loginFieldInput">
    <input type="password" name="secretkey" value="" id="secretkey" />
+  </td>
+ </tr>
+ <tr>
+  <td colspan="2">
    <?php echo $login_extra; ?>
   </td>
  </tr>
@@ -62,4 +66,4 @@ extract($t);
   </td>
  </tr>
 </table>
-</div>
\ No newline at end of file
+</div>

diff --git a/templates/default_advanced/login.tpl b/templates/default_advanced/login.tpl
index 90e7bdc6495b6968a605683b59f02fcbb8ed0657..8776da85f44598bbe8f19b28a526e5e9d5456593 100644 (file)
--- a/templates/default_advanced/login.tpl
+++ b/templates/default_advanced/login.tpl
@@ -66,6 +66,10 @@ extract($t);
      </td>
      <td class="fieldInput">
       <input type="password" name="secretkey" value="" id="secretkey" class="input" />
+     </td>
+    </tr>
+    <tr>
+     <td colspan="2">
       <?php echo $login_extra; ?>
      </td>
     </tr>
@@ -78,4 +82,4 @@ extract($t);
   </td>
  </tr>
 </table>
-</div>
\ No newline at end of file
+</div>