From 97a706f73ce2cedc8fd8a9bbeea6d25783260b2e Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 2 Aug 2010 15:14:33 +0200 Subject: both are now fixed in my po branch. --- doc/plugins/po.mdwn | 3 +++ doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn | 2 ++ 2 files changed, 5 insertions(+) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 0f1d66d32..91273ba98 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -315,3 +315,6 @@ underlay, and the underlays lack translation to a given language. >>>>>> although they do not in this case. I still need to have a deep >>>>>> look at the underlays-related code you added to `po.pm` a while >>>>>> ago. Stay tuned. --[[intrigeri]] + +>>>>>>> Fixed in my po branch, along with other related small bugs that +>>>>>>> happen in the very same situation only. --[[intrigeri]] diff --git a/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn b/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn index d4e1f743c..402f70b79 100644 --- a/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn +++ b/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn @@ -41,3 +41,5 @@ Re the meta title escaping issue worked around by `change`. >>>>>> Sure. I was fearing to break other plugins if I did so, so I >>>>>> did not dare to. I'll try this. --[[intrigeri]] + +>>>>>>> Done in my po branch, please have a look. --[[intrigeri]] -- cgit v1.2.3 From c5b052cbbda14c5c33127890d4a9842b8dee826a Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 2 Aug 2010 16:00:37 +0200 Subject: explored possible ways to do it, got trapped. --- doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc') diff --git a/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn b/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn index 26b1964ba..0801f7fcd 100644 --- a/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn +++ b/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn @@ -2,3 +2,10 @@ ikiwiki now has a `disable` hook. Should the po plugin remove the po files from the source repository when it has been disabled? > pot files, possibly, but the po files contain work, so no. --[[Joey]] + +>> I tried to implement this in my `po-disable` branch, but AFAIK, the +>> current rcs plugins interface provides no way to tell whether a +>> given file (e.g. a POT file in my case) is under version control; +>> in most cases, it is not, thanks to .gitignore or similar, but we +>> can't be sure. So I just can't decide it is needed to call +>> `rcs_remove` rather than a good old `unlink`. --[[intrigeri]] -- cgit v1.2.3 From 06641bb8809775dae7ba7fb0817a45e067501ee2 Mon Sep 17 00:00:00 2001 From: "http://liw.fi/" Date: Mon, 2 Aug 2010 18:35:07 +0000 Subject: --- .../__34__First_post__34___deletion_does_not_refresh_front_page.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn (limited to 'doc') diff --git a/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn new file mode 100644 index 000000000..8d04ed18f --- /dev/null +++ b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn @@ -0,0 +1,3 @@ +When I created an ikiwiki site (on Branchable) using the blog template, it added a "First post", which was fine. +Deleting that post removed it, but the front page did not get the re-generated, so it was still there. +--[[liw]] -- cgit v1.2.3 From d934cee673ee18cd814e658a86c607fe5a209476 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 2 Aug 2010 14:37:02 -0400 Subject: resp --- .../__34__First_post__34___deletion_does_not_refresh_front_page.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn index 8d04ed18f..d605aa8d4 100644 --- a/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn +++ b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn @@ -1,3 +1,6 @@ When I created an ikiwiki site (on Branchable) using the blog template, it added a "First post", which was fine. Deleting that post removed it, but the front page did not get the re-generated, so it was still there. --[[liw]] + +> From a quick look, it seems that `depends_simple` does not contain pages +> in the inline. Need to investigate further. --[[Joey]] -- cgit v1.2.3 From c2f2349de4507c8f7bb12926c3c49c917fcf2a06 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 4 Aug 2010 08:09:11 -0400 Subject: bug isolated --- .../__34__First_post__34___deletion_does_not_refresh_front_page.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn index d605aa8d4..78009da75 100644 --- a/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn +++ b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn @@ -2,5 +2,5 @@ When I created an ikiwiki site (on Branchable) using the blog template, it added Deleting that post removed it, but the front page did not get the re-generated, so it was still there. --[[liw]] -> From a quick look, it seems that `depends_simple` does not contain pages -> in the inline. Need to investigate further. --[[Joey]] +> This is a bug involving the `page()` pagespec. Deleted +> pages matching this pagespec are not noticed. --[[Joey]] -- cgit v1.2.3 From 5d88146861ac237ac89cbed2e90a985b9c3bfdc2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 4 Aug 2010 08:24:47 -0400 Subject: Fixes a bug that prevented matching deleted pages when using the page() PageSpec. --- IkiWiki.pm | 15 +++++++++------ debian/changelog | 2 ++ ...t_post__34___deletion_does_not_refresh_front_page.mdwn | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/IkiWiki.pm b/IkiWiki.pm index e08d02922..df8abe2c2 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2439,13 +2439,16 @@ sub match_internal ($$;@) { sub match_page ($$;@) { my $page=shift; my $match=match_glob($page, shift, @_); - if ($match && ! (exists $IkiWiki::pagesources{$page} - && defined IkiWiki::pagetype($IkiWiki::pagesources{$page}))) { - return IkiWiki::FailReason->new("$page is not a page"); - } - else { - return $match; + if ($match) { + my $source=exists $IkiWiki::pagesources{$page} ? + $IkiWiki::pagesources{$page} : + $IkiWiki::delpagesources{$page}; + my $type=defined $source ? IkiWiki::pagetype($source) : undef; + if (! defined $type) { + return IkiWiki::FailReason->new("$page is not a page"); + } } + return $match; } sub match_link ($$;@) { diff --git a/debian/changelog b/debian/changelog index 25123cecc..5c0064845 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low have been disabled. * Use Digest::SHA built into perl rather than external Digest::SHA1 to simplify dependencies. Closes: #591040 + * Fixes a bug that prevented matching deleted pages when using the page() + PageSpec. -- Joey Hess Fri, 23 Jul 2010 14:00:32 -0400 diff --git a/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn index 78009da75..2367335a7 100644 --- a/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn +++ b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn @@ -3,4 +3,4 @@ Deleting that post removed it, but the front page did not get the re-generated, --[[liw]] > This is a bug involving the `page()` pagespec. Deleted -> pages matching this pagespec are not noticed. --[[Joey]] +> pages matching this pagespec are not noticed. --[[Joey]] [[done]] -- cgit v1.2.3 From c8d2ea67da5d27382ff49d5c3761a256de77047c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 4 Aug 2010 09:27:01 -0400 Subject: add news item for ikiwiki 3.20100804 --- doc/news/version_3.20100518.2.mdwn | 3 --- doc/news/version_3.20100804.mdwn | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) delete mode 100644 doc/news/version_3.20100518.2.mdwn create mode 100644 doc/news/version_3.20100804.mdwn (limited to 'doc') diff --git a/doc/news/version_3.20100518.2.mdwn b/doc/news/version_3.20100518.2.mdwn deleted file mode 100644 index 64ce3f863..000000000 --- a/doc/news/version_3.20100518.2.mdwn +++ /dev/null @@ -1,3 +0,0 @@ -ikiwiki 3.20100518.2 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Fix a typo in the last release."""]] \ No newline at end of file diff --git a/doc/news/version_3.20100804.mdwn b/doc/news/version_3.20100804.mdwn new file mode 100644 index 000000000..be85cb949 --- /dev/null +++ b/doc/news/version_3.20100804.mdwn @@ -0,0 +1,14 @@ +ikiwiki 3.20100804 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * template: Fix dependency tracking. Broken in version 3.20100427. + * po: The po\_slave\_languages setting is now a list, so the order of + translated languages can be controlled. (intrigeri) + * git: Fix gitweb historyurl examples so "diff to current" links work. + (Thanks jrayhawk) + * meta: Allow syntax closer to html meta to be used. + * Add new disable hook, allowing plugins to perform cleanup after they + have been disabled. + * Use Digest::SHA built into perl rather than external Digest::SHA1 + to simplify dependencies. Closes: #[591040](http://bugs.debian.org/591040) + * Fixes a bug that prevented matching deleted pages when using the page() + PageSpec."""]] \ No newline at end of file -- cgit v1.2.3 From 6021b7a79202195fffd2a8f92ddd6e6c605f8d33 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkuR0eo_HO1s1hs49h0Y_4Bzm08l9evMEc" Date: Wed, 4 Aug 2010 14:39:25 +0000 Subject: --- doc/index.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/index.mdwn b/doc/index.mdwn index 06acc9cec..d227df1c3 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -26,3 +26,5 @@ can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, and is [[FreeSoftware]]. + +[[payday loans|http://www.todayloan.co.uk]] -- cgit v1.2.3 From 7bc5bf54f5b55144443d537ccc7f1124995ca061 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkuR0eo_HO1s1hs49h0Y_4Bzm08l9evMEc" Date: Wed, 4 Aug 2010 14:40:27 +0000 Subject: --- doc/index.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/index.mdwn b/doc/index.mdwn index d227df1c3..9563047db 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -18,6 +18,7 @@ This site generally runs the latest release of ikiwiki; currently, it runs ikiwiki [[!version ]]. ## developer resources +[[payday loans|http://www.hourpaydayloans.co.uk]] The [[RoadMap]] describes where the project is going. The [[forum]] is open for discussions. -- cgit v1.2.3 From 9fd43faa13c9b87b5056b7cb2b6585b23050a010 Mon Sep 17 00:00:00 2001 From: Perry Date: Wed, 4 Aug 2010 14:54:28 +0000 Subject: Remove vandalism. --- doc/index.mdwn | 3 --- 1 file changed, 3 deletions(-) (limited to 'doc') diff --git a/doc/index.mdwn b/doc/index.mdwn index 9563047db..06acc9cec 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -18,7 +18,6 @@ This site generally runs the latest release of ikiwiki; currently, it runs ikiwiki [[!version ]]. ## developer resources -[[payday loans|http://www.hourpaydayloans.co.uk]] The [[RoadMap]] describes where the project is going. The [[forum]] is open for discussions. @@ -27,5 +26,3 @@ can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, and is [[FreeSoftware]]. - -[[payday loans|http://www.todayloan.co.uk]] -- cgit v1.2.3 From 9943e270f8646fe01fa3d9feb49620f65467879c Mon Sep 17 00:00:00 2001 From: Perry Date: Thu, 5 Aug 2010 00:38:44 +0000 Subject: Note that the problem is not only for Brian May.... --- ...avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 65b7cd96a..5f17e3ae0 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -26,4 +26,6 @@ which seems to do the right thing in page.tmpl, but not for change.tmpl. Where i > The use of an absolute baseurl in change.tmpl is a special case. --[[Joey]] +So I'm facing this same issue. I have a wiki which needs to be accessed on three different URLs(!) and the hard coding of the URL from the setup file is becoming a problem for me. Is there anything I can do here? --[[Perry]] + [[wishlist]] -- cgit v1.2.3 From 69297da448452050823dd27ccb9c1a7d4b2dfe27 Mon Sep 17 00:00:00 2001 From: Perry Date: Thu, 5 Aug 2010 00:40:11 +0000 Subject: --- doc/users/Perry.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/users/Perry.mdwn (limited to 'doc') diff --git a/doc/users/Perry.mdwn b/doc/users/Perry.mdwn new file mode 100644 index 000000000..d10b8621f --- /dev/null +++ b/doc/users/Perry.mdwn @@ -0,0 +1 @@ +Just another IkiWiki user. -- cgit v1.2.3 From 86dc710d9047faa87cc38b2f8e44f6ff9cc457a6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 5 Aug 2010 17:38:20 -0400 Subject: add Branchable, new ikiwiki hosting service run by me and liw --- doc/ikiwikiusers.mdwn | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index efa111bae..e76d547cc 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -1,3 +1,8 @@ +Ikiwiki Hosting +=============== + +* [Branchable](http://branchable.com/) + Projects & Organizations ======================== -- cgit v1.2.3 From 22ae98b2fa7d40adc2c883e81609e1dd5a68b78f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 5 Aug 2010 17:44:47 -0400 Subject: add new item for ikiwiki-hosting, the free ikiwiki management interface I developed for Branchable --- doc/news/ikiwiki-hosting.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/news/ikiwiki-hosting.mdwn (limited to 'doc') diff --git a/doc/news/ikiwiki-hosting.mdwn b/doc/news/ikiwiki-hosting.mdwn new file mode 100644 index 000000000..3496d3f72 --- /dev/null +++ b/doc/news/ikiwiki-hosting.mdwn @@ -0,0 +1,16 @@ +ikiwiki-hosting is an interface on top of Ikiwiki to allow easy management +of lots of ikiwiki sites. I developed it for +[Branchable](http://www.branchable.com/), an Ikiwiki hosting provider. +It has a powerful, scriptable command-line interface, and also +includes special-purpose ikiwiki plugins for things like a user control +panel. + +To get a feel for it, here are some examples: + + ikisite create foo.ikiwiki.net --admin http://joey.kitenet.net/ + ikisite branch foo.ikiwiki.net bar.ikiwiki.net + ikisite backup bar.ikiwiki.net --stdout | ssh otherhost 'ikisite restore bar.ikiwiki.net' --stdin + +ikiwiki-hosting is free software, released under the AGPL. Its website: + +--[[Joey]] -- cgit v1.2.3 From 74d975ff4d883b7c2ed4e0517b6665abd2cfe6cc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 5 Aug 2010 17:46:14 -0400 Subject: typo --- doc/news/ikiwiki-hosting.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/news/ikiwiki-hosting.mdwn b/doc/news/ikiwiki-hosting.mdwn index 3496d3f72..092530a14 100644 --- a/doc/news/ikiwiki-hosting.mdwn +++ b/doc/news/ikiwiki-hosting.mdwn @@ -9,7 +9,7 @@ To get a feel for it, here are some examples: ikisite create foo.ikiwiki.net --admin http://joey.kitenet.net/ ikisite branch foo.ikiwiki.net bar.ikiwiki.net - ikisite backup bar.ikiwiki.net --stdout | ssh otherhost 'ikisite restore bar.ikiwiki.net' --stdin + ikisite backup bar.ikiwiki.net --stdout | ssh otherhost 'ikisite restore bar.ikiwiki.net --stdin' ikiwiki-hosting is free software, released under the AGPL. Its website: -- cgit v1.2.3 From 5bbbdbecbbe1e68b65baf35c3d8b8a371c9341b2 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Fri, 6 Aug 2010 08:12:11 +0000 Subject: update docs for new version --- doc/plugins/contrib/ymlfront.mdwn | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'doc') diff --git a/doc/plugins/contrib/ymlfront.mdwn b/doc/plugins/contrib/ymlfront.mdwn index 6dd8ed532..a2c649044 100644 --- a/doc/plugins/contrib/ymlfront.mdwn +++ b/doc/plugins/contrib/ymlfront.mdwn @@ -13,18 +13,21 @@ IkiWiki::Plugin::ymlfront - add YAML-format data to a page ## DESCRIPTION This plugin provides a way of adding arbitrary meta-data (data fields) to any -page by prefixing the page with a YAML-format document. This provides a way to -create per-page structured data, where each page is treated like a record, and -the structured data are fields in that record. This can include the meta-data -for that page, such as the page title. +page by prefixing the page with a YAML-format document. This also provides +the [[ikiwiki/directive/ymlfront]] directive, which enables one to put +YAML-formatted data inside a standard IkiWiki [[ikiwiki/directive]]. + +This is a way to create per-page structured data, where each page is +treated like a record, and the structured data are fields in that record. This +can include the meta-data for that page, such as the page title. This plugin is meant to be used in conjunction with the [[field]] plugin. ## DETAILS -The YAML-format data in a page must be placed at the start of the page -and delimited by lines containing precisely three dashes. The "normal" -content of the page then follows. +If one is not using the ymlfront directive, the YAML-format data in a page +must be placed at the start of the page and delimited by lines containing +precisely three dashes. The "normal" content of the page then follows. For example: @@ -42,7 +45,7 @@ That will be htmlized using the page-type of the page-file. ### Accessing the Data -There are a few ways to access the data given in the YAML section. +There are a few ways to access the given YAML data. * [[getfield]] plugin -- cgit v1.2.3 From f78357348a028fe97037429f4712d511d2921b14 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Fri, 6 Aug 2010 08:13:48 +0000 Subject: ymlfront now provides a ymlfront directive --- doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn (limited to 'doc') diff --git a/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn b/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn new file mode 100644 index 000000000..bb4a58fc6 --- /dev/null +++ b/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn @@ -0,0 +1,17 @@ +The `ymlfront` directive is supplied by the [[!iki plugins/contrib/ymlfront desc=ymlfront]] plugin. + +This directive allows the user to define arbitrary meta-data in YAML format. + + \[[!ymlfront data=""" + foo: fooness + bar: The Royal Pigeon + baz: 2 + """]] + +There is one argument to this directive. + +* **data:** + The YAML-format data. This should be enclosed inside triple-quotes to preserve the data correctly. + +If more than one ymlfront directive is given per page, the result is undefined. +Likewise, it is inadvisable to try to mix the "---" ymlfront format with the directive form of the data. -- cgit v1.2.3 From 0497b6379285df3c505c701ddfc9886922e85054 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Fri, 6 Aug 2010 08:19:06 +0000 Subject: Should I remove the old ymlfront format now that it recognises directives? --- doc/plugins/contrib/ymlfront/discussion.mdwn | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'doc') diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn index b5c08fedd..3f7f0a337 100644 --- a/doc/plugins/contrib/ymlfront/discussion.mdwn +++ b/doc/plugins/contrib/ymlfront/discussion.mdwn @@ -1,13 +1,5 @@ -My field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb: -) -has some fixes for compatibility with old YAML modules, mostly done by imitating -Joey's code in IkiWiki::Setup::Yaml. Please consider merging :-) --[[smcv]] +Now that I have implemented a \[[!ymlfront ...]] directive, I would like to remove support for the old "---" delimited format, because +* it is fragile (easily breakable) +* it is non-standard -> I would if I could *find* it. I checked out the "field-etc" branch, but I can't find the plugins in question under IkiWiki/Plugin; am I looking in the wrong place, or what? -> --[[KathrynAndersen]] - ->> Sorry, I accidentally removed `field-etc` by pushing with `--mirror` from a ->> different checkout. I've put it back; it's a branch from your `ikiplugins.git`, ->> so yes, the code should be in `IkiWiki/Plugin`. --[[smcv]] - ->>> Done a while back, but now I've actually pushed to my repo. --[[KathrynAndersen]] +Any objections? -- cgit v1.2.3 From d2b50c37b44972e60d08854e9e780a09481872d5 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Fri, 6 Aug 2010 08:19:39 +0000 Subject: formatting --- doc/plugins/contrib/ymlfront/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn index 3f7f0a337..b1fd65fff 100644 --- a/doc/plugins/contrib/ymlfront/discussion.mdwn +++ b/doc/plugins/contrib/ymlfront/discussion.mdwn @@ -1,4 +1,5 @@ Now that I have implemented a \[[!ymlfront ...]] directive, I would like to remove support for the old "---" delimited format, because + * it is fragile (easily breakable) * it is non-standard -- cgit v1.2.3 From 51d5e546974405741e08ed27d0bf89958fa7366b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 9 Aug 2010 13:18:59 -0400 Subject: filecheck: Fall back to using the file command if the freedesktop magic file cannot identify a file. --- IkiWiki/Plugin/filecheck.pm | 25 +++++++++++++++++++------ debian/changelog | 7 +++++++ doc/plugins/filecheck.mdwn | 3 ++- 3 files changed, 28 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm index d00b6dfd3..a78058ffe 100644 --- a/IkiWiki/Plugin/filecheck.pm +++ b/IkiWiki/Plugin/filecheck.pm @@ -132,15 +132,28 @@ sub match_mimetype ($$;@) { return IkiWiki::ErrorReason->new("file does not exist"); } - # Use ::magic to get the mime type, the idea is to only trust - # data obtained by examining the actual file contents. + # Get the mime type. + # + # First, try File::Mimeinfo. This is fast, but doesn't recognise + # all files. eval q{use File::MimeInfo::Magic}; - if ($@) { - return IkiWiki::ErrorReason->new("failed to load File::MimeInfo::Magic ($@); cannot check MIME type"); + my $mimeinfo_ok=! $@; + my $mimetype; + if ($mimeinfo_ok) { + my $mimetype=File::MimeInfo::Magic::magic($file); } - my $mimetype=File::MimeInfo::Magic::magic($file); + + # Fall back to using file, which has a more complete + # magic database. if (! defined $mimetype) { - $mimetype=File::MimeInfo::Magic::default($file); + open(my $file_h, "-|", "file", "-bi", $file); + $mimetype=<$file_h>; + close $file_h; + } + if (! defined $mimetype || $mimetype !~s /;.*//) { + # Fall back to default value. + $mimetype=File::MimeInfo::Magic::default($file) + if $mimeinfo_ok; if (! defined $mimetype) { $mimetype="unknown"; } diff --git a/debian/changelog b/debian/changelog index 8223074f3..440bee34f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.20100805) UNRELEASED; urgency=low + + * filecheck: Fall back to using the file command if the freedesktop + magic file cannot identify a file. + + -- Joey Hess Mon, 09 Aug 2010 13:18:28 -0400 + ikiwiki (3.20100804) unstable; urgency=low * template: Fix dependency tracking. Broken in version 3.20100427. diff --git a/doc/plugins/filecheck.mdwn b/doc/plugins/filecheck.mdwn index e5f68b29c..b038bc433 100644 --- a/doc/plugins/filecheck.mdwn +++ b/doc/plugins/filecheck.mdwn @@ -7,7 +7,8 @@ status. These tests are mostly useful for the [[attachment]] plugin, and are documented [[here|ikiwiki/pagespec/attachment]]. This plugin will use the [[!cpan File::MimeInfo::Magic]] perl module, if -available, for mimetype checking. +available, for mimetype checking. It falls back to using the `file` command +if necessary for hard to detect files. The `virusfree` [[PageSpec|ikiwiki/pagespec/attachment]] requires that ikiwiki be configured with a virus scanner program via the `virus_checker` -- cgit v1.2.3 From 801ed5c0c2b196a0b8bd21034074f7c8061fd3c1 Mon Sep 17 00:00:00 2001 From: tschwinge Date: Wed, 11 Aug 2010 08:23:04 +0000 Subject: Question. --- doc/forum/cutpaste.pm_not_only_file-local.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/cutpaste.pm_not_only_file-local.mdwn (limited to 'doc') diff --git a/doc/forum/cutpaste.pm_not_only_file-local.mdwn b/doc/forum/cutpaste.pm_not_only_file-local.mdwn new file mode 100644 index 000000000..df7b502af --- /dev/null +++ b/doc/forum/cutpaste.pm_not_only_file-local.mdwn @@ -0,0 +1,9 @@ +I'd like to use the cutpaste plugin, but not only on a file-local basis: fileA +has \[[!cut id=foo text="foo"]], and fileB does \[[!absorb pagenames=fileA]], +and can then use \[[!paste id=foo]]. + +Therefore, I've written an [*absorb* directive / +plugin](http://www.thomas.schwinge.homeip.net/tmp/absorb.pm), which is meant to +absorb pages in order to get hold of their *cut* and *copy* directives' +contents. This does work as expected. But it also absorbs page fileA's *meta* +values, like a *meta title*, etc. How to avoid / solve this? -- cgit v1.2.3 From 95393e2fa0b779e27558c0c80814c1f0b0b651a9 Mon Sep 17 00:00:00 2001 From: tschwinge Date: Wed, 11 Aug 2010 08:25:17 +0000 Subject: Alternative way? --- doc/forum/cutpaste.pm_not_only_file-local.mdwn | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') diff --git a/doc/forum/cutpaste.pm_not_only_file-local.mdwn b/doc/forum/cutpaste.pm_not_only_file-local.mdwn index df7b502af..3563e3e01 100644 --- a/doc/forum/cutpaste.pm_not_only_file-local.mdwn +++ b/doc/forum/cutpaste.pm_not_only_file-local.mdwn @@ -7,3 +7,8 @@ plugin](http://www.thomas.schwinge.homeip.net/tmp/absorb.pm), which is meant to absorb pages in order to get hold of their *cut* and *copy* directives' contents. This does work as expected. But it also absorbs page fileA's *meta* values, like a *meta title*, etc. How to avoid / solve this? + +Alternatively, do you have a better suggestion about how to achieve what I +described in the first paragraph? + +--[[tschwinge]] -- cgit v1.2.3 From 39ff7cf4fc02eb1929351a73e326711f3fb09d9a Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Thu, 12 Aug 2010 02:33:54 +0000 Subject: Added a comment: field and getfield and ymlfront --- .../comment_1_497c62f21fd1b87625b806407c72dbad._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/cutpaste.pm_not_only_file-local/comment_1_497c62f21fd1b87625b806407c72dbad._comment (limited to 'doc') diff --git a/doc/forum/cutpaste.pm_not_only_file-local/comment_1_497c62f21fd1b87625b806407c72dbad._comment b/doc/forum/cutpaste.pm_not_only_file-local/comment_1_497c62f21fd1b87625b806407c72dbad._comment new file mode 100644 index 000000000..8cc724a72 --- /dev/null +++ b/doc/forum/cutpaste.pm_not_only_file-local/comment_1_497c62f21fd1b87625b806407c72dbad._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://kerravonsen.dreamwidth.org/" + ip="60.241.8.244" + subject="field and getfield and ymlfront" + date="2010-08-12T02:33:54Z" + content=""" +Have you considered trying the [[plugins/contrib/field]] plugin, and its associated plugins? [[plugins/contrib/ymlfront]] can give you the source (\"cut\") and [[plugins/contrib/getfield]] and/or [[plugins/contrib/report]] can get you the value (\"paste\") including the values from other pages. +"""]] -- cgit v1.2.3 From 8853e4e79c725cc5a58bfc96c75785ae2f16b068 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnbe6oB_ecFtNYII1JN3zSggwUPUdOb8jI" Date: Thu, 12 Aug 2010 14:13:05 +0000 Subject: Note about jsMath --- doc/todo/Add_nicer_math_formatting.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/todo/Add_nicer_math_formatting.mdwn (limited to 'doc') diff --git a/doc/todo/Add_nicer_math_formatting.mdwn b/doc/todo/Add_nicer_math_formatting.mdwn new file mode 100644 index 000000000..041eaee11 --- /dev/null +++ b/doc/todo/Add_nicer_math_formatting.mdwn @@ -0,0 +1,5 @@ +It would be nice to add nicer math formatting. I currently use the [[plugins/teximg]] plugin, but I wonder if [jsMath](http://www.math.union.edu/~dpvc/jsMath/) wouldn't be a better option. + +[[Will]] + +[[!tag wishlist]] -- cgit v1.2.3 From 80102c042d0f2fd194222cd233a7bfd0e8bd467f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Aug 2010 16:53:52 -0400 Subject: flattr: New plugin. Thanks to jaywalk for the initial implementation at a flattr plugin! This one is less configurable, but simpler. --- IkiWiki/Plugin/flattr.pm | 97 +++++++++++++++++++++++++++++++++++++++ debian/changelog | 2 + doc/ikiwiki/directive/flattr.mdwn | 45 ++++++++++++++++++ doc/plugins/contrib/flattr.mdwn | 3 ++ doc/plugins/flattr.mdwn | 9 ++++ doc/style.css | 4 ++ 6 files changed, 160 insertions(+) create mode 100644 IkiWiki/Plugin/flattr.pm create mode 100644 doc/ikiwiki/directive/flattr.mdwn create mode 100644 doc/plugins/flattr.mdwn (limited to 'doc') diff --git a/IkiWiki/Plugin/flattr.pm b/IkiWiki/Plugin/flattr.pm new file mode 100644 index 000000000..3aee1eb93 --- /dev/null +++ b/IkiWiki/Plugin/flattr.pm @@ -0,0 +1,97 @@ +#!/usr/bin/perl +package IkiWiki::Plugin::flattr; + +use warnings; +use strict; +use IkiWiki 3.00; + +sub import { + hook(type => "getsetup", id => "flattr", call => \&getsetup); + hook(type => "preprocess", id => "flattr", call => \&preprocess); + hook(type => "format", id => "flattr", call => \&format); +} + +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => undef, + }, + flattr_userid => { + type => "string", + example => 'joeyh', + description => "userid or user name to use by default for Flattr buttons", + advanced => 0, + safe => 1, + rebuild => undef, + }, +} + +my %flattr_pages; + +sub preprocess (@) { + my %params=@_; + + $flattr_pages{$params{destpage}}=1; + + my $url=$params{url}; + if (! defined $url) { + $url=urlto($params{page}, "", 1); + } + + my @fields; + foreach my $field (qw{language uid button hidden category tags}) { + if (exists $params{$field}) { + push @fields, "$field:$params{$field}"; + } + } + + return ''. + (exists $params{description} ? $params{description} : ''). + ''; +} + +sub format (@) { + my %params=@_; + + # Add flattr's javascript to pages with flattr buttons. + if ($flattr_pages{$params{page}}) { + if (! ($params{content}=~s!^(]*>)!$1.flattrjs()!em)) { + # no tag, probably in preview mode + $params{content}=flattrjs().$params{content}; + } + } + return $params{content}; +} + +my $js_cached; +sub flattrjs { + return $js_cached if defined $js_cached; + + my $js_url='https://api.flattr.com/js/0.5.0/load.js?mode=auto'; + if (defined $config{flattr_userid}) { + my $userid=$config{flattr_userid}; + $userid=~s/[^-A-Za-z0-9_]//g; # sanitize for inclusion in javascript + $js_url.="&uid=$userid"; + } + + # This is Flattr's standard javascript snippet to include their + # external javascript file, asynchronously. + return $js_cached=<<"EOF"; + +EOF +} + +1 diff --git a/debian/changelog b/debian/changelog index 440bee34f..f90fd8855 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ ikiwiki (3.20100805) UNRELEASED; urgency=low * filecheck: Fall back to using the file command if the freedesktop magic file cannot identify a file. + * flattr: New plugin. (Thanks to jaywalk for the initial implementation + at a flattr plugin! This one is less configurable, but simpler.) -- Joey Hess Mon, 09 Aug 2010 13:18:28 -0400 diff --git a/doc/ikiwiki/directive/flattr.mdwn b/doc/ikiwiki/directive/flattr.mdwn new file mode 100644 index 000000000..5083005ce --- /dev/null +++ b/doc/ikiwiki/directive/flattr.mdwn @@ -0,0 +1,45 @@ +The `flattr` directive is supplied by the [[!iki plugins/flattr desc=flattr]] plugin. + +This directive allows easily inserting Flattr buttons onto wiki pages. + +Flattr supports both static buttons and javascript buttons. This directive +only creates dynamic javascript buttons. If you want to insert a static +Flattr button, you can simply copy the html code for it from Flattr, instead. +Note that this directive inserts javascript code into the page, that +loads more javascript code from Flattr.com. So only use it if you feel +comfortable with that. + +The directive can be used to display a button for a thing you have already +manually submitted to Flattr. In this mode, the only parameter you need to +include is the exact url to the thing that was submitted to Flattr. +(If the button is for the current page, you can leave that out.) For +example, this is the Flattr button for ikiwiki. Feel free to add it to all +your pages. ;) + + \[[!flattr url="http://ikiwiki.info/" button=compact]] + +The directive can also be used to create a button that automatically +submits a page to Flattr when a user clicks on it. In this mode you +need to include parameters to specify your uid, and a title, category, tags, +and description for the page. For example, this is a Flattr button for +a blog post: + + \[[!flattr uid=25634 title="my new blog post" category=text + tags="blog,example" description="This is a post on my blog."]] + +Here are all possible parameters you can pass to the Flattr directive. + +* `button` - Set to "compact" for a small button. +* `url` - The url to the thing to be Flattr'd. If omitted, defaults + to the url of the current page. +* `uid` - Your numeric Flattr userid. Not needed if the flattr plugin + has been configured with a global `flattr_userid`. +* `title` - A short title for the thing, to show on its Flattr page. +* `description` - A description of the thing, to show on its Flattr + page. +* `category` - One of: text, images, video, audio, software, rest. +* `tags` - A list of tags separated by a comma. +* `language` - A language code. +* `hidden` - Set to 1 to hide the button from listings on Flattr.com. + +[[!meta robots="noindex, follow"]] diff --git a/doc/plugins/contrib/flattr.mdwn b/doc/plugins/contrib/flattr.mdwn index f8f005c31..e9b4bf857 100644 --- a/doc/plugins/contrib/flattr.mdwn +++ b/doc/plugins/contrib/flattr.mdwn @@ -10,6 +10,9 @@ I wrote some notes on [jonatan.walck.se](http://jonatan.walck.se/software/ikiwik This plugin is licensed under [CC0](http://creativecommons.org/publicdomain/zero/1.0/) (public domain). +Note that there is now a [[plugins/flattr]] plugin bundled with ikiwiki. It +is less configurable, not supporting static buttons, but simpler to use. + # Usage # # [[!flattr args]] where args are in the form of arg=value. diff --git a/doc/plugins/flattr.mdwn b/doc/plugins/flattr.mdwn new file mode 100644 index 000000000..5da279518 --- /dev/null +++ b/doc/plugins/flattr.mdwn @@ -0,0 +1,9 @@ +[[!template id=plugin name=flattr author="[[Joey]]"]] +[[!tag type/web]] + +[Flattr](http://flattr.com/) is a social micropayment platform. +This plugin allows easily adding Flattr buttons to pages, +using the [[ikiwiki/directive/flattr]] directive. + +This plugin has a configuration setting. `flattr_userid` can be set +to either your numeric flatter userid, or your flattr username. diff --git a/doc/style.css b/doc/style.css index 8dd3b1c15..66d962bd6 100644 --- a/doc/style.css +++ b/doc/style.css @@ -449,6 +449,10 @@ li.L8 { list-style: upper-alpha; } background: #ff9900; } +.FlattrButton { + display: none; +} + /* openid selector */ #openid_choice { display: none; -- cgit v1.2.3 From 07e27bd082cf8ecd55908f6486a344bb74503de6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Aug 2010 20:55:59 -0400 Subject: add a link to libravatar --- doc/todo/avatar.mdwn | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') diff --git a/doc/todo/avatar.mdwn b/doc/todo/avatar.mdwn index f0599e4ed..91f924fa1 100644 --- a/doc/todo/avatar.mdwn +++ b/doc/todo/avatar.mdwn @@ -58,3 +58,8 @@ The hash is calculated from the user's email address. If the user's email is not known, skip it. End. :P + +--- + +[libravatar](https://launchpad.net/libravatar) is a federated avatar +system. Young but might be the right way to get avatars eventually. -- cgit v1.2.3 From 8a0b2d07d3aa1a833e9b83ce9e2a9b2a6f76fb9b Mon Sep 17 00:00:00 2001 From: "http://weakish.myopenid.com/" Date: Fri, 13 Aug 2010 16:13:06 +0000 Subject: possible to use place holders? --- doc/plugins/rst/discussion.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'doc') diff --git a/doc/plugins/rst/discussion.mdwn b/doc/plugins/rst/discussion.mdwn index 3c3b03275..c84a6218e 100644 --- a/doc/plugins/rst/discussion.mdwn +++ b/doc/plugins/rst/discussion.mdwn @@ -71,3 +71,11 @@ I need help on a couple of points * Can we include this in ikiwiki's rst if it is not too hairy? --ulrik + + +---- + +> The main problem with more sophisticated RST support is that ikiwiki turns +preprocessor directives into raw HTML and reST hates inline HTML. + +Is it possible for ikiwiki to store preprocessor directives in memory, and replace them with place holders, then do the rst process. After the rst processing, process the preprocessor directives and replace place holders. --[[weakish]] -- cgit v1.2.3 From 6e905e21a81223d64f759c9753f936e4b2a46064 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlAlJrRGUG_SY5lCIkWeO8muJTqRpRYz1E" Date: Fri, 13 Aug 2010 20:05:38 +0000 Subject: --- doc/sandbox.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 691f20ffe..cbef5394e 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,10 +1,10 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]). -> This is a blockerquote. +> This is a blockquote. > > This is the first level of quoting. > -> > This is nested blockquote. +> > This is a nested blockquote. > >> Without a space works too. >>> to three levels -- cgit v1.2.3 From 8591fa48633375aab0e2ff4dbef940984dc7c381 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawndltpDNFSfEZBR_TIcjeDQRkuuyT1e_3o" Date: Sat, 14 Aug 2010 22:41:57 +0000 Subject: --- doc/plugins/filecheck/discussion.mdwn | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'doc') diff --git a/doc/plugins/filecheck/discussion.mdwn b/doc/plugins/filecheck/discussion.mdwn index f91950b7d..9a3bcddfc 100644 --- a/doc/plugins/filecheck/discussion.mdwn +++ b/doc/plugins/filecheck/discussion.mdwn @@ -15,3 +15,20 @@ if ::magic() returns undef? --[[DavidBremner]] >> for ::default >>> Applied + +--- + +At first I need to thank you for ikiwiki - it is what I was always looking for - coming from a whole bunch of wiki engines, this is the most intelligent and least bloated one. + +My question is about the [[plugins/attachment]] plugin in conjunction with [[plugins/filecheck]]: I am using soundmanger2 js-library for having attached media files of all sorts played inline a page. + +To achieve this soundmanager2 asks for an id inside a ul-tag surrounding the a-tag. I was wondering if the Insert Link button could be provided with a more elegant solution than to have this code snippet to be filled in by hand every time you use it to insert links for attached media files. And in fact there apparently is a way in attachment.pm. + +While I can see that it is not needed for everyone inserting links to attached media files to have ul- and li-tags surrounding the link itself as well as being supplied with an id fill in, for me it would be the most straight forward solution. Pitty is I don't have the time to wrap my head around perl to write a patch myself. Is there any way to have this made an option which can be called via templates? + +For sure I would like to donate for such a patch as well as I will do it for ikiwiki anyway, because it is such a fine application. + +If you are not familiar with soundmanager2: It is a very straight forward solution to inline mediafiles, using the usual flash as well as html5 solutions (used by soundcloud.com, freesound.org and the like). Worth a look anyway [schillmania.com](http://www.schillmania.com/) + +Boris + -- cgit v1.2.3 From 52e3f698bc8fafdab4d911d925d214981ebd8d25 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 14 Aug 2010 20:17:12 -0400 Subject: respond, open wishlist todo item with design --- doc/plugins/filecheck/discussion.mdwn | 49 ++++++++++++++++++++++++++++++----- doc/todo/generic_insert_links | 24 +++++++++++++++++ 2 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 doc/todo/generic_insert_links (limited to 'doc') diff --git a/doc/plugins/filecheck/discussion.mdwn b/doc/plugins/filecheck/discussion.mdwn index 9a3bcddfc..6ef780772 100644 --- a/doc/plugins/filecheck/discussion.mdwn +++ b/doc/plugins/filecheck/discussion.mdwn @@ -18,17 +18,54 @@ if ::magic() returns undef? --[[DavidBremner]] --- -At first I need to thank you for ikiwiki - it is what I was always looking for - coming from a whole bunch of wiki engines, this is the most intelligent and least bloated one. +At first I need to thank you for ikiwiki - it is what I was always looking +for - coming from a whole bunch of wiki engines, this is the most +intelligent and least bloated one. -My question is about the [[plugins/attachment]] plugin in conjunction with [[plugins/filecheck]]: I am using soundmanger2 js-library for having attached media files of all sorts played inline a page. +My question is about the [[plugins/attachment]] plugin in conjunction with +[[plugins/filecheck]]: I am using soundmanger2 js-library for having +attached media files of all sorts played inline a page. -To achieve this soundmanager2 asks for an id inside a ul-tag surrounding the a-tag. I was wondering if the Insert Link button could be provided with a more elegant solution than to have this code snippet to be filled in by hand every time you use it to insert links for attached media files. And in fact there apparently is a way in attachment.pm. +To achieve this soundmanager2 asks for an id inside a ul-tag surrounding +the a-tag. I was wondering if the Insert Link button could be provided with +a more elegant solution than to have this code snippet to be filled in by +hand every time you use it to insert links for attached media files. And in +fact there apparently is a way in attachment.pm. -While I can see that it is not needed for everyone inserting links to attached media files to have ul- and li-tags surrounding the link itself as well as being supplied with an id fill in, for me it would be the most straight forward solution. Pitty is I don't have the time to wrap my head around perl to write a patch myself. Is there any way to have this made an option which can be called via templates? +While I can see that it is not needed for everyone inserting links to +attached media files to have ul- and li-tags surrounding the link itself as +well as being supplied with an id fill in, for me it would be the most +straight forward solution. Pitty is I don't have the time to wrap my head +around perl to write a patch myself. Is there any way to have this made an +option which can be called via templates? -For sure I would like to donate for such a patch as well as I will do it for ikiwiki anyway, because it is such a fine application. +For sure I would like to donate for such a patch as well as I will do it +for ikiwiki anyway, because it is such a fine application. -If you are not familiar with soundmanager2: It is a very straight forward solution to inline mediafiles, using the usual flash as well as html5 solutions (used by soundcloud.com, freesound.org and the like). Worth a look anyway [schillmania.com](http://www.schillmania.com/) +If you are not familiar with soundmanager2: It is a very straight forward +solution to inline mediafiles, using the usual flash as well as html5 +solutions (used by soundcloud.com, freesound.org and the like). Worth a +look anyway [schillmania.com](http://www.schillmania.com/) Boris +> The behavior of "Insert Links" is currently hardcoded to support images +> and has a fallback for other files. What you want is a +> [[todo/generic_insert_links]] that can insert a template directive. +> Then you could make a template that generates the html needed for +> soundmanager2. I've written down a design at +> [[todo/generic_insert_links]]; I am currently very busy and not sure +> when I will get around to writing it, but with it on the todo list +> I shouldn't forget. --[[Joey]] +> +> You could make a [[ikiwiki/directive/template]] for soundmanager2 +> now, and manually insert the template directive for now +> when you want to embed a sound file. Something like this: + + \[[!template id=embed_mp3 file=your.mp3]] + +> Then in templates/embed_mp3.mdwn, something vaguely like this: + + diff --git a/doc/todo/generic_insert_links b/doc/todo/generic_insert_links new file mode 100644 index 000000000..050f32ee7 --- /dev/null +++ b/doc/todo/generic_insert_links @@ -0,0 +1,24 @@ +The attachment plugin's Insert Links button currently only knows +how to insert plain wikilinks and img directives (for images). + +[[wishlist]]: Generalize this, so a plugin can cause arbitrary text +to be inserted for a particular file. --[[Joey]] + +Design: + +Add an insertlinks hook. Each plugin using the hook would be called, +and passed the filename of the attachment. If it knows how to handle +the file type, it returns a the text that should be inserted on the page. +If not, it returns undef, and the next plugin is tried. + +This would mean writing plugins in order to handle links for +special kinds of attachments. To avoid that for simple stuff, +a fallback plugin could run last and look for a template +named like `templates/embed_$extension`, and insert a directive like: + + \[[!template id=embed_vp8 file=my_movie.vp8]] + +Then to handle a new file type, a user could just make a template +that expands to some relevant html. In the example above, +`templates/embed_vp8` could make a html5 video tag, possibly with some +flash fallback code even. -- cgit v1.2.3 From 68770930a72adc39f535210bceff171efcf205ac Mon Sep 17 00:00:00 2001 From: "http://jasonriedy.wordpress.com/" Date: Sun, 15 Aug 2010 02:18:59 +0000 Subject: Add an XSLT style sheet for WP->iki conversion --- doc/tips/Importing_posts_from_Wordpress.mdwn | 85 ++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) (limited to 'doc') diff --git a/doc/tips/Importing_posts_from_Wordpress.mdwn b/doc/tips/Importing_posts_from_Wordpress.mdwn index af8e4005d..1ea82b862 100644 --- a/doc/tips/Importing_posts_from_Wordpress.mdwn +++ b/doc/tips/Importing_posts_from_Wordpress.mdwn @@ -15,3 +15,88 @@ I include a modified version of this script. This version includes the ability t -- [[users/simonraven]] [[ikiwiki-wordpress-import]] + +----- + +Perhaps slightly insane, but here's an XSLT style sheet that handles my pages. It's basic, but sufficient to get started. +Note that I had to break up the ikiwiki meta strings to post this. + +-- JasonRiedy + + + + + + + + + + + + + + + + + + + Creating + + + [[meta title=" + + "]] + [[meta date=" + + "]] + [[meta updated=" + + "]] + + + + + + + + + + + + $basename + + + + + + + + + + + + + [[comment format=html + + + + + subject="" + content=""" + + + """]] + + + + + [[!tag ""]] + + + + -- cgit v1.2.3 From 4e8a695431489d2059907122a11089c0e45a165c Mon Sep 17 00:00:00 2001 From: philippe Date: Sun, 15 Aug 2010 08:58:52 +0000 Subject: --- doc/bugs/po:_po_files_instead_of_html_files.mdwn | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/bugs/po:_po_files_instead_of_html_files.mdwn (limited to 'doc') diff --git a/doc/bugs/po:_po_files_instead_of_html_files.mdwn b/doc/bugs/po:_po_files_instead_of_html_files.mdwn new file mode 100644 index 000000000..4b08c7c70 --- /dev/null +++ b/doc/bugs/po:_po_files_instead_of_html_files.mdwn @@ -0,0 +1,4 @@ +On the home page of my wiki, when i click on the link "ikiwiki", i get the english file instead of the french file. +At the bottom of this page, there is the "Links" line: +Links: index index.fr templates templates.fr +When i click on "templates.fr", i get the po.file instead of html. -- cgit v1.2.3 From 7998f73ded64d3101bcd9cdf9a388f23e694653a Mon Sep 17 00:00:00 2001 From: "http://claimid.com/helios" Date: Sun, 15 Aug 2010 11:11:21 +0000 Subject: question "creating multi domain setup possible?" --- doc/forum/multi_domain_setup_possible__63__.mdwn | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/forum/multi_domain_setup_possible__63__.mdwn (limited to 'doc') diff --git a/doc/forum/multi_domain_setup_possible__63__.mdwn b/doc/forum/multi_domain_setup_possible__63__.mdwn new file mode 100644 index 000000000..01b31aafb --- /dev/null +++ b/doc/forum/multi_domain_setup_possible__63__.mdwn @@ -0,0 +1,15 @@ +Hi! I am searching for a replacement of my blog and webpages made off static HTML with just some custom PHP around it for years already. ikiwiki seems to be one of the hot candidates, since it uses a RCS. + +I would like to have a multi domain setup like this: + +- myname.private.de => more of a personal page +- professional.de => more of my professional work related page +- and possibly others + +Now when I write a blog entry about some Linux, Debian or KDE stuff, I possibly would like to have it shown on my private and my professional domain. + +And I might like to use some kind of inter wiki links now and then. + +Is such a setup possible? I thought about have a big wiki with Apache serving sub directories from it under different domains, but then wiki links like would not work. + +Maybe having the same blog entry, same content on several domains is not such a hot idea, but as long as I do not see a problem with it, I'd like to do it. -- cgit v1.2.3 From 2297935fc5bd14d80d9618e1d17b8d3de990e6e6 Mon Sep 17 00:00:00 2001 From: "http://claimid.com/helios" Date: Sun, 15 Aug 2010 11:12:51 +0000 Subject: --- doc/forum/multi_domain_setup_possible__63__.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/forum/multi_domain_setup_possible__63__.mdwn b/doc/forum/multi_domain_setup_possible__63__.mdwn index 01b31aafb..54946e346 100644 --- a/doc/forum/multi_domain_setup_possible__63__.mdwn +++ b/doc/forum/multi_domain_setup_possible__63__.mdwn @@ -13,3 +13,5 @@ And I might like to use some kind of inter wiki links now and then. Is such a setup possible? I thought about have a big wiki with Apache serving sub directories from it under different domains, but then wiki links like would not work. Maybe having the same blog entry, same content on several domains is not such a hot idea, but as long as I do not see a problem with it, I'd like to do it. + +--[[helios]] -- cgit v1.2.3 From e0f1d657983d5bf612cf70f231bf166c0b6d67d5 Mon Sep 17 00:00:00 2001 From: "http://claimid.com/helios" Date: Sun, 15 Aug 2010 11:13:29 +0000 Subject: --- doc/forum/multi_domain_setup_possible__63__.mdwn | 2 -- 1 file changed, 2 deletions(-) (limited to 'doc') diff --git a/doc/forum/multi_domain_setup_possible__63__.mdwn b/doc/forum/multi_domain_setup_possible__63__.mdwn index 54946e346..01b31aafb 100644 --- a/doc/forum/multi_domain_setup_possible__63__.mdwn +++ b/doc/forum/multi_domain_setup_possible__63__.mdwn @@ -13,5 +13,3 @@ And I might like to use some kind of inter wiki links now and then. Is such a setup possible? I thought about have a big wiki with Apache serving sub directories from it under different domains, but then wiki links like would not work. Maybe having the same blog entry, same content on several domains is not such a hot idea, but as long as I do not see a problem with it, I'd like to do it. - ---[[helios]] -- cgit v1.2.3 From 77aaf95d5d72149b31900048ee8ef4125ffa5548 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 15 Aug 2010 11:58:00 -0400 Subject: add news item for ikiwiki 3.20100815 --- doc/news/version_3.20100518.2.mdwn | 3 --- doc/news/version_3.20100815.mdwn | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 doc/news/version_3.20100518.2.mdwn create mode 100644 doc/news/version_3.20100815.mdwn (limited to 'doc') diff --git a/doc/news/version_3.20100518.2.mdwn b/doc/news/version_3.20100518.2.mdwn deleted file mode 100644 index 64ce3f863..000000000 --- a/doc/news/version_3.20100518.2.mdwn +++ /dev/null @@ -1,3 +0,0 @@ -ikiwiki 3.20100518.2 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Fix a typo in the last release."""]] \ No newline at end of file diff --git a/doc/news/version_3.20100815.mdwn b/doc/news/version_3.20100815.mdwn new file mode 100644 index 000000000..1073933a1 --- /dev/null +++ b/doc/news/version_3.20100815.mdwn @@ -0,0 +1,4 @@ +ikiwiki 3.20100815 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Fix po test suite to not assume ikiwiki's underlay is already installed. + Closes: #[593047](http://bugs.debian.org/593047)"""]] \ No newline at end of file -- cgit v1.2.3 From 0a4a7a70ba90963eec2cb2b35877c555d28e1eb7 Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Sun, 15 Aug 2010 16:06:43 +0000 Subject: Added a comment: branches --- .../comment_1_43f5df30d09046ccc4f7c44703979a11._comment | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 doc/forum/multi_domain_setup_possible__63__/comment_1_43f5df30d09046ccc4f7c44703979a11._comment (limited to 'doc') diff --git a/doc/forum/multi_domain_setup_possible__63__/comment_1_43f5df30d09046ccc4f7c44703979a11._comment b/doc/forum/multi_domain_setup_possible__63__/comment_1_43f5df30d09046ccc4f7c44703979a11._comment new file mode 100644 index 000000000..5b00272b3 --- /dev/null +++ b/doc/forum/multi_domain_setup_possible__63__/comment_1_43f5df30d09046ccc4f7c44703979a11._comment @@ -0,0 +1,17 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="branches" + date="2010-08-15T16:06:43Z" + content=""" +This is where the git backend (or bzr if you prefer) shines. Make a site, and then branch it to a second site, and put your personal type stuff on the branch. cherry-pick or merge changes from one branch to another. + +The possibility to do this kind of thing is why our recently launched Ikiwiki hosting service is called +[Branchable.com](http://branchable.com). It makes it easy to create branches of a Ikiwiki site hosted +there: +(Merging between branches need manual git, for now.) + +BTW, for links between the branched wikis you can just use the [[plugins/shortcut]] plugin. + +--[[Joey]] +"""]] -- cgit v1.2.3 From 09c8683c8e4c9f0c72b79f531194aa8c97d3290a Mon Sep 17 00:00:00 2001 From: "http://claimid.com/helios" Date: Sun, 15 Aug 2010 16:18:35 +0000 Subject: Added a comment: branches --- .../comment_2_75d6581f81b71fb8acbe3561047ea759._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/forum/multi_domain_setup_possible__63__/comment_2_75d6581f81b71fb8acbe3561047ea759._comment (limited to 'doc') diff --git a/doc/forum/multi_domain_setup_possible__63__/comment_2_75d6581f81b71fb8acbe3561047ea759._comment b/doc/forum/multi_domain_setup_possible__63__/comment_2_75d6581f81b71fb8acbe3561047ea759._comment new file mode 100644 index 000000000..473f52f5c --- /dev/null +++ b/doc/forum/multi_domain_setup_possible__63__/comment_2_75d6581f81b71fb8acbe3561047ea759._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="http://claimid.com/helios" + nickname="helios" + subject="branches" + date="2010-08-15T16:18:35Z" + content=""" +So I I just put a blog entry, which is just a file on both branches. Seems I have to learn cherry-picking and merging only some changes. + +Still I am duplicating files then and when I edit one file I have to think to also edit the other one or merge the change to it. I thought of a way to tag a blog entry on which site it should appear. And then I just have to edit one file and contents changes on all sites that share it. + +But then I possibly can do some master blog / shared content branch, so that shared content is only stored once. Then I need to find a way to automatically replicate the changes there to all sites it belongs too. But how do I store it. + +I also thought about just using symlinks for files. Can I have two sites in one repository and symlink shared files stuff around? I know bzr can version control symlinks. + +Hmmm, I think I better read more about branching, cherry-picking and merging before I proceed. I used bzr and git, but from the user interface side of things prefer bzr, which should be fast enough for this use case. +"""]] -- cgit v1.2.3 From 0ce0c86c298f1746fe1d7856bcaa5323c73d7b29 Mon Sep 17 00:00:00 2001 From: "http://claimid.com/helios" Date: Sun, 15 Aug 2010 17:22:40 +0000 Subject: --- doc/forum/editing_a_comment.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/editing_a_comment.mdwn (limited to 'doc') diff --git a/doc/forum/editing_a_comment.mdwn b/doc/forum/editing_a_comment.mdwn new file mode 100644 index 000000000..8bddab3fb --- /dev/null +++ b/doc/forum/editing_a_comment.mdwn @@ -0,0 +1 @@ +Is it possible to edit a comment? I did not find any button for it. -- cgit v1.2.3 From 949a1edac722577d2df9b99428d8fa1e04d37116 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawndltpDNFSfEZBR_TIcjeDQRkuuyT1e_3o" Date: Sun, 15 Aug 2010 21:39:27 +0000 Subject: --- doc/plugins/filecheck/discussion.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'doc') diff --git a/doc/plugins/filecheck/discussion.mdwn b/doc/plugins/filecheck/discussion.mdwn index 6ef780772..f3f3c4ffd 100644 --- a/doc/plugins/filecheck/discussion.mdwn +++ b/doc/plugins/filecheck/discussion.mdwn @@ -69,3 +69,17 @@ Boris + +>> Thanks a lot - looking forward to [[todo/generic_insert_links]] - I am using the [[ikiwiki/directive/template]] variant also adding a name vaiable, it looks like this and is working fine: + +
    +
  • + +
    • +
+ +>> Calling it: + + \[[!template id=embedmedia.tmpl file=../Tinas_Gonna_Have_A_Baby.mp3 name="Tina's Gonna Have A Baby" ]] + +>> BTW your Flattr button doesn't seem to work properly - or it is Flattr itself that doesn't- clicking it won't let ikiwiki show up on my Dashboard. -- cgit v1.2.3 From 40fcc3868c0521704e465fc22e44f4c71dd85b86 Mon Sep 17 00:00:00 2001 From: "http://oblomov.myopenid.com/" Date: Tue, 17 Aug 2010 07:35:18 +0000 Subject: patch to provide relative font sizes in default CSS --- doc/bugs/absolute_sizes_in_default_CSS.mdwn | 37 +++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 doc/bugs/absolute_sizes_in_default_CSS.mdwn (limited to 'doc') diff --git a/doc/bugs/absolute_sizes_in_default_CSS.mdwn b/doc/bugs/absolute_sizes_in_default_CSS.mdwn new file mode 100644 index 000000000..e2d4e611c --- /dev/null +++ b/doc/bugs/absolute_sizes_in_default_CSS.mdwn @@ -0,0 +1,37 @@ +While toying around with some font sizes on my persona ikiwiki I discovered that some font sizes in the default CSS are fixed rather than relative. Here's a git patch that replaces them with relative font sizes (assuming the default 12pt/16px base font size recommended by the W3C): + +
+From 01c14db255bbb727d8dd1e72c3f6f2f25f07e757 Mon Sep 17 00:00:00 2001
+From: Giuseppe Bilotta 
+Date: Tue, 17 Aug 2010 00:48:24 +0200
+Subject: [PATCH] Use relative font-sizes
+
+---
+ doc/style.css |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/style.css b/doc/style.css
+index 66d962b..fa4b2a3 100644
+--- a/doc/style.css
++++ b/doc/style.css
+@@ -14,7 +14,7 @@ nav {
+ 
+ .header {
+ 	margin: 0;
+-	font-size: 22px;
++	font-size: 140%;
+ 	font-weight: bold;
+ 	line-height: 1em;
+ 	display: block;
+@@ -22,7 +22,7 @@ nav {
+ 
+ .inlineheader .author {
+ 	margin: 0;
+-	font-size: 18px;
++	font-size: 112%;
+ 	font-weight: bold;
+ 	display: block;
+ }
+-- 
+1.7.2.rc0.231.gc73d
+
-- cgit v1.2.3 From ed80e02c06c0838dcf205378e1dcaa5f1076c278 Mon Sep 17 00:00:00 2001 From: "http://oblomov.myopenid.com/" Date: Tue, 17 Aug 2010 07:37:01 +0000 Subject: forgot to escape the <> chars in the format-patch output --- doc/bugs/absolute_sizes_in_default_CSS.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/bugs/absolute_sizes_in_default_CSS.mdwn b/doc/bugs/absolute_sizes_in_default_CSS.mdwn index e2d4e611c..5cf70d6ee 100644 --- a/doc/bugs/absolute_sizes_in_default_CSS.mdwn +++ b/doc/bugs/absolute_sizes_in_default_CSS.mdwn @@ -2,7 +2,7 @@ While toying around with some font sizes on my persona ikiwiki I discovered that 
 From 01c14db255bbb727d8dd1e72c3f6f2f25f07e757 Mon Sep 17 00:00:00 2001
-From: Giuseppe Bilotta 
+From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
 Date: Tue, 17 Aug 2010 00:48:24 +0200
 Subject: [PATCH] Use relative font-sizes
 
-- 
cgit v1.2.3


From 0506be0d6e489b3585233aa6d9d2a48e8da76ee7 Mon Sep 17 00:00:00 2001
From: Nick 
Date: Tue, 17 Aug 2010 11:09:40 +0000
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index cbef5394e..f6d8ac440 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -46,6 +46,7 @@ Bulleted list
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * 
 * [GNU](http://www.gnu.org/)
+* 
 
 ----
 
-- 
cgit v1.2.3


From 8b31418005a193af17a9b4315d3b8e5435eb90a7 Mon Sep 17 00:00:00 2001
From: Nick 
Date: Tue, 17 Aug 2010 11:10:16 +0000
Subject:

---
 doc/sandbox.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index f6d8ac440..364e3d4de 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -46,7 +46,7 @@ Bulleted list
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * 
 * [GNU](http://www.gnu.org/)
-* 
+* 
 
 ----
 
-- 
cgit v1.2.3


From 93f2129072f6ee89907c97bb3ff761d51cdd49c2 Mon Sep 17 00:00:00 2001
From: Nick 
Date: Tue, 17 Aug 2010 11:10:54 +0000
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 364e3d4de..01308dae4 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -48,6 +48,7 @@ Bulleted list
 * [GNU](http://www.gnu.org/)
 * 
 
+
 ----
 
 This **SandBox** is also a [[blog]]!
-- 
cgit v1.2.3


From e9133cb2e605e4197856cb844cd7ed2272df43fd Mon Sep 17 00:00:00 2001
From: "http://jblevins.org/" 
Date: Tue, 17 Aug 2010 12:56:46 +0000
Subject: Update URL

---
 doc/todo/Option_to_make_title_an_h1__63__.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/todo/Option_to_make_title_an_h1__63__.mdwn b/doc/todo/Option_to_make_title_an_h1__63__.mdwn
index f4023d6dd..8345cd010 100644
--- a/doc/todo/Option_to_make_title_an_h1__63__.mdwn
+++ b/doc/todo/Option_to_make_title_an_h1__63__.mdwn
@@ -11,4 +11,4 @@ Currently, the page title (either the name of the page or the title specified wi
 > latter, making `#` (only when on the first line) set the page title, removing it from
 > the page body. --[[JasonBlevins]], October 22, 2008
 
- [h1title]: http://code.jblevins.org/ikiwiki/plugins.git/plain/h1title.pm
+ [h1title]: http://jblevins.org/git/ikiwiki/plugins.git/plain/h1title.pm
-- 
cgit v1.2.3


From 20ecef4d024f751481645db3aa68d098e1251b19 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Tue, 17 Aug 2010 16:37:48 -0400
Subject: style.css: Use relative, not absolute font sizes. Thanks, Giuseppe
 Bilotta.

---
 debian/changelog                            | 1 +
 doc/bugs/absolute_sizes_in_default_CSS.mdwn | 2 ++
 doc/style.css                               | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index cbd7e7254..8fee36b98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low
   * openid: Syntax tweak to the javascript code to make it work with MSIE 7
     (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting
     the bug and providing access to debug it.
+  * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta.
 
  -- Joey Hess   Sun, 15 Aug 2010 11:45:48 -0400
 
diff --git a/doc/bugs/absolute_sizes_in_default_CSS.mdwn b/doc/bugs/absolute_sizes_in_default_CSS.mdwn
index 5cf70d6ee..bb3c0c7a0 100644
--- a/doc/bugs/absolute_sizes_in_default_CSS.mdwn
+++ b/doc/bugs/absolute_sizes_in_default_CSS.mdwn
@@ -1,5 +1,7 @@
 While toying around with some font sizes on my persona ikiwiki I discovered that some font sizes in the default CSS are fixed rather than relative. Here's a git patch that replaces them with relative font sizes (assuming the default 12pt/16px base font size recommended by the W3C):
 
+[[done]] --[[Joey]] 
+
 
 From 01c14db255bbb727d8dd1e72c3f6f2f25f07e757 Mon Sep 17 00:00:00 2001
 From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
diff --git a/doc/style.css b/doc/style.css
index 66d962bd6..fa4b2a38a 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -14,7 +14,7 @@ nav {
 
 .header {
 	margin: 0;
-	font-size: 22px;
+	font-size: 140%;
 	font-weight: bold;
 	line-height: 1em;
 	display: block;
@@ -22,7 +22,7 @@ nav {
 
 .inlineheader .author {
 	margin: 0;
-	font-size: 18px;
+	font-size: 112%;
 	font-weight: bold;
 	display: block;
 }
-- 
cgit v1.2.3