Jump to content

Erweiterung:Paragraph-based Edit Conflict Interface

Issue-Tracker: #two-column-edit-conflict-merge
From mediawiki.org
This page is a translated version of the page Extension:Paragraph-based Edit Conflict Interface and the translation is 55% complete.
Outdated translations are marked like this.
Languages:
MediaWiki-Erweiterungen
TwoColConflict
Freigabestatus: stabil
Einbindung Benutzer-Schnittstelle
Beschreibung Bietet eine zweispaltige Ansicht der Bearbeitungskonflikt-Seite
Autor(en) Wikimedia Germany (WMDE)
Letzte Version Laufende Aktualisierungen
Kompatibilitätspolitik Snapshots werden zusammen mit MediaWiki veröffentlicht. Der Master ist nicht abwärtskompatibel.
MediaWiki >= 1.43
Lizenz GNU General Public License 2.0 oder neuer
Herunterladen
Erweiterung herunterladen
Git [?]:
Hilfe Help:Paragraph-based Edit Conflict Interface
Parameter
  • $wgTwoColConflictBetaFeature
  • $wgTwoColConflictTrackingOversample
  • $wgTwoColConflictSuggestResolution
Verwendete Hooks
Quarterly downloads 18 (Ranked 122nd)
Public wikis using 944 (Ranked 268th)
Übersetze die Paragraph-based Edit Conflict Interface-Erweiterung
Probleme Offene Aufgaben · Einen Fehler melden

Die Paragraph-based Edit Conflict Interface (früher: Two Column Edit Conflict View) ist eine neue Schnittstelle für die Seite zur Lösung von Bearbeitungskonflikten. Sie zeigt kollidierende Textpassagen paarweise nebeneinander an und erleichtert so das Zusammenführen Ihres Textes mit demjenigen, der gerade online ist. 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.

Verwendung

Aktivieren der neuen Ansicht: Um die neue Ansicht zur Lösung von Editierkonflikten zu aktivieren, müssen Sie eingeloggt sein und auf der beta-features Einstellungen-Seite in Ihrem Wiki das Kontrollkästchen für das Paragraph-based Edit Conflict Interface aktivieren. Wenn Sie bereits das erste Beta-Feature aktiviert hatten, erhalten Sie automatisch die neue Ansicht. 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

  • Die Erweiterung herunterladen und die Datei(en) in ein Verzeichnis namens TwoColConflict im Ordner extensions/ ablegen.
    Entwickler und Code-Beitragende sollten stattdessen die Erweiterung von Git installieren, mit:cd extensions/
    git clone https://gerrit.wikimedia.org/r/mediawiki/extensions/TwoColConflict
  • Folgenden Code am Ende deiner LocalSettings.php -Datei einfügen: 
    wfLoadExtension( 'TwoColConflict' );
  • Configure as required.
  • Yes Erledigt – Navigiere zu Special:Version in deinem Wiki, um zu überprüfen, ob die Erweiterung erfolgreich installiert wurde.

Konfiguration

  • $wgTwoColConflictBetaFeature - (boolean, true by default) Activate this extension as a Beta Feature when Erweiterungen:BetaFeatures 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.

Allgemeine Projektseite auf Meta

Retrieved from "https://www.mediawiki.org/w/index.php?title=Extension:Paragraph-based_Edit_Conflict_Interface/de&oldid=6714995"