Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

doc/todo/Add_space_before_slash_in_parent_links.mdwn

@@ -4,6 +4,8 @@ This patch adds a space before the forward-slash in the the parent links. There
 > like how it looks that way. So I don't plan to apply this patch unless a
 > lot of people disagree with me or whatever. --[[Joey]]
 
+>> Couldn't we export what's put between the links to a variable? For instance, I might actually want to set it to ' : ' or '→'. --[[madduck]]
+
 Before:
 
     ikiwiki/ todo/ Add space before slash in parent links

doc/todo/a_navbar_based_on_page_properties.mdwn

@@ -0,0 +1,39 @@
+One thing I don't like about Tobi's `navbar.pm` is that the navigation bar is
+hardcoded instead of computed from what's available. Obviously, this allows
+for a very customised `navbar` (i.e. not making all pages show up, like
+a `map` would). However, I think this could also be achieved through page
+properties.
+
+So imagine four pages A, B, A/C, and A/D, and these pages would include the
+following directives, respectively
+
+    \[[!navbaritem navbar=main priority=3]]
+    \[[!navbaritem navbar=main priority=5]]
+    \[[!navbaritem navbar=main title="Something else"]]
+    \[[!navbaritem navbar=main]]
+
+then one could insert `\[[!navbar id=main maxlevels=0]]` somewhere and it
+would get replaced with (this being in the context of viewing page C):
+
+    <ol class="navbar" id="navbar_main">
+      <li><a href="../B">B</a></li>
+      <li><a href="../A">A</a>
+        <ol>
+          <li class="current">Something else</li>
+          <li><a href="D">D</a></li>
+        </ol>
+      </li>
+    </ol>
+
+B would sort before A because it has a higher priority, but C would sort
+before D because their priorities are equal. The overridden title is not used
+for sorting.
+
+Also, the code automatically deduces that C and D are second-level under A.
+
+I don't think this is hard to code up and it's what I've been using with
+[rest2web](http://www.voidspace.org.uk/python/rest2web/) and it's served me
+well.
+
+--[[madduck]]
+[[!tag wishlist]]

doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn

@@ -0,0 +1,6 @@
+Maybe sidebar could be beefed up to take the name of a sidebar, such that I could use multiple sidebars in the same wiki. For instance, the default name would be 'sidebar', meaning the plugin looks for `sidebar.pm` and fills in the `sidebar` slot, but I might also want a footer in `footer.pm`, filling the template's `footer` slot.
+
+Maybe a new `include` plugin would be better.
+
+--[[madduck]]
+[[!tag wishlist]]

doc/todo/call_git-update-server-info_from_post-udpate_hook.mdwn

@@ -11,3 +11,5 @@ wrappers['git'] configuration hash (?).
 > Of course you can have ikiwiki write the wrapper to post-update.ikiwiki
 > and then just call that from the real post-update script. What I do if I
 > need to also notify cia or what have you. --[[Joey]]
+
+[[Convinced|done]], --[[madduck]]