X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2Fdefault_advanced%2Flogin.tpl;h=b89fe0425a23c545477879c098efcd96d05c1a07;hb=3f69d9379db6f8b94608ae8d274563870417c0c7;hp=cf3441ccc241de4d97ff63946f84e0accfe50074;hpb=fe549255128d9a7ce9efa4c66f617ce90e8639d6;p=squirrelmail.git

diff --git a/templates/default_advanced/login.tpl b/templates/default_advanced/login.tpl
index cf3441cc..b89fe042 100644
--- a/templates/default_advanced/login.tpl
+++ b/templates/default_advanced/login.tpl
@@ -11,12 +11,14 @@
  *      $sm_attribute_str   - string containg SQM attributes.  Will be empty if
  *                            this has been disabled by the admin.
  *      $org_name_str       - translated string containing orginization's name
+ *      $org_logo_str       - translated string containing orginization's logo
  *      $login_field_value  - default value for the user name 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_extra       - Extra table row(s) that may be added by plugin(s).
- * 
+ *      $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
  * @version $Id$
@@ -24,8 +26,6 @@
  * @subpackage templates
  */
 
-// add includes
-require(SM_PATH . 'templates/util_global.php');
 
 /* retrieve the template vars */
 extract($t);
@@ -35,7 +35,7 @@ extract($t);
 <table cellspacing="0">
  <tr>
   <td colspan="2">
-   <?php echo getIcon($icon_theme_path, 'login1.png', ''); ?>
+   <?php echo getIcon($icon_theme_path, 'login1.png', '', _("The SquirrelMail logo")); ?>
   </td>
  </tr>
  <tr>
@@ -45,12 +45,12 @@ extract($t);
  </tr>
  <tr>
   <td class="attr" colspan="2">
-   <?php echo $sm_attribute_str; ?>
+   <?php echo nl2br($sm_attribute_str) . (empty($sm_attribute_str) ? '' : '<br /><br />'); ?>
   </td>
  </tr>
  <tr>
   <td class="orgLogo">
-   <img src="<?php echo $logo_path; ?>" width="50px" />
+   <img src="<?php echo $logo_path; ?>" width="50" alt="<?php echo $org_logo_str; ?>" />
   </td>
   <td>
    <table cellspacing="0">
@@ -59,7 +59,7 @@ extract($t);
       <?php echo _("Name:"); ?>
      </td>
      <td class="fieldInput">
-      <input type="text" name="login_username" value="<?php echo $login_field_value; ?>" id="login_username" class="input" />
+      <input type="text" name="login_username" value="<?php echo $login_field_value; ?>" id="login_username" class="input" onfocus="alreadyFocused=true;" />
      </td>
     </tr>
     <tr>
@@ -67,11 +67,11 @@ extract($t);
       <?php echo _("Password:"); ?>
      </td>
      <td class="fieldInput">
-      <input type="password" name="secretkey" value="" id="secretkey" class="input" />
+      <input type="password" name="secretkey" value="" id="secretkey" class="input" onfocus="alreadyFocused=true;" />
       <?php echo $login_extra; ?>
      </td>
     </tr>
-    <?php echo $plugin_extra; ?>
+    <?php if (!empty($plugin_output['login_form'])) echo $plugin_output['login_form']; ?>
     <tr>
      <td class="loginSubmit" colspan="2">
       <input type="image" src="<?php echo getIconPath($icon_theme_path, 'login_submit.png', _("Login"), _("Login")); ?>" alt="<?php echo _("Login"); ?>" />