diff options
| author | Joey Hess <joey@kitenet.net> | 2010-04-23 16:43:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-04-23 16:43:44 -0400 |
| commit | 7bba52254569047ef1d9f5752096f155b0a2be77 (patch) | |
| tree | 0c79effe8cbf7847e36557e4ed9fe10d08728a33 /doc/todo | |
| parent | 6486452e4c94f5699d98d13e25a361435ed3ddeb (diff) | |
| parent | d822e37d0efc34f2267f275030de11cd3c7ff7bb (diff) | |
Merge branch 'master' into templatemove
Conflicts:
doc/templates.mdwn
Diffstat (limited to 'doc/todo')
| -rw-r--r-- | doc/todo/auto_rebuild_on_template_change.mdwn | 3 | ||||
| -rw-r--r-- | doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn index 838d15c1a..6f560353b 100644 --- a/doc/todo/auto_rebuild_on_template_change.mdwn +++ b/doc/todo/auto_rebuild_on_template_change.mdwn @@ -39,6 +39,9 @@ Note also that when using templates from "$srcdir/templates/", `no_includes` needs to be set. Currently this is done by the two plugins that use such templates, while includes are allowed in `templatedir`. +Have started working on this. +[[!template id=gitbranch branch=origin/templatemove author="[[Joey]]"]] + > But would this require that templates be parseable as wiki pages? Because that would be a nuisance. --[[KathrynAndersen]] >> It would be better for them not to be rendered separately at all. diff --git a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn index 02b83244e..bb4339f88 100644 --- a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn +++ b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn @@ -15,6 +15,8 @@ those contents instead. >> Here a simple [[patch]] for multiple sidebars. Not too fancy but better than having multiple copies of the sidebar plugin. --[[jeanprivat]] +>>> I made a [[git]] branch for it [[!template id=gitbranch branch="privat/multiple_sidebars" author="[[jeanprivat]]"]] --[[jeanprivat]] + <pre> --- /usr/share/perl5/IkiWiki/Plugin/sidebar.pm 2010-02-11 22:53:17.000000000 -0500 +++ plugins/IkiWiki/Plugin/sidebar.pm 2010-02-27 09:54:12.524412391 -0500 |