From a80a5a90e4a7a7b664112e69fd01ce02fe9fb76a Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 20 Dec 2010 14:49:45 +0100 Subject: [PATCH 01/11] bug+patch Signed-off-by: intrigeri --- .../urlto_API_change_breaks_wikis_with_po_plugin.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn diff --git a/doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn b/doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn new file mode 100644 index 000000000..07e925a03 --- /dev/null +++ b/doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn @@ -0,0 +1,11 @@ +The po plugin needs to be updated to match the urlto sub API and +signature changes. Else a wiki with the po plugin enabled cannot be +refreshed / rebuilt because of (correct) Perl errors. + +My po branch contains a fix. + +Also, I fear the lack of any useful `$from` parameter might break some +l10n'd link niceness when using `po_link_to = current` but I have not +investigated this yet. + +--[[intrigeri]] From 1e34e4d34168717dcf61504554cbf1137d34b87e Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 20 Dec 2010 15:32:13 +0100 Subject: [PATCH 02/11] Asking for a new mirrorlist branch review. Signed-off-by: intrigeri --- doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn index 88c82f66c..31e62f44c 100644 --- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn +++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn @@ -72,3 +72,7 @@ and decided this time it was really needed to implement this feature. >>>> Have to wonder if it wouldn't perhaps be better to do something >>>> using the goto plugin and cgiurl, so that the mirror doesn't have >>>> to know about the configuration of the other mirror. --[[Joey]] + +>>>>> I have implemented something using the cgi + goto in my (history +>>>>> rewrite warning) mirrorlist branch. Please review, please pull. +>>>>> --[[intrigeri]] From ace0ae206538b486484a047ec07109db319eff9a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Dec 2010 15:11:40 -0400 Subject: [PATCH 03/11] new SPI website using ikiwiki --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index cd274c445..29c0ba9e2 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -61,6 +61,7 @@ Projects & Organizations * [Apua IT](http://apua.se/) * [PDFpirate Community](http://community.pdfpirate.org/) * [Banu](https://banu.com/) uses Ikiwiki for its website, to convert static Markdown pages into PHP scripts which are served along with non-Ikiwiki PHP generated contents. The static contents benefit from use of Ikiwiki's plugins. Ikiwiki is purely used as a CMS and no wiki or web-based editing is allowed. Ikiwiki is run offline, and the resulting scripts are uploaded using rsync to the website. +* [Software in the Public Interest](http://spi-inc.org/) Personal sites and blogs ======================== From f83fa962d5a7d43eed5d0902771365b717b224b4 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 20 Dec 2010 23:08:14 +0000 Subject: [PATCH 04/11] looks good to merge, suggestions for further testing --- ...API_change_breaks_wikis_with_po_plugin.mdwn | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn b/doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn index 07e925a03..9690b8b7b 100644 --- a/doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn +++ b/doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn @@ -3,9 +3,25 @@ signature changes. Else a wiki with the po plugin enabled cannot be refreshed / rebuilt because of (correct) Perl errors. My po branch contains a fix. +--[[intrigeri]] + +> The commit looks sane to me, for what it's worth. Joey, please +> consider merging? --[[smcv]] Also, I fear the lack of any useful `$from` parameter might break some l10n'd link niceness when using `po_link_to = current` but I have not investigated this yet. - --[[intrigeri]] + +> If `urlto` is called without a second parameter, it means we need +> a URL valid from either the CGI URL or any page in the wiki, +> (so we'd previously have set the third parameter true), but we +> don't *necessarily* need an absolute URL - so return what you'd +> have returned if asked for an absolute URL, but looking like +> `/bugs/` rather than `http://ikiwiki.info/bugs/` if possible. +> +> It looks as though `beautify_urlpath` under `po_link_to = current`, +> and 3-argument `urlto`, aren't tested by `t/po.t` - perhaps you +> could add some test cases there? To test 3-argument `urlto` you'd +> need to add `$config{baseurl} = "http://example.com"` or +> something. --[[smcv]] From 788872d12756ba95d34449b4bd37890e6ac01700 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 21 Dec 2010 09:11:03 +0000 Subject: [PATCH 05/11] Test --- doc/examples/blog/index.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn index 7914cd203..3f0c82ca3 100644 --- a/doc/examples/blog/index.mdwn +++ b/doc/examples/blog/index.mdwn @@ -4,6 +4,8 @@ [[!inline pages=sidebar raw=yes]] """]] +It works! + [[!inline pages="page(./posts/*) and !*/Discussion" show="10" actions=yes rootpage="posts"]] From 83e6f33f7f1c900c8d6336388f300150f44535d2 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 21 Dec 2010 09:11:46 +0000 Subject: [PATCH 06/11] This reverts commit 788872d12756ba95d34449b4bd37890e6ac01700 --- doc/examples/blog/index.mdwn | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn index 3f0c82ca3..7914cd203 100644 --- a/doc/examples/blog/index.mdwn +++ b/doc/examples/blog/index.mdwn @@ -4,8 +4,6 @@ [[!inline pages=sidebar raw=yes]] """]] -It works! - [[!inline pages="page(./posts/*) and !*/Discussion" show="10" actions=yes rootpage="posts"]] From 2fbfd12c3385e59c24d266c14b1bb29fa5412323 Mon Sep 17 00:00:00 2001 From: JoeRayhawk Date: Tue, 21 Dec 2010 10:25:11 +0000 Subject: [PATCH 07/11] Autoindex: Requesting merge --- doc/todo/transient_pages.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/todo/transient_pages.mdwn b/doc/todo/transient_pages.mdwn index 642114d97..47af92686 100644 --- a/doc/todo/transient_pages.mdwn +++ b/doc/todo/transient_pages.mdwn @@ -56,6 +56,9 @@ of directories that become empty aren't deleted. Recent changes and aggregated files could conceivably go in the transient underlay too. +> I can confirm that the behavior of autoindex, at least, is excellent. +> Haven't tried tag. Joey, can you merge transient and autoindex? --JoeRayhawk + -------------------------- ## An earlier version From d6adc89654dc63ffd1f774042e2c312c37632fd4 Mon Sep 17 00:00:00 2001 From: chrysn Date: Tue, 21 Dec 2010 14:56:44 +0100 Subject: [PATCH 08/11] [no]usedirs still required for cgi-less mode --- doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn index 31e62f44c..c164cf54a 100644 --- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn +++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn @@ -76,3 +76,10 @@ and decided this time it was really needed to implement this feature. >>>>> I have implemented something using the cgi + goto in my (history >>>>> rewrite warning) mirrorlist branch. Please review, please pull. >>>>> --[[intrigeri]] + +>>>>> concerning goto/cgiurl, what about having that as the default in +>>>>> mirrorlist, but keeping ``nousedirs|file:///home/intrigeri/wiki`` and +>>>>> ``usedirs|http://example.com/wiki`` valid for cgi-less cases? +>>>>> that would keep typical installation with a clutter-less configuration, +>>>>> and support more individual setups too. +>>>>> --[[chrysn]] From cffd2e34548b034fc8e7fa11b22927c0decf73d2 Mon Sep 17 00:00:00 2001 From: "http://openid.ppke.hu/cstamas" Date: Wed, 22 Dec 2010 02:39:00 +0000 Subject: [PATCH 09/11] test --- doc/sandbox.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index e0bdb6d03..65eee200d 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,5 +1,7 @@ Hello, world! +test...id + This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]). From fd4cfe722e99ee5a90030a6e042330633cab6145 Mon Sep 17 00:00:00 2001 From: ricola Date: Wed, 22 Dec 2010 08:32:01 +0000 Subject: [PATCH 10/11] --- ...ot_override_the_title_on_the_homepage.mdwn | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 doc/bugs/po_plugin_should_not_override_the_title_on_the_homepage.mdwn diff --git a/doc/bugs/po_plugin_should_not_override_the_title_on_the_homepage.mdwn b/doc/bugs/po_plugin_should_not_override_the_title_on_the_homepage.mdwn new file mode 100644 index 000000000..a6287714b --- /dev/null +++ b/doc/bugs/po_plugin_should_not_override_the_title_on_the_homepage.mdwn @@ -0,0 +1,19 @@ +The po plugin systematically overrides the title of the homepage with the wikiname. This prevents explicitly changing it with a meta directive. It should rather check whether it was overridden before setting it back. + +Here is a simple patch for that: + + diff --git a/Plugin/po.pm b/Plugin/po.pm + index 6395ebd..a048c6a 100644 + --- a/Plugin/po.pm + +++ b/Plugin/po.pm + @@ -333,7 +333,7 @@ sub pagetemplate (@) { + && $masterpage eq "index") { + $template->param('parentlinks' => []); + } + - if (ishomepage($page) && $template->query(name => "title")) { + + if (ishomepage($page) && $template->query(name => "title") && !$template->query(name => "title_overridden")) { + $template->param(title => $config{wikiname}); + } + } + +Thanks. From fd6d4fda6a95f8318c33aed66c4fcf05aad72b86 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 22 Dec 2010 12:50:50 +0100 Subject: [PATCH 11/11] Rename new bug so that it appears on the po plugin page. --- ...po:_plugin_should_not_override_the_title_on_the_homepage.mdwn} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/bugs/{po_plugin_should_not_override_the_title_on_the_homepage.mdwn => po:_plugin_should_not_override_the_title_on_the_homepage.mdwn} (100%) diff --git a/doc/bugs/po_plugin_should_not_override_the_title_on_the_homepage.mdwn b/doc/bugs/po:_plugin_should_not_override_the_title_on_the_homepage.mdwn similarity index 100% rename from doc/bugs/po_plugin_should_not_override_the_title_on_the_homepage.mdwn rename to doc/bugs/po:_plugin_should_not_override_the_title_on_the_homepage.mdwn