Open main menu

Extension:TwoColConflict

This page is a translated version of the page Extension:TwoColConflict and the translation is 29% complete.

Other languages:
Deutsch • ‎English • ‎español • ‎français • ‎polski • ‎português do Brasil • ‎українська • ‎עברית • ‎中文 • ‎日本語 • ‎한국어
MediaWiki 拡張機能マニュアル
OOjs UI icon advanced.svg
Extension:TwoColConflict
リリースの状態: ベータ
New design for the Two Column edit conflict interface, status October 2018.png
実装 ユーザー インターフェイス
説明 Provides an alternative two-column view for the edit conflict resolution page
作者 Wikimedia Germany (WMDE)
最新バージョン 継続的な更新
互換性ポリシー リリースブランチ
MediaWiki 1.27+
データベースの変更 いいえ
ライセンス GNU 一般公衆利用許諾書 2.0 以降
ダウンロード
  • $wgTwoColConflictBetaFeature
  • $wgTwoColConflictUseInline
translatewiki.net で翻訳を利用できる場合は、TwoColConflict 拡張機能の翻訳にご協力ください
使用状況とバージョン マトリクスを確認してください。
問題点 未解決のタスク · バグを報告
The first beta feature got a new interface on November 8, 2018.

The Two Column Edit Conflict View is a new interface for the edit conflict resolution page. It displays colliding text passages in pairs next to each other, making it easier to merge your text with the one that’s currently online.

インストール

  • ダウンロードして、ファイルを extensions/ フォルダー内の TwoColConflict という名前のディレクトリ内に配置します。
  • 以下のコードを LocalSettings.php の末尾に追加します:
    wfLoadExtension( 'TwoColConflict' );
    
  •   完了 – ウィキの「Special:Version」に移動して、拡張機能が正しくインストールされたことを確認します。

使用法

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. If you had already activated the first beta feature, you will automatically get the new view.

1. Get oriented.

In order to help you solve the edit conflict, the interface breaks down the differences between the two revisions like this:

  • Text passages that differ are displayed in pairs next to each other: The current version of the page is shown in yellow and your version in blue. Inside, text that was changed is highlighted.
  • Text passages that are identical in both versions are displayed as a grey bar, spanning the whole width.

A tutorial guides you through the interface the first time you encounter an edit conflict. You can open it again by clicking on the help icon (?).


 
selected text box, with a black pencil to start the editing mode
 
text box in editing mode, with checkmark and back arrow

2. Build a new version by merging your text with the one that’s currently online.

  • Select the passages you want to keep by clicking on the radio buttons next to them. By default, all texts from the other person are selected, so if you publish immediately, none of your text changes are saved.
  • Edit passages, if needed.
  • Click on the black pencil to open the editing mode for a text passage. If the pencil is grey, it means you need to select the text passage first. Otherwise, this version won’t be saved when you click publish.
  • You can also edit text passages that are identical in both versions.
  • The highlights that indicate the differences between the versions disappear when you edit a text passage.
  • You can integrate parts from other text passages by copy and paste, either with the copy and paste function on your keyboard or with a right click.
  • Click on the check mark to apply changes to a text box and to close its editing mode.
  • If you want to discard your changes and reset the contents of the text box to what it was when the edit conflict occurred, click on the back arrow. This also restores the highlighting.

3. Publish a new page version. When you’re done selecting and editing all of the passages, click “Publish changes”. This composes all of the text passages you selected and the grey boxes into a new page revision. As on all wiki pages, you can preview the changes first via the Preview button. On clicking Cancel, you return to the current version of the page.

Non-JS version

If you’re not using JavaScript, the look or behavior of the feature will be as follows:

  • All text passages are shown in editor boxes.
  • There are no buttons within the editor boxes.
  • Text passages that are identical in both versions are always expanded.

設定

  • $wgTwoColConflictBetaFeature : (boolean, true by default) Activate this extension as a Beta Feature when Extension:BetaFeatures is activated.
  • $wgTwoColConflictUseInline : (boolean, false by default) Use the old view with inline conflicting changes in one column and a classic wikitext form in the other column; the default 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