Upper frame out

[squirrelmail.git] / functions / page_header.php
diff --git a/functions/page_header.php b/functions/page_header.php

index 98332826444c044f125f85611a5a08e0ea8d56e2..98b916884ff95d3791e2c3b5bcc173c55eff3ff7 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -16,14 +16,10 @@
     function displayHtmlHeader ($title="SquirrelMail") {
       global $theme_css;
  
-      echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">';
-      echo "\n\n";
-      echo "<HTML>\n";
-      echo "<HEAD>\n";
-      if ($theme_css != "") {
-        printf ('<LINK REL="stylesheet" TYPE="text/css" HREF="%s">', 
-                $theme_css);
-        echo "\n";
+      echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">' .
+           "\n\n<HTML>\n<HEAD>\n";
+      if ($theme_css != '') {
+        echo "<LINK REL=\"stylesheet\" TYPE=\"text/css\" HREF=\"$theme_css\">\n"; 
        }
        
        do_hook ("generic_header");
@@ -32,35 +28,35 @@
        echo "</HEAD>\n\n";
     }
  
-   function displayInternalLink ($path, $text, $target="") {
+   function displayInternalLink ($path, $text, $target='') {
        global $base_uri;
  
-      if ($target != "")
+      if ($target != '')
           $target = " target=\"$target\"";
        
        echo '<a href="'.$base_uri.$path.'"'.$target.'>'.$text.'</a>';
     }
  
     function displayPageHeader($color, $mailbox) {
+      global $delimiter;
        displayHtmlHeader ();
  
-      echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\" onLoad='document.forms[0].elements[0].focus();'>\n\n";
+      echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\" onLoad='if ( ( document.forms.length > 0 ) && ( document.forms[0].elements[0].type == \"text\" ) ) { document.forms[0].elements[0].focus(); }'>\n\n";
  
        /** Here is the header and wrapping table **/
-      $shortBoxName = readShortMailboxName($mailbox, ".");
+      $shortBoxName = readShortMailboxName($mailbox, $delimiter);
        echo "<A NAME=pagetop></A>\n";
+      // echo "<table cellpadding=1 cellspacing=1 BGCOLOR=\"$color[4]\" width=100%><tr><td>";
        echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 WIDTH=\"100%\" CELLSPACING=0 CELLPADDING=2>\n";
-      echo "   <TR BGCOLOR=\"$color[9]\">\n";
-      echo "      <TD ALIGN=left WIDTH=\"30%\"><b>\n";
+      echo "   <TR BGCOLOR=\"$color[9]\" >\n";
+      echo "      <TD ALIGN=left><b>\n";
        displayInternalLink ("src/signout.php", _("Sign Out"), "_top");
-      echo "      </b></TD><TD ALIGN=right WIDTH=\"70%\">\n";
-      echo "         <div align=right>" . _("Current Folder") . ": <B>$shortBoxName&nbsp;</B></div>\n";
+      echo "      </b></TD><TD ALIGN=right>\n";
+      echo '         ' . _("Current Folder") . ": <B>$shortBoxName&nbsp;</B>\n";
        echo "      </TD>\n";
        echo "   </TR>\n";
-      echo "</TABLE>\n\n";
-      echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 WIDTH=\"100%\" CELLSPACING=0 CELLPADDING=2>\n";
-      echo "   <TR>\n";
-      echo "      <TD ALIGN=left WIDTH=\"90%\">\n";
+      echo "   <TR BGCOLOR=\"$color[4]\">\n";
+      echo "      <TD ALIGN=left>\n";
        $urlMailbox = urlencode($mailbox);
        displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), "right");
        echo "&nbsp;&nbsp;\n";
@@ -77,10 +73,11 @@
  
        do_hook("menuline");
  
-      echo "      </TD><TD ALIGN=right nowrap WIDTH=\"10%\">\n";
+      echo "      </TD><TD ALIGN=right>\n";
        echo "         <A HREF=\"http://www.squirrelmail.org/\" TARGET=\"_blank\">SquirrelMail</A>\n";
        echo "      </TD>\n";
        echo "   </TR>\n";
        echo "</TABLE>\n\n";
+      // echo "</td></tr></table>";
    }
  ?>