Arange the settings in three groups: How to call the editor, how
the editor looks and how the preview works. The only toolbar
preference is at the bottom because the WikiEditor extension adds
its stuff there. All the preferences are untouched. This does not
add or remove a preference.
Goes with Id8b9a47a in the WikiEditor extension.
Change-Id: I429c8125b8db789d2756d61249f6cf1fa7f2f51c
global $wgAllowUserCssPrefs;
## Editing #####################################
global $wgAllowUserCssPrefs;
## Editing #####################################
- $defaultPreferences['cols'] = array(
- 'type' => 'int',
- 'label-message' => 'columns',
- 'section' => 'editing/textboxsize',
- 'min' => 4,
- 'max' => 1000,
+ if ( $wgAllowUserCssPrefs ) {
+ $defaultPreferences['editsection'] = array(
+ 'type' => 'toggle',
+ 'section' => 'editing/advancedediting',
+ 'label-message' => 'tog-editsection',
+ );
+ }
+ $defaultPreferences['editsectiononrightclick'] = array(
+ 'type' => 'toggle',
+ 'section' => 'editing/advancedediting',
+ 'label-message' => 'tog-editsectiononrightclick',
- $defaultPreferences['rows'] = array(
- 'type' => 'int',
- 'label-message' => 'rows',
- 'section' => 'editing/textboxsize',
- 'min' => 4,
- 'max' => 1000,
+ $defaultPreferences['editondblclick'] = array(
+ 'type' => 'toggle',
+ 'section' => 'editing/advancedediting',
+ 'label-message' => 'tog-editondblclick',
);
if ( $wgAllowUserCssPrefs ) {
$defaultPreferences['editfont'] = array(
'type' => 'select',
);
if ( $wgAllowUserCssPrefs ) {
$defaultPreferences['editfont'] = array(
'type' => 'select',
- 'section' => 'editing/advancedediting',
+ 'section' => 'editing/editor',
'label-message' => 'editfont-style',
'options' => array(
$context->msg( 'editfont-default' )->text() => 'default',
'label-message' => 'editfont-style',
'options' => array(
$context->msg( 'editfont-default' )->text() => 'default',
- $defaultPreferences['previewontop'] = array(
- 'type' => 'toggle',
- 'section' => 'editing/advancedediting',
- 'label-message' => 'tog-previewontop',
+ $defaultPreferences['cols'] = array(
+ 'type' => 'int',
+ 'label-message' => 'columns',
+ 'section' => 'editing/editor',
+ 'min' => 4,
+ 'max' => 1000,
- $defaultPreferences['previewonfirst'] = array(
- 'type' => 'toggle',
- 'section' => 'editing/advancedediting',
- 'label-message' => 'tog-previewonfirst',
+ $defaultPreferences['rows'] = array(
+ 'type' => 'int',
+ 'label-message' => 'rows',
+ 'section' => 'editing/editor',
+ 'min' => 4,
+ 'max' => 1000,
-
- if ( $wgAllowUserCssPrefs ) {
- $defaultPreferences['editsection'] = array(
+ if ( $user->isAllowed( 'minoredit' ) ) {
+ $defaultPreferences['minordefault'] = array(
- 'section' => 'editing/advancedediting',
- 'label-message' => 'tog-editsection',
+ 'section' => 'editing/editor',
+ 'label-message' => 'tog-minordefault',
- $defaultPreferences['editsectiononrightclick'] = array(
+ $defaultPreferences['forceeditsummary'] = array(
- 'section' => 'editing/advancedediting',
- 'label-message' => 'tog-editsectiononrightclick',
+ 'section' => 'editing/editor',
+ 'label-message' => 'tog-forceeditsummary',
- $defaultPreferences['editondblclick'] = array(
+ $defaultPreferences['useeditwarning'] = array(
- 'section' => 'editing/advancedediting',
- 'label-message' => 'tog-editondblclick',
+ 'section' => 'editing/editor',
+ 'label-message' => 'tog-useeditwarning',
);
$defaultPreferences['showtoolbar'] = array(
'type' => 'toggle',
);
$defaultPreferences['showtoolbar'] = array(
'type' => 'toggle',
- 'section' => 'editing/advancedediting',
+ 'section' => 'editing/editor',
'label-message' => 'tog-showtoolbar',
);
'label-message' => 'tog-showtoolbar',
);
- if ( $user->isAllowed( 'minoredit' ) ) {
- $defaultPreferences['minordefault'] = array(
- 'type' => 'toggle',
- 'section' => 'editing/advancedediting',
- 'label-message' => 'tog-minordefault',
- );
- }
-
- $defaultPreferences['forceeditsummary'] = array(
+ $defaultPreferences['previewonfirst'] = array(
- 'section' => 'editing/advancedediting',
- 'label-message' => 'tog-forceeditsummary',
+ 'section' => 'editing/preview',
+ 'label-message' => 'tog-previewonfirst',
-
- $defaultPreferences['uselivepreview'] = array(
+ $defaultPreferences['previewontop'] = array(
- 'section' => 'editing/advancedediting',
- 'label-message' => 'tog-uselivepreview',
+ 'section' => 'editing/preview',
+ 'label-message' => 'tog-previewontop',
-
- $defaultPreferences['useeditwarning'] = array(
+ $defaultPreferences['uselivepreview'] = array(
- 'section' => 'editing/advancedediting',
- 'label-message' => 'tog-useeditwarning',
+ 'section' => 'editing/preview',
+ 'label-message' => 'tog-uselivepreview',
'resetprefs' => 'Clear unsaved changes',
'restoreprefs' => 'Restore all default settings',
'prefs-editing' => 'Editing',
'resetprefs' => 'Clear unsaved changes',
'restoreprefs' => 'Restore all default settings',
'prefs-editing' => 'Editing',
-'prefs-edit-boxsize' => 'Size of the edit window.',
'rows' => 'Rows:',
'columns' => 'Columns:',
'searchresultshead' => 'Search',
'rows' => 'Rows:',
'columns' => 'Columns:',
'searchresultshead' => 'Search',
'prefs-reset-intro' => 'You can use this page to reset your preferences to the site defaults.
This cannot be undone.',
'prefs-emailconfirm-label' => 'Email confirmation:',
'prefs-reset-intro' => 'You can use this page to reset your preferences to the site defaults.
This cannot be undone.',
'prefs-emailconfirm-label' => 'Email confirmation:',
-'prefs-textboxsize' => 'Size of editing window',
'youremail' => 'Email:',
'username' => '{{GENDER:$1|Username}}:',
'uid' => '{{GENDER:$1|User}} ID:',
'youremail' => 'Email:',
'username' => '{{GENDER:$1|Username}}:',
'uid' => '{{GENDER:$1|User}} ID:',
'prefs-signature' => 'Signature',
'prefs-dateformat' => 'Date format',
'prefs-timeoffset' => 'Time offset',
'prefs-signature' => 'Signature',
'prefs-dateformat' => 'Date format',
'prefs-timeoffset' => 'Time offset',
-'prefs-advancedediting' => 'Advanced options',
+'prefs-advancedediting' => 'General',
+'prefs-editor' => 'Editor',
+'prefs-preview' => 'Preview',
'prefs-advancedrc' => 'Advanced options',
'prefs-advancedrendering' => 'Advanced options',
'prefs-advancedsearchoptions' => 'Advanced options',
'prefs-advancedrc' => 'Advanced options',
'prefs-advancedrendering' => 'Advanced options',
'prefs-advancedsearchoptions' => 'Advanced options',
{{Identical|Date format}}',
'prefs-timeoffset' => 'Used in [[Special:Preferences]], tab "Date and time".',
'prefs-advancedediting' => 'Used in [[Special:Preferences]], tab "Editing".
{{Identical|Date format}}',
'prefs-timeoffset' => 'Used in [[Special:Preferences]], tab "Date and time".',
'prefs-advancedediting' => 'Used in [[Special:Preferences]], tab "Editing".
-{{Identical|Advanced options}}',
+This used to say "Advanced options", the key name is a left over from that.',
+'prefs-editor' => 'Used in [[Special:Preferences]], tab "Editing".',
+'prefs-preview' => 'Used in [[Special:Preferences]], tab "Editing".',
'prefs-advancedrc' => 'Used in [[Special:Preferences]], tab "Recent changes".
{{Identical|Advanced options}}',
'prefs-advancedrendering' => 'Used in [[Special:Preferences]], tab "Appearence".
'prefs-advancedrc' => 'Used in [[Special:Preferences]], tab "Recent changes".
{{Identical|Advanced options}}',
'prefs-advancedrendering' => 'Used in [[Special:Preferences]], tab "Appearence".
'resetprefs',
'restoreprefs',
'prefs-editing',
'resetprefs',
'restoreprefs',
'prefs-editing',
'rows',
'columns',
'searchresultshead',
'rows',
'columns',
'searchresultshead',
'prefs-common-css-js',
'prefs-reset-intro',
'prefs-emailconfirm-label',
'prefs-common-css-js',
'prefs-reset-intro',
'prefs-emailconfirm-label',
'youremail',
'username',
'uid',
'youremail',
'username',
'uid',
'prefs-dateformat',
'prefs-timeoffset',
'prefs-advancedediting',
'prefs-dateformat',
'prefs-timeoffset',
'prefs-advancedediting',
+ 'prefs-editor',
+ 'prefs-preview',
'prefs-advancedrc',
'prefs-advancedrendering',
'prefs-advancedsearchoptions',
'prefs-advancedrc',
'prefs-advancedrendering',
'prefs-advancedsearchoptions',