diff options
Diffstat (limited to 'program/steps/settings/func.inc')
| -rw-r--r-- | program/steps/settings/func.inc | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 032bafd1d..91543ec85 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -157,7 +157,6 @@ function rcmail_user_prefs($current=null) $blocks = array( 'main' => array('name' => Q(rcube_label('mainoptions'))), - 'list' => array('name' => Q(rcube_label('listoptions'))), ); // language selection @@ -175,7 +174,7 @@ function rcmail_user_prefs($current=null) ); } - // show page size selection + // timezone selection if (!isset($no_override['timezone'])) { $field_id = 'rcmfd_timezone'; $select_timezone = new html_select(array('name' => '_timezone', 'id' => $field_id, @@ -276,17 +275,6 @@ function rcmail_user_prefs($current=null) ); } - // show page size selection - if (!isset($no_override['pagesize'])) { - $field_id = 'rcmfd_pgsize'; - $input_pagesize = new html_inputfield(array('name' => '_pagesize', 'id' => $field_id, 'size' => 5)); - - $blocks['list']['options']['pagesize'] = array( - 'title' => html::label($field_id, Q(rcube_label('pagesize'))), - 'content' => $input_pagesize->show($config['pagesize']), - ); - } - // show drop-down for available skins if (!isset($no_override['skin'])) { $skins = rcmail_get_skins(); @@ -378,6 +366,17 @@ function rcmail_user_prefs($current=null) ); } + // show page size selection + if (!isset($no_override['pagesize'])) { + $field_id = 'rcmfd_pagesize'; + $input_pagesize = new html_inputfield(array('name' => '_pagesize', 'id' => $field_id, 'size' => 5)); + + $blocks['main']['options']['pagesize'] = array( + 'title' => html::label($field_id, Q(rcube_label('pagesize'))), + 'content' => $input_pagesize->show($config['pagesize']), + ); + } + if (!isset($no_override['keep_alive'])) { $field_id = 'rcmfd_keep_alive'; $select_keep_alive = new html_select(array('name' => '_keep_alive', 'id' => $field_id)); @@ -690,6 +689,19 @@ function rcmail_user_prefs($current=null) ); } + // show addressbook page size selection + if (!isset($no_override['addressbook_pagesize'])) { + $field_id = 'rcmfd_addressbook_pagesize'; + $input_pagesize = new html_inputfield(array('name' => '_addressbook_pagesize', 'id' => $field_id, 'size' => 5)); + + $size = $config['addressbook_pagesize'] ? $config['addressbook_pagesize'] : $config['pagesize']; + + $blocks['main']['options']['pagesize'] = array( + 'title' => html::label($field_id, Q(rcube_label('pagesize'))), + 'content' => $input_pagesize->show((int)$size), + ); + } + break; // Special IMAP folders |