On Tue, Jun 5, 2012 at 10:21 AM, Marius Dumitru Florea <
mariusdumitru.florea(a)xwiki.com> wrote:
Hi Caty,
On Fri, Jun 1, 2012 at 6:11 PM, Ecaterina Moraru (Valica)
<valicac(a)gmail.com> wrote:
Hi,
As you know Thomas and Marius are working on a Diff API and there are
also
some conflict resolution improvements for the
Extension Manager [1].
Marius asked me to think about our current history diff and make some
improvements suggestions based on their work.
I've made a mockup with some ideas that could improve the History Diff UI
Looks good. For "single line" properties I was thinking to display the
diff on a single line:
Parent: XWiki Syntax<ins>es</ins>
Date: 30/05/2012 <del>10:22:33</del><ins>16:08:08</ins>
Other changes I made:
- Mark 'modified' lines with yellow (much easier to scan)
- Line numbers zone for single line properties is now empty
Of course, <ins> means green background color
and <del> red background
color.
Thanks,
Marius
The UI is mostly based and inspired from GitHub.
Let me know what you think.
Thanks,
Caty
[1]
http://www.xwiki.org/xwiki/bin/view/ReleaseNotes/ReleaseNotesXWikiEnterpris…
_______________________________________________
devs mailing list
devs(a)xwiki.org
http://lists.xwiki.org/mailman/listinfo/devs
_______________________________________________
devs mailing list
devs(a)xwiki.org
http://lists.xwiki.org/mailman/listinfo/devs