X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fpage_header.php;h=c4d8f3af2e0a0a3fc5d59ad304e3e48fde18fd39;hp=3cac7aeda9a42075c3d4995ff49d703e5487d62b;hb=b01b21d00c21c47620a86a8412918b287676eca7;hpb=d55c0f66fc0f73d886fc2040936a28d7a17fa1ea;ds=sidebyside diff --git a/functions/page_header.php b/functions/page_header.php index 3cac7aed..c4d8f3af 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -13,6 +13,7 @@ require_once('../functions/strings.php'); require_once('../functions/imap_utf7_decode_local.php'); +require_once('../functions/html.php'); /* Always set up the language before calling these functions */ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE ) { @@ -183,29 +184,29 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) { } - echo "\n\n"; + echo "\n\n"; /** Here is the header and wrapping table **/ $shortBoxName = imap_utf7_decode_local( readShortMailboxName($mailbox, $delimiter)); if ( $shortBoxName == 'INBOX' ) { $shortBoxName = _("INBOX"); } - echo "\n" - . "\n" - . " \n" - . " \n" - . ' \n" + . html_tag( 'td', '', 'right' ) ."\n"; displayInternalLink ('src/signout.php', _("Sign Out"), $frame_top); - echo "\n" - . " \n" - . " \n" - . " \n" + . " \n" + . html_tag( 'tr', '', '', $color[4] ) ."\n" + . html_tag( 'td', '', 'left' ) ."\n"; $urlMailbox = urlencode($mailbox); if ($compose_new_win == '1') { echo "". _("Compose"). ''; @@ -227,12 +228,13 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) { do_hook("menuline"); - echo " \n \n" + . html_tag( 'td', '', 'right' ) ."\n"; echo ($hide_sm_attributions ? ' ' : - 'SquirrelMail'); - echo "\n". - " \n". - "
\n"; + echo "\n" + . html_tag( 'table', '', '', $color[4], 'border="0" width="100%" cellspacing="0" cellpadding="2"' ) ."\n" + . html_tag( 'tr', '', '', $color[9] ) ."\n" + . html_tag( 'td', '', 'left' ) ."\n"; if ( $shortBoxName <> '' && strtolower( $shortBoxName ) <> 'none' ) { - echo ' ' . _("Current Folder") . ": $shortBoxName \n"; + echo ' ' . _("Current Folder") . ": $shortBoxName \n"; } else { echo ' '; } - echo " '; + echo "
\n"; + echo "
"; + echo "
\n\n"; + 'SquirrelMail'); + echo "\n". + " \n". + "\n\n"; } /* blatently copied/truncated/modified from the above function */ @@ -285,6 +287,6 @@ function compose_Header($color, $mailbox) { } - echo "\n\n"; + echo "\n\n"; } ?>