Commit graph

221 commits

Author SHA1 Message Date
jem
404110092f add copy for user resources 2019-12-16 15:34:09 +01:00
jem
1b025378ee added last todos 2019-12-16 15:18:53 +01:00
jem
1cd962375c fixed delete-resource 2019-12-16 15:16:33 +01:00
jem
c4c295f2e3 use new io 2019-12-16 15:00:35 +01:00
jem
edc93f6857 html/404 should reside in root 2019-12-16 15:00:25 +01:00
jem
cdf7dbef6e removed debug prints 2019-12-16 14:02:41 +01:00
jem
ef171bbd2c fix basepath problem 2019-12-16 13:51:41 +01:00
jem
1bdb53d4e3 add ! for side-effect-full functions 2019-12-16 12:32:50 +01:00
jem
fe5b94c61c delete recursive works 2019-12-16 11:06:36 +01:00
jem
bb53615ed5 wip 2019-12-13 16:53:24 +01:00
Jan Krebs
5ad40301bf "mob next [ci-skip]" 2019-12-13 15:25:52 +01:00
jem
c7006a8477 wip 2019-12-13 15:01:07 +01:00
jem
025b5c16a7 Merge remote-tracking branch 'origin/mob-session' into mob-session2 2019-12-13 14:20:18 +01:00
Jan Krebs
ea3f626283 "mob next [ci-skip]" 2019-12-13 14:18:53 +01:00
jem
549bf8275d wip 2019-12-13 13:48:58 +01:00
lukas
88cf7dd3df fixed target-path 2019-12-13 12:15:37 +01:00
mattis
0d7521d87f wip 2019-12-13 11:56:16 +01:00
Lukas Schondorff
b49ebe6186
renamed copy-dir 2019-12-13 11:41:16 +01:00
jem
4d467957ee wip 2019-12-13 11:34:48 +01:00
jem
636bfc6f41 Merge remote-tracking branch 'origin/mob-session' into mob-session2 2019-12-13 11:17:16 +01:00
mattis
5566ccecc2 wip 2019-12-13 11:11:49 +01:00
Jan Krebs
0a9ee92a27 Remove unnecessary function 2019-12-13 11:09:58 +01:00
Jan Krebs
b782c7feca Tail recursion works 2019-12-13 11:03:41 +01:00
jem
9dc30ef71c wip 2019-12-13 10:53:13 +01:00
Jan Krebs
64a3b1d62c Fix symbol-not-found and Nullpointer-Exception 2019-12-11 22:01:08 +01:00
jem
3300dce8ae "Mob Session DONE [ci-skip]" 2019-12-11 18:04:48 +01:00
jem
34f723a55c "Mob Session DONE [ci-skip]" 2019-12-11 17:53:34 +01:00
Jan Krebs
91c6812243 "mob next [ci-skip]" 2019-12-11 17:36:39 +01:00
Jan Krebs
ed46ed1e0e Attemt at tail end recursion 2019-12-06 20:10:56 +01:00
Jan Krebs
1c7720bdbf "mob next [ci-skip]" 2019-12-06 16:59:44 +01:00
jem
e29c246e3b "Mob Session DONE [ci-skip]" 2019-12-06 16:37:24 +01:00
Jan Krebs
6f2a28df22 "mob next [ci-skip]" 2019-12-06 16:00:05 +01:00
jem
8b0ac5e800 "Mob Session DONE [ci-skip]" 2019-12-06 15:34:41 +01:00
Jan Krebs
bbfc535c3b "mob next [ci-skip]" 2019-12-06 15:15:40 +01:00
jem
0204170811 "Mob Session DONE [ci-skip]" 2019-12-06 14:51:06 +01:00
jem
1c9c4f3e60 "Mob Session DONE [ci-skip]" 2019-12-06 10:00:08 +01:00
Jan Krebs
3182421a5e "mob next [ci-skip]" 2019-12-03 18:11:30 +01:00
jem
c1594a035e "Mob Session DONE [ci-skip]" 2019-12-03 17:51:21 +01:00
Jan Krebs
c19498abbb "mob next [ci-skip]" 2019-12-03 17:33:48 +01:00
jem
90935bab43 "Mob Session DONE [ci-skip]" 2019-12-03 17:07:42 +01:00
jem
965ceda614 test now is fine 2019-11-29 16:44:29 +01:00
jem
999b041925 test copy-from-classpath first 2019-11-29 16:29:58 +01:00
jem
843e0eaaec compile works again 2019-11-29 16:29:35 +01:00
805e369bb8 fixed not recognized :page-root-uri configuration 2017-03-22 08:05:36 +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
da84c946c9 reflect refactoring page-model -> navbar-mode 2017-02-17 08:59:50 +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
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
2e6723d2fa readded missing debug? configuration 2017-02-08 09:53:15 +01:00
d36acf2316 Merge branch 'master' into master 2017-02-08 09:13:45 +01:00
Aleksander Madland Stapnes
60c4ec0054 Add nohighlight to klipsified code blocks. 2017-02-02 00:49:51 -03: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
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
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
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
1ea38c5b84 respect :page-index order for navmap 2017-01-05 17:10:07 +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
Scot Brown
6d28af459f Fix symbol not found exception in compile-assets function 2017-01-03 16:38:57 -05:00
773ee269b9 add some more debug options 2016-12-31 15:48:52 +01:00
e796a5adc5 added debug switch & improved home vs. preview handling 2016-12-31 11:20:09 +01:00
60b395e047 added ability to select one page as home-page (add :home? true as meta)
instead of newest post.
2016-12-30 23:43:13 +01:00
Carmen La
e3d2d3f433 Fix npe 2016-12-18 19:22:29 -05:00
Carmen La
fb0dc9e1d4 Merge pull request #77 from SVMBrown/master
conditionally drop any posts with dates set in the future
2016-12-18 14:24:20 -05:00
Torsten Uhlmann
998fc077e8 Provided fixes make cryogen work on Windows.
The path is converted to forward slash before further processed
The executables for sass and compass are configurable, that's because
on a Windows installation they are named sass.bat and compass.bat
The default is still the Unix version.
2016-12-17 11:29:16 +01:00
Scot Brown
1a75abb0e4 conditionally drop any posts with dates set in the future 2016-12-13 15:59:09 -05:00
Ben Swift
c9828f6cc3 nicer pretty-printing of "compiling sass" 2016-12-04 16:48:41 +11:00
Ben Swift
a66f8df5e4 in compile-sass-file!, sh doesn't like nil arg when no compass 2016-12-02 14:30:11 +11:00
Ben Swift
fc1d1d725c bugfix for compass-installed?
catch the (previously uncaught) exception when there isn't a `compass`
binary on the `$PATH`, return `false` instead
2016-12-02 11:55:47 +11:00
Shigeaki Matsumura
9858723403 fix toc entry for title which has a link 2016-10-23 12:07:50 +09:00
Shigeaki Matsumura
510c33c23d support sub directories in pages and posts 2016-10-19 00:43:09 +09:00
Carmen La
52457c7b64 Add :today key to params for compiling posts 2016-09-03 15:33:37 -04:00
Arsene Rei
f383661e5e Fallback to resources/templates/{pages,posts}
By default, when using markdown files, Cryogen will look for
`resources/templates/md/pages/*.md`. This commits allows Cryogen to fall back to
`resources/templates/pages/*.md` in the case that it can't find any files in the
former directory. It works similarly for posts and Asciidoc files.

Since we're looking specifically for `*.md` for Markdown files and `*.asc` for
Ascii files, this is an opportunity to eliminate redundancy.
2016-05-27 11:52:41 -04:00
Carmen La
3e7d43b212 update dependencies/version 2016-04-18 22:44:09 -04:00
Jan Stępień
0d1149a9c2 Use Hawk in cryogen-core.watcher
This is a follow-up to PR #46. It replaces the 300ms loop with a file
watcher. Hawk is a wrapper around java.nio.file.WatchService coming with
proper OS X support.

Now rebuilds should be instantaneous.
2016-03-13 16:43:14 +01:00
Dan Hable
683bcad292 Make archive grouping configurable
The blog that I'm moving to cryogen currently groups the posts by year instead of by year/month. This change makes the grouping configurable while defaulting to the current behavior of year/month grouping on posts.
2016-03-08 20:22:20 -06:00
Tom L
0c4156f43f Add servlet context to tags, archives rendering. 2016-02-15 20:31:40 -06:00
Tom L
c18c3d60f2 Implement clean URLs feature (Issue #89)
When `clean-urls?` is set in config, emit pages as subdirectories
`prefix/root/page-name/index.html` instead of
`prefix/root/page-name.html`. Links in emitted HTML then point to
`prefix/root/page-name/`. When `clean-urls?` not set, behaves as
before.

Refactor most URI generation into a new `page-uri` function.
`page-uri` replaces most calls* to `path`, all calls to `post-uri`
and all calls to the old `page-uri`.

Introduce function `create-file-recursive`. Function creates
file parent if not exists.

Introduce function `write-html`. When `clean-urls?` is set, spits
emitted HTML into subdirectories as described above; otherwise
behaves like `create-file`. Replaces most* calls to `create-file`
Calls `create-file` or `create-file-recursive`.

* Exceptions made for sitemap XML and RSS feed XML pages
2016-02-11 20:04:56 -06:00
Tomasz Biernacki
c84b550f92 Add multiple authors filtering support 2016-02-10 03:13:06 +01:00
Tomasz Biernacki
e5395a362a Add author and (short) description for RSS 2016-02-09 03:01:10 +01:00
Sean
852b431d71 Add home to index params when previews are enabled 2016-02-04 04:07:17 -08:00
ponkore
556fe84ef8 content-with-more-marker returns with correct tags
`content-with-more-marker` returns a HTML string when the `content`
conteins more marker ("<!--more-->").

In many case, HTML tags in `content` is balanced.
ex.
------------------------------
<div id='post'>
  <div class='post-content'>
    this post has more marker
<!--more-->
and more content.
  </div>
</div>
------------------------------

But original code breaks the balance.
------------------------------
<div id='post'>
  <div class='post-content'>
    this post has more marker
------------------------------

Afer this patch applied, `tagsoup` read above text and `hiccup`
re-render to HTML text with correct balanced tags.
------------------------------
<div id='post'>
  <div class='post-content'>
    this post has more marker
</div></div>
------------------------------
2016-01-11 21:30:21 +09:00
ponkore
792833facb rewrite-hrefs bug fix (when :blog-prefix is blank)
When :blog-prefix in `config.edn` is set nil or "",
rewrite-hrefs should return `text` itself.
2016-01-10 23:40:19 +09:00
Carmen La
839ed5c469 Remove unnecesasry tag-root key 2016-01-08 20:44:07 -05:00