Remove ability for HTML emails to use CSS positioning to overlay SquirrelMail content...

[squirrelmail.git] / templates / default / page_header.tpl
diff --git a/templates/default/page_header.tpl b/templates/default/page_header.tpl

index 99a4de40f129357179f7c066fd5b998afaede807..e66fe17b464a752331c7a0e301867d44882f18cb 100644 (file)
--- a/templates/default/page_header.tpl
+++ b/templates/default/page_header.tpl
@@ -5,7 +5,7 @@
   *
   * Template to create the header for each page.
   *
- * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+ * @copyright &copy; 1999-2009 The SquirrelMail Project Team
   * @license http://opensource.org/licenses/gpl-license.php GNU Public License
   * @version $Id$
   * @package squirrelmail
@@ -51,16 +51,24 @@ $options_str = $options_link_default;
  $search_str = $search_link_default;
  $help_str = $help_link_default;
  
-$compose_link  = makeComposeLink ('src/compose.php?mailbox='.$urlMailbox.'&amp;startMessage='.$startMessage, $compose_str);
-$signout_link  = makeInternalLink ('src/signout.php', $signout_str, $frame_top);
-$address_link  = makeInternalLink ('src/addressbook.php', $address_str);
-$folders_link  = makeInternalLink ('src/folders.php', $folders_str);
-$search_link   = makeInternalLink ('src/search.php?mailbox='.$urlMailbox, $search_str);
-$options_link  = makeInternalLink ('src/options.php', $options_str);
-$help_link             = makeInternalLink ('src/help.php', $help_str);
+$compose_link = makeComposeLink('src/compose.php?mailbox=' . $urlMailbox
+                                . '&amp;startMessage=' . $startMessage,
+                                $compose_str, '', $accesskey_menubar_compose);
+$signout_link = makeInternalLink('src/signout.php', $signout_str, $frame_top,
+                                 $accesskey_menubar_signout);
+$address_link = makeInternalLink('src/addressbook.php', $address_str, '',
+                                 $accesskey_menubar_addresses);
+$folders_link = makeInternalLink('src/folders.php', $folders_str, '',
+                                 $accesskey_menubar_folders);
+$search_link  = makeInternalLink('src/search.php?mailbox='.$urlMailbox,
+                                 $search_str, '', $accesskey_menubar_search);
+$options_link = makeInternalLink('src/options.php', $options_str, '',
+                                 $accesskey_menubar_options);
+$help_link    = makeInternalLink('src/help.php', $help_str, '',
+                                 $accesskey_menubar_help);
  
  ?>
-<body <?php echo $body_tag_js; ?>>
+<body <?php if (!empty($onload)) echo ' onload="' . $onload . '"'; ?>>
  <div id="page_header">
  <a name="pagetop"></a>
  <?php if (!empty($plugin_output['page_header_top'])) echo $plugin_output['page_header_top']; ?>
@@ -75,19 +83,25 @@ $help_link          = makeInternalLink ('src/help.php', $help_str);
    </td>
   </tr>
   <tr>
-  <td class="sqm_topNavigation"<?php echo (empty($provider_link) ? ' colspan="2"' : ''); ?>>
+  <td class="sqm_topNavigation">
     <?php echo $compose_link; ?>&nbsp;&nbsp;
     <?php echo $address_link; ?>&nbsp;&nbsp;
     <?php echo $folders_link; ?>&nbsp;&nbsp;
     <?php echo $options_link; ?>&nbsp;&nbsp;
     <?php echo $search_link; ?>&nbsp;&nbsp;
     <?php echo $help_link; ?>&nbsp;&nbsp;
-   <?php /* FIXME: no hooks in templates!! */ global $null; do_hook('menuline', $null); ?>
+   <?php if (!empty($plugin_output['menuline'])) echo $plugin_output['menuline']; ?>
+  </td>
+  <td class="sqm_providerInfo">
+   <?php 
+       if (!empty($plugin_output['provider_link_before']))
+           echo $plugin_output['provider_link_before'];
+       if (!empty($provider_link))
+           echo $provider_link;
+       if (!empty($plugin_output['provider_link_after']))
+           echo $plugin_output['provider_link_after'];
+   ?>
    </td>
-  <?php if (!empty($provider_link))
-            echo '<td class="sqm_providerInfo">'
-               . $provider_link
-               . "</td>\n"; ?>
   </tr>
  </table>
  </div>