feat(ui): inline conflict resolution with Keep This button

Browse Source

Replace the 'Go to Conflicts Page' link with inline conflict resolution.
Each conflict source now has a 'Keep This' button that resolves the
conflict directly from the book detail page.

- Conflict data now keyed by source name (koreader, web) instead of
  new/existing, with Source and Timestamp fields
- Display percentage scaled correctly (* 100)
- Fix page field name from current_page to page
- Add conflict resolution JavaScript in book-detail.ts
- Add 10-minute cooldown after resolution to prevent re-detection

...

This commit is contained in:

john-okeefe committed 2026-06-02 19:46:17 -04:00

1 parent f57d64563b

commit bc59159cde

4 files changed

+491 -412

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

templates/book_detail_modals_templ.go

+440 -397

File diff suppressed because it is too large. Load diff