From 98fb28fd4ec24a6026af074e879855ce36555bc5 Mon Sep 17 00:00:00 2001 From: tokul Date: Sun, 2 Feb 2003 13:14:58 +0000 Subject: [PATCH] Closes bug 672350. Right-to-Left language fixes from Saleh Madi git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4493 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/page_header.php | 2 +- src/compose.php | 40 ++++++++++++++++++++------------------- src/read_body.php | 16 ++++++++++------ 3 files changed, 32 insertions(+), 26 deletions(-) diff --git a/functions/page_header.php b/functions/page_header.php index 00c26d4f..a658c6e5 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -25,7 +25,7 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE global $theme_css, $custom_css; echo '' . - "\n\n\n\n"; + "\n\n" . html_tag( 'html' ,'' , '', '', '' ) . "\n\n"; if ( !isset( $custom_css ) || $custom_css == 'none' ) { if ($theme_css != '') { diff --git a/src/compose.php b/src/compose.php index fef9c415..e53592f3 100644 --- a/src/compose.php +++ b/src/compose.php @@ -867,7 +867,7 @@ function showInputForm ($session, $values=false) { echo '' . "\n"; if ($compose_new_win == '1') { echo '
'."\n" . - ' '."\n"; + ' '. html_tag( 'td', '', 'right' ) . ''."\n"; } if ($location_of_buttons == 'top') { showComposeButtonRow(); @@ -876,9 +876,9 @@ function showInputForm ($session, $values=false) { $idents = getPref($data_dir, $username, 'identities', 0); if ($idents > 1) { echo ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n"; } echo ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . ' ' . "\n" . ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . ' ' . "\n" . ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . ' ' . "\n" . ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . @@ -990,7 +990,7 @@ function showInputForm ($session, $values=false) { showComposeButtonRow(); } else { echo ' ' . "\n" . - ' ' . "\n" . @@ -1008,9 +1008,9 @@ function showInputForm ($session, $values=false) { '
' . + html_tag( 'td', '', 'right', $color[4], 'WIDTH="10%"' ) . _("From:") . '' . "\n" . + html_tag( 'td', '', 'left', $color[4], 'WIDTH="90%"' ) . '
' . + html_tag( 'td', '', 'right', $color[4], 'WIDTH="10%"' ) . _("To:") . '' . "\n" . + html_tag( 'td', '', 'left', $color[4], 'WIDTH="90%"' ) . '
' . "\n" . '
' . + html_tag( 'td', '', 'right', $color[4] ) . _("CC:") . '' . "\n" . + html_tag( 'td', '', 'left', $color[4] ) . '
' . "\n" . '
' . + html_tag( 'td', '', 'right', $color[4] ) . _("BCC:") . '' . "\n" . + html_tag( 'td', '', 'left', $color[4] ) . '
' . "\n" . '
' . + html_tag( 'td', '', 'right', $color[4] ) . _("Subject:") . '' . "\n"; + html_tag( 'td', '', 'left', $color[4] ) . "\n"; echo ' ' . "\n" . '
' . "\n" . + html_tag( 'td', '', 'right', '', 'COLSPAN=2' ) . "\n" . ' ' . "\n" . '     

' . "\n" . '
' . "\n" . ' ' . "\n" . - ' ' . "\n" . - ' '; + echo '' . html_tag( 'td', '', 'left', $color[0], 'colspan="2"' ) . $s .''; } echo '
' . + html_tag( 'td', '', 'right', '', 'VALIGN=MIDDLE' ) . _("Attach:") . '' . "\n" . + html_tag( 'td', '', 'left', '', 'VALIGN=MIDDLE' ) . ' ' . "\n" . '   ' . "\n" . @@ -1026,16 +1026,18 @@ function showInputForm ($session, $values=false) { $attached_filename = decodeHeader($attachment->mime_header->getParameter('name')); $type = $attachment->mime_header->type0.'/'. $attachment->mime_header->type1; - $s_a[] = '\n" . $attached_filename . ' - ' . $type . - ' ('.show_readable_size( filesize( $attached_file ) ) - . ')
'."\n"; + + $s_a[] = '
\n" . $attached_filename . '- ' . $type . '('.show_readable_size( filesize( $attached_file ) ) . ' +)
'."\n"; } } } if (count($s_a)) { foreach ($s_a as $s) { - echo '
'.$s.'
\n" . diff --git a/src/read_body.php b/src/read_body.php index c7cd3966..873a3598 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -480,7 +480,8 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp $topbar_delimiter = ' | '; $urlMailbox = urlencode($mailbox); $s = '' . + html_tag( 'td', '', 'left', '', 'width="33%"' ) . ''; $msgs_url = $base_uri . 'src/'; if (isset($where) && isset($what)) { @@ -592,7 +593,8 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp $s .= $topbar_delimiter . $next_link; } - $s .= '' . "\n" . '' . "\n" . + html_tag( 'td', '', 'right', '', 'width="33%" nowrap' ) . ''; $comp_action_uri = $comp_uri . '&action=forward'; $s .= $link_open . $comp_action_uri . $link_close . _("Forward") . ''; @@ -622,8 +624,8 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) { $url = $base_uri.'src/view_header.php?'.$_SERVER['QUERY_STRING']; $s = "\n" . - '\n" . - '\n" . + html_tag( 'td', '', 'left', '', 'VALIGN="MIDDLE" WIDTH="80%"' ) . '' . ''._("View Full Header").''; /* Output the printer friendly link if we are in subtle mode. */ @@ -830,7 +832,8 @@ echo '
'; + ' border="0" bgcolor="'.$color[9].'">
'; + $s .= '
' . _("Options") . ":  ' . + html_tag( 'td', '', 'right', '', 'VALIGN="MIDDLE" WIDTH="20%"' ) . '' . _("Options") . ":  
'; echo ' '; echo '
'; -echo ' '; +// echo '
'; +echo html_tag( 'table' ,'' , 'left', '', 'cellpadding="1" cellspacing="5" border="0"' ); echo ' ' . html_tag( 'td', '
'. $messagebody."\n", 'left') . ''; echo '
'; @@ -848,7 +851,8 @@ if ($attachmentsdisplay) { echo ' '; echo '
'; echo ' '; - echo ' ' . html_tag( 'td', '', 'left', $color[9] ); echo ' ' . _("Attachments") . ':'; echo ' '; echo '
'; + // echo '
'; + echo '
'; -- 2.25.1