meissa/cryogen-core
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

renamed config to page-model

Browse source
This commit is contained in:
Michael Jerger 2017-03-12 08:59:38 +01:00
parent 593766a603
commit 6cf7b1a72b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/cryogen_core/compiler.clj
View file

@ -466,7 +466,7 @@
(update-in [:post-date-format] (fnil str "yyyy-MM-dd")) (update-in [:post-date-format] (fnil str "yyyy-MM-dd"))
(update-in [:keep-files] (fnil seq [])) (update-in [:keep-files] (fnil seq []))
(update-in [:ignored-files] (fnil seq [#"^\.#.*" #".*\.swp$"])) (update-in [:ignored-files] (fnil seq [#"^\.#.*" #".*\.swp$"]))
(update-in [:pages-mode] (fnil keyword :flat)) (update-in [:page-model] (fnil keyword :flat))
)] )]
(merge (merge
config config
@ -489,7 +489,7 @@
[] []
(println (green "compiling assets...")) (println (green "compiling assets..."))
(let [{:keys [^String site-url blog-prefix rss-name recent-posts sass-dest keep-files ignored-files previews? (let [{:keys [^String site-url blog-prefix rss-name recent-posts sass-dest keep-files ignored-files previews?
author-root-uri theme debug? pages-mode] author-root-uri theme debug? page-model]
:as config} (read-config) :as config} (read-config)
posts (map klipsify (add-prev-next (read-posts config))) posts (map klipsify (add-prev-next (read-posts config)))
posts-by-tag (group-by-tags posts) posts-by-tag (group-by-tags posts)
@ -509,8 +509,8 @@
:tags (map (partial tag-info config) (keys posts-by-tag)) :tags (map (partial tag-info config) (keys posts-by-tag))
:latest-posts latest-posts :latest-posts latest-posts
:pages (cond :pages (cond
(= pages-mode :flat) other-pages (= page-model :flat) other-pages
(= pages-mode :hierarchic) (hierarchic/build-hierarchic-map other-pages) (= page-model :hierarchic) (hierarchic/build-hierarchic-map other-pages)
) )
:home-page (if home-page :home-page (if home-page
home-page home-page
@ -521,8 +521,8 @@
:rss-uri (cryogen-io/path "/" blog-prefix rss-name) :rss-uri (cryogen-io/path "/" blog-prefix rss-name)
:site-url (if (.endsWith site-url "/") (.substring site-url 0 (dec (count site-url))) site-url)})] :site-url (if (.endsWith site-url "/") (.substring site-url 0 (dec (count site-url))) site-url)})]
(when debug? (when debug?
(println (blue "debug: pages-mode:")) (println (blue "debug: page-model:"))
(println "\t-->" (cyan pages-mode)) (println "\t-->" (cyan page-model))
(println (blue "debug: pages:")) (println (blue "debug: pages:"))
(println "\t-->" (cyan (-> params :pages))) (println "\t-->" (cyan (-> params :pages)))
(println (blue "debug: home-page:")) (println (blue "debug: home-page:"))