Make the conflict UI more useful and intuitive - Githubissues

divec / ll

Two-way parallel translation

GNU Affero General Public License v3.0

3 stars 5 forks source link

Make the conflict UI more useful and intuitive #36

Open divec opened 5 years ago

divec commented 5 years ago

Summary Implement the conflict UI shown here:

conflict inspector design

Understanding required

The content we're three-way diffing (old MT, human correction, new MT)
The three-way diff structure as returned by of ll.Differ#diff3 — see https://github.com/divec/ll/blob/master/tests/ll.Differ.test.js for examples
How this would map to the UI above
The linear model structure needed to power this UI
What attributes we need in ll/conflict annotations

Changes needed

Rewrite ve.dm.LLConflictAnnotation to take the required attributes
Modify ll.adaptCorrections to return the required linear model structure
Write an inspector for ll/conflict annotations

trevorparscal commented 5 years ago

Segments belong to one of the following groups (and the colors as shown in the mockup above)

context-original (gray)
subject-original (black)
context-change (light orange)
subject-change (orange)
context-merge (light blue)
subject-merge (blue)

Conflicts are a combination of change and merge.

Design improvements:

Connect colors between timeline and document
Refine colors and coding to improve a. visibility b. accessibility c. relationship between segments
Improve labels to better guide the user