From f995a7bea39087e4eb1dc3512b23bff060a2f023 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Feb 2012 13:22:02 -0400 Subject: [PATCH 01/63] response --- ...mmend_libtext-markdown-discount_instead_of_depending.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/todo/recommend_libtext-markdown-discount_instead_of_depending.mdwn b/doc/todo/recommend_libtext-markdown-discount_instead_of_depending.mdwn index 3c1446920..bb953ef8d 100644 --- a/doc/todo/recommend_libtext-markdown-discount_instead_of_depending.mdwn +++ b/doc/todo/recommend_libtext-markdown-discount_instead_of_depending.mdwn @@ -18,3 +18,8 @@ installable on a wheezy host. -- [[Jon]] >> not installable on *squeeze*, which is what I care about, rather than >> *wheezy*. Someone needs to backport `libtext-markdown-discount` I >> guess. — [[Jon]] + +>>> For squeeze, it will be appropriate for an ikiwiki backport to +>>> still depend on the old markdown. Although a discount backport would be +>>> nice! I don't want the current ikiwiki to be held back by requirement +>>> that it be installable as-is on squeeze. --[[Joey]] From 087a9d93c29e4d6bb03ceb4e555470382ac022d9 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Tue, 7 Feb 2012 15:58:10 -0400 Subject: [PATCH 02/63] --- doc/forum/Problem_with_gitweb.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/forum/Problem_with_gitweb.mdwn diff --git a/doc/forum/Problem_with_gitweb.mdwn b/doc/forum/Problem_with_gitweb.mdwn new file mode 100644 index 000000000..98a7f39a3 --- /dev/null +++ b/doc/forum/Problem_with_gitweb.mdwn @@ -0,0 +1,3 @@ +I use gitweb to display the pagehistories of my local ikiwiki. However since a few weeks it doesn't work anymore and displays just: 404 - No such project. I don't remember that I changed something with my wiki. Any ideas how to fix this? I guess that it could be a permission problem, however I don't really know which permissions are important in this case. + + From ea7e0b77f22d78f1e945b921d68802d916674b51 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnp4lzWSX1pvSpwAoboehP3SSbmbQESe80" Date: Wed, 8 Feb 2012 00:54:22 -0400 Subject: [PATCH 03/63] Added a comment: I'm trying to use OpenID without success --- ..._f581afcdb4481ea5d65bcc33bdbab99a._comment | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 doc/forum/OpenID_not_working___47___where_to_define_wiki__39__s_ID__63__/comment_3_f581afcdb4481ea5d65bcc33bdbab99a._comment diff --git a/doc/forum/OpenID_not_working___47___where_to_define_wiki__39__s_ID__63__/comment_3_f581afcdb4481ea5d65bcc33bdbab99a._comment b/doc/forum/OpenID_not_working___47___where_to_define_wiki__39__s_ID__63__/comment_3_f581afcdb4481ea5d65bcc33bdbab99a._comment new file mode 100644 index 000000000..1ac15d74c --- /dev/null +++ b/doc/forum/OpenID_not_working___47___where_to_define_wiki__39__s_ID__63__/comment_3_f581afcdb4481ea5d65bcc33bdbab99a._comment @@ -0,0 +1,25 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnp4lzWSX1pvSpwAoboehP3SSbmbQESe80" + nickname="Felipe Augusto" + subject="I'm trying to use OpenID without success" + date="2012-02-08T04:54:22Z" + content=""" +I'm using ikiwiki package from Debian squeeze and I can't seem +to be able to make OpenID work. It's a blog and when I try to +add a comment and click on SignIn, I'm redirected to + +>http://my.site/ikiwiki.cgi?do=commentsignin + + +Once I click on Google logo/icon, it takes a while before showing + +>no_identity_server: The provided URL doesn't declare its OpenID identity server. + + +It's not clear for me what's wrong or if I should add meta openid in some page. +This is the version of libnet-openid-consumer-perl: 1.03-1. It also fails for +Yahoo! and other providers, we never get redirected to Google/Yahoo! or other +verification page. + +Thank you in advance! +"""]] From 38ff2b44c689e94cd0976620b0f5db8ba53bf225 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 8 Feb 2012 16:07:20 -0400 Subject: [PATCH 04/63] Fix a snail mail address. Closes: #659158 --- IkiWiki/Plugin/calendar.pm | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index fc497b3c7..d443198f6 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. require 5.002; package IkiWiki::Plugin::calendar; diff --git a/debian/changelog b/debian/changelog index c8db76966..7eb34f8fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20120203) UNRELEASED; urgency=low + + * Fix a snail mail address. Closes: #659158 + + -- Joey Hess Wed, 08 Feb 2012 16:07:00 -0400 + ikiwiki (3.20120202) unstable; urgency=low * mdwn: Added nodiscount setting, which can be used to avoid using the From a82afbf488fafaebead4a32ad1eae5ccf2c08d1a Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnjRHxyH6FSS25h_6x3YYbZ6SaVsozC3Ts" Date: Thu, 9 Feb 2012 04:01:09 -0400 Subject: [PATCH 05/63] rename bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn to bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn --- ..._SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn} | 0 .../discussion.mdwn | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename doc/bugs/{Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn => __91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn} (100%) rename doc/bugs/{Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8 => __91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8}/discussion.mdwn (100%) diff --git a/doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn b/doc/bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn similarity index 100% rename from doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn rename to doc/bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn diff --git a/doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8/discussion.mdwn b/doc/bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8/discussion.mdwn similarity index 100% rename from doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8/discussion.mdwn rename to doc/bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8/discussion.mdwn From 8be7c6137fd98ba39e4517420ef3950960717d34 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnjRHxyH6FSS25h_6x3YYbZ6SaVsozC3Ts" Date: Thu, 9 Feb 2012 04:01:48 -0400 Subject: [PATCH 06/63] --- ...andoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/doc/bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn b/doc/bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn index ab4dc8953..c80c9151a 100644 --- a/doc/bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn +++ b/doc/bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn @@ -1,13 +1,6 @@ -I'm writing [pykipandoc plugin](https://github.com/temmen/pykipandoc/blob/master/pykipandoc), that work at least as pandoc-iki. +import os +os.environment['LANG'] = 'it_IT.utf-8' -It works in compile mode, editing pages in web mode however results in +Suona plausibile? - pandoc: : hGetContents: invalid argument (Invalid or incomplete multibyte or wide character) - -I think that is because HTTP POST request building editpage doesn't correctly manage utf-8 contents: see strange chars in this form-data name="editcontent"? - - This principle has guided pandoc’s decisions in finding syntax for tables, footnotes, and other extensions. - -Please, any advice can be sent to [GitHub pykipandoc](https://github.com/temmen/pykipandoc) (some other info there on the [README](https://github.com/temmen/pykipandoc/blob/master/README.md)) and to [temmenel(at)gmail(dot)com](mailto:temmenel@gmail.com). - -¡Thank you all! +[GitHub pykipandoc](https://github.com/temmen/pykipandoc) -- Temmen From 4a6450ca73ed20848cc2d988f42ccbb3ec130e93 Mon Sep 17 00:00:00 2001 From: "http://cgray.myopenid.com/" Date: Thu, 9 Feb 2012 15:01:32 -0400 Subject: [PATCH 07/63] --- doc/git.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/git.mdwn b/doc/git.mdwn index 2e58c6992..c9f16a214 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -74,6 +74,7 @@ think about merging them. This is recommended. :-) * nezmer `git://gitorious.org/ikiwiki-nezmer/ikiwiki-nezmer.git` * [[yds]] `git://github.com/yds/ikiwiki.git` * [[pelle]] `git://github.com/hemmop/ikiwiki.git` +* [[cgray]] `git://github.com/chrismgray/ikiwiki.git` ## branches From 2717d9774a2214f936af4e9e74f10181e6a9c027 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 9 Feb 2012 16:04:16 -0400 Subject: [PATCH 08/63] close --- ...VED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn b/doc/bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn index c80c9151a..7282a71b8 100644 --- a/doc/bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn +++ b/doc/bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn @@ -4,3 +4,8 @@ os.environment['LANG'] = 'it_IT.utf-8' Suona plausibile? [GitHub pykipandoc](https://github.com/temmen/pykipandoc) -- Temmen + +> The place to put contrib plugins is in [[plugins/contrib]]. +> +> Closing this bug report as whatever it is that was fixed is apparently not an ikiwiki +> bug.. I guess. [[done]] --[[Joey]] From ddea0488e98232c251a9624bdcb2e46a8e9d2d93 Mon Sep 17 00:00:00 2001 From: "http://cgray.myopenid.com/" Date: Thu, 9 Feb 2012 22:34:45 -0400 Subject: [PATCH 09/63] Easier if I go by my github name --- doc/git.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/git.mdwn b/doc/git.mdwn index c9f16a214..b8bf501c6 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -74,7 +74,7 @@ think about merging them. This is recommended. :-) * nezmer `git://gitorious.org/ikiwiki-nezmer/ikiwiki-nezmer.git` * [[yds]] `git://github.com/yds/ikiwiki.git` * [[pelle]] `git://github.com/hemmop/ikiwiki.git` -* [[cgray]] `git://github.com/chrismgray/ikiwiki.git` +* [[chrismgray]] `git://github.com/chrismgray/ikiwiki.git` ## branches From 1a163a568ca755749cfba74f3b17a6ef1b8ba504 Mon Sep 17 00:00:00 2001 From: "http://cgray.myopenid.com/" Date: Thu, 9 Feb 2012 22:38:20 -0400 Subject: [PATCH 10/63] --- ...be_more_selective_about_running_hooks.mdwn | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/todo/be_more_selective_about_running_hooks.mdwn diff --git a/doc/todo/be_more_selective_about_running_hooks.mdwn b/doc/todo/be_more_selective_about_running_hooks.mdwn new file mode 100644 index 000000000..0c8e0b090 --- /dev/null +++ b/doc/todo/be_more_selective_about_running_hooks.mdwn @@ -0,0 +1,20 @@ +[[!template id=gitbranch branch=chrismgray/exclusive-hooks author="[[chrismgray]]"]] + +Sometimes plugins register a function with `hook`, but they only want +the function called with the content that they know how to deal with. +Normally, this means that they call `pagetype` first thing in the +function, determine if they know how to deal with the content, and +only do anything if they do. + +This is a bit wasteful in itself, but for external plugins, it's +really bad. For functions like `scan` and `linkify`, where the entire +page is sent back and forth over `stdout` and `stdin`, it really slows +things down. + +Thus, I propose that there be a new optional parameter to `hook` that +tells it that the function should only be called for files whose type +is the same as the id of the plugin calling `hook`. I have called +this parameter `exclusive` in my branch, but this might not be the +best name. + +[[!tag patch]] From 53276c4d674305cd00b1865c5ef719654e3cab5b Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Fri, 10 Feb 2012 01:33:46 -0400 Subject: [PATCH 11/63] hmmmm --- doc/todo/be_more_selective_about_running_hooks.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/todo/be_more_selective_about_running_hooks.mdwn b/doc/todo/be_more_selective_about_running_hooks.mdwn index 0c8e0b090..b57bd5c72 100644 --- a/doc/todo/be_more_selective_about_running_hooks.mdwn +++ b/doc/todo/be_more_selective_about_running_hooks.mdwn @@ -18,3 +18,7 @@ this parameter `exclusive` in my branch, but this might not be the best name. [[!tag patch]] + +> It's an interesting idea, but it might be more useful if it was more generalized, say, by making it a filter, where the parameter is a regexp. +> +> --[[KathrynAndersen]] From 68717497d3eb7a024ea0f48b60ddae98caccd81b Mon Sep 17 00:00:00 2001 From: "http://cgray.myopenid.com/" Date: Fri, 10 Feb 2012 11:16:07 -0400 Subject: [PATCH 12/63] --- doc/users/chrismgray.mdwn | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/users/chrismgray.mdwn diff --git a/doc/users/chrismgray.mdwn b/doc/users/chrismgray.mdwn new file mode 100644 index 000000000..b0084830d --- /dev/null +++ b/doc/users/chrismgray.mdwn @@ -0,0 +1,4 @@ +I'm Chris Gray. I have an ikiwiki-based blog at +[[http://chrismgray.github.com]]. I wrote a plugin for +[[org-mode|todo/org_mode]] files that is probably the first ikiwiki +plugin written mostly in emacs lisp. From 8f8e7f112f0c614c42c261a5fae70efd538795e6 Mon Sep 17 00:00:00 2001 From: "http://cgray.myopenid.com/" Date: Fri, 10 Feb 2012 11:19:31 -0400 Subject: [PATCH 13/63] --- doc/todo/be_more_selective_about_running_hooks.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/todo/be_more_selective_about_running_hooks.mdwn b/doc/todo/be_more_selective_about_running_hooks.mdwn index b57bd5c72..d9fefb981 100644 --- a/doc/todo/be_more_selective_about_running_hooks.mdwn +++ b/doc/todo/be_more_selective_about_running_hooks.mdwn @@ -22,3 +22,7 @@ best name. > It's an interesting idea, but it might be more useful if it was more generalized, say, by making it a filter, where the parameter is a regexp. > > --[[KathrynAndersen]] + +>> Would it make more sense as a pagespec? That might be a bit more hard to implement, but would certainly fix the naming issue. +>> +>> --[[chrismgray]] From 63494cff898427a5bbe1b044a4600ba46c368c8e Mon Sep 17 00:00:00 2001 From: "http://jamestechnotes.com/" Date: Fri, 10 Feb 2012 12:38:01 -0400 Subject: [PATCH 14/63] --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 96b94a163..4d7df7501 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -172,3 +172,4 @@ Personal sites and blogs * [SolderPad Documentation](http://docs.solderpad.com) * various sub-domains at kisikew.org ([example](https://portal.kisikew.org/)) * [Paul Elms](http://paul.elms.pro) Personal site and blog in russian. +* [James' Tech Notes](http://jamestechnotes.com) My technical notes, blog, wiki, personal site. From f1cee65538923b832cdebfabfd41e9f2cbbc1491 Mon Sep 17 00:00:00 2001 From: JoshTriplett Date: Fri, 10 Feb 2012 12:43:29 -0400 Subject: [PATCH 15/63] Perl plugins for a Haskell program? --- doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn index b6495194a..e19ceaa8f 100644 --- a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn +++ b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn @@ -55,3 +55,7 @@ href="http://jaspervdj.be/hakyll">Hakyll? >> dependency stuff. -- [[tychoish]] >>> (nods) Which is why I suggested it. I'm not sure whether it would be easier to "bolt on" those things than static compilation, but it could be worth looking at, at least. -- [[KathrynAndersen]] + +----- + +Rather than coding plugins for the Perl ikiwiki in Haskell, I wonder how easily a Haskell ikiwiki could still support plugins written in Perl? The (old and apparently stale) [HsPerl5](http://hackage.haskell.org/package/HsPerl5) package might provide a helpful starting point there. -- [[JoshTriplett]] From 204d29d9253d803fb1d03415b3f9fecbec3c82f6 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Fri, 10 Feb 2012 20:49:30 -0400 Subject: [PATCH 16/63] hmmm again --- doc/todo/be_more_selective_about_running_hooks.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/be_more_selective_about_running_hooks.mdwn b/doc/todo/be_more_selective_about_running_hooks.mdwn index d9fefb981..8c47d4e5f 100644 --- a/doc/todo/be_more_selective_about_running_hooks.mdwn +++ b/doc/todo/be_more_selective_about_running_hooks.mdwn @@ -26,3 +26,5 @@ best name. >> Would it make more sense as a pagespec? That might be a bit more hard to implement, but would certainly fix the naming issue. >> >> --[[chrismgray]] + +>>> Considering where it would be called, a pagespec might be overkill. --[[KathrynAndersen]] From e3304d234d59a5124ec94ea91161a80cfd3078e0 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmUWmB1M35_jviFvGPYDIH-a-_Al-7OrXM" Date: Mon, 13 Feb 2012 10:14:50 -0400 Subject: [PATCH 17/63] Change suggestion to man page. --- doc/ikiwiki-calendar/discussion.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/ikiwiki-calendar/discussion.mdwn diff --git a/doc/ikiwiki-calendar/discussion.mdwn b/doc/ikiwiki-calendar/discussion.mdwn new file mode 100644 index 000000000..0fa062413 --- /dev/null +++ b/doc/ikiwiki-calendar/discussion.mdwn @@ -0,0 +1,11 @@ +Suggestion to change + + 0 0 * * * ikiwiki-calendar ~/ikiwiki.setup "posts/* and !*/Discussion" + +to + + 0 0 * * * ikiwiki-calendar ~/ikiwiki.setup 'posts/* and !*/Discussion' + +I ran into (for me) unexpected behaviour with double quotes, since when I tried it in the interactive shell, the "!" made it fail ([history expansion](http://mywiki.wooledge.org/BashPitfalls#echo_.22Hello_World.21.22)). I thought "aha, it should be escaped!", did so, and did not get any error messages, but it no longer functioned as intended (as per the earlier linked page). + +The latter line will work everywhere, not just in environments without history expansion. I think trying a command manually before putting it into crontab is common, and this would avoid the possible user issue I ran into. From 303854564e5660b9ab00092b468039aeed641b81 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Feb 2012 11:58:34 -0400 Subject: [PATCH 18/63] response --- ...be_more_selective_about_running_hooks.mdwn | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/doc/todo/be_more_selective_about_running_hooks.mdwn b/doc/todo/be_more_selective_about_running_hooks.mdwn index 8c47d4e5f..429647712 100644 --- a/doc/todo/be_more_selective_about_running_hooks.mdwn +++ b/doc/todo/be_more_selective_about_running_hooks.mdwn @@ -6,6 +6,12 @@ Normally, this means that they call `pagetype` first thing in the function, determine if they know how to deal with the content, and only do anything if they do. +> So, I can't find any plugins shipped with ikiwiki that actually do that. +> Scan hooks are only ever passed the content of actual wiki pages, and +> so unless a scan hook cares whether a page is written in markdown or +> something else, it has no reason to care what the pagetype is. (Same for +> linkify.) --[[Joey]] + This is a bit wasteful in itself, but for external plugins, it's really bad. For functions like `scan` and `linkify`, where the entire page is sent back and forth over `stdout` and `stdin`, it really slows @@ -19,12 +25,30 @@ best name. [[!tag patch]] -> It's an interesting idea, but it might be more useful if it was more generalized, say, by making it a filter, where the parameter is a regexp. +> It's an interesting idea, but it might be more useful if it was more +> generalized, say, by making it a filter, where the parameter is a regexp. > > --[[KathrynAndersen]] ->> Would it make more sense as a pagespec? That might be a bit more hard to implement, but would certainly fix the naming issue. +>> Would it make more sense as a pagespec? That might be a bit more hard +>> to implement, but would certainly fix the naming issue. >> >> --[[chrismgray]] >>> Considering where it would be called, a pagespec might be overkill. --[[KathrynAndersen]] + +>>>> Pagespecs have some overhead themselves. Probably less than shipping +>>>> the page content over stdio. +>>>> +>>>> Rather than putting filtering in the core of ikiwiki, I can think +>>>> of two options. One is to make the main plugin a perl plugin, and +>>>> have it call functions that are provided by another, external plugin. +>>>> This is assuming you're using the other language because something +>>>> is easy to do in it, not to avoid writing perl. +>>>> +>>>> Or, the external plugin interface could provide a version of `hook()` +>>>> that does not pass the content parameter, but saves a copy that +>>>> the plugin could request with a later rpc call. Assuming that +>>>> it's really the overhead of serializing the page content, that's +>>>> the problem, and not just the general overhead of making rpc calls +>>>> for every page.. --[[Joey]] From d09de3116fdca109468d949999985059765dfcc8 Mon Sep 17 00:00:00 2001 From: JoshTriplett Date: Mon, 13 Feb 2012 12:04:59 -0400 Subject: [PATCH 19/63] Support for BrowserID as an authentication plugin, ideally on by default. --- doc/todo/BrowserID.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/todo/BrowserID.mdwn diff --git a/doc/todo/BrowserID.mdwn b/doc/todo/BrowserID.mdwn new file mode 100644 index 000000000..aa35f6660 --- /dev/null +++ b/doc/todo/BrowserID.mdwn @@ -0,0 +1,8 @@ +Please consider providing a plugin for [BrowserID](https://browserid.org/) authentication, preferably enabled by default. + +Some additional information on BrowserID: + +- https://github.com/mozilla/browserid/wiki/How-to-Use-BrowserID-on-Your-Site +- http://identity.mozilla.com/post/7616727542/introducing-browserid-a-better-way-to-sign-in +- http://identity.mozilla.com/post/7669886219/how-browserid-differs-from-openid +- http://identity.mozilla.com/post/7899984443/privacy-and-browserid From c5ba451bb561f185577b82f736671ea9fbd56b69 Mon Sep 17 00:00:00 2001 From: JoshTriplett Date: Mon, 13 Feb 2012 12:07:00 -0400 Subject: [PATCH 20/63] Linkify URLs. --- doc/todo/BrowserID.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/todo/BrowserID.mdwn b/doc/todo/BrowserID.mdwn index aa35f6660..9340dc0f1 100644 --- a/doc/todo/BrowserID.mdwn +++ b/doc/todo/BrowserID.mdwn @@ -2,7 +2,7 @@ Please consider providing a plugin for [BrowserID](https://browserid.org/) authe Some additional information on BrowserID: -- https://github.com/mozilla/browserid/wiki/How-to-Use-BrowserID-on-Your-Site -- http://identity.mozilla.com/post/7616727542/introducing-browserid-a-better-way-to-sign-in -- http://identity.mozilla.com/post/7669886219/how-browserid-differs-from-openid -- http://identity.mozilla.com/post/7899984443/privacy-and-browserid +- +- +- +- From b514b8d2af71ca14bd0cbc895d41ed9fa30234b4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Feb 2012 12:37:08 -0400 Subject: [PATCH 21/63] response --- doc/todo/BrowserID.mdwn | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/doc/todo/BrowserID.mdwn b/doc/todo/BrowserID.mdwn index aa35f6660..f45ac34b8 100644 --- a/doc/todo/BrowserID.mdwn +++ b/doc/todo/BrowserID.mdwn @@ -6,3 +6,27 @@ Some additional information on BrowserID: - http://identity.mozilla.com/post/7616727542/introducing-browserid-a-better-way-to-sign-in - http://identity.mozilla.com/post/7669886219/how-browserid-differs-from-openid - http://identity.mozilla.com/post/7899984443/privacy-and-browserid + +> I would like to see BrowserID offered as a signin option in ikiwiki +> right next to the buttons for common openid providers. +> +> As far as implementing it goes, I don't want to rely on browserid.org. +> This means that include.js needs to be shipped with ikiwiki (or in a +> dependency in a sane world). +> +> And it means that relying on a https +> connection to browserid.org to verify the user's identity assertion +> token is out. (Well, it's probably out anyway, since it relies on https +> CA security as the only security in that part of the protocol. I'm not +> impressed by the documention using *curl* for this, which won't even +> validate the certificate AFAIK; and I don't trust https to random SPoF sites +> for security.) +> +> This seems to need an implementation, in perl or an externally callable +> program (haskell would be fine ;), +> of . +> The documentation of which is .. two cellphone snaps of a whiteboard? +> There is some kind of standalone verifier, but I have not found +> the part of the code that actually does the crypto. +> +> --[[Joey]] From b70a488b67e45ff99dfd8269cbddb5520e7d89af Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Feb 2012 12:40:54 -0400 Subject: [PATCH 22/63] remove incorrect bit --- doc/todo/BrowserID.mdwn | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/doc/todo/BrowserID.mdwn b/doc/todo/BrowserID.mdwn index f45ac34b8..aafd41275 100644 --- a/doc/todo/BrowserID.mdwn +++ b/doc/todo/BrowserID.mdwn @@ -17,10 +17,7 @@ Some additional information on BrowserID: > And it means that relying on a https > connection to browserid.org to verify the user's identity assertion > token is out. (Well, it's probably out anyway, since it relies on https -> CA security as the only security in that part of the protocol. I'm not -> impressed by the documention using *curl* for this, which won't even -> validate the certificate AFAIK; and I don't trust https to random SPoF sites -> for security.) +> CA security as the only security in that part of the protocol.) > > This seems to need an implementation, in perl or an externally callable > program (haskell would be fine ;), From 24bdab75e379c5a542d9e07bc0997ee16cef992d Mon Sep 17 00:00:00 2001 From: "http://cgray.myopenid.com/" Date: Mon, 13 Feb 2012 13:43:06 -0400 Subject: [PATCH 23/63] --- .../be_more_selective_about_running_hooks.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/todo/be_more_selective_about_running_hooks.mdwn b/doc/todo/be_more_selective_about_running_hooks.mdwn index 429647712..70a1cb7a2 100644 --- a/doc/todo/be_more_selective_about_running_hooks.mdwn +++ b/doc/todo/be_more_selective_about_running_hooks.mdwn @@ -12,6 +12,11 @@ only do anything if they do. > something else, it has no reason to care what the pagetype is. (Same for > linkify.) --[[Joey]] +>> My [[org-mode|todo/org_mode]] external plugin (which will never +>> really make sense to include with ikiwiki I think) does this. I +>> think that most plugins defining alternate wiki syntaxes would as +>> well. --[[chrismgray]] + This is a bit wasteful in itself, but for external plugins, it's really bad. For functions like `scan` and `linkify`, where the entire page is sent back and forth over `stdout` and `stdin`, it really slows @@ -52,3 +57,12 @@ best name. >>>> it's really the overhead of serializing the page content, that's >>>> the problem, and not just the general overhead of making rpc calls >>>> for every page.. --[[Joey]] + +>>>>> Since the argument to `hook` is optional, the pagespec is only +>>>>> interpreted if it is given. So there is no extra overhead +>>>>> (beyond an unused `if` branch) in 99% of the cases. +>>>>> +>>>>> Rewriting the external plugin's shim using Perl is a good idea, +>>>>> and one that I wish I had thought of earlier. On the other +>>>>> hand, it doesn't set a great precedent about the usability of +>>>>> external plugins. --[[chrismgray]] From 3d6cb667aafa175819ffcec86930eef3621c8b04 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmmty-QrKVaEh42EoB_-YkX10dUlrlitEc" Date: Thu, 16 Feb 2012 10:13:51 -0400 Subject: [PATCH 24/63] --- doc/plugins/sidebar/discussion.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/plugins/sidebar/discussion.mdwn b/doc/plugins/sidebar/discussion.mdwn index eb441529c..b9ab36fb1 100644 --- a/doc/plugins/sidebar/discussion.mdwn +++ b/doc/plugins/sidebar/discussion.mdwn @@ -3,3 +3,8 @@ I tried exactly that, namely having an inline in my sidebar to include an rss feed from some other side. I think the complete wiki rebuild should be doable every few days when a new article appears in that feed. But contrary to that warning there is no complete wiki rebuild, only the sidebar page is rebuilt by the "ikiwiki --aggregate" from cron. Is that a bug or a feature? > It's a bug, discussed in [[bugs/transitive_dependencies]]. --[[Joey]] + +I needed to include inline directives into sidebars at different site sections to generate a dynamically updated navigation - very nice when combined with toggles - and I ran into the very same problem. I tried the map directive instead, but found I wouldn't like to re-style everything and also was missing the show=title variable giving me meta titles of some pages that make use of it. Then I came across the tip to include the quick=yes variable, described thatr it wouldn't show page titles included with the meta-directive, and I thought, well if it lets me have it only this way, maybe I can restrain from using meta titles. +But to my surprise, even with the quick=yes variable included into the inline in the sidebars meta titles still are shown, which is amazing, but maybe it should be noted somewhere. One more time ikiwiki showed its bright face, thank you. + +Boris From f8e17ccc558116387dffa5d484e1503d49d03f7c Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmmty-QrKVaEh42EoB_-YkX10dUlrlitEc" Date: Thu, 16 Feb 2012 10:14:18 -0400 Subject: [PATCH 25/63] --- doc/plugins/sidebar/discussion.mdwn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/plugins/sidebar/discussion.mdwn b/doc/plugins/sidebar/discussion.mdwn index b9ab36fb1..192baa3f8 100644 --- a/doc/plugins/sidebar/discussion.mdwn +++ b/doc/plugins/sidebar/discussion.mdwn @@ -5,6 +5,4 @@ I tried exactly that, namely having an inline in my sidebar to include an rss fe > It's a bug, discussed in [[bugs/transitive_dependencies]]. --[[Joey]] I needed to include inline directives into sidebars at different site sections to generate a dynamically updated navigation - very nice when combined with toggles - and I ran into the very same problem. I tried the map directive instead, but found I wouldn't like to re-style everything and also was missing the show=title variable giving me meta titles of some pages that make use of it. Then I came across the tip to include the quick=yes variable, described thatr it wouldn't show page titles included with the meta-directive, and I thought, well if it lets me have it only this way, maybe I can restrain from using meta titles. -But to my surprise, even with the quick=yes variable included into the inline in the sidebars meta titles still are shown, which is amazing, but maybe it should be noted somewhere. One more time ikiwiki showed its bright face, thank you. - -Boris +But to my surprise, even with the quick=yes variable included into the inline in the sidebars meta titles still are shown, which is amazing, but maybe it should be noted somewhere. One more time ikiwiki showed its bright face, thank you. --Boris From ef94fa192adedd47978b4c7f8f317d343ca46913 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmmty-QrKVaEh42EoB_-YkX10dUlrlitEc" Date: Thu, 16 Feb 2012 10:17:15 -0400 Subject: [PATCH 26/63] --- doc/plugins/sidebar/discussion.mdwn | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/plugins/sidebar/discussion.mdwn b/doc/plugins/sidebar/discussion.mdwn index 192baa3f8..423ab5bbf 100644 --- a/doc/plugins/sidebar/discussion.mdwn +++ b/doc/plugins/sidebar/discussion.mdwn @@ -4,5 +4,7 @@ I tried exactly that, namely having an inline in my sidebar to include an rss fe > It's a bug, discussed in [[bugs/transitive_dependencies]]. --[[Joey]] -I needed to include inline directives into sidebars at different site sections to generate a dynamically updated navigation - very nice when combined with toggles - and I ran into the very same problem. I tried the map directive instead, but found I wouldn't like to re-style everything and also was missing the show=title variable giving me meta titles of some pages that make use of it. Then I came across the tip to include the quick=yes variable, described thatr it wouldn't show page titles included with the meta-directive, and I thought, well if it lets me have it only this way, maybe I can restrain from using meta titles. -But to my surprise, even with the quick=yes variable included into the inline in the sidebars meta titles still are shown, which is amazing, but maybe it should be noted somewhere. One more time ikiwiki showed its bright face, thank you. --Boris +I needed to include inline directives into sidebars at different site sections to generate a dynamically updated navigation - very nice when combined with toggles - and I ran into the very same problem. I tried the map directive instead, but found I wouldn't like to re-style everything and also was missing the show=title variable giving me meta titles of some pages that make use of it. + +Then I came across the tip to include the quick=yes variable with the inline directive, where it is described as not showing page titles included with the meta-directive, and I thought, well if it lets me have it only this way, maybe I can restrain from using meta titles. +But to my surprise, even with the quick=yes variable included into the inline directive in the sidebars meta titles still are shown, no more forced rebuild when editing via cgi, which is amazing, but maybe it should be noted somewhere. One more time ikiwiki showed its bright face, thank you. --Boris From c5d924c55d25440d457bde5d16ec5488536b3282 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmmty-QrKVaEh42EoB_-YkX10dUlrlitEc" Date: Thu, 16 Feb 2012 10:19:49 -0400 Subject: [PATCH 27/63] --- doc/plugins/sidebar/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/sidebar/discussion.mdwn b/doc/plugins/sidebar/discussion.mdwn index 423ab5bbf..42bc6a3e1 100644 --- a/doc/plugins/sidebar/discussion.mdwn +++ b/doc/plugins/sidebar/discussion.mdwn @@ -4,7 +4,7 @@ I tried exactly that, namely having an inline in my sidebar to include an rss fe > It's a bug, discussed in [[bugs/transitive_dependencies]]. --[[Joey]] -I needed to include inline directives into sidebars at different site sections to generate a dynamically updated navigation - very nice when combined with toggles - and I ran into the very same problem. I tried the map directive instead, but found I wouldn't like to re-style everything and also was missing the show=title variable giving me meta titles of some pages that make use of it. +I needed to include inline directives into sidebars at different site sections to generate a dynamically updated navigation - very nice when combined with toggles - and I ran into the very same problem. I tried the map directive instead, but found I wouldn't like to re-style everything and also was missing the ability to make use of the show=title variable giving me meta titles where needed without taking the cost of rebuild with every page edit. Then I came across the tip to include the quick=yes variable with the inline directive, where it is described as not showing page titles included with the meta-directive, and I thought, well if it lets me have it only this way, maybe I can restrain from using meta titles. But to my surprise, even with the quick=yes variable included into the inline directive in the sidebars meta titles still are shown, no more forced rebuild when editing via cgi, which is amazing, but maybe it should be noted somewhere. One more time ikiwiki showed its bright face, thank you. --Boris From d17cf8e658bc8ff5516446103f85dd1aff353845 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_dxcOgWQT1XNABaAjIHF3vRFSksODrW0" Date: Thu, 16 Feb 2012 12:24:10 -0400 Subject: [PATCH 28/63] fix single dash --- doc/ikiwiki-makerepo.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ikiwiki-makerepo.mdwn b/doc/ikiwiki-makerepo.mdwn index eccfb692a..928440f99 100644 --- a/doc/ikiwiki-makerepo.mdwn +++ b/doc/ikiwiki-makerepo.mdwn @@ -12,7 +12,7 @@ ikiwiki-makerepo bzr|mercurial srcdir `ikiwiki-makerepo` injects an existing `srcdir` directory, containing sources for an ikiwiki wiki, into revision control. It is rarely -run directly; consider using `ikiwiki -setup /etc/ikiwiki/wiki.setup` instead +run directly; consider using `ikiwiki --setup /etc/ikiwiki/wiki.setup` instead to set up a wiki. For git, the `repo` is created as a bare git repository, and the srcdir is From 90796a3285b9ee0cb0e678847a8b0539e8f860cf Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk-b16zEKvUn_sHxIvCoo9aj_bR9iXOJGk" Date: Thu, 16 Feb 2012 20:40:15 -0400 Subject: [PATCH 29/63] --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 4d7df7501..3bf3f3fff 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -102,6 +102,7 @@ Personal sites and blogs * [Keith Packard's homepage and blog](http://keithp.com/). * [Christian Mock's homepage](http://www.tahina.priv.at/). * [Choffee](http://choffee.co.uk/). +* [Salient Dream](http://www.salientdream.com/) All Things Strange. * [Tales from the Gryphon](http://www.golden-gryphon.com/blog/manoj/), Manoj Srivastava's free software blog. * [Proper Treatment 正當作法](http://conway.rutgers.edu/~ccshan/wiki/) * [lost scraps](http://web.mornfall.net), pages/blog of Petr Ročkai aka mornfall From 2cc07710aad89b66815ff11df52cd5f7de34baea Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk-b16zEKvUn_sHxIvCoo9aj_bR9iXOJGk" Date: Thu, 16 Feb 2012 20:41:12 -0400 Subject: [PATCH 30/63] --- doc/ikiwikiusers.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 3bf3f3fff..0e2f903e8 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -102,7 +102,6 @@ Personal sites and blogs * [Keith Packard's homepage and blog](http://keithp.com/). * [Christian Mock's homepage](http://www.tahina.priv.at/). * [Choffee](http://choffee.co.uk/). -* [Salient Dream](http://www.salientdream.com/) All Things Strange. * [Tales from the Gryphon](http://www.golden-gryphon.com/blog/manoj/), Manoj Srivastava's free software blog. * [Proper Treatment 正當作法](http://conway.rutgers.edu/~ccshan/wiki/) * [lost scraps](http://web.mornfall.net), pages/blog of Petr Ročkai aka mornfall @@ -174,3 +173,4 @@ Personal sites and blogs * various sub-domains at kisikew.org ([example](https://portal.kisikew.org/)) * [Paul Elms](http://paul.elms.pro) Personal site and blog in russian. * [James' Tech Notes](http://jamestechnotes.com) My technical notes, blog, wiki, personal site. +* [Salient Dream](http://www.salientdream.com/) All Things Strange. From f612200d8e53f3ee69e825361d6daf82ff62c7ed Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk-b16zEKvUn_sHxIvCoo9aj_bR9iXOJGk" Date: Thu, 16 Feb 2012 20:42:12 -0400 Subject: [PATCH 31/63] --- doc/ikiwikiusers.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 0e2f903e8..4695514d9 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -173,4 +173,4 @@ Personal sites and blogs * various sub-domains at kisikew.org ([example](https://portal.kisikew.org/)) * [Paul Elms](http://paul.elms.pro) Personal site and blog in russian. * [James' Tech Notes](http://jamestechnotes.com) My technical notes, blog, wiki, personal site. -* [Salient Dream](http://www.salientdream.com/) All Things Strange. +* [Salient Dream](http://www.salientdream.com/) - All Things Strange. From b92a8d4f86a4b566e2ea559e80d916acffffd554 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Thu, 16 Feb 2012 23:24:13 -0400 Subject: [PATCH 32/63] --- doc/plugins/contrib/osm.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 doc/plugins/contrib/osm.mdwn diff --git a/doc/plugins/contrib/osm.mdwn b/doc/plugins/contrib/osm.mdwn new file mode 100644 index 000000000..b15453e0c --- /dev/null +++ b/doc/plugins/contrib/osm.mdwn @@ -0,0 +1,6 @@ +Primitive Openstreetmap/Openlayers support for ikiwiki +------------------------------------------------------ + +This plugin provides simple Openstreetmap/Openlayers support for ikiwiki. It uses a static .html map and links to it, generating a CSV-style POI list. + +Plugin was originally written by [[the techno-viking|http://techno-viking.com/posts/ikiwiki-maps/]] and fixed up by [[anarcat]]. Code is available at `git://src.anarcat.ath.cx/ikiwiki-osm.git`. From f9ecc4c4c964c84fb45bd567ee3dbe8f18e40921 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Thu, 16 Feb 2012 23:32:29 -0400 Subject: [PATCH 33/63] --- doc/plugins/contrib/googlemaps.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/plugins/contrib/googlemaps.mdwn b/doc/plugins/contrib/googlemaps.mdwn index 953f296ab..9d21a6b7a 100644 --- a/doc/plugins/contrib/googlemaps.mdwn +++ b/doc/plugins/contrib/googlemaps.mdwn @@ -17,3 +17,5 @@ can be calculated automatically. It can be [found here][3]. [3]: http://www.tahina.priv.at/hacks/googlemaps.html + +See also [[plugins/contrib/osm]]. From 38526059e06f34dc03b297a598bebb33f267793c Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Thu, 16 Feb 2012 23:32:54 -0400 Subject: [PATCH 34/63] --- doc/plugins/contrib/osm.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/plugins/contrib/osm.mdwn b/doc/plugins/contrib/osm.mdwn index b15453e0c..f75cb2506 100644 --- a/doc/plugins/contrib/osm.mdwn +++ b/doc/plugins/contrib/osm.mdwn @@ -1,6 +1,12 @@ +[[!template id=plugin name=osm author="Blars Blarson"]] +[[!tag type/special-purpose todo/geotagging]] + Primitive Openstreetmap/Openlayers support for ikiwiki ------------------------------------------------------ This plugin provides simple Openstreetmap/Openlayers support for ikiwiki. It uses a static .html map and links to it, generating a CSV-style POI list. Plugin was originally written by [[the techno-viking|http://techno-viking.com/posts/ikiwiki-maps/]] and fixed up by [[anarcat]]. Code is available at `git://src.anarcat.ath.cx/ikiwiki-osm.git`. + +See also [[plugins/contrib/googlemaps]]. + From 5f4945d40f1fe6a6b7782b9444e85f139a1d9fbd Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 17 Feb 2012 02:51:56 -0400 Subject: [PATCH 35/63] update the status here, this actually works fairly well --- doc/plugins/contrib/osm.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/plugins/contrib/osm.mdwn b/doc/plugins/contrib/osm.mdwn index f75cb2506..de0623da9 100644 --- a/doc/plugins/contrib/osm.mdwn +++ b/doc/plugins/contrib/osm.mdwn @@ -1,10 +1,10 @@ -[[!template id=plugin name=osm author="Blars Blarson"]] +[[!template id=plugin name=osm author="Blars Blarson, Antoine Beaupré"]] [[!tag type/special-purpose todo/geotagging]] -Primitive Openstreetmap/Openlayers support for ikiwiki ------------------------------------------------------- +Openstreetmap/Openlayers support for ikiwiki +-------------------------------------------- -This plugin provides simple Openstreetmap/Openlayers support for ikiwiki. It uses a static .html map and links to it, generating a CSV-style POI list. +This plugin provides simple Openstreetmap/Openlayers support for ikiwiki. It can embed Openstreetmap viewports within a page or link to a bigger map that will have multiple markers, generated with a CSV-style POI list based on the different calling pages. Multiple distinct maps on a single wiki are supported. Plugin was originally written by [[the techno-viking|http://techno-viking.com/posts/ikiwiki-maps/]] and fixed up by [[anarcat]]. Code is available at `git://src.anarcat.ath.cx/ikiwiki-osm.git`. From badbe8aae3adecf4efba41dc6858b49c7fed633d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Fri, 17 Feb 2012 03:56:20 -0400 Subject: [PATCH 36/63] webmasters.stackexchange.com --- doc/todo/pdf_output.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/pdf_output.mdwn b/doc/todo/pdf_output.mdwn index 29c89e4eb..a0f324054 100644 --- a/doc/todo/pdf_output.mdwn +++ b/doc/todo/pdf_output.mdwn @@ -18,3 +18,5 @@ Note that for example dokuwiki has a [[nice plugin|http://danjer.doudouke.org/te >>>>> Have you tried running it with "verbose" turned on, and noting the output? That could give some clues. >>>>> And no, the PDFs are not placed in the source dir, only in the destination dir. >>>>> -- [[KathrynAndersen]] + +**Edit (17.02.2012)**: I have put an extended version of the question on webmasters.stackexchange: [[http://webmasters.stackexchange.com/questions/24905/run-external-application-on-markdown-source-in-ikiwiki]] , perhaps someone of the ikiwiki programmers is intersted in having this feature too... From 7bc9bc7812701d236e16f6da8b2215114a66e31c Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sat, 18 Feb 2012 13:32:26 -0400 Subject: [PATCH 37/63] note KML and GeoJSON support --- doc/plugins/contrib/osm.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/contrib/osm.mdwn b/doc/plugins/contrib/osm.mdwn index de0623da9..cee6be0c7 100644 --- a/doc/plugins/contrib/osm.mdwn +++ b/doc/plugins/contrib/osm.mdwn @@ -4,7 +4,7 @@ Openstreetmap/Openlayers support for ikiwiki -------------------------------------------- -This plugin provides simple Openstreetmap/Openlayers support for ikiwiki. It can embed Openstreetmap viewports within a page or link to a bigger map that will have multiple markers, generated with a CSV-style POI list based on the different calling pages. Multiple distinct maps on a single wiki are supported. +This plugin provides simple Openstreetmap/Openlayers support for ikiwiki. It can embed Openstreetmap viewports within a page or link to a bigger map that will have multiple markers, generated with a KML (or CSV, or GeoJSON) datafile of markers based on the different calling pages. Multiple distinct maps on a single wiki are supported. Plugin was originally written by [[the techno-viking|http://techno-viking.com/posts/ikiwiki-maps/]] and fixed up by [[anarcat]]. Code is available at `git://src.anarcat.ath.cx/ikiwiki-osm.git`. From 33e712b78e5fbb93bc0200e96d6bff6869b9856f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sun, 19 Feb 2012 20:44:23 +0100 Subject: [PATCH 38/63] Bug#660549: ikiwiki: [PATCH] openid-jquery.js: Update URL of Wordpress favicon From a3041e786fe9e09110218e83e996fe688f8376ea Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sun, 19 Feb 2012 16:05:33 +0100 Subject: [PATCH] openid-jquery.js: Update URL of Wordpress favicon The URL for the favicon for Wordpress in the OpenID login page [1] is not valid anymore and gives the following access denied error. AccessDeniedAccess DeniedC2BF55AE9F76A487FFmvol84V82UR34uxP1N7pDNGSLWS0QDtLBsP5JKj0GcU//C3jm3TftcIcGzFBbh Looking at the Wordpress site I found a different URL for the favicon [2]. The other URLs only use non-secured HTTP access and therefore I only took the http version, although I do not know about the downsides. [1] https://ddgw.s3.amazonaws.com/wordpress.org.ico [2] http://s2.wp.com/i/favicon.ico --- underlays/openid-selector/ikiwiki/openid/openid-jquery.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js index c59be1edc..056110384 100644 --- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js +++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js @@ -38,7 +38,7 @@ var providers_small = { }, wordpress: { name: 'Wordpress', - icon: 'https://ddgw.s3.amazonaws.com/wordpress.org.ico', + icon: 'https://s2.wp.com/i/favicon.ico', label: 'Enter your Wordpress.com username:', url: 'http://{username}.wordpress.com/' }, From da0df8b40fd504b4aacc842cbf41e8ff7689f340 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 19 Feb 2012 19:27:25 -0400 Subject: [PATCH 39/63] changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 7eb34f8fe..2d9ffdb85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ikiwiki (3.20120203) UNRELEASED; urgency=low * Fix a snail mail address. Closes: #659158 + * openid-jquery.js: Update URL of Wordpress favicon. Closes: #660549 -- Joey Hess Wed, 08 Feb 2012 16:07:00 -0400 From 0312eb59674272d6de05ca0d4fe0748e90fbf6f5 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sun, 19 Feb 2012 20:43:15 -0400 Subject: [PATCH 40/63] --- .../internal_definition_list_support.mdwn | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 doc/todo/internal_definition_list_support.mdwn diff --git a/doc/todo/internal_definition_list_support.mdwn b/doc/todo/internal_definition_list_support.mdwn new file mode 100644 index 000000000..4348e76f8 --- /dev/null +++ b/doc/todo/internal_definition_list_support.mdwn @@ -0,0 +1,37 @@ +While ikiwiki can support definition lists (`dl/dt/dd`) through [[multimarkdown|mdwn]], it doesn't actually /do/ anything with those valuable definitions. It would be interesting for third party plugins to have access to this stuff as a proper data structure. This is what allows MoinMoin to have plugins that collect that data across multiple pages and tabulate it, for example. + +What I am proposing here is that the [[variables exported to plugins|plugins/write/#index6h2]] be extended to include a `%dictionnaries` hash. For a markup like this: + +[[!format txt """ +Apple +: Apple is a fruit +: It's also a computer company +Orange +: Orange is a fruit +"""]] + +would result in a data structure like this: + +[[!format txt """ +%dicts = { + 'Apple' => [ "Apple is a fruit", "It's also a computer company" ], + 'Orange' => [ "Orange is a fruit" ], +} +"""]] + +Now, I know I can write myself a `format()` parser that would do this on all pages in my own plugin, but then it would need to be adapted to all markups, while markup formatters should be the ones implementing this directly, if possible. + +My first use case for this would be to extend the [[plugins/contrib/osm]] plugin to tap into those lists, so that I could have this data in the page, visible to the user: + +[[!format txt """ +Longitude +: -45.30 +Latitude +: 73.67 +"""]] + +and then reuse that data in the plugin. + +Then for us running the humongous [[koumbit wiki|https://wiki.koumbit.net/]], it is a necessary step to be able to migrate away from MoinMoin to Ikiwiki as we have a lot of pages that tabulate information like this. For example, see our [[ServerList|https://wiki.koumbit.net/ServerList]] ([[source|https://wiki.koumbit.net/ServerList?action=raw]]), being generated from pages like [[this one|https://wiki.koumbit.net/metis.koumbit.net]]. + +If there are no objections to that concept, I may try to start coding patches. Otherwise this is really just a [[wishlist]]. From 42134152faec7608c503e91199a516822aef2006 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sun, 19 Feb 2012 20:51:27 -0400 Subject: [PATCH 41/63] --- doc/plugins/contrib/osm.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/plugins/contrib/osm.mdwn b/doc/plugins/contrib/osm.mdwn index cee6be0c7..2ef20c8ab 100644 --- a/doc/plugins/contrib/osm.mdwn +++ b/doc/plugins/contrib/osm.mdwn @@ -10,3 +10,4 @@ Plugin was originally written by [[the techno-viking|http://techno-viking.com/po See also [[plugins/contrib/googlemaps]]. +This plugin would be greatly improved by [[todo/internal_definition_list_support]]. From f450b7ce99a782222545831b3280b2b3e826e573 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sun, 19 Feb 2012 21:09:40 -0400 Subject: [PATCH 42/63] link to the readme --- doc/plugins/contrib/osm.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/contrib/osm.mdwn b/doc/plugins/contrib/osm.mdwn index 2ef20c8ab..098170a1a 100644 --- a/doc/plugins/contrib/osm.mdwn +++ b/doc/plugins/contrib/osm.mdwn @@ -6,7 +6,7 @@ Openstreetmap/Openlayers support for ikiwiki This plugin provides simple Openstreetmap/Openlayers support for ikiwiki. It can embed Openstreetmap viewports within a page or link to a bigger map that will have multiple markers, generated with a KML (or CSV, or GeoJSON) datafile of markers based on the different calling pages. Multiple distinct maps on a single wiki are supported. -Plugin was originally written by [[the techno-viking|http://techno-viking.com/posts/ikiwiki-maps/]] and fixed up by [[anarcat]]. Code is available at `git://src.anarcat.ath.cx/ikiwiki-osm.git`. +Plugin was originally written by [[the techno-viking|http://techno-viking.com/posts/ikiwiki-maps/]] and fixed up by [[anarcat]]. Code is available at `git://src.anarcat.ath.cx/ikiwiki-osm.git`. See [[this page|http://anarcat.ath.cx/software/ikiwiki-osm/README]] for a more complete description. See also [[plugins/contrib/googlemaps]]. From 40ad087b339942c677728518587f99c9d3b723d1 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sun, 19 Feb 2012 21:13:16 -0400 Subject: [PATCH 43/63] --- doc/plugins/contrib/osm.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/contrib/osm.mdwn b/doc/plugins/contrib/osm.mdwn index 098170a1a..a4ddbcb37 100644 --- a/doc/plugins/contrib/osm.mdwn +++ b/doc/plugins/contrib/osm.mdwn @@ -6,7 +6,7 @@ Openstreetmap/Openlayers support for ikiwiki This plugin provides simple Openstreetmap/Openlayers support for ikiwiki. It can embed Openstreetmap viewports within a page or link to a bigger map that will have multiple markers, generated with a KML (or CSV, or GeoJSON) datafile of markers based on the different calling pages. Multiple distinct maps on a single wiki are supported. -Plugin was originally written by [[the techno-viking|http://techno-viking.com/posts/ikiwiki-maps/]] and fixed up by [[anarcat]]. Code is available at `git://src.anarcat.ath.cx/ikiwiki-osm.git`. See [[this page|http://anarcat.ath.cx/software/ikiwiki-osm/README]] for a more complete description. +Plugin was originally written by [[the techno-viking|http://techno-viking.com/posts/ikiwiki-maps/]] and fixed up by [[anarcat]]. Code is available at `git://src.anarcat.ath.cx/ikiwiki-osm.git`. See [[this page|http://anarcat.ath.cx/software/ikiwiki-osm/README]] for a more complete description and [[the Mtl-mesh wiki|http://mesh.openisp.ca/nodes/anarcat]] for a sample of what this plugin can do. See also [[plugins/contrib/googlemaps]]. From b530e8be09f9011ff058bc27a4da276905b8f583 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Sun, 19 Feb 2012 21:30:07 -0400 Subject: [PATCH 44/63] pointing out the existence of field --- doc/todo/internal_definition_list_support.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/todo/internal_definition_list_support.mdwn b/doc/todo/internal_definition_list_support.mdwn index 4348e76f8..4550e4e32 100644 --- a/doc/todo/internal_definition_list_support.mdwn +++ b/doc/todo/internal_definition_list_support.mdwn @@ -35,3 +35,6 @@ and then reuse that data in the plugin. Then for us running the humongous [[koumbit wiki|https://wiki.koumbit.net/]], it is a necessary step to be able to migrate away from MoinMoin to Ikiwiki as we have a lot of pages that tabulate information like this. For example, see our [[ServerList|https://wiki.koumbit.net/ServerList]] ([[source|https://wiki.koumbit.net/ServerList?action=raw]]), being generated from pages like [[this one|https://wiki.koumbit.net/metis.koumbit.net]]. If there are no objections to that concept, I may try to start coding patches. Otherwise this is really just a [[wishlist]]. + +> Have you looked at the [[plugins/contrib/field]] plugin? This gives you the infrastructure, and all you need is to write a plugin that parses the definition list format. Then you could use [[plugins/contrib/getfield]], [[plugins/contrib/ftemplate]] and/or [[plugins/contrib/report]] to do what you like with the data. +> --[[KathrynAndersen]] From af96c082ee556cb2e110e67f32a901bbe84b0a76 Mon Sep 17 00:00:00 2001 From: testzar Date: Mon, 20 Feb 2012 05:59:29 -0400 Subject: [PATCH 45/63] code block test --- doc/sandbox.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index c3fb32b30..be6abdbde 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -116,6 +116,13 @@ Now we try to write a "code" block starting with a hash sign $ another test +Oh, let's try to do the same thing using sane syntax instead: + +~~~ +# test 1,2,3 +$ another test +~~~ + Now let's write the same block, with a bullest list preceding it. From 950a45ec7709203716db3df0dea29fb0f236b773 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk8xAM2eNwroSSl-Pb9eqkb9apWStenU2U" Date: Mon, 20 Feb 2012 07:23:46 -0400 Subject: [PATCH 46/63] --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index be6abdbde..6d589e33b 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,7 +1,7 @@ # Sandbox [[!pagestats pages="/tags/*"]] - +ttt [[!sidebar content="dfdsfsf"" This is my custom sidebar for this page. From 0726ac642068429d86f548c66904f087f7b2ffa6 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk8xAM2eNwroSSl-Pb9eqkb9apWStenU2U" Date: Mon, 20 Feb 2012 07:24:39 -0400 Subject: [PATCH 47/63] --- doc/sandbox.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 6d589e33b..47785d0bf 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,6 +1,7 @@ # Sandbox [[!pagestats pages="/tags/*"]] +<<<<<<< HEAD ttt [[!sidebar content="dfdsfsf"" This is my custom sidebar for this page. From 045d64720475bf004fad45bbaa258b7c34984c45 Mon Sep 17 00:00:00 2001 From: spalax Date: Mon, 20 Feb 2012 17:29:42 -0400 Subject: [PATCH 48/63] Question an proposition about relevance of `ikiwiki-calendar` --- doc/ikiwiki-calendar/discussion.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/ikiwiki-calendar/discussion.mdwn b/doc/ikiwiki-calendar/discussion.mdwn index 0fa062413..1b01761c8 100644 --- a/doc/ikiwiki-calendar/discussion.mdwn +++ b/doc/ikiwiki-calendar/discussion.mdwn @@ -9,3 +9,13 @@ to I ran into (for me) unexpected behaviour with double quotes, since when I tried it in the interactive shell, the "!" made it fail ([history expansion](http://mywiki.wooledge.org/BashPitfalls#echo_.22Hello_World.21.22)). I thought "aha, it should be escaped!", did so, and did not get any error messages, but it no longer functioned as intended (as per the earlier linked page). The latter line will work everywhere, not just in environments without history expansion. I think trying a command manually before putting it into crontab is common, and this would avoid the possible user issue I ran into. + +---- + +I wonder what this program (ikiwiki-calendar) is useful for. Would not it be simpler to have the [[calendar|ikiwiki/directive/calendar]] directive generate the `archive_base/year/month.mdwn` files on the fly, as are the tag pages generated by the [[tag|plugins/tag]] plugin? This solution would have the advantage of automatically generating the right calendar pages, instead of having to tell ikiwiki-calendar which years to take into account. + +Using this solution would mean to have the pagespec stored somewhere in the configuration. But this is already the case, as the pagespec used by [[ikiwiki-calendar]] is either set in the configuration file of the wiki, or in the crontab or whatever script used to call ikiwiki-calendar. + +Having done this, the only purpose of ikiwiki-calendar would be to re-generate the wiki on a daily (or whatever frequency) basis, which can be done using ikiwiki instead of ikiwiki-calendar. + +Did I miss something? If I am right, I offer to write the necessary patch, copied and adapted from the tag plugin, to generate the pages `archive_base/year/month.mdwn` on the fly. From 29ac3084bb4ba409ba2ad695690ebcb31497cfed Mon Sep 17 00:00:00 2001 From: spalax Date: Mon, 20 Feb 2012 17:30:41 -0400 Subject: [PATCH 49/63] =?UTF-8?q?Forgot=20to=20sign=20my=20message?= =?UTF-8?q?=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/ikiwiki-calendar/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/ikiwiki-calendar/discussion.mdwn b/doc/ikiwiki-calendar/discussion.mdwn index 1b01761c8..fc80470fc 100644 --- a/doc/ikiwiki-calendar/discussion.mdwn +++ b/doc/ikiwiki-calendar/discussion.mdwn @@ -19,3 +19,5 @@ Using this solution would mean to have the pagespec stored somewhere in the conf Having done this, the only purpose of ikiwiki-calendar would be to re-generate the wiki on a daily (or whatever frequency) basis, which can be done using ikiwiki instead of ikiwiki-calendar. Did I miss something? If I am right, I offer to write the necessary patch, copied and adapted from the tag plugin, to generate the pages `archive_base/year/month.mdwn` on the fly. + +-- Spalax From 498883cc1e82dcdbeb02f6f2776461668c312957 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 21 Feb 2012 13:10:25 -0400 Subject: [PATCH 50/63] response --- doc/ikiwiki-calendar/discussion.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/doc/ikiwiki-calendar/discussion.mdwn b/doc/ikiwiki-calendar/discussion.mdwn index fc80470fc..b64321008 100644 --- a/doc/ikiwiki-calendar/discussion.mdwn +++ b/doc/ikiwiki-calendar/discussion.mdwn @@ -21,3 +21,16 @@ Having done this, the only purpose of ikiwiki-calendar would be to re-generate t Did I miss something? If I am right, I offer to write the necessary patch, copied and adapted from the tag plugin, to generate the pages `archive_base/year/month.mdwn` on the fly. -- Spalax + +> Good spotting, `ikiwiki-calendar` predates the `add_autofile` API used to +> autocreate tag pages and was bolted in as an easy way to create calendar +> pages. +> +> It would be possible to do that inside the caneldar plugin now. Although +> some command would still need to be run on a daily (or weekly, or +> monthly, or yearly..) basis to have it wake up and make the new calendar +> pages and update the displayed current day from calendar directives. +> +> That last is, arguably, the real point of running ikiwiki-calendar in +> a cron job. Of course all it really does is run `ikiwiki -setup foo +> -refresh`. --[[Joey]] From 1a7f29cab6c9090003ed76ae23e3a748d5597caf Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 21 Feb 2012 13:10:59 -0400 Subject: [PATCH 51/63] change quoting to work around some shell problem --- doc/ikiwiki-calendar.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ikiwiki-calendar.mdwn b/doc/ikiwiki-calendar.mdwn index 03cbdd86c..d311a1859 100644 --- a/doc/ikiwiki-calendar.mdwn +++ b/doc/ikiwiki-calendar.mdwn @@ -39,7 +39,7 @@ the calendars to highlight the current day. An example crontab: - 0 0 * * * ikiwiki-calendar ~/ikiwiki.setup "posts/* and !*/Discussion" + 0 0 * * * ikiwiki-calendar ~/ikiwiki.setup 'posts/* and !*/Discussion' # TEMPLATES From ee975178b8befa0bfdc866c54bc3bfb64f570be2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 21 Feb 2012 13:13:37 -0400 Subject: [PATCH 52/63] make a proper wikilink you know, backlinks are nice.. --- doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn b/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn index 51c320067..ebea43697 100644 --- a/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn +++ b/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn @@ -4,7 +4,7 @@ I'd very much like to be able to list my blog posts on a daily basis (used for l There was some effort to do this as detailed here. -[[http://ikiwiki.info/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin/]] +[[todo/Set_arbitrary_date_to_be_used_by_calendar_plugin]] I had a quick go at doing something similar on Debian Stable (Ikiwiki 3.0) but alas my Ikiwiki fu is not strong enough. From 36518a3a1110eed1d115a798048a9d8bb84b5517 Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Tue, 21 Feb 2012 13:23:00 -0400 Subject: [PATCH 53/63] Added a comment --- ...nt_4_4be39c2043821848d4b25d0bf946a718._comment | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/forum/Calendar:_listing_multiple_entries_per_day/comment_4_4be39c2043821848d4b25d0bf946a718._comment diff --git a/doc/forum/Calendar:_listing_multiple_entries_per_day/comment_4_4be39c2043821848d4b25d0bf946a718._comment b/doc/forum/Calendar:_listing_multiple_entries_per_day/comment_4_4be39c2043821848d4b25d0bf946a718._comment new file mode 100644 index 000000000..a71276d6b --- /dev/null +++ b/doc/forum/Calendar:_listing_multiple_entries_per_day/comment_4_4be39c2043821848d4b25d0bf946a718._comment @@ -0,0 +1,15 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 4" + date="2012-02-21T17:23:00Z" + content=""" +To be clear, this patch creates a `yyyy/mm/dd` file for each day, listing the posts for that day, so the calendar can link to it rather than a random single post. + +While a valid solution certainly, that's a lot of added pages! Especially a high overhead for such a minor UI point as this. + +Surely something interesting could be done with javascript or some other form of UI to make clicking on a day in a calendar that has multiple posts present a list of them? That would have essentially no overhead, since the calendar plugin already has a list of the posts made on a given day. + +Ikiwiki already does something similar to deal with the case where a page has a great many backlinks.. It makes a UI element that, if hovered over, pops up a display of all the rest. This is done quite simply in the `page.tmpl` +using the popup and balloon CSS classes. Calendar could also use this. +"""]] From 0c2841349b083b5bf549c2d1f1b44514a79b5a38 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Fri, 3 Feb 2012 11:50:45 -0500 Subject: [PATCH 54/63] Avoid a GNUism in find(1). (cherry picked from commit 9659272e25fac37f896991dab01a05b4f4c85ccb) --- Makefile.PL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.PL b/Makefile.PL index 69ba5e5ef..ef29a950c 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -75,7 +75,7 @@ underlay_install: install -d $(DESTDIR)$(PREFIX)/share/ikiwiki for dir in `cd underlays && $(FIND) . -follow -type d`; do \ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ - for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f -not -name \\*.full.js -not -name \\*.full.css`; do \ + for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f ! -name \\*.full.js ! -name \\*.full.css`; do \ cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ done; \ From 1ac2da7ffa702f96b406687c463940f599748659 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 21 Feb 2012 13:32:15 -0400 Subject: [PATCH 55/63] fix picked --- doc/bugs/find_gnuism.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/find_gnuism.mdwn b/doc/bugs/find_gnuism.mdwn index 89eee7816..65ee10657 100644 --- a/doc/bugs/find_gnuism.mdwn +++ b/doc/bugs/find_gnuism.mdwn @@ -3,3 +3,5 @@ Whoops, somehow missed a spot on the last incarnation of this branch. `find -not` doesn't work on NetBSD and `find !` runs equivalently for me. Fixed in 9659272e25fac37f896991dab01a05b4f4c85ccb. + +> [[done]] --[[Joey]] From 2805999a031556602d3fcf8cf38426b613c36842 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmKyeW2G4jjSdnL1m6kPPtAiGFUBsnYCfY" Date: Wed, 22 Feb 2012 16:13:55 -0400 Subject: [PATCH 56/63] --- ...to_add_a_mouse-over_pop-up_label_for_a_text__63__.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/How_to_add_a_mouse-over_pop-up_label_for_a_text__63__.mdwn diff --git a/doc/forum/How_to_add_a_mouse-over_pop-up_label_for_a_text__63__.mdwn b/doc/forum/How_to_add_a_mouse-over_pop-up_label_for_a_text__63__.mdwn new file mode 100644 index 000000000..cf9245404 --- /dev/null +++ b/doc/forum/How_to_add_a_mouse-over_pop-up_label_for_a_text__63__.mdwn @@ -0,0 +1,8 @@ +How to add a mouse-over pop-up label for a text? + +I'd like to have the following effect: + +when a user move the mouse arrow on top of the text, a small window will show up at the upper right of the text and the window contains some additional information about the text. + +Any idea how to achieve this? + From 64825362ad925990b979cb2813539cca9fb8eb70 Mon Sep 17 00:00:00 2001 From: bob Date: Thu, 23 Feb 2012 08:26:13 -0400 Subject: [PATCH 57/63] just for Sally --- doc/sandbox.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 47785d0bf..9e4994415 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -11,6 +11,7 @@ This is my custom sidebar for this page. [[!sidebar ]] + ## number 2 ### number 3 @@ -19,6 +20,8 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki [[!toc levels=1 startlevel=2 ]] +See, online editing :-p + Let's try this~! w00t, how does this look on the **git** end? Well, as a commit of course. From 7f2e2069a9796d4eed7d0196604e623ac4fa0cc8 Mon Sep 17 00:00:00 2001 From: bob Date: Thu, 23 Feb 2012 13:31:10 -0400 Subject: [PATCH 58/63] I'm sure I'm missing something obvious... --- doc/forum/links_to_diff_on_recentchanges__63__.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/links_to_diff_on_recentchanges__63__.mdwn diff --git a/doc/forum/links_to_diff_on_recentchanges__63__.mdwn b/doc/forum/links_to_diff_on_recentchanges__63__.mdwn new file mode 100644 index 000000000..9a8db62b9 --- /dev/null +++ b/doc/forum/links_to_diff_on_recentchanges__63__.mdwn @@ -0,0 +1 @@ +How can I get the little glasses-icon with a link to the diff on Recentchanges, please? I have git integration working nicely, and recentchangesdiff is producing diffs in the RSS feed, but I'd really like a link on the RecentChanges like you have here. From f85b348070d309f40c2f94aae75e4a374c8affb4 Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Thu, 23 Feb 2012 16:20:18 -0400 Subject: [PATCH 59/63] Added a comment --- .../comment_1_1dbc723cc2794f6d45de9cbd2fc2e0fd._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/links_to_diff_on_recentchanges__63__/comment_1_1dbc723cc2794f6d45de9cbd2fc2e0fd._comment diff --git a/doc/forum/links_to_diff_on_recentchanges__63__/comment_1_1dbc723cc2794f6d45de9cbd2fc2e0fd._comment b/doc/forum/links_to_diff_on_recentchanges__63__/comment_1_1dbc723cc2794f6d45de9cbd2fc2e0fd._comment new file mode 100644 index 000000000..a09b410b3 --- /dev/null +++ b/doc/forum/links_to_diff_on_recentchanges__63__/comment_1_1dbc723cc2794f6d45de9cbd2fc2e0fd._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 1" + date="2012-02-23T20:20:17Z" + content=""" +Set up gitweb and configure the `diffurl` in ikiwiki and the glasses will appear. +"""]] From e71642090ca335ae39aa797b9502cf960757e5bb Mon Sep 17 00:00:00 2001 From: bob Date: Fri, 24 Feb 2012 05:30:51 -0400 Subject: [PATCH 60/63] Added a comment --- ...comment_2_4349c85d92cf9c1acf2e7678371ab12a._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/links_to_diff_on_recentchanges__63__/comment_2_4349c85d92cf9c1acf2e7678371ab12a._comment diff --git a/doc/forum/links_to_diff_on_recentchanges__63__/comment_2_4349c85d92cf9c1acf2e7678371ab12a._comment b/doc/forum/links_to_diff_on_recentchanges__63__/comment_2_4349c85d92cf9c1acf2e7678371ab12a._comment new file mode 100644 index 000000000..b98172bfd --- /dev/null +++ b/doc/forum/links_to_diff_on_recentchanges__63__/comment_2_4349c85d92cf9c1acf2e7678371ab12a._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="bob" + ip="137.205.152.60" + subject="comment 2" + date="2012-02-24T09:30:50Z" + content=""" +Thanks, that was just the ticket :). My ikiwiki.setup file didn't even have a commented out diffurl in it - is there a handy list of configuration-variables somewhere? I thought the theory was that ikiwiki.setup was generated with (commented out) nearly all the config variables already mentioned? + +[FWIW, I'm using the version in Debian stable] +"""]] From 0f9cbf3ab2db47a6c3d664059d676f9c200144a4 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sat, 25 Feb 2012 15:48:06 -0400 Subject: [PATCH 61/63] create a theme market --- doc/theme_market.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/theme_market.mdwn diff --git a/doc/theme_market.mdwn b/doc/theme_market.mdwn new file mode 100644 index 000000000..06526df1a --- /dev/null +++ b/doc/theme_market.mdwn @@ -0,0 +1,11 @@ +[[!meta title="Theme Market" description="user-contributed themes for ikiwiki"]] + +This is a directory of user-contributed ikiwiki themes. For more information about themes, see the [[plugins/theme]] page. + +It is usually preferable (and more maintainable) to create a [[css]] file instead of a full theme, but sometimes the HTML produced by ikiwiki just isn't compatible with your template, so you need to modify the templates provided. This is when you need to make your own theme. + +Feel free to add your own [[theme|themes]] here, but first consider writing a simpler [[css]] file and adding it to the [[css market]] instead, or look at the [[themes]] shipped with ikiwiki. + + * **[[AntPortal theme|https://github.com/AntPortal/ikiwiked]]**, contributed by Danny, see an example [[on the Antportal wiki|https://antportal.com/wiki/]] + + * **[[Night city theme|http://anarcat.ath.cx/night_city/README/]]**, contributed by [[anarcat]], see an example [[on his homepage|http://anarcat.ath.cx/]] From e2c3579399371169b2a2635c59d3b975d80881de Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sat, 25 Feb 2012 15:48:46 -0400 Subject: [PATCH 62/63] link to the themes page --- doc/plugins/theme.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/theme.mdwn b/doc/plugins/theme.mdwn index d2c62062b..d74784ac2 100644 --- a/doc/plugins/theme.mdwn +++ b/doc/plugins/theme.mdwn @@ -5,7 +5,7 @@ The theme plugin allows easily applying a theme to your wiki, by configuring the `theme` setting in the setup file with the name of a theme to use. The themes you can choose from are all subdirectories, typically inside `/usr/share/ikiwiki/themes/`. See [[themes]] for an overview -of the themes included in ikiwiki. +of the themes included in ikiwiki and the [[theme market]] for third party themes. You can set the theme via the **theme** option in your config file (after enabling the plugin). Refresh the wiki after changing it to see the changes. From c9b1291873c55a4c9f2d2271d0c6d6536fb611fe Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sat, 25 Feb 2012 15:49:17 -0400 Subject: [PATCH 63/63] --- doc/themes/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/themes/discussion.mdwn b/doc/themes/discussion.mdwn index f2fc8cadf..ce79d0f70 100644 --- a/doc/themes/discussion.mdwn +++ b/doc/themes/discussion.mdwn @@ -5,3 +5,5 @@ I would like to contribute a theme I created and posted on github: For an example of the theme in action, see: [[https://antportal.com/wiki/]] > Shouldn't we just make people post their themes in the [[themes]] page? Or maybe we should make a [[theme market]]? --[[anarcat]] + +> I did just that. -- [[anarcat]]