Adapt help dialogue to moment of beta deploy
Closed, ResolvedPublic
Actions

Description

N.B: This needs to be deployed latest on May 09, to be live when T162806: Make TwoColConflict a beta feature on all wikis happens.

Screen1
Text:

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.

Feedback to the page is very much appreciated here.

(here is still the same link)

Screen2
Text:

The first column shows the changes in your version and the changes in the currently saved version. The differences between both versions are highlighted.

Screen3
Text:

At the top of the first column you can click on “show” to see unchanged text. This might help to understand the context of changes. By default, unchanged text is greyed out and collapsed.

Screen4
Text:

The second column is an editor. Copy and paste the desired parts of your version into the text in the editor. Only what is in the editor will be published, when you click the "Publish changes" button.

Help manual
Please update the usage part of the manual as well:
https://www.mediawiki.org/wiki/Help:Two_Column_Edit_Conflict_View/en

Only for the first screen, please use the following text:

Whenever an edit conflict happens, the new page for conflict resolution will appear. It is split into two columns: The first shows the conflicting changes and the second column is a text editor, whose content will be saved.

Details

	Project	Branch	Lines +/-	Subject
	mediawiki/extensions/TwoColConflict	wmf/1.29.0-wmf.21	+2 K -559	BACKPORTS from master.
	mediawiki/extensions/TwoColConflict	master	+6 -6	Adapt help dialog to current version

Customize query in gerrit

Related Objects

Mentioned In: rESCCdd7c217aa902: BACKPORTS from master.
T162806: Make TwoColConflict a beta feature on all wikis
rESCCe19dc188c0cd: Adapt help dialog to current version
T162148: Improve the help dialogue for users of edit conflict
Mentioned Here: T162806: Make TwoColConflict a beta feature on all wikis

Event Timeline

Lea_WMDE created this task.Apr 26 2017, 11:58 AM

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptApr 26 2017, 11:58 AM

Lea_WMDE changed the task status from Open to Stalled.Apr 26 2017, 11:58 AM

Lea_WMDE mentioned this in T162148: Improve the help dialogue for users of edit conflict.Apr 26 2017, 12:01 PM

IKhitron added a subscriber: IKhitron.Apr 26 2017, 12:02 PM

Lea_WMDE changed the task status from Stalled to Open.Apr 26 2017, 1:28 PM

Lea_WMDE triaged this task as High priority.

Lea_WMDE updated the task description. (Show Details)

WMDE-Fisch claimed this task.Apr 27 2017, 1:05 PM

WMDE-Fisch moved this task from Todo to Sprint ready on the WMDE-TechWish board.

On Screen3 is still a hint to hide the 'yours' text. Since this option is/will be removed I will remove that sentence in the help text and base the patch upon the patch where the option is removed.

The text will then be:

At the top of the first column you can click on “show” to see unchanged text. This might help to understand the context of changes. By default, unchanged text is greyed out and collapsed.

Forget my last comment. These adjustments are done in https://phabricator.wikimedia.org/T162148

Change 350557 had a related patch set uploaded (by WMDE-Fisch; owner: WMDE-Fisch):
[mediawiki/extensions/TwoColConflict@master] Adapt help dialog to current version

https://gerrit.wikimedia.org/r/350557

gerritbot added a project: Patch-For-Review.Apr 27 2017, 1:56 PM

WMDE-Fisch mentioned this in rESCCe19dc188c0cd: Adapt help dialog to current version.Apr 27 2017, 1:58 PM

@Lea_WMDE On question to the text for the manual:

Screen3 currently has

When javascript is enabled, you can use 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. Also you have the possibility to only show your text.

The part about JS should also be taken into account here for the new text I guess. How about:

When javascript is enabled, you can click on “show” to see unchanged text at the top of the first column . This might help to understand the context of changes. By default, unchanged text is greyed out and collapsed. You can also click on "mine" to see only your changes.

Change 350557 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Adapt help dialog to current version

https://gerrit.wikimedia.org/r/350557

Lea_WMDE mentioned this in T162806: Make TwoColConflict a beta feature on all wikis.Apr 28 2017, 3:49 PM

ReleaseTaggerBot added a project: MW-1.30-release-notes (WMF-deploy-2017-05-09_(1.30.0-wmf.1)).Apr 28 2017, 4:01 PM

Changed wording to reduce workload for translators - sorry @WMDE-Fisch :/

Change 352817 had a related patch set uploaded (by Addshore; owner: Addshore):
[mediawiki/extensions/TwoColConflict@wmf/1.29.0-wmf.21] BACKPORTS from master.

https://gerrit.wikimedia.org/r/352817

Addshore mentioned this in rESCCdd7c217aa902: BACKPORTS from master..May 9 2017, 1:00 PM

Change 352817 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@wmf/1.29.0-wmf.21] BACKPORTS from master.

https://gerrit.wikimedia.org/r/352817

Mentioned in SAL (#wikimedia-operations) [2017-05-09T13:49:10Z] <hashar@tin> Synchronized php-1.29.0-wmf.21/extensions/TwoColConflict: BACKPORTS from master - T162806 T163886 (duration: 00m 41s)