From 22642690982acc5a0a63de7e180228922729afa7 Mon Sep 17 00:00:00 2001 From: stekkel Date: Thu, 10 Oct 2002 21:15:11 +0000 Subject: [PATCH] UI thread: Temporary permission to put back some layout changes. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3831 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/mailbox_display.php | 88 +++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 40 deletions(-) diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 379bea5f..24602f9b 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -417,23 +417,28 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, $msg_cnt_str = get_msgcnt_str($start_msg, $end_msg, $num_msgs); do_hook('mailbox_index_before'); - - mail_message_listing_beginning($imapConnection, $mailbox, $sort, - $msg_cnt_str, $paginator_str, $start_msg); - - - echo ''; + echo '\n" + echo " \n" . html_tag( 'td', '', 'right', '', 'nowrap' ); + + if (!$auto_expunge) { echo getButton('SUBMIT', 'expungeButton',_("Expunge")) .' ' . _("mailbox") . "\n"; @@ -726,15 +738,10 @@ function mail_message_listing_beginning ($imapConnection, , '', '', '' ); } - echo "
'; + echo ''; + echo ''; + /* line between the button area and the list */ + echo ''; + + echo '
'; + + mail_message_listing_beginning($imapConnection, $mailbox, $sort, + $msg_cnt_str, $paginator_str, $start_msg); + echo '
'; + echo ' '; + echo '
'; + echo ' '; + echo '
'; printHeader($mailbox, $srt, $color, !$thread_sort_messages); - displayMessageArray($imapConnection, $num_msgs, $start_msg, - $msort, $mailbox, $sort, $color, $show_num, 0, 0); + displayMessageArray($imapConnection, $num_msgs, $start_msg, + $msort, $mailbox, $sort, $color, $show_num,0,0); + echo '
'; - mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color); + mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color); echo '
'; - - /** - * TODO: Switch to using $_SESSION[] whenever we ditch the 4.0.x series. - */ } function calc_msort($msgs, $sort) { @@ -661,35 +666,42 @@ function mail_message_listing_beginning ($imapConnection, * This is the beginning of the message list table. * It wraps around all messages */ - echo "
\n" - . html_tag( 'table' ,'' , '', '', 'border="0" width="100%" cellpadding="1" cellspacing="0"' ) . + . html_tag( 'table' , html_tag( 'tr', html_tag( 'td' , html_tag( 'table' , html_tag( 'tr', html_tag( 'td', $paginator, 'left' ) . - html_tag( 'td', $msg_cnt_str, 'right' ) + html_tag( 'td', $msg_cnt_str, 'right' ) ) - , '', $color[4], 'border="0" width="100%" cellpadding="2" cellspacing="0"' ) + , '', $color[4], 'border="0" width="100%" cellpadding="1" cellspacing="0"' ) , 'left', '', '' ) , '', $color[0] ) - . html_tag( 'tr' ) . "\n" - . html_tag( 'td' ,'' , 'left', $color[0], '' ) - . html_tag( 'table' ,'' , '', $color[0], 'border="0" width="100%" cellpadding="0" cellspacing="0"' ) + , '', '', 'border="0" width="100%" cellpadding="1" cellspacing="0"' ); + echo '
'; + + echo html_tag( 'tr' ) . "\n" + . html_tag( 'td' ,'' , 'left', '', '' ) + . html_tag( 'table' ,'' , '', $color[9], 'border="0" width="100%" cellpadding="1" cellspacing="0"' ) + . '
' + . html_tag( 'table' ,'' , '', $color[0], 'border="0" width="100%" cellpadding="1" cellspacing="0"' ) . html_tag( 'tr', - getSmallStringCell(' ' . _("Move Selected To"), 'left') . - getSmallStringCell(_("Transform Selected Messages"), 'right') + getSmallStringCell(_("Move Selected To"), 'left', 'nowrap') . + getSmallStringCell(_("Transform Selected Messages"), 'right') ) . html_tag( 'tr' ) ."\n" . html_tag( 'td', '', 'left', '', 'valign="middle" nowrap' ); - getMbxList($imapConnection); - echo getButton('SUBMIT', 'moveButton',_("Move")) . "\n"; - echo getButton('SUBMIT', 'attache',_("Forward")) . "\n"; + getMbxList($imapConnection); + echo getButton('SUBMIT', 'moveButton',_("Move")) . "\n"; + echo getButton('SUBMIT', 'attache',_("Forward")) . "\n"; - echo "
\n"; - echo "\n"; + echo "\n"; do_hook('mailbox_form_before'); - echo '' - . html_tag( 'tr' ) - . html_tag( 'td' ,'' , '', $color[0], '' ); - /* if using server sort we highjack the * the $sort var and use $server_sort_order * instead. but here we reset sort for a bit @@ -746,8 +753,10 @@ function mail_message_listing_beginning ($imapConnection, } function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color) { - if ($num_msgs) { - echo html_tag( 'table', + if ($num_msgs) { + echo ''; + echo ''; + echo html_tag( 'table', html_tag( 'tr', html_tag( 'td', html_tag( 'table', @@ -755,12 +764,12 @@ function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $colo html_tag( 'td', $paginator_str ) . html_tag( 'td', $msg_cnt_str, 'right' ) ) - , '', $color[4], 'width="100%" cellpadding="1" cellspacing="1"' ) + , '', $color[4], 'width="100%" border="0" cellpadding="1" cellspacing="0"' ) ) - , '', $color[4] ) - , '', $color[9], 'width="100%" cellpadding="1" cellspacing="1"' ); - - } + ) + , '', $color[9], 'width="100%" border="0" cellpadding="1" cellspacing="0"' ); + echo ''; + } /* End of message-list table */ do_hook('mailbox_index_after'); @@ -769,7 +778,6 @@ function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $colo function printHeader($mailbox, $sort, $color, $showsort=true) { global $index_order; - echo html_tag( 'table' ,'' , '', $color[4], 'border="0" width="100%" cellpadding="1" cellspacing="0"' ); echo html_tag( 'tr' ,'' , 'center', $color[5] ); for ($i = 1; $i <= count($index_order); $i++) { switch ($index_order[$i]) { -- 2.25.1