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

Thomas Bruederli

2013-09-13 7be8a9134c73d830dec0a46a529400ada93e8664

 program/steps/settings/func.inc

@@ -158,6 +158,7 @@
                'main'    => array('name' => Q(rcube_label('mainoptions'))),
                'skin'    => array('name' => Q(rcube_label('skin'))),
                'browser' => array('name' => Q(rcube_label('browseroptions'))),
                'advanced'=> array('name' => Q(rcube_label('advancedoptions'))),
            );

            // language selection
@@ -367,6 +368,7 @@
            $blocks = array(
                'main'        => array('name' => Q(rcube_label('mainoptions'))),
                'new_message' => array('name' => Q(rcube_label('newmessage'))),
                'advanced'    => array('name' => Q(rcube_label('advancedoptions'))),
            );

            // show config parameter for preview pane
@@ -488,6 +490,7 @@
        case 'mailview':
            $blocks = array(
                'main' => array('name' => Q(rcube_label('mainoptions'))),
                'advanced'   => array('name' => Q(rcube_label('advancedoptions'))),
            );

            // show checkbox to open message view in new window
@@ -543,7 +546,7 @@

                $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'))),
                    'content' => $RCMAIL->output->charset_selector(array(
                        'id' => $field_id, 'name' => '_default_charset', 'selected' => $config['default_charset']
@@ -605,6 +608,7 @@
                'main'       => array('name' => Q(rcube_label('mainoptions'))),
                'sig'        => array('name' => Q(rcube_label('signatureoptions'))),
                'spellcheck' => array('name' => Q(rcube_label('spellcheckoptions'))),
                'advanced'   => array('name' => Q(rcube_label('advancedoptions'))),
            );

            // show checkbox to compose messages in a new window
@@ -673,8 +677,7 @@
                $select->add(rcube_label('miscfolding'), 1);
                $select->add(rcube_label('2047folding'), 2);

                $blocks['main']['options']['mime_param_folding'] = array(
                    'advanced' => true,
                $blocks['advanced']['options']['mime_param_folding'] = array(
                    'title'    => html::label($field_id, Q(rcube_label('mimeparamfolding'))),
                    'content'  => $select->show($config['mime_param_folding']),
                );
@@ -688,8 +691,7 @@
                $field_id = 'rcmfd_force_7bit';
                $input    = new html_checkbox(array('name' => '_force_7bit', 'id' => $field_id, 'value' => 1));

                $blocks['main']['options']['force_7bit'] = array(
                    'advanced' => true,
                $blocks['advanced']['options']['force_7bit'] = array(
                    'title'    => html::label($field_id, Q(rcube_label('force7bit'))),
                    'content'  => $input->show($config['force_7bit']?1:0),
                );
@@ -866,7 +868,8 @@
        // Addressbook config
        case 'addressbook':
            $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'])
@@ -962,7 +965,8 @@
        // Special IMAP folders
        case 'folders':
            $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'])) {
@@ -1043,6 +1047,7 @@
            $blocks = array(
                'main'        => array('name' => Q(rcube_label('mainoptions'))),
                'maintenance' => array('name' => Q(rcube_label('maintenance'))),
                'advanced'    => array('name' => Q(rcube_label('advancedoptions'))),
            );

            if (!isset($no_override['read_when_deleted'])) {