aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-04-15 18:51:50 -0400
committerJoey Hess <joey@gnu.kitenet.net>2010-04-15 18:51:50 -0400
commitc0a2eaf7964657a164e2108ded1931d0c360fd63 (patch)
tree87745fd852cc8776374dde2d3acffc313d77e972
parent579ee70e9524844fb40be41b859a5c2869663cda (diff)
downloadikiwiki-c0a2eaf7964657a164e2108ded1931d0c360fd63.tar
ikiwiki-c0a2eaf7964657a164e2108ded1931d0c360fd63.tar.gz
calendarmonth.tmpl: The month calendar is now put in a sidebar.
-rw-r--r--debian/changelog1
-rw-r--r--templates/calendarmonth.tmpl2
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index dfb94ae22..e4056fdc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
* Enable calendar and sidebar in auto-blog.setup.
* sidebar: Add global_sidebars setting.
* conditional: Fix bug that forced "all" mode off by default.
+ * calendarmonth.tmpl: The month calendar is now put in a sidebar.
-- Joey Hess <joeyh@debian.org> Sun, 04 Apr 2010 12:17:11 -0400
diff --git a/templates/calendarmonth.tmpl b/templates/calendarmonth.tmpl
index 37ad78c5c..23cd95430 100644
--- a/templates/calendarmonth.tmpl
+++ b/templates/calendarmonth.tmpl
@@ -1,3 +1,5 @@
+[[!sidebar content="""
[[!calendar type=month month=<TMPL_VAR MONTH> year=<TMPL_VAR YEAR> pages="<TMPL_VAR PAGESPEC>"]]
+"""]]
[[!inline pages="creation_month(<TMPL_VAR MONTH>) and creation_year(<TMPL_VAR YEAR>) and <TMPL_VAR PAGESPEC>" show=0 feeds=no reverse=yes]]