|
@@ -76,8 +76,8 @@
|
|
|
(or (not= page-name old-page-name)
|
|
|
(not= hiccup old-hiccup)
|
|
|
(not= block-uuid old-block-uuid))))}
|
|
|
- [page-name _blocks hiccup sidebar? _block-uuid]
|
|
|
- [:div.page-blocks-inner {:style {:margin-left (if sidebar? 0 -20)}}
|
|
|
+ [page-name _blocks hiccup sidebar? whiteboard? _block-uuid]
|
|
|
+ [:div.page-blocks-inner {:style {:margin-left (if (or sidebar? whiteboard?) 0 -20)}}
|
|
|
(rum/with-key
|
|
|
(content/content page-name
|
|
|
{:hiccup hiccup
|
|
@@ -124,7 +124,7 @@
|
|
|
(date/journal-title->int (date/today))))
|
|
|
(state/pub-event! [:journal/insert-template page-name])))
|
|
|
state)}
|
|
|
- [repo page-e {:keys [sidebar?] :as config}]
|
|
|
+ [repo page-e {:keys [sidebar? whiteboard?] :as config}]
|
|
|
(when page-e
|
|
|
(let [page-name (or (:block/name page-e)
|
|
|
(str (:block/uuid page-e)))
|
|
@@ -147,7 +147,7 @@
|
|
|
hiccup-config (common-handler/config-with-document-mode hiccup-config)
|
|
|
hiccup (component-block/->hiccup page-blocks hiccup-config {})]
|
|
|
[:div
|
|
|
- (page-blocks-inner page-name page-blocks hiccup sidebar? block-id)
|
|
|
+ (page-blocks-inner page-name page-blocks hiccup sidebar? whiteboard? block-id)
|
|
|
(when-not config/publishing?
|
|
|
(let [args (if block-id
|
|
|
{:block-uuid block-id}
|
|
@@ -435,7 +435,7 @@
|
|
|
_ (and block? page (reset! *current-block-page (:block/name (:block/page page))))
|
|
|
_ (when (and block? (not page))
|
|
|
(route-handler/redirect-to-page! @*current-block-page))]
|
|
|
- (page-blocks-cp repo page {:sidebar? sidebar?}))]])
|
|
|
+ (page-blocks-cp repo page {:sidebar? sidebar? :whiteboard? whiteboard?}))]])
|
|
|
|
|
|
(when today?
|
|
|
(today-queries repo today? sidebar?))
|