확장기능:TwoColConflict

미디어위키 확장 기능 설명서

TwoColConflict 출시 상태: 안정
구현	사용자 인터페이스
설명	Provides an alternative two-column view for the edit conflict resolution page
만든 이	Wikimedia Germany (WMDE)
최신 버전	지속적인 업데이트
호환성 정책	스냅샷은 미디어위키와 함께 릴리스됩니다. Master is not backward compatible.
MediaWiki	>= 1.43
라이선스	GNU General Public License 2.0 or later
다운로드	확장 기능 다운로드 Git [?]: Git master 다운로드 저장소 보기 (GitHub) 커밋 기록 repository contributors (GitHub) 코드 리뷰
도움말	Help:Paragraph-based Edit Conflict Interface
변수 $wgTwoColConflictBetaFeature $wgTwoColConflictTrackingOversample $wgTwoColConflictSuggestResolution
사용된 훅 AlternateEdit EditPage::importFormData EditPage::showEditForm:fields EditPage::showEditForm:initial EditPageBeforeConflictDiff EditPageBeforeEditButtons GetBetaFeaturePreferences GetPreferences LoadUserOptions
Quarterly downloads	18 (Ranked 122nd)
Public wikis using	944 (Ranked 268th)
Paragraph-based Edit Conflict Interface 확장 기능 번역
이슈	미해결 작업 · 버그 보고

The Paragraph-based Edit Conflict Interface (codename: TwoColConflict) extension is an alternative interface for the edit conflict resolution form. 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.

Usage

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 Paragraph-based Edit Conflict Interface 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 (?).

• If you want to copy your version (the entire article text with your edits) of the article page, click on the 'copy full text' link next to the blue marked 'Your revision' headline on the top of the interface.

Selected text box, with a black pencil to start the editing mode

Text box in editing mode, with checkmark and "X"

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 "X". 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-JavaScript version

If you are 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.

Installation

• 파일을 다운로드하고 TwoColConflict 폴더를 extensions/ 디렉토리에 넣어 주세요.
  개발자와 코딩 기여자는 Git을 이용해 확장기능을 다운받는 것이 좋습니다.cd extensions/
git clone https://gerrit.wikimedia.org/r/mediawiki/extensions/TwoColConflict
• 아래의 코드를 LocalSettings.php 코드의 마지막에 추가합니다.

  wfLoadExtension( 'TwoColConflict' );
  

• Configure as required.
•  완료 – 위키의 ‘Special:Version’에 이동해서, 확장기능이 올바르게 설치된 것을 확인합니다.

Configuration

• $wgTwoColConflictBetaFeature - (boolean, true by default) Activate this extension as a Beta Feature when 확장 기능:베타기능 is activated.
• $wgTwoColConflictSuggestResolution - (boolean, true by default) Suggest an easy resolution for edit conflicts on talk pages when two users replied at the same time.

Links

• Help page and central feedback page on mw.org

• Main project page on Meta