Change Details

The headers of a conflict currently look like this: {F25010408, size=full} … while a regular diff looks like this: {F25010500, size=full} … and a diff for an unsaved edit looks like this: {F25010762, size=full} Issues: * Day and time are flipped, compared to the diff page. * The right side shows the current time. I find this more confusing than helpful. A time typically indicates the time a revision was saved, but this was not saved yet. It takes the user a while to understand what is displayed there is meant to be the current time (which might or might not be off, depending on the users timezone). Also, what information does the user gain from this? It's the time he submitted the edit form. Can he do anything with this information? * The sentences "saved" and "not saved" should start with an upper case letter. * I think it helps to say "Not saved yet", because saving is what the user is most probably going to do. * "Save" should also be relabeled to say "publish", see {T202052}.

**Task** Update the headers of the two conflicting versions as shown in the mock: {F25678287} **Acceptance Criteria** [] The first line identifies the revision version as shown in the mock [] The time indicator in the first row should always be a round number in the biggest displayable unit (e.g. 1 week ago if it was 8 days ago) and never be smaller than 1 second [] The second line shows the user name in the published version. Although the mock shows "user:xxx" this should be in the mediawiki default format, including links to talk pages and all other relevant links [] On the user's version, the line says "Not published yet" [] The third line on both sides contains the edit summary in brackets. Contrary to the mock, the text should be italic **Notes** First line: - show whos revision this is - in the revision of the other user show how long the publishing is ago Second line: - on the "other user's side" show the user name plus user page and talk page – what to see should be connected to the user's level (admin etc.) - on "your side" show "Not published yet" Third line: - show the edit summary on each version The headers of a conflict currently look like this: {F25010408, size=full} … while a regular diff looks like this: {F25010500, size=full} … and a diff for an unsaved edit looks like this: {F25010762, size=full} Issues: * Day and time are flipped, compared to the diff page. * The right side shows the current time. I find this more confusing than helpful. A time typically indicates the time a revision was saved, but this was not saved yet. It takes the user a while to understand what is displayed there is meant to be the current time (which might or might not be off, depending on the users timezone). Also, what information does the user gain from this? It's the time he submitted the edit form. Can he do anything with this information? * The sentences "saved" and "not saved" should start with an upper case letter. * I think it helps to say "Not saved yet", because saving is what the user is most probably going to do. * "Save" should also be relabeled to say "publish", see {T202052}.

**Task** Update the headers of the two conflicting versions as shown in the mock: {F25678287} **Acceptance Criteria** [] The first line identifies the revision version as shown in the mock [] The time indicator in the first row should always be a round number in the biggest displayable unit (e.g. 1 week ago if it was 8 days ago) and never be smaller than 1 second [] The second line shows the user name in the published version. Although the mock shows "user:xxx" this should be in the mediawiki default format, including links to talk pages and all other relevant links [] On the user's version, the line says "Not published yet" [] The third line on both sides contains the edit summary in brackets. Contrary to the mock, the text should be italic **Notes** First line: - show whos revision this is - in the revision of the other user show how long the publishing is ago Second line: - on the "other user's side" show the user name plus user page and talk page – what to see should be connected to the user's level (admin etc.) - on "your side" show "Not published yet" Third line: - show the edit summary on each version The headers of a conflict currently look like this: {F25010408, size=full} … while a regular diff looks like this: {F25010500, size=full} … and a diff for an unsaved edit looks like this: {F25010762, size=full} Issues: * Day and time are flipped, compared to the diff page. * The right side shows the current time. I find this more confusing than helpful. A time typically indicates the time a revision was saved, but this was not saved yet. It takes the user a while to understand what is displayed there is meant to be the current time (which might or might not be off, depending on the users timezone). Also, what information does the user gain from this? It's the time he submitted the edit form. Can he do anything with this information? * The sentences "saved" and "not saved" should start with an upper case letter. * I think it helps to say "Not saved yet", because saving is what the user is most probably going to do. * "Save" should also be relabeled to say "publish", see {T202052}.