banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move some config options to new and collapsible 'advanced' blocks

Browse Source
pull/121/merge
Thomas Bruederli 11 years ago
parent a315bf2dda
commit 7be8a9134c
4 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File

9
program/steps/settings/edit_prefs.inc
Unescape Escape View File

@ -40,24 +40,21 @@ function rcmail_user_prefs_form($attrib)
$out = $form_start; $out = $form_start;
foreach ($SECTIONS[$CURR_SECTION]['blocks'] as $block) { foreach ($SECTIONS[$CURR_SECTION]['blocks'] as $class => $block) {
if (!empty($block['options'])) { if (!empty($block['options'])) {
$table = new html_table(array('cols' => 2)); $table = new html_table(array('cols' => 2));
foreach ($block['options'] as $option) { foreach ($block['options'] as $option) {
if ($option['advanced'])
$table->set_row_attribs('advanced');
if (isset($option['title'])) { if (isset($option['title'])) {
$table->add('title', $option['title']); $table->add('title', $option['title']);
$table->add(null, $option['content']); $table->add(null, $option['content']);
} }
else { else {
$table->add(array('colspan' => 2), $option['content']); $table->add(array('colspan' => 2), $option['content']);
} }
} }
$out .= html::tag('fieldset', null, html::tag('legend', null, $block['name']) . $table->show($attrib)); $out .= html::tag('fieldset', $class, html::tag('legend', null, $block['name']) . $table->show($attrib));
} }
else if (!empty($block['content'])) { else if (!empty($block['content'])) {
$out .= html::tag('fieldset', null, html::tag('legend', null, $block['name']) . $block['content']); $out .= html::tag('fieldset', null, html::tag('legend', null, $block['name']) . $block['content']);

19
program/steps/settings/func.inc
Unescape Escape View File

@ -158,6 +158,7 @@ function rcmail_user_prefs($current = null)
'main' => array('name' => Q(rcube_label('mainoptions'))), 'main' => array('name' => Q(rcube_label('mainoptions'))),
'skin' => array('name' => Q(rcube_label('skin'))), 'skin' => array('name' => Q(rcube_label('skin'))),
'browser' => array('name' => Q(rcube_label('browseroptions'))), 'browser' => array('name' => Q(rcube_label('browseroptions'))),
'advanced'=> array('name' => Q(rcube_label('advancedoptions'))),
); );
// language selection // language selection
@ -367,6 +368,7 @@ function rcmail_user_prefs($current = null)
$blocks = array( $blocks = array(
'main' => array('name' => Q(rcube_label('mainoptions'))), 'main' => array('name' => Q(rcube_label('mainoptions'))),
'new_message' => array('name' => Q(rcube_label('newmessage'))), 'new_message' => array('name' => Q(rcube_label('newmessage'))),
'advanced' => array('name' => Q(rcube_label('advancedoptions'))),
); );
// show config parameter for preview pane // show config parameter for preview pane
@ -488,6 +490,7 @@ function rcmail_user_prefs($current = null)
case 'mailview': case 'mailview':
$blocks = array( $blocks = array(
'main' => array('name' => Q(rcube_label('mainoptions'))), 'main' => array('name' => Q(rcube_label('mainoptions'))),
'advanced' => array('name' => Q(rcube_label('advancedoptions'))),
); );
// show checkbox to open message view in new window // show checkbox to open message view in new window
@ -543,7 +546,7 @@ function rcmail_user_prefs($current = null)
$field_id = 'rcmfd_default_charset'; $field_id = 'rcmfd_default_charset';
$blocks['main']['options']['default_charset'] = array( $blocks['advanced']['options']['default_charset'] = array(
'title' => html::label($field_id, Q(rcube_label('defaultcharset'))), 'title' => html::label($field_id, Q(rcube_label('defaultcharset'))),
'content' => $RCMAIL->output->charset_selector(array( 'content' => $RCMAIL->output->charset_selector(array(
'id' => $field_id, 'name' => '_default_charset', 'selected' => $config['default_charset'] 'id' => $field_id, 'name' => '_default_charset', 'selected' => $config['default_charset']
@ -605,6 +608,7 @@ function rcmail_user_prefs($current = null)
'main' => array('name' => Q(rcube_label('mainoptions'))), 'main' => array('name' => Q(rcube_label('mainoptions'))),
'sig' => array('name' => Q(rcube_label('signatureoptions'))), 'sig' => array('name' => Q(rcube_label('signatureoptions'))),
'spellcheck' => array('name' => Q(rcube_label('spellcheckoptions'))), 'spellcheck' => array('name' => Q(rcube_label('spellcheckoptions'))),
'advanced' => array('name' => Q(rcube_label('advancedoptions'))),
); );
// show checkbox to compose messages in a new window // show checkbox to compose messages in a new window
@ -673,8 +677,7 @@ function rcmail_user_prefs($current = null)
$select->add(rcube_label('miscfolding'), 1); $select->add(rcube_label('miscfolding'), 1);
$select->add(rcube_label('2047folding'), 2); $select->add(rcube_label('2047folding'), 2);
$blocks['main']['options']['mime_param_folding'] = array( $blocks['advanced']['options']['mime_param_folding'] = array(
'advanced' => true,
'title' => html::label($field_id, Q(rcube_label('mimeparamfolding'))), 'title' => html::label($field_id, Q(rcube_label('mimeparamfolding'))),
'content' => $select->show($config['mime_param_folding']), 'content' => $select->show($config['mime_param_folding']),
); );
@ -688,8 +691,7 @@ function rcmail_user_prefs($current = null)
$field_id = 'rcmfd_force_7bit'; $field_id = 'rcmfd_force_7bit';
$input = new html_checkbox(array('name' => '_force_7bit', 'id' => $field_id, 'value' => 1)); $input = new html_checkbox(array('name' => '_force_7bit', 'id' => $field_id, 'value' => 1));
$blocks['main']['options']['force_7bit'] = array( $blocks['advanced']['options']['force_7bit'] = array(
'advanced' => true,
'title' => html::label($field_id, Q(rcube_label('force7bit'))), 'title' => html::label($field_id, Q(rcube_label('force7bit'))),
'content' => $input->show($config['force_7bit']?1:0), 'content' => $input->show($config['force_7bit']?1:0),
); );
@ -866,7 +868,8 @@ function rcmail_user_prefs($current = null)
// Addressbook config // Addressbook config
case 'addressbook': case 'addressbook':
$blocks = array( $blocks = array(
'main' => array('name' => Q(rcube_label('mainoptions'))), 'main' => array('name' => Q(rcube_label('mainoptions'))),
'advanced' => array('name' => Q(rcube_label('advancedoptions'))),
); );
if (!isset($no_override['default_addressbook']) if (!isset($no_override['default_addressbook'])
@ -962,7 +965,8 @@ function rcmail_user_prefs($current = null)
// Special IMAP folders // Special IMAP folders
case 'folders': case 'folders':
$blocks = array( $blocks = array(
'main' => array('name' => Q(rcube_label('mainoptions'))), 'main' => array('name' => Q(rcube_label('mainoptions'))),
'advanced' => array('name' => Q(rcube_label('advancedoptions'))),
); );
if (!isset($no_override['show_real_foldernames'])) { if (!isset($no_override['show_real_foldernames'])) {
@ -1043,6 +1047,7 @@ function rcmail_user_prefs($current = null)
$blocks = array( $blocks = array(
'main' => array('name' => Q(rcube_label('mainoptions'))), 'main' => array('name' => Q(rcube_label('mainoptions'))),
'maintenance' => array('name' => Q(rcube_label('maintenance'))), 'maintenance' => array('name' => Q(rcube_label('maintenance'))),
'advanced' => array('name' => Q(rcube_label('advancedoptions'))),
); );
if (!isset($no_override['read_when_deleted'])) { if (!isset($no_override['read_when_deleted'])) {

20
skins/larry/settings.css
Unescape Escape View File

@ -48,6 +48,26 @@
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
} }
#preferences-details fieldset.advanced legend {
position: relative;
display: block;
width: 100%;
cursor: pointer;
}
#preferences-details fieldset.advanced .propform {
display: none;
}
#preferences-details fieldset.advanced .advanced-toggle {
position: absolute;
top: 2px;
right: 6px;
text-decoration: none;
color: #666;
font-size: 11px;
}
#sections-table tbody td.section, #sections-table tbody td.section,
#settings-sections span.listitem a, #settings-sections span.listitem a,
#settings-sections span.tablink a { #settings-sections span.tablink a {

13
skins/larry/ui.js
Unescape Escape View File

@ -195,6 +195,19 @@ function rcube_mail_ui()
new rcube_splitter({ id:'prefviewsplitter', p1:'#sectionslist', p2:'#preferences-box', new rcube_splitter({ id:'prefviewsplitter', p1:'#sectionslist', p2:'#preferences-box',
orientation:'v', relative:true, start:266, min:180, size:12 }).init(); orientation:'v', relative:true, start:266, min:180, size:12 }).init();
} }
else if (rcmail.env.action == 'edit-prefs') {
$('<a href="#toggle">&#9660;</a>')
.addClass('advanced-toggle')
.appendTo('#preferences-details fieldset.advanced legend');
$('#preferences-details fieldset.advanced legend').click(function(e){
var collapsed = $(this).hasClass('collapsed'),
toggle = $('.advanced-toggle', this).html(collapsed ? '&#9650;' : '&#9660;');
$(this)
.toggleClass('collapsed')
.closest('fieldset').children('.propform').toggle()
}).addClass('collapsed')
}
} }
/*** addressbook task ***/ /*** addressbook task ***/
else if (rcmail.env.task == 'addressbook') { else if (rcmail.env.task == 'addressbook') {

Write Preview
Loading…
Cancel
Save