diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/localization/en_US/labels.inc | 2 | ||||
| -rw-r--r-- | program/localization/pl_PL/labels.inc | 2 | ||||
| -rw-r--r-- | program/steps/settings/func.inc | 76 |
4 files changed, 44 insertions, 37 deletions
@@ -5,6 +5,7 @@ CHANGELOG RoundCube Webmail ---------- - Added option to display images in messages from known senders (#1484601) - Updated PEAR::Mail_Mime +- User preferences grouped in more fieldsets 2008/06/12 (alec) ---------- diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 1b69ec598..6eae419a2 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -266,6 +266,8 @@ $labels['flagfordeletion'] = 'Flag the message for deletion instead of delete'; $labels['autosavedraft'] = 'Automatically save draft'; $labels['everynminutes'] = 'every $n minutes'; $labels['never'] = 'never'; +$labels['messagesdisplaying'] = 'Messages displaying'; +$labels['messagescomposition'] = 'Messages composition'; $labels['folder'] = 'Folder'; $labels['folders'] = 'Folders'; diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc index fcee15031..1fa322e18 100644 --- a/program/localization/pl_PL/labels.inc +++ b/program/localization/pl_PL/labels.inc @@ -59,6 +59,8 @@ $labels['preferhtml'] = 'Domyślny HTML'; $labels['htmlmessage'] = 'Wiadomość HTML'; $labels['showknownimages'] = 'Wyświetlaj obrazki od znanych nadawców'; $labels['prettydate'] = 'Ładne daty'; +$labels['messagesdisplaying'] = 'Wyświetlanie wiadomości'; +$labels['messagescomposition'] = 'Tworzenie wiadomości'; $labels['addtoaddressbook'] = 'Dodaj do książki adresowej '; $labels['sun'] = 'Nd'; $labels['mon'] = 'Pn'; diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index e35a27a02..c52daf94e 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -104,7 +104,6 @@ function rcmail_user_prefs_form($attrib) $select_timezone->add('(GMT +13:00) Tonga, Pheonix Islands', '13'); $select_timezone->add('(GMT +14:00) Kiribati', '14'); - $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", $field_id, Q(rcube_label('timezone')), @@ -122,6 +121,18 @@ function rcmail_user_prefs_form($attrib) $input_dst->show($config['dst_active'])); } + // MM: Show checkbox for toggling 'pretty dates' + if (!isset($no_override['prettydate'])) + { + $field_id = 'rcmfd_prettydate'; + $input_prettydate = new html_checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1)); + + $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", + $field_id, + Q(rcube_label('prettydate')), + $input_prettydate->show($config['prettydate']?1:0)); + } + // show page size selection if (!isset($no_override['pagesize'])) { @@ -134,18 +145,35 @@ function rcmail_user_prefs_form($attrib) $input_pagesize->show($config['pagesize'])); } - // MM: Show checkbox for toggling 'pretty dates' - if (!isset($no_override['prettydate'])) + if (!isset($no_override['mdn_requests'])) { - $field_id = 'rcmfd_prettydate'; - $input_prettydate = new html_checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1)); + $field_id = 'rcmfd_mdn_requests'; + $select_mdn_requests = new html_select(array('name' => '_mdn_requests', 'id' => $field_id)); + $select_mdn_requests->add(rcube_label('askuser'), 0); + $select_mdn_requests->add(rcube_label('autosend'), 1); + $select_mdn_requests->add(rcube_label('ignore'), 2); $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", $field_id, - Q(rcube_label('prettydate')), - $input_prettydate->show($config['prettydate']?1:0)); + Q(rcube_label('mdnrequests')), + $select_mdn_requests->show($config['mdn_requests'])); + } + + $out .= "</table></fieldset>\n<fieldset><legend>" . Q(rcube_label('mailboxview')) . "</legend>\n<table" . $attrib_str . ">\n\n"; + + // show config parameter for preview pane + if (!isset($no_override['preview_pane'])) + { + $field_id = 'rcmfd_preview'; + $input_preview = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1)); + $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", + $field_id, + Q(rcube_label('previewpane')), + $input_preview->show($config['preview_pane']?1:0)); } + $out .= "</table></fieldset>\n<fieldset><legend>" . Q(rcube_label('messagesdisplaying')) . "</legend>\n<table" . $attrib_str . ">\n\n"; + // show checkbox for HTML/plaintext messages if (!isset($no_override['prefer_html'])) { @@ -172,6 +200,8 @@ function rcmail_user_prefs_form($attrib) $input_addrbook_show_images->show($config['addrbook_show_images']?1:0)); } + $out .= "</table></fieldset>\n<fieldset><legend>" . Q(rcube_label('messagescomposition')) . "</legend>\n<table" . $attrib_str . ">\n\n"; + // Show checkbox for HTML Editor if (!isset($no_override['htmleditor'])) { @@ -182,36 +212,6 @@ function rcmail_user_prefs_form($attrib) Q(rcube_label('htmleditor')), $input_htmleditor->show($config['htmleditor']?1:0)); } - - - if (!isset($no_override['mdn_requests'])) - { - $field_id = 'rcmfd_mdn_requests'; - $select_mdn_requests = new html_select(array('name' => '_mdn_requests', 'id' => $field_id)); - $select_mdn_requests->add(rcube_label('askuser'), 0); - $select_mdn_requests->add(rcube_label('autosend'), 1); - $select_mdn_requests->add(rcube_label('ignore'), 2); - - $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", - $field_id, - Q(rcube_label('mdnrequests')), - $select_mdn_requests->show($config['mdn_requests'])); - } - - $out .= "</table></fieldset>\n<fieldset><legend>" . Q(rcube_label('mailboxview')) . "</legend>\n<table" . $attrib_str . ">\n\n"; - - // show config parameter for preview pane - if (!isset($no_override['preview_pane'])) - { - $field_id = 'rcmfd_preview'; - $input_preview = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1)); - $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", - $field_id, - Q(rcube_label('previewpane')), - $input_preview->show($config['preview_pane']?1:0)); - } - - $out .= "</table></fieldset>\n<fieldset><legend>" . Q(rcube_label('serversettings')) . "</legend>\n<table" . $attrib_str . ">\n\n"; if (!empty($config['drafts_mbox']) && !isset($no_override['draft_autosave'])) { @@ -227,6 +227,8 @@ function rcmail_user_prefs_form($attrib) $select_autosave->show($config['draft_autosave'])); } + $out .= "</table></fieldset>\n<fieldset><legend>" . Q(rcube_label('serversettings')) . "</legend>\n<table" . $attrib_str . ">\n\n"; + if (!isset($no_override['read_when_deleted'])) { $field_id = 'rcmfd_read_deleted'; |