From: TMg Date: Sat, 25 May 2013 15:01:27 +0000 (+0200) Subject: Re-grouping and ordering the editing preferences X-Git-Tag: 1.31.0-rc.0~19313^2 X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=08de49eb886dd75d0d8a86b58194c23003bf08c6;p=lhc%2Fweb%2Fwiklou.git Re-grouping and ordering the editing preferences 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 --- diff --git a/includes/Preferences.php b/includes/Preferences.php index 848cd32831..8f784bb507 100644 --- a/includes/Preferences.php +++ b/includes/Preferences.php @@ -732,25 +732,28 @@ class Preferences { 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', - 'section' => 'editing/advancedediting', + 'section' => 'editing/editor', 'label-message' => 'editfont-style', 'options' => array( $context->msg( 'editfont-default' )->text() => 'default', @@ -760,64 +763,57 @@ class Preferences { ) ); } - $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( 'type' => 'toggle', - 'section' => 'editing/advancedediting', - 'label-message' => 'tog-editsection', + 'section' => 'editing/editor', + 'label-message' => 'tog-minordefault', ); } - $defaultPreferences['editsectiononrightclick'] = array( + $defaultPreferences['forceeditsummary'] = array( 'type' => 'toggle', - 'section' => 'editing/advancedediting', - 'label-message' => 'tog-editsectiononrightclick', + 'section' => 'editing/editor', + 'label-message' => 'tog-forceeditsummary', ); - $defaultPreferences['editondblclick'] = array( + $defaultPreferences['useeditwarning'] = array( 'type' => 'toggle', - 'section' => 'editing/advancedediting', - 'label-message' => 'tog-editondblclick', + 'section' => 'editing/editor', + 'label-message' => 'tog-useeditwarning', ); $defaultPreferences['showtoolbar'] = array( 'type' => 'toggle', - 'section' => 'editing/advancedediting', + 'section' => 'editing/editor', '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( 'type' => 'toggle', - 'section' => 'editing/advancedediting', - 'label-message' => 'tog-forceeditsummary', + 'section' => 'editing/preview', + 'label-message' => 'tog-previewonfirst', ); - - $defaultPreferences['uselivepreview'] = array( + $defaultPreferences['previewontop'] = array( 'type' => 'toggle', - 'section' => 'editing/advancedediting', - 'label-message' => 'tog-uselivepreview', + 'section' => 'editing/preview', + 'label-message' => 'tog-previewontop', ); - - $defaultPreferences['useeditwarning'] = array( + $defaultPreferences['uselivepreview'] = array( 'type' => 'toggle', - 'section' => 'editing/advancedediting', - 'label-message' => 'tog-useeditwarning', + 'section' => 'editing/preview', + 'label-message' => 'tog-uselivepreview', ); } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 63f00076a0..bd33ca8d25 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1903,7 +1903,6 @@ Note that their indexes of {{SITENAME}} content may be out of date.', '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', @@ -1947,7 +1946,6 @@ Here's a randomly-generated value you can use: $1", '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:', @@ -1983,7 +1981,9 @@ Your email address is not revealed when other users contact you.', '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', diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php index ed742fdb15..ad65f0816a 100644 --- a/languages/messages/MessagesQqq.php +++ b/languages/messages/MessagesQqq.php @@ -2671,7 +2671,9 @@ See also: {{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". diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 4236191a03..70f0490563 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -1035,7 +1035,6 @@ $wgMessageStructure = array( 'resetprefs', 'restoreprefs', 'prefs-editing', - 'prefs-edit-boxsize', 'rows', 'columns', 'searchresultshead', @@ -1077,7 +1076,6 @@ $wgMessageStructure = array( 'prefs-common-css-js', 'prefs-reset-intro', 'prefs-emailconfirm-label', - 'prefs-textboxsize', 'youremail', 'username', 'uid', @@ -1112,6 +1110,8 @@ $wgMessageStructure = array( 'prefs-dateformat', 'prefs-timeoffset', 'prefs-advancedediting', + 'prefs-editor', + 'prefs-preview', 'prefs-advancedrc', 'prefs-advancedrendering', 'prefs-advancedsearchoptions',