Commit graph

301 commits

Author SHA1 Message Date
c9ea1adc2e Merge branch 'development' 2017-03-22 08:06:42 +01:00
805e369bb8 fixed not recognized :page-root-uri configuration 2017-03-22 08:05:36 +01:00
9e548cc4f5 Merge branch 'development'
Conflicts:
	project.clj
2017-03-12 11:40:46 +01:00
feb973f77c add changelog 2017-03-12 11:38:48 +01:00
e8d7069598 compile hierarchic pages 2017-03-12 10:33:50 +01:00
6cf7b1a72b renamed config to page-model 2017-03-12 08:59:38 +01:00
593766a603 refactoring: replace navbar-pages & sidebar-pages by pages 2017-03-11 21:32:58 +01:00
30f299c240 Merge branch 'development' 2017-02-17 09:00:52 +01:00
da84c946c9 reflect refactoring page-model -> navbar-mode 2017-02-17 08:59:50 +01:00
82abae1f46 Merge branch 'development' 2017-02-13 21:46:19 +01:00
d772f95990 refactored name of configuration parameter. 2017-02-13 21:18:15 +01:00
a7f5f3a7b1 made sidebar-pages flat again.
There is no way to ensure a sidebar-only hierarchy without tree gaps. So
filtering a flat sequence would work much better.
2017-02-12 22:15:31 +01:00
39ca87f777 fixed project name 2017-02-10 14:58:36 +01:00
b781b8b9bb renamed navpage-model to page-model 2017-02-10 14:55:11 +01:00
f758b5744d tested in real live -works now 2017-02-10 14:49:21 +01:00
4f9ac917ae added hierarchic sidbar-pages & refactored namesspace. 2017-02-09 08:52:42 +01:00
d8f86e0414 fixed read-config 2017-02-08 20:27:56 +01:00
439ae6fba8 all things implemented - probably works 2017-02-08 20:09:01 +01:00
e9d1c1e194 refactored navbar-model out of compiler & introduced new :navbar-model
parameter to config
2017-02-08 19:22:15 +01:00
28cb312dc2 Merge branch 'master' into development 2017-02-08 18:36:15 +01:00
2e6723d2fa readded missing debug? configuration 2017-02-08 09:53:15 +01:00
2570dc4997 Merge branch 'master' into development
Conflicts:
	project.clj
	src/cryogen_core/compiler.clj
2017-02-08 09:21:08 +01:00
d36acf2316 Merge branch 'master' into master 2017-02-08 09:13:45 +01:00
67d91b4611 format 2017-02-08 08:37:39 +01:00
Carmen La
d502799a93 Update deps 2017-02-01 23:17:27 -05:00
Carmen La
dea3725759 Merge pull request #87 from madstap/master
Add nohighlight to klipsified code blocks.
2017-02-01 23:16:25 -05:00
Aleksander Madland Stapnes
60c4ec0054 Add nohighlight to klipsified code blocks. 2017-02-02 00:49:51 -03:00
Carmen La
296e01abb1 Merge pull request #86 from madstap/master
Add Klipse integration
2017-02-01 22:30:58 -05:00
Aleksander Madland Stapnes
70c95b41d8 Look at the content as well as the config to infer clojure eval
Before only the config was looked at to determine whether to include
the js minified of not, now look at the html as well. This makes it
more convenient to set up all klipse stuff once in config.edn without
having to manually specify which js to include.
2017-01-27 02:57:33 -03:00
Aleksander Madland Stapnes
f7f02f7433 Change confusing local names. cfg -> settings 2017-01-20 16:16:01 -03:00
Aleksander Madland Stapnes
c5d995b262 Add some docstrings 2017-01-20 02:57:47 -03:00
Aleksander Madland Stapnes
ac52785b19 Automatic klipse integration 2017-01-20 02:57:38 -03:00
Carmen La
84a933bdcf Fix dest-sass/sass-dest key
Issue #85
2017-01-17 23:46:23 -05:00
Carmen La
f0cc7353c1 Pass both page/post params to the index template 2017-01-17 01:57:19 -05:00
Carmen La
6ba76bc7f5 Fix a regression 2017-01-17 01:41:04 -05:00
Carmen La
1b7f0fb367 update deps and version number 2017-01-16 23:29:48 -05:00
Carmen La
9cd5016537 Don't create prev/next links pointing to :home? pages
- Also include more metadata in page.prev and page.next params
- And some general code cleanup
2017-01-16 23:25:05 -05:00
Carmen La
e1cb70dc1d Merge pull request #83 from madstap/master
Remove crouton dep because enlive does the same thing
2017-01-16 17:55:12 -05:00
Aleksander Madland Stapnes
1cfb2b17df Remove crouton dep because enlive does the same thing
Almost the same thing; it doesn't insert missing html, head and body
tags, but in this case we only care about the stuff in the body.
2017-01-16 18:16:11 -03:00
Carmen La
dec80185e5 A big ol' cleanup 2017-01-16 02:37:19 -05:00
Carmen La
abf45945d0 Merge pull request #82 from madstap/master
Depend on enlive instead of tagsoup (to be able to upgrade to clojure 1.9.0)
2017-01-15 23:32:15 -05:00
Aleksander Madland Stapnes
dbd5caaf1f Replace tagsoup dependency with enlive
Tagsoup depends on an old version of clojure.data.xml, which doesn't
compile with clojure 1.9.0-alpha12. Enlive seems more actively
maintained and used.
2017-01-15 05:30:25 -03:00
Aleksander Madland Stapnes
9c7c935d66 Style pedantry: Remove trailing whitespace.
My emacs did it...
2017-01-15 05:17:48 -03:00
65cd1f5997 adjust project name 2017-01-05 17:35:34 +01:00
6a4ede6117 gitgnore ... 2017-01-05 17:32:23 +01:00
1ea38c5b84 respect :page-index order for navmap 2017-01-05 17:10:07 +01:00
0d4a9c90f6 Merge branch 'master' into master 2017-01-04 09:44:10 +01:00
b6b8ebfa22 undo project renaming 2017-01-04 09:41:18 +01:00
3c415f48e0 Added navmap feature.
Navmap will allow nested navigation for pages. To 
* add a page to navmap, you've to add `{:navmap? true}` to pages meta.
* define navigation hierarchy you can use directory-structure (first
level will be in /pages/nav1.md, second level will be in
/pages/nav1/nav11.md)
* use navmap, you can 
  * access navmap-pages (sequence of pages) in your template, same as
you've used navbar-pages and
  * access navigation childs as :navmap-children in specific pages (eg.
nav1 will contain a sequence of one page representing nav11).
2017-01-04 09:36:50 +01:00
78e4a6d067 fixed navbar-pages bug 2017-01-04 09:36:37 +01:00