From b8be54db227e94502b8caf47ac06b51ba53bc283 Mon Sep 17 00:00:00 2001 From: simonraven Date: Tue, 28 Apr 2009 01:41:12 -0400 Subject: s/choosen/chosen/ --- doc/ikiwiki/directive/teximg.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/ikiwiki') diff --git a/doc/ikiwiki/directive/teximg.mdwn b/doc/ikiwiki/directive/teximg.mdwn index e13d1ed65..992a3f68d 100644 --- a/doc/ikiwiki/directive/teximg.mdwn +++ b/doc/ikiwiki/directive/teximg.mdwn @@ -12,7 +12,7 @@ To scale the image, use height=x: \[[!teximg code="\frac{1}{2}" height="17"]] \[[!teximg code="\frac{1}{2}" height="8"]] -If no height is choosen the default height 12 is used. Valid heights are: 8, 9, +If no height is chosen the default height 12 is used. Valid heights are: 8, 9, 10, 11, 12, 14, 17, 20. If another height is entered, the closest available height is used. -- cgit v1.2.3 From f9244f06b672d7502d511ef5278a092352f54c40 Mon Sep 17 00:00:00 2001 From: "http://zwol.livejournal.com/" Date: Fri, 15 May 2009 12:47:47 -0400 Subject: --- doc/ikiwiki/directive/map/discussion.mdwn | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'doc/ikiwiki') diff --git a/doc/ikiwiki/directive/map/discussion.mdwn b/doc/ikiwiki/directive/map/discussion.mdwn index 808930fa4..e82b3f71b 100644 --- a/doc/ikiwiki/directive/map/discussion.mdwn +++ b/doc/ikiwiki/directive/map/discussion.mdwn @@ -11,3 +11,32 @@ Question: Is there a way to generate a listing that shows *both* title and descr Is that possible? --Peter + +---- + +The site I'm trying to set up right now (not really a wiki - no public editing) is divided into topics. Topics are pages that have `\[[!meta link="/topic"]]`. Topic pages contain an index of their subpages (done with `\[[!inline]]`); the subpages are the real content. I want a map in the sidebar that lists: + + * all of the topics; + * all of the first-level subpages of the *current topic only*. + +That is, if the current page is "Topic A" or "Topic A/Page 1", then the map should look like + + Topic A + Page 1 + Page 2 + Page 3 + Topic B + Topic C + +but if the current page is "Topic B" or one of its subpages, then the map should look like + + Topic A + Topic B + Page 1 + Page 2 + Page 3 + Topic C + +Is there any way to do that? I don't mind mucking around with `[[!meta]]` on every page if that's what it takes. + +-- Zack -- cgit v1.2.3 From 9224fd47340e46c3f0838f3f95a15688855197bc Mon Sep 17 00:00:00 2001 From: "http://zwol.livejournal.com/" Date: Fri, 15 May 2009 12:50:48 -0400 Subject: --- doc/ikiwiki/directive/map/discussion.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'doc/ikiwiki') diff --git a/doc/ikiwiki/directive/map/discussion.mdwn b/doc/ikiwiki/directive/map/discussion.mdwn index e82b3f71b..d0809188f 100644 --- a/doc/ikiwiki/directive/map/discussion.mdwn +++ b/doc/ikiwiki/directive/map/discussion.mdwn @@ -37,6 +37,8 @@ but if the current page is "Topic B" or one of its subpages, then the map should Page 3 Topic C -Is there any way to do that? I don't mind mucking around with `[[!meta]]` on every page if that's what it takes. +On the top-level index page, or on any other page that is neither a topic nor a subpage of a topic, the map should list only the topics. + +Is there any way to do that? I don't mind mucking around with `\[[!meta]]` on every page if that's what it takes. -- Zack -- cgit v1.2.3 From 2612595a0c2fef24de733a175e55c9e30455f350 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 15 May 2009 16:42:19 -0400 Subject: response --- doc/ikiwiki/directive/map/discussion.mdwn | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'doc/ikiwiki') diff --git a/doc/ikiwiki/directive/map/discussion.mdwn b/doc/ikiwiki/directive/map/discussion.mdwn index d0809188f..6d44733ac 100644 --- a/doc/ikiwiki/directive/map/discussion.mdwn +++ b/doc/ikiwiki/directive/map/discussion.mdwn @@ -42,3 +42,23 @@ On the top-level index page, or on any other page that is neither a topic nor a Is there any way to do that? I don't mind mucking around with `\[[!meta]]` on every page if that's what it takes. -- Zack + +> I think that you're looking for this: +> +> pages="((Topic*/* or Topic*) and ./*) or (Topic* and ! Topic*/*)" +> +> Let's pull that [[PageSpec]] apart. +> +> * `(Topic*/* or Topic*)` matches all pages that are underneath a Topic +> page or are a topic page themselves. +> * `and ./*` further adds the limitation that the pages have to be +> in the same directory as the page that is displaying the map. So, +> for `Topic_A/Page_1`, it will match `Topic_A/*`; for `Topic_A`, +> it will match `Topic_*` but not subpages. +> * Finally, `Topic* and ! Topic*/*` matches all the toplevel topic pages, +> since we always want those to show up. +> +> I haven't tested that this works or displays, but I hope it gets you +> on the right track. PS, be aware of +> [[this_sidebar_issue|todo/Post-compilation_inclusion_of_the_sidebar]]! +> --[[Joey]] -- cgit v1.2.3 From ad6be8137daf79ec3fef870b6b00230ae37985eb Mon Sep 17 00:00:00 2001 From: "http://zwol.livejournal.com/" Date: Fri, 15 May 2009 17:30:14 -0400 Subject: --- doc/ikiwiki/directive/map/discussion.mdwn | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'doc/ikiwiki') diff --git a/doc/ikiwiki/directive/map/discussion.mdwn b/doc/ikiwiki/directive/map/discussion.mdwn index 6d44733ac..095c5d8d0 100644 --- a/doc/ikiwiki/directive/map/discussion.mdwn +++ b/doc/ikiwiki/directive/map/discussion.mdwn @@ -45,7 +45,7 @@ Is there any way to do that? I don't mind mucking around with `\[[!meta]]` on e > I think that you're looking for this: > -> pages="((Topic*/* or Topic*) and ./*) or (Topic* and ! Topic*/*)" +> `pages="((Topic*/* or Topic*) and ./*) or (Topic* and ! Topic*/*)"` > > Let's pull that [[PageSpec]] apart. > @@ -62,3 +62,9 @@ Is there any way to do that? I don't mind mucking around with `\[[!meta]]` on e > on the right track. PS, be aware of > [[this_sidebar_issue|todo/Post-compilation_inclusion_of_the_sidebar]]! > --[[Joey]] + +>> Thanks, but this assumes that topic pages are named `Topic`. +>> They aren't. They are tagged with `\[[!meta link="/topic"]]`, and as +>> far as I can tell there is no [[PageSpec]] notation for "subpages of a +>> page that satisfies link(foo)"... +>> -- Zack -- cgit v1.2.3 From e1264a4d22c7905c31f16f4199b9201093d4a44a Mon Sep 17 00:00:00 2001 From: "http://lj.rossia.org/users/imz/" Date: Fri, 15 May 2009 23:50:05 -0400 Subject: Added a note that Yahoo is not yet supported. --- doc/ikiwiki/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/ikiwiki') diff --git a/doc/ikiwiki/openid.mdwn b/doc/ikiwiki/openid.mdwn index dd851e549..5c91dfb58 100644 --- a/doc/ikiwiki/openid.mdwn +++ b/doc/ikiwiki/openid.mdwn @@ -16,7 +16,7 @@ To sign up for an OpenID, visit one of the following identity providers: * [Videntity](http://videntity.org/) * [LiveJournal](http://www.livejournal.com/openid/) * [TrustBearer](https://openid.trustbearer.com/) -* or any of the [many others out there](http://openiddirectory.com/openid-providers-c-1.html). +* or any of the [many others out there](http://openiddirectory.com/openid-providers-c-1.html) (but not [Yahoo](http://openid.yahoo.com) [[yet|plugins/openid/discussion/#Yahoo_unsupported]]). Your OpenID is the URL that you are given when you sign up. [[!if test="enabled(openid)" then=""" -- cgit v1.2.3 From 0d0df508bf634f23bfb3a57bc66e9cbbac37dd85 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 16 May 2009 16:10:27 -0400 Subject: response --- doc/ikiwiki/directive/map/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc/ikiwiki') diff --git a/doc/ikiwiki/directive/map/discussion.mdwn b/doc/ikiwiki/directive/map/discussion.mdwn index 095c5d8d0..062b4267a 100644 --- a/doc/ikiwiki/directive/map/discussion.mdwn +++ b/doc/ikiwiki/directive/map/discussion.mdwn @@ -68,3 +68,7 @@ Is there any way to do that? I don't mind mucking around with `\[[!meta]]` on e >> far as I can tell there is no [[PageSpec]] notation for "subpages of a >> page that satisfies link(foo)"... >> -- Zack + +>>> I think that the ideas and code in +>>> [[todo/tracking_bugs_with_dependencies]] might also handle this case. +>>> --[[Joey]] -- cgit v1.2.3 From 340be7fb570be3be71d8e05ea6605db84fe70b19 Mon Sep 17 00:00:00 2001 From: "http://lj.rossia.org/users/imz/" Date: Sun, 17 May 2009 13:14:43 -0400 Subject: About to post a bug. --- doc/ikiwiki/wikilink/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc/ikiwiki') diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn index 0677ff7de..58a5df18b 100644 --- a/doc/ikiwiki/wikilink/discussion.mdwn +++ b/doc/ikiwiki/wikilink/discussion.mdwn @@ -79,3 +79,6 @@ Is it possible to refer to a page, say \[[foobar]], such that the link text is t > Not yet. :-) Any suggestion for a syntax for it? Maybe something like \[[|foobar]] ? --[[Joey]] I like your suggestion because it's short and conscise. However, it would be nice to be able to refer to more or less arbitrary meta tags in links, not just "title". To do that, the link needs two parameters: the page name and the tag name, i.e. \[[pagename!metatag]]. Any sufficiently weird separater can be used instead of '!', of course. I like \[[pagename->metatag]], too, because it reminds me of accessing a data member of a structure (which is what referencing a meta tag is, really). --Peter + +# Bug +* [[bugs/Pipe-symbol in wikilink target]] -- cgit v1.2.3 From 14c940fc9d5ece3b4edc730e18fa9fea822d7f34 Mon Sep 17 00:00:00 2001 From: "http://lj.rossia.org/users/imz/" Date: Sun, 17 May 2009 13:27:09 -0400 Subject: update for rename of bugs/pipe-symbol_in_wikilink_target.mdwn to bugs/pipe-symbol_in_taglink_target.mdwn --- doc/ikiwiki/wikilink/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/ikiwiki') diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn index 58a5df18b..274c8aaf1 100644 --- a/doc/ikiwiki/wikilink/discussion.mdwn +++ b/doc/ikiwiki/wikilink/discussion.mdwn @@ -81,4 +81,4 @@ Is it possible to refer to a page, say \[[foobar]], such that the link text is t I like your suggestion because it's short and conscise. However, it would be nice to be able to refer to more or less arbitrary meta tags in links, not just "title". To do that, the link needs two parameters: the page name and the tag name, i.e. \[[pagename!metatag]]. Any sufficiently weird separater can be used instead of '!', of course. I like \[[pagename->metatag]], too, because it reminds me of accessing a data member of a structure (which is what referencing a meta tag is, really). --Peter # Bug -* [[bugs/Pipe-symbol in wikilink target]] +* [[bugs/Pipe-symbol_in_taglink_target]] -- cgit v1.2.3 From 897cf26ab2cf7b8fe3b2b03a096fc7e7c2d8ccb6 Mon Sep 17 00:00:00 2001 From: "http://lj.rossia.org/users/imz/" Date: Mon, 18 May 2009 00:49:53 -0400 Subject: Added a link to a bugreport I'm about to post. --- doc/ikiwiki/pagespec/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc/ikiwiki') diff --git a/doc/ikiwiki/pagespec/discussion.mdwn b/doc/ikiwiki/pagespec/discussion.mdwn index 4eed3722c..ac3038a22 100644 --- a/doc/ikiwiki/pagespec/discussion.mdwn +++ b/doc/ikiwiki/pagespec/discussion.mdwn @@ -92,3 +92,7 @@ does not seem suitable for this, as > \[[!map pages="./*"]] also lists the current page and all its siblings. + +---- + +I'm about to post [[bugs/pagespec can't match curly braces]]. --Ivan Z. -- cgit v1.2.3 From 0bbeb9fa231bd3135120d91cc80de49d4b4ccaa9 Mon Sep 17 00:00:00 2001 From: "http://lj.rossia.org/users/imz/" Date: Mon, 18 May 2009 00:52:40 -0400 Subject: minor: Another name for the bugreport, so that it can participate in my test. --- doc/ikiwiki/pagespec/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/ikiwiki') diff --git a/doc/ikiwiki/pagespec/discussion.mdwn b/doc/ikiwiki/pagespec/discussion.mdwn index ac3038a22..f4fdd764e 100644 --- a/doc/ikiwiki/pagespec/discussion.mdwn +++ b/doc/ikiwiki/pagespec/discussion.mdwn @@ -95,4 +95,4 @@ also lists the current page and all its siblings. ---- -I'm about to post [[bugs/pagespec can't match curly braces]]. --Ivan Z. +I'm about to post [[bugs/pagespec can't match {curly} braces]]. --Ivan Z. -- cgit v1.2.3 From 81a0e378565703daa8c87078647b6dc25e84bce9 Mon Sep 17 00:00:00 2001 From: "http://lj.rossia.org/users/imz/" Date: Mon, 18 May 2009 00:55:45 -0400 Subject: A misfeature report. --- .../pagespec_can__39__t_match___123__curly__125___braces.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/ikiwiki/pagespec/bugs/pagespec_can__39__t_match___123__curly__125___braces.mdwn (limited to 'doc/ikiwiki') diff --git a/doc/ikiwiki/pagespec/bugs/pagespec_can__39__t_match___123__curly__125___braces.mdwn b/doc/ikiwiki/pagespec/bugs/pagespec_can__39__t_match___123__curly__125___braces.mdwn new file mode 100644 index 000000000..a2cf92df7 --- /dev/null +++ b/doc/ikiwiki/pagespec/bugs/pagespec_can__39__t_match___123__curly__125___braces.mdwn @@ -0,0 +1,9 @@ +I want match pages which have actually curly braces in the names (like this one), but this matches a lot of pages without the braces in their names :( : + +[[!map pages="{*}*"]] + +When escaped, it doesn't work at all: + +[[!map pages="\{*}*"]] + +[[!map pages="{*\}*"]] -- cgit v1.2.3 From bb0e9b7825c1de69e300fea5b440d496476abd53 Mon Sep 17 00:00:00 2001 From: "http://lj.rossia.org/users/imz/" Date: Mon, 18 May 2009 00:57:31 -0400 Subject: minor: A narrower pattern, so that the example list is not that huge. --- .../bugs/pagespec_can__39__t_match___123__curly__125___braces.mdwn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/ikiwiki') diff --git a/doc/ikiwiki/pagespec/bugs/pagespec_can__39__t_match___123__curly__125___braces.mdwn b/doc/ikiwiki/pagespec/bugs/pagespec_can__39__t_match___123__curly__125___braces.mdwn index a2cf92df7..263950a1d 100644 --- a/doc/ikiwiki/pagespec/bugs/pagespec_can__39__t_match___123__curly__125___braces.mdwn +++ b/doc/ikiwiki/pagespec/bugs/pagespec_can__39__t_match___123__curly__125___braces.mdwn @@ -1,9 +1,9 @@ I want match pages which have actually curly braces in the names (like this one), but this matches a lot of pages without the braces in their names :( : -[[!map pages="{*}*"]] +[[!map pages="*_{*}_*"]] When escaped, it doesn't work at all: -[[!map pages="\{*}*"]] +[[!map pages="*_\{*}_*"]] -[[!map pages="{*\}*"]] +[[!map pages="*_{*\}_*"]] -- cgit v1.2.3 From 43013495bbc15530f7d59d7314dd54ac94419012 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Mon, 18 May 2009 11:29:07 +0100 Subject: move bug to /bugs --- .../pagespec_can__39__t_match___123__curly__125___braces.mdwn | 9 +++++++++ .../pagespec_can__39__t_match___123__curly__125___braces.mdwn | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 doc/bugs/pagespec_can__39__t_match___123__curly__125___braces.mdwn delete mode 100644 doc/ikiwiki/pagespec/bugs/pagespec_can__39__t_match___123__curly__125___braces.mdwn (limited to 'doc/ikiwiki') diff --git a/doc/bugs/pagespec_can__39__t_match___123__curly__125___braces.mdwn b/doc/bugs/pagespec_can__39__t_match___123__curly__125___braces.mdwn new file mode 100644 index 000000000..263950a1d --- /dev/null +++ b/doc/bugs/pagespec_can__39__t_match___123__curly__125___braces.mdwn @@ -0,0 +1,9 @@ +I want match pages which have actually curly braces in the names (like this one), but this matches a lot of pages without the braces in their names :( : + +[[!map pages="*_{*}_*"]] + +When escaped, it doesn't work at all: + +[[!map pages="*_\{*}_*"]] + +[[!map pages="*_{*\}_*"]] diff --git a/doc/ikiwiki/pagespec/bugs/pagespec_can__39__t_match___123__curly__125___braces.mdwn b/doc/ikiwiki/pagespec/bugs/pagespec_can__39__t_match___123__curly__125___braces.mdwn deleted file mode 100644 index 263950a1d..000000000 --- a/doc/ikiwiki/pagespec/bugs/pagespec_can__39__t_match___123__curly__125___braces.mdwn +++ /dev/null @@ -1,9 +0,0 @@ -I want match pages which have actually curly braces in the names (like this one), but this matches a lot of pages without the braces in their names :( : - -[[!map pages="*_{*}_*"]] - -When escaped, it doesn't work at all: - -[[!map pages="*_\{*}_*"]] - -[[!map pages="*_{*\}_*"]] -- cgit v1.2.3 From a4ce0468f6f562ad4ec749f156528aa5b3f2fe39 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 18 May 2009 15:26:02 -0400 Subject: remove link to fixed bug Let's just rely on backlinks for this? --- doc/ikiwiki/pagespec/discussion.mdwn | 4 ---- 1 file changed, 4 deletions(-) (limited to 'doc/ikiwiki') diff --git a/doc/ikiwiki/pagespec/discussion.mdwn b/doc/ikiwiki/pagespec/discussion.mdwn index f4fdd764e..4eed3722c 100644 --- a/doc/ikiwiki/pagespec/discussion.mdwn +++ b/doc/ikiwiki/pagespec/discussion.mdwn @@ -92,7 +92,3 @@ does not seem suitable for this, as > \[[!map pages="./*"]] also lists the current page and all its siblings. - ----- - -I'm about to post [[bugs/pagespec can't match {curly} braces]]. --Ivan Z. -- cgit v1.2.3 From 4f4666c4ae5cdf5e04ac42cc52a97d90e978adb0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 18 May 2009 15:30:07 -0400 Subject: remove manual backlink ikiwiki has backlinks so we don't have to clutter up pages with links to pages that link to them, which this basically did --- doc/ikiwiki/wikilink/discussion.mdwn | 3 --- 1 file changed, 3 deletions(-) (limited to 'doc/ikiwiki') diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn index 274c8aaf1..0677ff7de 100644 --- a/doc/ikiwiki/wikilink/discussion.mdwn +++ b/doc/ikiwiki/wikilink/discussion.mdwn @@ -79,6 +79,3 @@ Is it possible to refer to a page, say \[[foobar]], such that the link text is t > Not yet. :-) Any suggestion for a syntax for it? Maybe something like \[[|foobar]] ? --[[Joey]] I like your suggestion because it's short and conscise. However, it would be nice to be able to refer to more or less arbitrary meta tags in links, not just "title". To do that, the link needs two parameters: the page name and the tag name, i.e. \[[pagename!metatag]]. Any sufficiently weird separater can be used instead of '!', of course. I like \[[pagename->metatag]], too, because it reminds me of accessing a data member of a structure (which is what referencing a meta tag is, really). --Peter - -# Bug -* [[bugs/Pipe-symbol_in_taglink_target]] -- cgit v1.2.3