From cb105aa9f12396d1644e87d91c35e8f5c3eefbbd Mon Sep 17 00:00:00 2001 From: alecpl Date: Fri, 5 Nov 2010 11:01:15 +0000 Subject: [PATCH] - Fix displaying long header names in message headers table - Fix translation labels names for Mail-Followup-to and Mail-Reply-To --- program/localization/bg_BG/labels.inc | 4 ++-- program/localization/cy_GB/labels.inc | 4 ++-- program/localization/en_US/labels.inc | 4 ++-- program/localization/he_IL/labels.inc | 4 ++-- program/localization/it_IT/labels.inc | 4 ++-- program/localization/ja_JP/labels.inc | 4 ++-- program/localization/nl_NL/labels.inc | 4 ++-- program/localization/pl_PL/labels.inc | 4 ++-- program/localization/pt_PT/labels.inc | 4 ++-- program/localization/ru_RU/labels.inc | 2 +- program/localization/sl_SI/labels.inc | 4 ++-- program/localization/sv_SE/labels.inc | 4 ++-- program/localization/uk_UA/labels.inc | 4 ++-- program/steps/mail/compose.inc | 8 ++++---- program/steps/mail/func.inc | 2 +- skins/default/mail.css | 19 +++++++++++-------- 16 files changed, 41 insertions(+), 38 deletions(-) diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc index a268ffca0..b62665b8e 100644 --- a/program/localization/bg_BG/labels.inc +++ b/program/localization/bg_BG/labels.inc @@ -47,8 +47,8 @@ $labels['priority'] = 'Приоритет'; $labels['organization'] = 'Организация'; $labels['readstatus'] = 'Статут (прочетено/непрочетено)'; $labels['reply-to'] = 'Отговор до'; -$labels['mailreply-to'] = 'Отговор към'; -$labels['mailfollowup-to'] = 'Препращане към'; +$labels['mail-reply-to'] = 'Отговор към'; +$labels['mail-followup-to'] = 'Препращане към'; $labels['mailboxlist'] = 'Папки'; $labels['messagesfromto'] = 'Съобщения $from до $to от $count'; $labels['threadsfromto'] = 'Съобщения $from до $to от $count'; diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc index 634e410c0..0f8e22c26 100644 --- a/program/localization/cy_GB/labels.inc +++ b/program/localization/cy_GB/labels.inc @@ -42,8 +42,8 @@ $labels['size'] = 'Maint'; $labels['priority'] = 'Blaenoriaeth'; $labels['organization'] = 'Enw\'r Sefydliad'; $labels['reply-to'] = 'Ateb-I'; -$labels['mailreply-to'] = 'Neges-Ateb-I'; -$labels['mailfollowup-to'] = 'Neges-Ddilynol-I'; +$labels['mail-reply-to'] = 'Neges-Ateb-I'; +$labels['mail-followup-to'] = 'Neges-Ddilynol-I'; $labels['mailboxlist'] = 'Ffolderi'; $labels['messagesfromto'] = 'Negeseuon $from i $to o $count'; $labels['threadsfromto'] = 'Edefau $from i $to o $count'; diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 26f9dca31..a212e65c3 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -56,8 +56,8 @@ $labels['readstatus'] = 'Read status'; // aliases $labels['reply-to'] = $labels['replyto']; -$labels['mailreply-to'] = $labels['mailreplyto']; -$labels['mailfollowup-to'] = $labels['mailfollowupto']; +$labels['mail-reply-to'] = $labels['mailreplyto']; +$labels['mail-followup-to'] = $labels['mailfollowupto']; $labels['mailboxlist'] = 'Folders'; $labels['messagesfromto'] = 'Messages $from to $to of $count'; diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc index ce6276c7c..327118ef4 100644 --- a/program/localization/he_IL/labels.inc +++ b/program/localization/he_IL/labels.inc @@ -44,8 +44,8 @@ $labels['priority'] = 'עדיפות'; $labels['organization'] = 'ארגון'; $labels['readstatus'] = 'נקרא'; $labels['reply-to'] = 'כתובת למענה'; -$labels['mailreply-to'] = 'כתובת למענה'; -$labels['mailfollowup-to'] = 'כתובת להעברת הודעה'; +$labels['mail-reply-to'] = 'כתובת למענה'; +$labels['mail-followup-to'] = 'כתובת להעברת הודעה'; $labels['mailboxlist'] = 'תיקים'; $labels['messagesfromto'] = 'הודעות $from עד $to מתוך $count'; $labels['threadsfromto'] = 'שרשור $from עד $to מתוך $count'; diff --git a/program/localization/it_IT/labels.inc b/program/localization/it_IT/labels.inc index 941db0b3f..78e1d4eab 100644 --- a/program/localization/it_IT/labels.inc +++ b/program/localization/it_IT/labels.inc @@ -46,8 +46,8 @@ $labels['size'] = 'Dimensione'; $labels['priority'] = 'Priorità'; $labels['organization'] = 'Società'; $labels['reply-to'] = 'Rispondi a'; -$labels['mailreply-to'] = 'Mail-Reply-To'; -$labels['mailfollowup-to'] = 'Mail-Followup-To'; +$labels['mail-reply-to'] = 'Mail-Reply-To'; +$labels['mail-followup-to'] = 'Mail-Followup-To'; $labels['mailboxlist'] = 'Cartelle'; $labels['messagesfromto'] = 'Messaggi da $from a $to di $count'; $labels['threadsfromto'] = 'Thread da $from a $to di $count'; diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc index 6ceb07618..276000ed5 100644 --- a/program/localization/ja_JP/labels.inc +++ b/program/localization/ja_JP/labels.inc @@ -48,8 +48,8 @@ $labels['size'] = '容量'; $labels['priority'] = '優先度'; $labels['organization'] = '所属'; $labels['reply-to'] = '返信先'; -$labels['mailreply-to'] = 'Mail-Reply-To (ML 投稿者)'; -$labels['mailfollowup-to'] = 'Mail-Followup-To (ML の宛先)'; +$labels['mail-reply-to'] = 'Mail-Reply-To (ML 投稿者)'; +$labels['mail-followup-to'] = 'Mail-Followup-To (ML の宛先)'; $labels['mailboxlist'] = 'フォルダー一覧'; $labels['messagesfromto'] = '表示中のメール: $from ～ $to (全: $count 件)'; $labels['threadsfromto'] = '表示中のスレッド: $from ～ $to (全: $count 件)'; diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc index 97ad8cc18..9840cff1e 100644 --- a/program/localization/nl_NL/labels.inc +++ b/program/localization/nl_NL/labels.inc @@ -50,8 +50,8 @@ $labels['priority'] = 'Prioriteit'; $labels['organization'] = 'Organisatie'; $labels['readstatus'] = 'Gelezen?'; $labels['reply-to'] = 'Antwoord-aan'; -$labels['mailreply-to'] = 'Mail-Antwoord-Aan'; -$labels['mailfollowup-to'] = 'Mail-Followup-Aan'; +$labels['mail-reply-to'] = 'Mail-Antwoord-Aan'; +$labels['mail-followup-to'] = 'Mail-Followup-Aan'; $labels['mailboxlist'] = 'Mappen'; $labels['messagesfromto'] = 'Bericht $from t/m $to van $count'; $labels['threadsfromto'] = 'Conversatie $from t/m $to van $count'; diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc index 361ab6d4f..03eaa97ed 100644 --- a/program/localization/pl_PL/labels.inc +++ b/program/localization/pl_PL/labels.inc @@ -354,8 +354,8 @@ $labels['contacts'] = 'Kontakty'; $labels['messageoptions'] = 'Opcje wiadomości...'; $labels['mailreplyto'] = 'Mail-Reply-To'; $labels['mailfollowupto'] = 'Mail-Followup-To'; -$labels['mailreply-to'] = 'Mail-Reply-To'; -$labels['mailfollowup-to'] = 'Mail-Followup-To'; +$labels['mail-reply-to'] = 'Mail-Reply-To'; +$labels['mail-followup-to'] = 'Mail-Followup-To'; $labels['replyall'] = 'Odpowiedz wszystkim'; $labels['replylist'] = 'Odpowiedz na listę'; $labels['editidents'] = 'Edytuj tożsamości'; diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc index bec5efbdf..b27d4eaf8 100644 --- a/program/localization/pt_PT/labels.inc +++ b/program/localization/pt_PT/labels.inc @@ -49,8 +49,8 @@ $labels['size'] = 'Tamanho'; $labels['priority'] = 'Prioridade'; $labels['organization'] = 'Organização'; $labels['reply-to'] = 'Responder para'; -$labels['mailreply-to'] = 'Mensagem-Responder-Para'; -$labels['mailfollowup-to'] = 'Mensagem-Reencaminhar-Para'; +$labels['mail-reply-to'] = 'Mensagem-Responder-Para'; +$labels['mail-followup-to'] = 'Mensagem-Reencaminhar-Para'; $labels['mailboxlist'] = 'Pastas'; $labels['messagesfromto'] = 'Mensagens de $from a $to de $count'; $labels['threadsfromto'] = 'Tópicos de $from a $to de $count'; diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc index d8e5ff84a..c211f2508 100644 --- a/program/localization/ru_RU/labels.inc +++ b/program/localization/ru_RU/labels.inc @@ -46,7 +46,7 @@ $labels['size'] = 'Размер'; $labels['priority'] = 'Приоритет'; $labels['organization'] = 'Организация'; $labels['reply-to'] = 'Ответить'; -$labels['mailreply-to'] = 'Ответить в списке рассылки'; +$labels['mail-reply-to'] = 'Ответить в списке рассылки'; $labels['mailboxlist'] = 'Папки'; $labels['messagesfromto'] = 'Сообщения с $from по $to из $count'; $labels['threadsfromto'] = 'Обсуждения с $from по $to из $count'; diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc index 8b90a004c..fa6e5cb9d 100644 --- a/program/localization/sl_SI/labels.inc +++ b/program/localization/sl_SI/labels.inc @@ -47,8 +47,8 @@ $labels['priority'] = 'Prioriteta'; $labels['organization'] = 'Organizacija'; $labels['readstatus'] = 'Status'; $labels['reply-to'] = 'Odgovor na'; -$labels['mailreply-to'] = 'Odgovor na'; -$labels['mailfollowup-to'] = 'Odgovor na'; +$labels['mail-reply-to'] = 'Odgovor na'; +$labels['mail-followup-to'] = 'Odgovor na'; $labels['mailboxlist'] = 'Mape'; $labels['messagesfromto'] = 'Sporočila $from do $to od $count'; $labels['threadsfromto'] = 'Nit $from do $to od $count'; diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc index e8811aa1c..3519e2b91 100644 --- a/program/localization/sv_SE/labels.inc +++ b/program/localization/sv_SE/labels.inc @@ -47,8 +47,8 @@ $labels['size'] = 'Storlek'; $labels['priority'] = 'Prioritet'; $labels['organization'] = 'Organisation'; $labels['reply-to'] = 'Svara till'; -$labels['mailreply-to'] = 'Mail-Reply-To'; -$labels['mailfollowup-to'] = 'Mail-Followup-To'; +$labels['mail-reply-to'] = 'Mail-Reply-To'; +$labels['mail-followup-to'] = 'Mail-Followup-To'; $labels['mailboxlist'] = 'Kataloger'; $labels['messagesfromto'] = 'Meddelande $from till $to av $count'; $labels['threadsfromto'] = 'Tråd $from till $to av $count'; diff --git a/program/localization/uk_UA/labels.inc b/program/localization/uk_UA/labels.inc index 737861814..12026da0c 100644 --- a/program/localization/uk_UA/labels.inc +++ b/program/localization/uk_UA/labels.inc @@ -45,8 +45,8 @@ $labels['size'] = 'Розмір'; $labels['priority'] = 'Пріоритет'; $labels['organization'] = 'Організація'; $labels['reply-to'] = 'Відповісти'; -$labels['mailreply-to'] = 'Mail-Reply-To'; -$labels['mailfollowup-to'] = 'Mail-Followup-To'; +$labels['mail-reply-to'] = 'Mail-Reply-To'; +$labels['mail-followup-to'] = 'Mail-Followup-To'; $labels['mailboxlist'] = 'Папки'; $labels['messagesfromto'] = 'Повідомлення з $from по $to із $count'; $labels['threadsfromto'] = 'Обговорення з $from по $to із $count'; diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 421ff32c6..2c29fc708 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -266,19 +266,19 @@ function rcmail_compose_headers($attrib) $header = 'reply-to'; case 'mailreplyto': - case 'mailreply-to': + case 'mail-reply-to': if (!$fname) { $fname = '_mailreplyto'; $param = 'mailreplyto'; - $header = 'mailreply-to'; + $header = 'mail-reply-to'; } case 'mailfollowupto': - case 'mailfollowup-to': + case 'mail-followup-to': if (!$fname) { $fname = '_mailfollowupto'; $param = 'mailfollowupto'; - $header = 'mailfollowup-to'; + $header = 'mail-followup-to'; } $allow_attrib = array('id', 'class', 'style', 'size', 'tabindex'); diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index a4f945fea..39551c1c0 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -972,7 +972,7 @@ function rcmail_message_headers($attrib, $headers=NULL) foreach ($plugin['output'] as $hkey => $row) { $table->add(array('class' => 'header-title'), Q($row['title'])); - $table->add(array('class' => $hkey, 'width' => "90%"), Q($row['value'], ($hkey == 'subject' ? 'strict' : 'show'))); + $table->add(array('class' => 'header '.$hkey), Q($row['value'], ($hkey == 'subject' ? 'strict' : 'show'))); } // all headers division diff --git a/skins/default/mail.css b/skins/default/mail.css index ec4b0d975..d380eff7c 100644 --- a/skins/default/mail.css +++ b/skins/default/mail.css @@ -1005,7 +1005,6 @@ table.headers-table { width: 100%; background-color: #EBEBEB; - table-layout: fixed; } #messagebody table.headers-table @@ -1027,19 +1026,23 @@ table.headers-table tr td border-bottom:1px solid #FFFFFF; } -table.headers-table td.header-title +table.headers-table tr td.header-title { - width: 80px; + width: 1%; color: #666666; font-weight: bold; text-align: right; white-space: nowrap; - padding-right: 4px; + padding: 0 4px; +} + +table.headers-table tr td.header +{ + width: 99%; } table.headers-table tr td.subject { - width: 90%; font-weight: bold; } @@ -1064,12 +1067,12 @@ table.headers-table tr td.more-headers #attachment-list { - margin: 0px; - padding: 0px 0px 0px 72px; + margin: 0; + padding: 0 4px 0 8px; min-height: 16px; list-style-image: none; list-style-type: none; - background: url(images/icons/attachment.png) 60px 2px no-repeat #DFDFDF; + background: url(images/icons/attachment.png) 4px 2px no-repeat #DFDFDF; } #attachment-list:after