summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mulkcms.lisp11
-rw-r--r--templates/journal_page.html3
2 files changed, 11 insertions, 3 deletions
diff --git a/mulkcms.lisp b/mulkcms.lisp
index 3a13215..0119418 100644
--- a/mulkcms.lisp
+++ b/mulkcms.lisp
@@ -240,7 +240,8 @@
path)))
(ecase action
(:index "")
- (:full-index "/?full")
+ (:journal-index "/journal")
+ (:full-journal-index "/journal?full")
(:view-atom-feed (values "/feed"))
(:view-comment-feed (cond (article-id (values "/~A?comment-feed" article-base))
(t "/comment-feed")))
@@ -596,8 +597,10 @@
:root *base-uri*
:site-name *site-name*
:site-subtitle ""
- :link ""
- :full-archive-link ""
+ :link (link-to :journal-index
+ :absolute t)
+ :full-archive-link (link-to :full-journal-index
+ :absolute t)
:full-archive-label "Full archive (slow!)"
:archive-title "Older posts"
:archive-table-caption "Posts by date"
@@ -1163,6 +1166,8 @@
(expand-page page-template
(getf article-params :title)
(list* :articles (list article-params)
+ :link (getf article-params :link)
+
:info-messages (if submission-notice
(list submission-notice)
nil)
diff --git a/templates/journal_page.html b/templates/journal_page.html
index f686cd7..959cde0 100644
--- a/templates/journal_page.html
+++ b/templates/journal_page.html
@@ -11,6 +11,9 @@
href="/journal/feed"
rel="alternate"
type="application/atom+xml" />
+ {.section link}
+ <link rel="canonical" href="{@}" />
+ {.end}
{.end}
{.section body}