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

Merge branch 'development'

Browse source
This commit is contained in:
Michael Jerger 2017-02-13 21:46:19 +01:00
commit 82abae1f46
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
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 [:page-model] (fnil keyword :flat)) (update-in [:navbar-mode] (fnil keyword :flat))
)] )]
(merge (merge
config config
@ -514,10 +514,7 @@
(= page-model :flat) navbar-pages (= page-model :flat) navbar-pages
(= page-model :hierarchic) (hierarchic/build-hierarchic-map navbar-pages) (= page-model :hierarchic) (hierarchic/build-hierarchic-map navbar-pages)
) )
:sidebar-pages (cond :sidebar-pages sidebar-pages
(= page-model :flat) sidebar-pages
(= page-model :hierarchic) (hierarchic/build-hierarchic-map sidebar-pages)
)
:home-page (if home-page :home-page (if home-page
home-page home-page
(assoc (first latest-posts) :layout "home.html")) (assoc (first latest-posts) :layout "home.html"))
@ -533,6 +530,8 @@
(println "\t-->" (cyan (-> params :navbar-pages))) (println "\t-->" (cyan (-> params :navbar-pages)))
(println (blue "debug: sidebar-pages:")) (println (blue "debug: sidebar-pages:"))
(println "\t-->" (cyan (-> params :sidebar-pages))) (println "\t-->" (cyan (-> params :sidebar-pages)))
(println (blue "debug: home-page:"))
(println "\t-->" (cyan (-> params :home-page)))
) )
(set-custom-resource-path! (str "file:resources/templates/themes/" theme)) (set-custom-resource-path! (str "file:resources/templates/themes/" theme))
(cryogen-io/wipe-public-folder keep-files) (cryogen-io/wipe-public-folder keep-files)