aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-03-18 14:01:15 -0400
committerJoey Hess <joey@kitenet.net>2012-03-18 14:01:15 -0400
commit9c8262c6637773891871c24862874fcdbef9c651 (patch)
tree1314aae25d267eba049f1778dd59928585b2841c
parent4fee7097cd4c2ddb600640eb9266ea5f561a8fa2 (diff)
parent8fccf62f9297a7ae5df4fb020b583593517c9b0f (diff)
downloadikiwiki-9c8262c6637773891871c24862874fcdbef9c651.tar
ikiwiki-9c8262c6637773891871c24862874fcdbef9c651.tar.gz
Merge branch 'master' of ssh://git.ikiwiki.info
-rw-r--r--doc/plugins/contrib/trail.mdwn12
-rw-r--r--doc/todo/allow_TMPL__95__LOOP_in_template_directives.mdwn2
2 files changed, 10 insertions, 4 deletions
diff --git a/doc/plugins/contrib/trail.mdwn b/doc/plugins/contrib/trail.mdwn
index bfd4d3d0b..9d895783a 100644
--- a/doc/plugins/contrib/trail.mdwn
+++ b/doc/plugins/contrib/trail.mdwn
@@ -1,7 +1,7 @@
[[!tag patch]]
-[[!template id=gitbranch branch=smcv/trail3 author="[[smcv]]"]]
+[[!template id=gitbranch branch=smcv/trail3-integrated author="[[smcv]]"]]
-Available from [[smcv]]'s git repository, in the `trail3` branch. This
+Available from [[smcv]]'s git repository, in the `trail3` and `trail3-integrated` branches. This
plugin aims to solve [[todo/wikitrails]] in a simpler way; it can also be
used for [[navigation through blog posts|todo/Pagination_next_prev_links]].
@@ -38,7 +38,7 @@ as its data structure, resulting in timing-related limitations (it couldn't
select pages for the trail by using pagespecs, because pagespecs can't be
evaluated correctly until the scan stage has finished).
-Updated, November 2011:
+Updated, November 2011 (`trail3`):
* reinstated `inline` integration ([[report]] integration would probably be
pretty easy too, if this gets merged)
@@ -49,6 +49,12 @@ Updated, November 2011:
* CSS for the default anti-theme and all built-in themes (it looks nicest
in the default anti-theme and in actiontabs - the demo uses actiontabs)
+Updated, March 2012 (`trail3-integrated`):
+
+* replaced `\[[!trailinline]]` with `\[[!inline trail=yes]]`
+* added a `build_affected` hook so it doesn't have to use `inject`
+ (optional commit, can be omitted)
+
Known bugs:
* the blueview and goldtype CSS nearly work, but the alignment is a bit off
diff --git a/doc/todo/allow_TMPL__95__LOOP_in_template_directives.mdwn b/doc/todo/allow_TMPL__95__LOOP_in_template_directives.mdwn
index fb8b7095c..1aafb173b 100644
--- a/doc/todo/allow_TMPL__95__LOOP_in_template_directives.mdwn
+++ b/doc/todo/allow_TMPL__95__LOOP_in_template_directives.mdwn
@@ -1,4 +1,4 @@
-[[!tag patch]]
+[[!tag patch todo]]
[[!template id="note" text="""
Simply copied this from my website