Fix missing internationalisation and display of empty cells, thanks

[squirrelmail.git] / templates / default / login.tpl

diff --git a/templates/default/login.tpl b/templates/default/login.tpl
index dabb185a03ecb4247d9ee4ae329adc3c4a7c208b..3b3901592b11fabf5faa7b789764c647eb10b025 100644 (file)
--- a/templates/default/login.tpl
+++ b/templates/default/login.tpl
@@ -12,8 +12,11 @@
  *                            this has been disabled by the admin.
  *      $org_name_str       - translated string containing orginization's name
  *      $login_field_value  - default value for the user name field
- *      $login_extra        - Some extra fields needed by SquirrelMail for the 
- *                            login.  YOU SHOULD ALWAYS INCLUDE THIS FIELD!!
+ *      $login_extra        - Some extra form fields needed by SquirrelMail
+ *                            for the login.  Template designers SHOULD ALWAYS
+ *                            INCLUDE this value somewhere in the form.
+ *      $plugin_output      - An array of extra output that may be added by 
+ *                            plugin(s).
  * 
  * @copyright © 1999-2006 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
@@ -30,8 +33,10 @@ extract($t);
 <table cellspacing="0">
  <tr>
   <td class="sqm_loginTop" colspan="2">
-   <?php echo $logo_str; ?>
-   <?php echo $sm_attribute_str; ?>
+   <?php 
+       echo $logo_str; if (!empty($logo_str)) echo '<br />'; 
+       echo nl2br($sm_attribute_str) . (empty($sm_attribute_str) ? '' : '<br /><br />'); 
+   ?>
   </td>
  </tr>
  <tr>
@@ -44,7 +49,7 @@ extract($t);
    <?php echo _("Name:"); ?>
   </td>
   <td class="sqm_loginFieldInput">
-   <input type="text" name="login_username" value="<?php echo $login_field_value; ?>" id="login_username" />
+   <input type="text" name="login_username" value="<?php echo $login_field_value; ?>" id="login_username" onfocus="alreadyFocused=true;" />
   </td>
  </tr>
  <tr>
@@ -52,14 +57,11 @@ extract($t);
    <?php echo _("Password:"); ?>
   </td>
   <td class="sqm_loginFieldInput">
-   <input type="password" name="secretkey" value="" id="secretkey" />
-  </td>
- </tr>
- <tr>
-  <td colspan="2">
+   <input type="password" name="secretkey" value="" id="secretkey" onfocus="alreadyFocused=true;" />
    <?php echo $login_extra; ?>
   </td>
  </tr>
+ <?php if (!empty($plugin_output['login_form'])) echo $plugin_output['login_form']; ?>
  <tr>
   <td class="sqm_loginSubmit" colspan="2">
    <input type="submit" value="<?php echo _("Login"); ?>" />