greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feat/custom-children-list-style

pull/9269/head
charlie 2023-05-01 09:49:14 +08:00
parent 1f279b43a5 a5e31128a6
commit f727f6fc8e
4 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/frontend/components/header.cljs
View File

@ -114,17 +114,19 @@
:options {:href (rfe/href :import)}
:icon (ui/icon "file-upload")})
{:title [:div.flex-row.flex.justify-between.items-center
[:span (t :join-community)]]
:options {:href "https://discuss.logseq.com"
:title (t :discourse-title)
:target "_blank"}
:icon (ui/icon "brand-discord")}
(when-not config/publishing?
{:title [:div.flex-row.flex.justify-between.items-center
[:span (t :join-community)]]
:options {:href "https://discuss.logseq.com"
:title (t :discourse-title)
:target "_blank"}
:icon (ui/icon "brand-discord")})
{:title [:div.flex-row.flex.justify-between.items-center
[:span (t :help/bug)]]
:options {:href (rfe/href :bug-report)}
:icon (ui/icon "bug")}
(when-not config/publishing?
{:title [:div.flex-row.flex.justify-between.items-center
[:span (t :help/bug)]]
:options {:href (rfe/href :bug-report)}
:icon (ui/icon "bug")})
(when (and (state/sub :auth/id-token) (user-handler/logged-in?))
{:title (str (t :logout) " (" (user-handler/email) ")")

22
src/main/frontend/components/page_menu.cljs
View File

@ -80,15 +80,16 @@
(file-sync-handler/get-current-graph-uuid))]
(when (and page (not block?))
(->>
[{:title (if favorited?
(t :page/unfavorite)
(t :page/add-to-favorites))
:options {:on-click
(fn []
(if favorited?
(page-handler/unfavorite-page! page-original-name)
(page-handler/favorite-page! page-original-name)))}}
[(when-not config/publishing?
{:title (if favorited?
(t :page/unfavorite)
(t :page/add-to-favorites))
:options {:on-click
(fn []
(if favorited?
(page-handler/unfavorite-page! page-original-name)
(page-handler/favorite-page! page-original-name)))}})
(when (or (util/electron?) file-sync-graph-uuid)
{:title (t :page/version-history)
:options {:on-click
@ -109,7 +110,8 @@
{:title (t :page/copy-page-url)
:options {:on-click #(page-handler/copy-page-url page-original-name)}})
(when-not contents?
(when-not (or contents?
config/publishing?)
{:title (t :page/delete)
:options {:on-click #(state/set-modal! (delete-page-dialog page-name))}})

2
src/main/frontend/dicts.cljc
View File

@ -319,7 +319,7 @@
:plugin/found-updates "New updates"
:plugin/found-n-updates "Found {1} updates"
:plugin/update-all-selected "Update all of selected"
:plugin/updates-downloading "Downloading for the updates"
:plugin/updates-downloading "Downloading updates"
:plugin/refresh-lists "Refresh lists"
:plugin/enabled "Enabled"
:plugin/disabled "Disabled"

4
src/main/frontend/modules/shortcut/config.cljs
View File

@ -351,7 +351,7 @@
(state/pub-event! [:command/run]))}
:go/home {:binding "g h"
:fn route-handler/redirect-to-home!}
:fn #(route-handler/redirect-to-home!)}
:go/all-pages {:binding "g a"
:fn route-handler/redirect-to-all-pages!}
@ -421,7 +421,7 @@
:editor/copy-page-url {:binding false
:inactive (not (util/electron?))
:fn page-handler/copy-page-url}
:fn #(page-handler/copy-page-url)}
:ui/toggle-wide-mode {:binding "t w"
:fn ui-handler/toggle-wide-mode!}