From bf357a0e2dee24d80dc17082b1f685e8ee1ed9aa Mon Sep 17 00:00:00 2001 From: Jebbs Date: Mon, 7 Oct 2019 11:55:15 +0800 Subject: Add toast message for some keyboard shortcuts Add notification message when using keyboard shortcuts: f, s, and m. --- template/common.go | 5 ++++- template/html/common/layout.html | 3 +++ template/html/entry.html | 5 +++++ template/views.go | 7 ++++++- 4 files changed, 18 insertions(+), 2 deletions(-) (limited to 'template') diff --git a/template/common.go b/template/common.go index 9590cda..ace693c 100644 --- a/template/common.go +++ b/template/common.go @@ -115,6 +115,9 @@ var templateCommonMap = map[string]string{ +

+ +

@@ -247,6 +250,6 @@ var templateCommonMap = map[string]string{ var templateCommonMapChecksums = map[string]string{ "entry_pagination": "4faa91e2eae150c5e4eab4d258e039dfdd413bab7602f0009360e6d52898e353", "item_meta": "34deb081a054f2948ad808bdb2c8603d6ab00c58f2f50c4ead0b47ae092888eb", - "layout": "0204dc6636be38ff00a2ad6b70ac56c4ae8f8fb0a27f987a73819520129cbb84", + "layout": "93a4873adf5deb99b77f60e71465eab817c32a381de696b93ff27b7eaa47bb3b", "pagination": "3386e90c6e1230311459e9a484629bc5d5bf39514a75ef2e73bbbc61142f7abb", } diff --git a/template/html/common/layout.html b/template/html/common/layout.html index b095385..7ca571b 100644 --- a/template/html/common/layout.html +++ b/template/html/common/layout.html @@ -41,6 +41,9 @@ +

+ +

diff --git a/template/html/entry.html b/template/html/entry.html index b10cea6..4dcd3ca 100644 --- a/template/html/entry.html +++ b/template/html/entry.html @@ -14,6 +14,8 @@ data-toggle-status="true" data-label-read="✔︎ {{ t "entry.status.read" }}" data-label-unread="✘ {{ t "entry.status.unread" }}" + data-toast-read="✔︎ {{ t "entry.status.toast.read" }}" + data-toast-unread="✘ {{ t "entry.status.toast.unread" }}" data-value="{{ if eq .entry.Status "read" }}read{{ else }}unread{{ end }}" >{{ if eq .entry.Status "read" }}✘ {{ t "entry.status.unread" }}{{ else }}✔︎ {{ t "entry.status.read" }}{{ end }} @@ -24,6 +26,8 @@ data-label-loading="{{ t "entry.state.saving" }}" data-label-star="☆ {{ t "entry.bookmark.toggle.on" }}" data-label-unstar="★ {{ t "entry.bookmark.toggle.off" }}" + data-toast-star="★ {{ t "entry.bookmark.toast.on" }}" + data-toast-unstar="☆ {{ t "entry.bookmark.toast.off" }}" data-value="{{ if .entry.Starred }}star{{ else }}unstar{{ end }}" >{{ if .entry.Starred }}★ {{ t "entry.bookmark.toggle.off" }}{{ else }}☆ {{ t "entry.bookmark.toggle.on" }}{{ end }} @@ -35,6 +39,7 @@ data-save-url="{{ route "saveEntry" "entryID" .entry.ID }}" data-label-loading="{{ t "entry.state.saving" }}" data-label-done="{{ t "entry.save.completed" }}" + data-toast-done="{{ t "entry.save.toast.completed" }}" >{{ t "entry.save.title" }} {{ end }} diff --git a/template/views.go b/template/views.go index f1cadd5..c951f8a 100644 --- a/template/views.go +++ b/template/views.go @@ -593,6 +593,8 @@ var templateViewsMap = map[string]string{ data-toggle-status="true" data-label-read="✔︎ {{ t "entry.status.read" }}" data-label-unread="✘ {{ t "entry.status.unread" }}" + data-toast-read="✔︎ {{ t "entry.status.toast.read" }}" + data-toast-unread="✘ {{ t "entry.status.toast.unread" }}" data-value="{{ if eq .entry.Status "read" }}read{{ else }}unread{{ end }}" >{{ if eq .entry.Status "read" }}✘ {{ t "entry.status.unread" }}{{ else }}✔︎ {{ t "entry.status.read" }}{{ end }} @@ -603,6 +605,8 @@ var templateViewsMap = map[string]string{ data-label-loading="{{ t "entry.state.saving" }}" data-label-star="☆ {{ t "entry.bookmark.toggle.on" }}" data-label-unstar="★ {{ t "entry.bookmark.toggle.off" }}" + data-toast-star="★ {{ t "entry.bookmark.toast.on" }}" + data-toast-unstar="☆ {{ t "entry.bookmark.toast.off" }}" data-value="{{ if .entry.Starred }}star{{ else }}unstar{{ end }}" >{{ if .entry.Starred }}★ {{ t "entry.bookmark.toggle.off" }}{{ else }}☆ {{ t "entry.bookmark.toggle.on" }}{{ end }} @@ -614,6 +618,7 @@ var templateViewsMap = map[string]string{ data-save-url="{{ route "saveEntry" "entryID" .entry.ID }}" data-label-loading="{{ t "entry.state.saving" }}" data-label-done="{{ t "entry.save.completed" }}" + data-toast-done="{{ t "entry.save.toast.completed" }}" >{{ t "entry.save.title" }} {{ end }} @@ -1476,7 +1481,7 @@ var templateViewsMapChecksums = map[string]string{ "edit_category": "daf073d2944a180ce5aaeb80b597eb69597a50dff55a9a1d6cf7938b48d768cb", "edit_feed": "34aa0d668b3ea1a1b5fa480c20cebeae729b37010af3bb915d2a9eed73d3b996", "edit_user": "f4f99412ba771cfca2a2a42778b023b413c5494e9a287053ba8cf380c2865c5f", - "entry": "e14434fc6f57963eae26057a18c835d0328af783d41f5af04b03387b4da604be", + "entry": "24aeba26ef9a51ce585ca5c4af090f1de7d7bfd7f1e3ff1b63af520e2afa76bd", "feed_entries": "9c70b82f55e4b311eff20be1641733612e3c1b406ce8010861e4c417d97b6dcc", "feeds": "fa2dad422445eca898c1daa4ab742691207a8c0d3c274eed84462bc610d22219", "history_entries": "87e17d39de70eb3fdbc4000326283be610928758eae7924e4b08dcb446f3b6a9", -- cgit v1.2.3