Extension:TwoColConflict

From MediaWiki.org
Jump to navigation Jump to search

Other languages:
Deutsch • ‎English • ‎español • ‎français • ‎polski • ‎português do Brasil • ‎українська • ‎עברית • ‎中文 • ‎日本語
MediaWiki extensions manual
Crystal Clear action run.svg
Extension:TwoColConflict
Release status: beta
TwoColConflict MediaWiki Extension.png
Implementation User interface
Description Provides an alternative two-column view for the edit conflict resolution page
Author(s) Wikimedia Germany (WMDE)
Latest version continuous updates
Compatibility policy release branches
MediaWiki 1.27+
Database changes No
License GNU General Public License 2.0 or later
Download
Parameters
  • $wgTwoColConflictBetaFeature
  • $wgTwoColConflictUseInline
Hooks used
GetBetaFeaturePreferences
AlternateEdit
EditPage::importFormData
EditPageBeforeConflictDiff
EditPageBeforeEditButtons
ResourceLoaderTestModules
Translate the TwoColConflict extension if it is available at translatewiki.net
Check usage and version matrix.
Issues Open tasks · Report a bug
This feature is undergoing some changes. Expect a new interface in the second half of 2018.

The TwoColConflict extension provides an alternative two-column view for the edit conflict resolution page. It highlights differences between the editor's and the conflicting change directly in the textfield for an easy possibility to copy and paste desired pieces of the text and resolving the conflict.

Installation[edit]

  • Download and place the file(s) in a directory called TwoColConflict in your extensions/ folder.
  • Add the following code at the bottom of your LocalSettings.php:
    wfLoadExtension( 'TwoColConflict' );
    
  • Yes Done – Navigate to Special:Version on your wiki to verify that the extension is successfully installed.

Usage[edit]

Enabling the new view: To enable the new view for edit-conflict resolution, you have to be logged in and tick the checkbox for the Two column edit conflict feature on the beta-features preferences page in your Wiki.

Two Column Edit Conflict View LTR 1.svg

This page helps you to resolve an edit conflict.
There are two columns: The first shows the conflicting changes and the second column is a text editor, whose content will be saved.

Two Column Edit Conflict View LTR 2.svg

Inside the box containing the conflicting changes, both the conflicting text and your text is shown, and the differences between the two are highlighted.

Two Column Edit Conflict View LTR 3.svg

There are buttons above the box which allow you to hide any unchanged parts of the text to make it easier to focus on the conflicting areas.

Two Column Edit Conflict View LTR 0.svg

The second column is an editor. When the page is opened, there is a selection box on top of the editor. It lets you decide which version should be in the editor. This is often the version where more changes were made.

Two Column Edit Conflict View LTR 4.svg

You can then copy and paste the desired parts of the text to the editor to edit the version that should be saved.
Once you hit the "publish changes" button, the version from the editor will be saved.

Configuration[edit]

  • $wgTwoColConflictBetaFeature : (boolean, true by default) Activate this extension as a Beta Feature when Extension:BetaFeatures is activated.
  • $wgTwoColConflictUseInline : (boolean, true by default) Use the view with inline conflicting changes in one column and a classic wikitext form in the other column; the alternative view is a diff similar to MediaWiki built-in view, but with buttons on each conflicting line to select one or the other version.

Links[edit]