Extensión:TwoColConflict

MediaWiki extensions manual

TwoColConflict Release status: beta
Implementación	User interface
Descripción	Proporciona una vista alternativa en dos columnas para la página de resolución de conflictos de edición
Autor(es)	Wikimedia Alemania (WMDE)
Última versión	actualizaciones continuas
Política de compatibilidad	release branches
MediaWiki	1.27+
Cambios de la base de datos	No
Licencia	GNU General Public License 2.0 or later
Descarga	Download extension Git [?]: Descargar desde master de Git Explorar el repositorio (GitHub) historial de cambios revisión de código
Parámetros $wgTwoColConflictBetaFeature $wgTwoColConflictUseInline
Hooks que usa GetBetaFeaturePreferences AlternateEdit EditPage::importFormData EditPageBeforeConflictDiff EditPageBeforeEditButtons ResourceLoaderTestModules
Translate the TwoColConflict extension if it is available at translatewiki.net
Verificar uso y versión de la matriz.
Asuntos	Tareas abiertas · Reportar un bug

The first beta feature got a new interface on November 8, 2018.

La extensión TwoColConflict («Conflicto en dos columnas») proporciona una vista alternativa en dos columnas para la página de resolución de conflictos de edición. Resalta directamente en la caja de texto las diferencias entre la edición del usuario y la edición en conflicto para permitir fácilmente copiar y pegar las partes deseadas del texto para resolver el conflicto.

Instalación

• Descarga y extrae los archivos en el directorio «TwoColConflict» dentro del directorio extensions/ existente.

• Añade el siguiente código a tu LocalSettings.php (preferiblemente al final):

  wfLoadExtension( 'TwoColConflict' );
  

•  Hecho – Navega a Special:Version en tu wiki para verificar que la apariencia se haya instalado correctamente.

Uso

Habilitar la nueva vista: Para habilitar la nueva vista para la resolución de conflictos de edición, tienes que tener una sesión iniciada y activar la casilla de verificación de la funcionalidad «Conflicto de edición en dos columnas en la sección de funciones en pruebas de tu página de preferencias de tu wiki.

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.

Configuration

• $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.

Enlaces

• Página de ayuda y página central de comentarios en mw.org
• Página principal del proyecto en Meta