From 1284941f732920cf0248956eda35f36b87a22beb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Mar 2008 05:41:00 -0400 Subject: [PATCH 1/8] web commit by http://madduck.net/: closing --- doc/todo/call_git-update-server-info_from_post-udpate_hook.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/call_git-update-server-info_from_post-udpate_hook.mdwn b/doc/todo/call_git-update-server-info_from_post-udpate_hook.mdwn index dcd7eac3c..5c769211b 100644 --- a/doc/todo/call_git-update-server-info_from_post-udpate_hook.mdwn +++ b/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]] From af213e83f6e934e4d871dd6f847de862a5308929 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Mar 2008 05:47:14 -0400 Subject: [PATCH 2/8] web commit by http://madduck.net/ --- doc/todo/Add_space_before_slash_in_parent_links.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/Add_space_before_slash_in_parent_links.mdwn b/doc/todo/Add_space_before_slash_in_parent_links.mdwn index 094d686db..cc644335f 100644 --- a/doc/todo/Add_space_before_slash_in_parent_links.mdwn +++ b/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 From 16c7dfa733a3cbec43a976cccdf86a7798e946c5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Mar 2008 07:06:39 -0400 Subject: [PATCH 3/8] web commit by http://madduck.net/ --- doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn 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 new file mode 100644 index 000000000..17155df9e --- /dev/null +++ b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn @@ -0,0 +1,5 @@ +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]] From 2317ce58b0bdda0ba850bae938e3b36715bb258a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Mar 2008 07:14:57 -0400 Subject: [PATCH 4/8] web commit by http://madduck.net/ --- .../a_navbar_based_on_page_properties.mdwn | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 doc/todo/a_navbar_based_on_page_properties.mdwn diff --git a/doc/todo/a_navbar_based_on_page_properties.mdwn b/doc/todo/a_navbar_based_on_page_properties.mdwn new file mode 100644 index 000000000..b158ced43 --- /dev/null +++ b/doc/todo/a_navbar_based_on_page_properties.mdwn @@ -0,0 +1,32 @@ +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 + + \[[navbar id=main priority=3]] + \[[navbar id=main priority=5]] + \[[navbar id=main title="Something else"]] + \[[navbar id=main]] + +then the computed navigation bar would be + + B + A + Something else + D + +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]] From 2e29699c42e0c6dbbdce0133d1e6bbbea0e269b0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Mar 2008 07:15:55 -0400 Subject: [PATCH 5/8] web commit by http://madduck.net/: tagging wishlist --- doc/todo/a_navbar_based_on_page_properties.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/todo/a_navbar_based_on_page_properties.mdwn b/doc/todo/a_navbar_based_on_page_properties.mdwn index b158ced43..b4f5b1cf0 100644 --- a/doc/todo/a_navbar_based_on_page_properties.mdwn +++ b/doc/todo/a_navbar_based_on_page_properties.mdwn @@ -30,3 +30,4 @@ I don't think this is hard to code up and it's what I've been using with well. --[[madduck]] +[[!tag wishlist]] From 6c77cb1242241951c2b2b5837aef405edc7b1d7f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Mar 2008 07:16:32 -0400 Subject: [PATCH 6/8] web commit by http://madduck.net/ --- doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn | 1 + 1 file changed, 1 insertion(+) 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 17155df9e..15a115714 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 @@ -3,3 +3,4 @@ Maybe sidebar could be beefed up to take the name of a sidebar, such that I coul Maybe a new `include` plugin would be better. --[[madduck]] +[[!tag wishlist]] From bc96a06b992213d9e09ec8ec6fb6f028e53791bd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Mar 2008 07:17:56 -0400 Subject: [PATCH 7/8] web commit by http://madduck.net/: add note about marking current pages --- doc/todo/a_navbar_based_on_page_properties.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/a_navbar_based_on_page_properties.mdwn b/doc/todo/a_navbar_based_on_page_properties.mdwn index b4f5b1cf0..7300aced2 100644 --- a/doc/todo/a_navbar_based_on_page_properties.mdwn +++ b/doc/todo/a_navbar_based_on_page_properties.mdwn @@ -25,6 +25,8 @@ for sorting. Also, the code automatically deduces that C and D are second-level under A. +Obviously, while on e.g. A/C, the `
  • ` element enclosing C would get a special CSS class (or even ID), and no `` tag inside. + 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. From 99f9e54ca71420fe42d9130184df23ad044a9595 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Mar 2008 10:25:45 -0400 Subject: [PATCH 8/8] web commit by http://madduck.net/: more details --- .../a_navbar_based_on_page_properties.mdwn | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/doc/todo/a_navbar_based_on_page_properties.mdwn b/doc/todo/a_navbar_based_on_page_properties.mdwn index 7300aced2..f88a3e802 100644 --- a/doc/todo/a_navbar_based_on_page_properties.mdwn +++ b/doc/todo/a_navbar_based_on_page_properties.mdwn @@ -7,17 +7,23 @@ properties. So imagine four pages A, B, A/C, and A/D, and these pages would include the following directives, respectively - \[[navbar id=main priority=3]] - \[[navbar id=main priority=5]] - \[[navbar id=main title="Something else"]] - \[[navbar id=main]] + \[[!navbaritem navbar=main priority=3]] + \[[!navbaritem navbar=main priority=5]] + \[[!navbaritem navbar=main title="Something else"]] + \[[!navbaritem navbar=main]] -then the computed navigation bar would be +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): - B - A - Something else - D + 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 @@ -25,8 +31,6 @@ for sorting. Also, the code automatically deduces that C and D are second-level under A. -Obviously, while on e.g. A/C, the `
  • ` element enclosing C would get a special CSS class (or even ID), and no `` tag inside. - 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.