From a8ded6bf1d8ac389100ac3f3c55a075065290cb1 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Wed, 25 Jan 2012 04:55:25 -0400 Subject: Fix wikipedia URL: wikipedia.org, not wikimedia.org --- doc/shortcuts.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn index ecd73f52c..07210f9bf 100644 --- a/doc/shortcuts.mdwn +++ b/doc/shortcuts.mdwn @@ -15,7 +15,7 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=archive url="http://web.archive.org/*/%S"]] * [[!shortcut name=gmap url="https://maps.google.com/maps?q=%s"]] * [[!shortcut name=gmsg url="https://groups.google.com/groups?selm=%s"]] -* [[!shortcut name=wikipedia url="https://en.wikimedia.org/wiki/%s"]] +* [[!shortcut name=wikipedia url="https://en.wikipedia.org/wiki/%s"]] * [[!shortcut name=wikitravel url="https://wikitravel.org/en/%s"]] * [[!shortcut name=wiktionary url="https://en.wiktionary.org/wiki/%s"]] * [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]] -- cgit v1.2.3 From 0d48385bd3fe77f74d9f99f464f1f231eba9a799 Mon Sep 17 00:00:00 2001 From: "http://roughnecks.myopenid.com/" Date: Wed, 25 Jan 2012 19:58:39 -0400 Subject: --- doc/ikiwikiusers.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 1fc455298..bd85d6cf8 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -164,7 +164,7 @@ Personal sites and blogs * [Richard "RichiH" Hartmann](http://richardhartmann.de/blog) - I thought I had added myself a year ago. Oups :) * [Jonas Smedegaard](http://dr.jones.dk/) multilingual "classic" website w/ blog * [Siri Reiter](http://sirireiter.dk/) portfolio website with a blog (in danish) -* [L'Altro Wiki](http://laltromondo.dynalias.net/~iki/) Tutorials, reviews, miscellaneus articles in English and Italian, from the IRC network syrolnet.org +* [L'Altro Wiki](http://laltromondo.dynalias.net/~iki/) Tutorials, reviews, miscellaneus articles in English and Italian. * [STUPiD](http://lhzhang.com/) * gregoa's [p.r. - political rants](http://info.comodo.priv.at/pr/) * [Michael Hammer](http://www.michael-hammer.at/) -- cgit v1.2.3 From 6226d1a7656954f6636932aec1f9badea582bafa Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Thu, 26 Jan 2012 21:57:21 -0400 Subject: unofficial opinion --- doc/todo/multi-thread_ikiwiki.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/todo/multi-thread_ikiwiki.mdwn b/doc/todo/multi-thread_ikiwiki.mdwn index 1494fed7a..396037fa7 100644 --- a/doc/todo/multi-thread_ikiwiki.mdwn +++ b/doc/todo/multi-thread_ikiwiki.mdwn @@ -6,3 +6,7 @@ Lots of \[[!img ]] (~2200), lots of \[[!teximg ]] (~2700). A complete rebuild ta We could use a big machine, with plenty of CPUs. Could some multi-threading support be added to ikiwiki, by forking out all the external heavy plugins (imagemagick, tex, ...) and/or by processing pages in parallel? Disclaimer: I know nothing of the Perl approach to parallel processing. + +> I agree that it would be lovely to be able to use multiple processors to speed up rebuilds on big sites (I have a big site myself), but, taking a quick look at what Perl threads entails, and taking into acount what I've seen of the code of IkiWiki, it would take a massive rewrite to make IkiWiki thread-safe - the API would have to be completely rewritten - and then more work again to introduce threading itself. So my unofficial humble opinion is that it's unlikely to be done. +> Which is a pity, and I hope I'm mistaken about it. +> --[[KathrynAndersen]] -- cgit v1.2.3 From 7bfa77380ac1fda68d224343c46b310779ce9980 Mon Sep 17 00:00:00 2001 From: tycho garen Date: Thu, 26 Jan 2012 21:28:19 -0500 Subject: comment to multi-threading discussion --- doc/todo/multi-thread_ikiwiki.mdwn | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'doc') diff --git a/doc/todo/multi-thread_ikiwiki.mdwn b/doc/todo/multi-thread_ikiwiki.mdwn index 396037fa7..3838103ff 100644 --- a/doc/todo/multi-thread_ikiwiki.mdwn +++ b/doc/todo/multi-thread_ikiwiki.mdwn @@ -10,3 +10,28 @@ Disclaimer: I know nothing of the Perl approach to parallel processing. > I agree that it would be lovely to be able to use multiple processors to speed up rebuilds on big sites (I have a big site myself), but, taking a quick look at what Perl threads entails, and taking into acount what I've seen of the code of IkiWiki, it would take a massive rewrite to make IkiWiki thread-safe - the API would have to be completely rewritten - and then more work again to introduce threading itself. So my unofficial humble opinion is that it's unlikely to be done. > Which is a pity, and I hope I'm mistaken about it. > --[[KathrynAndersen]] + +> > I have much less experience with the internals of Ikiwiki, much +> > less Multi-threading perl, but I agree that to make Ikiwiki thread +> > safe and to make the modifications to really take advantage of the +> > threads is probably beyond the realm of reasonable +> > expectations. Having said that, I wonder if there aren't ways to +> > make Ikiwiki perform better for these big cases where the only +> > option is to wait for it to grind through everything. Something +> > along the lines of doing all of the aggregation and dependency +> > heavy stuff early on, and then doing all of the page rendering +> > stuff at the end quasi-asynchronously? Or am I way off in the deep +> > end. +> > +> > From a practical perspective, it seems like these massive rebuild +> > situations represent a really small subset of ikiwiki builds. Most +> > sites are pretty small, and most sites need full rebuilds very +> > very infrequently. In that scope, 10 minute rebuilds aren't that +> > bad seeming. In terms of performance challenges, it's the one page +> > with 3-5 dependency that takes 10 seconds (say) to rebuild that's +> > a larger challenge for Ikiwiki as a whole. At the same time, I'd +> > be willing to bet that performance benefits for these really big +> > repositories for using fast disks (i.e. SSDs) could probably just +> > about meet the benefit of most of the threading/async work. +> > +> > --[[tychoish]] -- cgit v1.2.3 From a631d8b2a51de34444df5ffa89e3cb8d9678b96c Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Thu, 26 Jan 2012 23:51:04 -0400 Subject: which came first, the chicken or the egg? --- doc/todo/multi-thread_ikiwiki.mdwn | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'doc') diff --git a/doc/todo/multi-thread_ikiwiki.mdwn b/doc/todo/multi-thread_ikiwiki.mdwn index 3838103ff..0beea6fe2 100644 --- a/doc/todo/multi-thread_ikiwiki.mdwn +++ b/doc/todo/multi-thread_ikiwiki.mdwn @@ -35,3 +35,32 @@ Disclaimer: I know nothing of the Perl approach to parallel processing. > > about meet the benefit of most of the threading/async work. > > > > --[[tychoish]] + +>>> It's at this point that doing profiling for a particular site would come +>>> in, because it would depend on the site content and how exactly IkiWiki is +>>> being used as to what the performance bottlenecks would be. For the +>>> original poster, it would be image processing. For me, it tends to be +>>> PageSpecs, because I have a lot of maps and reports. + +>>> But I sincerely don't think that Disk I/O is the main bottleneck, not when +>>> the original poster mentions CPU usage, and also in my experience, I see +>>> IkiWiki chewing up 100% CPU usage one CPU, while the others remain idle. I +>>> haven't noticed slowdowns due to waiting for disk I/O, whether that be a +>>> system with HD or SSD storage. + +>>> I agree that large sites are probably not the most common use-case, but it +>>> can be a chicken-and-egg situation with large sites and complete rebuilds, +>>> since it can often be the case with a large site that rebuilding based on +>>> dependencies takes *longer* than rebuilding the site from scratch, simply +>>> because there are so many pages that are interdependent. It's not always +>>> the number of pages itself, but how the site is being used. If IkiWiki is +>>> used with the absolute minimum number of page-dependencies - that is, no +>>> maps, no sitemaps, no trails, no tags, no backlinks, no albums - then one +>>> can have a very large number of pages without having performance problems. +>>> But when you have a change in PageA affecting PageB which affects PageC, +>>> PageD, PageE and PageF, then performance can drop off horribly. And it's a +>>> trade-off, because having features that interlink pages automatically is +>>> really nifty ad useful - but they have a price. + +>>> I'm not really sure what the best solution is. Me, I profile my IkiWiki builds and try to tweak performance for them... but there's only so much I can do. +>>> --[[KathrynAndersen]] -- cgit v1.2.3 From c0eca7ddc7a382e39ef94518f18e53b23a20ece6 Mon Sep 17 00:00:00 2001 From: simonraven Date: Sat, 28 Jan 2012 05:16:52 -0400 Subject: --- doc/plugins/wmd/discussion.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'doc') diff --git a/doc/plugins/wmd/discussion.mdwn b/doc/plugins/wmd/discussion.mdwn index 42af97ec3..7246f22aa 100644 --- a/doc/plugins/wmd/discussion.mdwn +++ b/doc/plugins/wmd/discussion.mdwn @@ -59,3 +59,13 @@ copy [...] > It does not, however, have a markdown to html converter -- for > previewing it has to talk to the server with AJAX. > --[[Joey]] + +>> I've got pagedown working on my personal site (simon.kisikew.org) but I'm not sure how +>> I can inject the relevant <div>'s in the right place. They need to go **above** +>> the editing <textarea> . (Too bad about the licensing, it's rather nice.) +>> I had to do one minor change to it to have it inject itself into the page properly, +>> and that was to make this change in `Markdown.Editor.js`: +>> +>> `this.input = doc.getElementById("editcontent" + postfix);` +>> +>> on line 247. --[[simonraven]] -- cgit v1.2.3 From 4ba3c1c1048705eeb6c71d1b86528eba5cf33eb7 Mon Sep 17 00:00:00 2001 From: simonraven Date: Sat, 28 Jan 2012 06:05:44 -0400 Subject: --- doc/plugins/wmd/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/plugins/wmd/discussion.mdwn b/doc/plugins/wmd/discussion.mdwn index 7246f22aa..b57ef4057 100644 --- a/doc/plugins/wmd/discussion.mdwn +++ b/doc/plugins/wmd/discussion.mdwn @@ -69,3 +69,5 @@ copy [...] >> `this.input = doc.getElementById("editcontent" + postfix);` >> >> on line 247. --[[simonraven]] + +>>> Well, I re-figured out that I needed a TMPL_VAR FOO in the template(s). --[[simonraven]] -- cgit v1.2.3 From f312ff30d48ad2be1f83e26c580f8ae85234f5c6 Mon Sep 17 00:00:00 2001 From: zut Date: Sat, 28 Jan 2012 06:26:51 -0400 Subject: Encoding problem in french with ikiwiki-calendar --- doc/forum.mdwn | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/forum.mdwn b/doc/forum.mdwn index 19ca9ed0b..5722bef23 100644 --- a/doc/forum.mdwn +++ b/doc/forum.mdwn @@ -1,8 +1,21 @@ -This is a place for questions and discussions that don't have a Discussion -page fitting enough. Users of ikiwiki can ask questions here. +Hi! + +I'm using the ikiwiki calendar plugin. + +My website is in french (locale fr_FR.UTF-8), and calendars that are generated by the plugin makes some encoding problem (with "Février", "Août" and "Décembre". + +I don't know how the plugin generate translation for dates, but I've seen that there is no ikiwiki translation file for this. + +That's why I suppose (but I'm not sure) that it use date unix command to insert date into the html page, without replacing specials characters with html code ( "é" by "é" for example). + +Could I have forgotten some options to make it nice or not? + +Is someone could test it and verify if it works or not? + +Thanks. + +Zut -Note that for more formal bug reports or todo items, you can also edit the -[[bugs]] and [[todo]] pages. ## Current topics ## -- cgit v1.2.3 From a0fe1511ed270e2454c6043961c83b718fcaba77 Mon Sep 17 00:00:00 2001 From: zut Date: Sat, 28 Jan 2012 06:29:27 -0400 Subject: Oups --- doc/forum.mdwn | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'doc') diff --git a/doc/forum.mdwn b/doc/forum.mdwn index 5722bef23..62b62a401 100644 --- a/doc/forum.mdwn +++ b/doc/forum.mdwn @@ -1,20 +1,8 @@ -Hi! +This is a place for questions and discussions that don't have a Discussion +page fitting enough. Users of ikiwiki can ask questions here. -I'm using the ikiwiki calendar plugin. - -My website is in french (locale fr_FR.UTF-8), and calendars that are generated by the plugin makes some encoding problem (with "Février", "Août" and "Décembre". - -I don't know how the plugin generate translation for dates, but I've seen that there is no ikiwiki translation file for this. - -That's why I suppose (but I'm not sure) that it use date unix command to insert date into the html page, without replacing specials characters with html code ( "é" by "é" for example). - -Could I have forgotten some options to make it nice or not? - -Is someone could test it and verify if it works or not? - -Thanks. - -Zut +Note that for more formal bug reports or todo items, you can also edit the +[[bugs]] and [[todo]] pages. ## Current topics ## -- cgit v1.2.3 From d05463b06979cee9be5ad98d3c7807c9696e87d4 Mon Sep 17 00:00:00 2001 From: zut Date: Sat, 28 Jan 2012 06:30:47 -0400 Subject: --- ...ncoding_problem_in_french_with_ikiwiki-calendar.mdwn | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 doc/forum/Encoding_problem_in_french_with_ikiwiki-calendar.mdwn (limited to 'doc') diff --git a/doc/forum/Encoding_problem_in_french_with_ikiwiki-calendar.mdwn b/doc/forum/Encoding_problem_in_french_with_ikiwiki-calendar.mdwn new file mode 100644 index 000000000..7e21644ac --- /dev/null +++ b/doc/forum/Encoding_problem_in_french_with_ikiwiki-calendar.mdwn @@ -0,0 +1,17 @@ +Hi! + +I'm using the ikiwiki calendar plugin. + +My website is in french (locale fr_FR.UTF-8), and calendars that are generated by the plugin makes some encodi$ + +I don't know how the plugin generate translation for dates, but I've seen that there is no ikiwiki translation$ + +That's why I suppose (but I'm not sure) that it use date unix command to insert date into the html page, witho$ + +Could I have forgotten some options to make it nice or not? + +Is someone could test it and verify if it works or not? + +Thanks. + +Zut -- cgit v1.2.3 From 53872ea80b79fbc0994d3befc99266ab0f232875 Mon Sep 17 00:00:00 2001 From: seven Date: Sat, 28 Jan 2012 10:37:33 -0400 Subject: --- doc/__126__root/testblog.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/__126__root/testblog.mdwn (limited to 'doc') diff --git a/doc/__126__root/testblog.mdwn b/doc/__126__root/testblog.mdwn new file mode 100644 index 000000000..d4c298b62 --- /dev/null +++ b/doc/__126__root/testblog.mdwn @@ -0,0 +1 @@ +hi - main page or so. -- cgit v1.2.3 From cac88b738ba8de3599ae505fefb58653df5c9e31 Mon Sep 17 00:00:00 2001 From: spalax Date: Sat, 28 Jan 2012 15:09:31 -0400 Subject: New bug: encoding problem in calendar plugin --- doc/bugs/Encoding_problem_in_calendar_plugin.mdwn | 69 +++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 doc/bugs/Encoding_problem_in_calendar_plugin.mdwn (limited to 'doc') diff --git a/doc/bugs/Encoding_problem_in_calendar_plugin.mdwn b/doc/bugs/Encoding_problem_in_calendar_plugin.mdwn new file mode 100644 index 000000000..bf2cad8b7 --- /dev/null +++ b/doc/bugs/Encoding_problem_in_calendar_plugin.mdwn @@ -0,0 +1,69 @@ +Hello, + +I studied this [[guy's problem|forum/Encoding_problem_in_french_with_ikiwiki-calendar]] and I propose here a (dirty) hack to correct it. + +The problem is that in French, for example, "December" is "Décembre" which, because of encoding problems, is rendered as "Décembre". + +I managed to track this problem down to an encoding problem of `POSIX::strftime` in `Ikiwiki/Plugin/calendar.pm`. I used [[this guy's solution|http://www.perlmonks.org/?node_id=857018]] to solve the problem (the diff is printed below). + +The problem is that I do not know Perl, encoding is one of the thing I would be happy not to dive into, and it is the first time I contribute to Ikiwiki: I copied and made a few changes to the code I found without understanding it. So I am not sure that my code is neat, or works in every situation. Feel free to improve it! + +Cheers, +Louis + + + diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm + index c7d2b7c..1345939 100644 + --- a/IkiWiki/Plugin/calendar.pm + +++ b/IkiWiki/Plugin/calendar.pm + @@ -22,7 +22,14 @@ use warnings; + use strict; + use IkiWiki 3.00; + use Time::Local; + -use POSIX (); + + + +use POSIX qw/setlocale LC_TIME strftime/; + +use Encode; + +my ($strftime_encoding)= setlocale(LC_TIME)=~m#\.([^@]+)#; + +sub strftime_utf8 { + +# try to return an utf8 value from strftime + + $strftime_encoding ? Encode::decode($strftime_encoding, &strftime) : &strftime; + +} + + my $time=time; + my @now=localtime($time); + @@ -123,10 +130,10 @@ sub format_month (@) { + } + + # Find out month names for this, next, and previous months + - my $monthabbrev=POSIX::strftime("%b", @monthstart); + - my $monthname=POSIX::strftime("%B", @monthstart); + - my $pmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$pmonth-1,$pyear-1900))); + - my $nmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$nmonth-1,$nyear-1900))); + + my $monthabbrev=strftime_utf8("%b", @monthstart); + + my $monthname=strftime_utf8("%B", @monthstart); + + my $pmonthname=strftime_utf8("%B", localtime(timelocal(0,0,0,1,$pmonth-1,$pyear-1900))); + + my $nmonthname=strftime_utf8("%B", localtime(timelocal(0,0,0,1,$nmonth-1,$nyear-1900))); + + my $archivebase = 'archives'; + $archivebase = $config{archivebase} if defined $config{archivebase}; + @@ -182,7 +189,7 @@ EOF + my %dowabbr; + for my $dow ($week_start_day..$week_start_day+6) { + my @day=localtime(timelocal(0,0,0,$start_day++,$params{month}-1,$params{year}-1900)); + - my $downame = POSIX::strftime("%A", @day); + + my $downame = strftime_utf8("%A", @day); + my $dowabbr = substr($downame, 0, 1); + $downame{$dow % 7}=$downame; + $dowabbr{$dow % 7}=$dowabbr; + @@ -329,8 +336,8 @@ EOF + for (my $month = 1; $month <= 12; $month++) { + my @day=localtime(timelocal(0,0,0,15,$month-1,$params{year}-1900)); + my $murl; + - my $monthname = POSIX::strftime("%B", @day); + - my $monthabbr = POSIX::strftime("%b", @day); + + my $monthname = strftime_utf8("%B", @day); + + my $monthabbr = strftime_utf8("%b", @day); + $calendar.=qq{\t\n} if ($month % $params{months_per_row} == 1); + my $tag; + my $mtag=sprintf("%02d", $month); -- cgit v1.2.3 From b0d6eef321ac1540cd4a9fb807ab99e04f942535 Mon Sep 17 00:00:00 2001 From: spalax Date: Sat, 28 Jan 2012 15:13:43 -0400 Subject: Clearer (I hope) bug report --- doc/bugs/Encoding_problem_in_calendar_plugin.mdwn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/bugs/Encoding_problem_in_calendar_plugin.mdwn b/doc/bugs/Encoding_problem_in_calendar_plugin.mdwn index bf2cad8b7..2ccc43c03 100644 --- a/doc/bugs/Encoding_problem_in_calendar_plugin.mdwn +++ b/doc/bugs/Encoding_problem_in_calendar_plugin.mdwn @@ -2,13 +2,13 @@ Hello, I studied this [[guy's problem|forum/Encoding_problem_in_french_with_ikiwiki-calendar]] and I propose here a (dirty) hack to correct it. -The problem is that in French, for example, "December" is "Décembre" which, because of encoding problems, is rendered as "Décembre". +Bug summary: when using the [[calendar plugin|plugins/calendar]] in French (`LANG=fr_FR.UTF-8`), "Décembre" (French for "December") is rendered as "Décembre". I managed to track this problem down to an encoding problem of `POSIX::strftime` in `Ikiwiki/Plugin/calendar.pm`. I used [[this guy's solution|http://www.perlmonks.org/?node_id=857018]] to solve the problem (the diff is printed below). -The problem is that I do not know Perl, encoding is one of the thing I would be happy not to dive into, and it is the first time I contribute to Ikiwiki: I copied and made a few changes to the code I found without understanding it. So I am not sure that my code is neat, or works in every situation. Feel free to improve it! +The problem is that I do not know Perl, encoding is one of the thing I would be happy not to dive into, and it is the first time I contribute to Ikiwiki: I copied and made a few changes to the code I found without understanding it. So I am not sure that my code is neat, or works in every situation. Feel free to (help me to) improve it! -Cheers, +Cheers, Louis -- cgit v1.2.3 From a5fd547b9f996d89e56c9b17435a8b4e626eb671 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Sat, 28 Jan 2012 19:08:55 -0400 Subject: new plugin "jssearchfield" --- doc/plugins/contrib/jssearchfield.mdwn | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 doc/plugins/contrib/jssearchfield.mdwn (limited to 'doc') diff --git a/doc/plugins/contrib/jssearchfield.mdwn b/doc/plugins/contrib/jssearchfield.mdwn new file mode 100644 index 000000000..2d41ee24f --- /dev/null +++ b/doc/plugins/contrib/jssearchfield.mdwn @@ -0,0 +1,35 @@ +[[!template id=plugin name=jssearchfield author="[[rubykat]]"]] +[[!tag type/search]] +IkiWiki::Plugin::jssearchfield - Create a search form to search page field data. + +This plugin provides the [[ikiwiki/directive/jssearchfield]] directive. This +enables one to search the structured data ("field" values) of multiple pages. +This uses Javascript for the searching, which means that the entire thing +is self-contained and does not require a server or CGI access, unlike +the default IkiWiki search. This means that it can be used in places such +as ebook readers. The disadvantage is that because Javascript runs +in the browser, the searching is only as fast as the machine your browser +is running on. + +Because this uses Javascript, the htmlscrubber must be turned off for any page where the directive is used. + +This plugin depends on the [[!iki plugins/contrib/field]] plugin. + +## Activate the plugin + + # activate the plugin + add_plugins => [qw{goodstuff field jssearchfield ....}], + + # disable scrubbing for search page + htmlscrubber_skip => 'mysearchpage', + +## PREREQUISITES + + IkiWiki + IkiWiki::Plugin::field + HTML::Template + +## DOWNLOAD + +* browse at GitHub: +* git repo at git://github.com/rubykat/ikiplugins.git -- cgit v1.2.3 From beed6aaaafd716aad06bedb45784c1e015277678 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Sat, 28 Jan 2012 19:11:39 -0400 Subject: new jssearchfield directive --- .../contrib/ikiwiki/directive/jssearchfield.mdwn | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 doc/plugins/contrib/ikiwiki/directive/jssearchfield.mdwn (limited to 'doc') diff --git a/doc/plugins/contrib/ikiwiki/directive/jssearchfield.mdwn b/doc/plugins/contrib/ikiwiki/directive/jssearchfield.mdwn new file mode 100644 index 000000000..5d338901d --- /dev/null +++ b/doc/plugins/contrib/ikiwiki/directive/jssearchfield.mdwn @@ -0,0 +1,42 @@ +The `jssearchfield` directive is supplied by the [[!iki plugins/contrib/jssearchfield desc=jssearchfield]] plugin. + +This enables one to search the structured data ("field" values) of +multiple pages. A search form is constructed, and the searching is +done with Javascript, which means that the entire thing is self-contained. +This depends on the [[!iki plugins/contrib/field]] plugin. + +The pages to search are selected by a PageSpec given by the "pages" +parameter. +The fields to search are given by the "fields" parameter. By default, +the field name is given, and the user can type the search parameter for +that field into a text input field. + +## OPTIONS + +**pages**: A PageSpec to determine the pages to search through. + +**fields**: The fields to put into the search form, and to display +in the results. + +**tagfields**: Display the given fields as a list of tags that can +be selected from, rather than having a text input field. Every distinct +value of that field will be listed, so it is best used for things with +short values, like "Author" rather than long ones like "Description". +Note that "tagfields" must be a subset of "fields". + +**sort**: A SortSpec to determine how the matching pages should be sorted; this is the "default" sort order that the results will be displayed in. +The search form also gives the option of "random" sort, which will +display the search results in random order. + +## SEARCHING + +The search form that is created by this directive contains the following: + +* for each search field, a label, plus either a text input field, or a list of checkboxes with values next to them if the field is also a tagfield. Note that the lists of checkboxes are initially hidden; one must click on the triangle next to the label to display them. +* a "sort" toggle. One can select either "default" or "random". +* A "Search!" button, to trigger the search if needed (see below) +* A "Reset" button, which will clear all the values. + +The searching is dynamic. As soon as a value is changed, either by tabbing out of the text field, or by selecting or de-selecting a checkbox, the search +results are updated. Furthermore, for tagfields, the tagfield lists +themselves are updated to reflect the current search results. -- cgit v1.2.3 From e925b946c8fea0febc675fd34d1f7ec022da438e Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Sat, 28 Jan 2012 19:18:19 -0400 Subject: new plugins, anyone? --- ...w_contrib_plugins:_newpage__44___jssearchfield.mdwn | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 doc/forum/two_new_contrib_plugins:_newpage__44___jssearchfield.mdwn (limited to 'doc') diff --git a/doc/forum/two_new_contrib_plugins:_newpage__44___jssearchfield.mdwn b/doc/forum/two_new_contrib_plugins:_newpage__44___jssearchfield.mdwn new file mode 100644 index 000000000..757b58a41 --- /dev/null +++ b/doc/forum/two_new_contrib_plugins:_newpage__44___jssearchfield.mdwn @@ -0,0 +1,18 @@ +Just thought people might like to know I've added a couple more plugins to contrib. + +[[plugins/contrib/newpage]]: This plugin adds a new action to the "ACTIONS" section of a page; a button labelled "create" and an input field next to it. + +The common way of creating a new page is to edit a different page and add a link to the new page. However, there are some situations where that is a nuisance; for example, where pages are listed using a map directive. The newpage plugin enables one to simply type the name of the new page, click the "create" button, and one is then taken to the standard IkiWiki create-page form. + +[[plugins/contrib/jssearchfield]]: This plugin provides the [[plugins/contrib/ikiwiki/directive/jssearchfield]] directive. This +enables one to search the structured data ("field" values) of multiple pages. +This uses Javascript for the searching, which means that the entire thing +is self-contained and does not require a server or CGI access, unlike +the default IkiWiki search. This means that it can be used in places such +as ebook readers. The disadvantage is that because Javascript runs +in the browser, the searching is only as fast as the machine your browser +is running on. + +Because this uses Javascript, the htmlscrubber must be turned off for any page where the directive is used. + +This plugin depends on the [[!iki plugins/contrib/field]] plugin. -- cgit v1.2.3 From d96d185f24b4d63305cb4ac3aefeb98b4af78374 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Sat, 28 Jan 2012 19:19:15 -0400 Subject: why do I always forget something? --- doc/forum/two_new_contrib_plugins:_newpage__44___jssearchfield.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/forum/two_new_contrib_plugins:_newpage__44___jssearchfield.mdwn b/doc/forum/two_new_contrib_plugins:_newpage__44___jssearchfield.mdwn index 757b58a41..8293b098f 100644 --- a/doc/forum/two_new_contrib_plugins:_newpage__44___jssearchfield.mdwn +++ b/doc/forum/two_new_contrib_plugins:_newpage__44___jssearchfield.mdwn @@ -16,3 +16,5 @@ is running on. Because this uses Javascript, the htmlscrubber must be turned off for any page where the directive is used. This plugin depends on the [[!iki plugins/contrib/field]] plugin. + +--[[KathrynAndersen]] -- cgit v1.2.3 From e9c38d16fc587ccd5ab08166253afdc9363de65b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 28 Jan 2012 12:22:46 -0400 Subject: cleanup --- doc/__126__root/testblog.mdwn | 1 - 1 file changed, 1 deletion(-) delete mode 100644 doc/__126__root/testblog.mdwn (limited to 'doc') diff --git a/doc/__126__root/testblog.mdwn b/doc/__126__root/testblog.mdwn deleted file mode 100644 index d4c298b62..000000000 --- a/doc/__126__root/testblog.mdwn +++ /dev/null @@ -1 +0,0 @@ -hi - main page or so. -- cgit v1.2.3 From c6b5d3a8c9b2002575e10f0030c3476588ccb782 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 28 Jan 2012 22:50:28 -0400 Subject: response --- doc/todo/multi-thread_ikiwiki.mdwn | 23 +++++++++++++++++++++++ doc/todo/rewrite_ikiwiki_in_haskell.mdwn | 6 +----- 2 files changed, 24 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/todo/multi-thread_ikiwiki.mdwn b/doc/todo/multi-thread_ikiwiki.mdwn index 0beea6fe2..358185a22 100644 --- a/doc/todo/multi-thread_ikiwiki.mdwn +++ b/doc/todo/multi-thread_ikiwiki.mdwn @@ -64,3 +64,26 @@ Disclaimer: I know nothing of the Perl approach to parallel processing. >>> I'm not really sure what the best solution is. Me, I profile my IkiWiki builds and try to tweak performance for them... but there's only so much I can do. >>> --[[KathrynAndersen]] + +>>>> IMHO, the best way to get a multithreaded ikiwiki is to rewrite it +>>>> in haskell, using as much pure code as possible. Many avenues +>>>> then would open up to taking advantage of haskell's ability to +>>>> parallize pure code. +>>>> +>>>> With that said, we already have some nice invariants that could be +>>>> used to parallelize page builds. In particular, we know that +>>>> page A never needs state built up while building page B, for any +>>>> pages A and B that don't have a dependency relationship -- and ikiwiki +>>>> tracks such dependency relationships, although not currently in a form +>>>> that makes it very easy (or fast..) to pick out such groups of +>>>> unrelated pages. +>>>> +>>>> OTOH, there are problems.. building page A can result in changes to +>>>> ikiwiki's state; building page B can result in other changes. All +>>>> such changes would have to be made thread-safely. And would the +>>>> resulting lock contention result in a program that ran any faster +>>>> once parallelized? +>>>> +>>>> Which is why [[rewrite_ikiwiki_in_haskell]], while pretty insane, is +>>>> something I keep thinking about. If only I had a spare year.. +>>>> --[[Joey]] diff --git a/doc/todo/rewrite_ikiwiki_in_haskell.mdwn b/doc/todo/rewrite_ikiwiki_in_haskell.mdwn index 48ed744b1..e48765b0e 100644 --- a/doc/todo/rewrite_ikiwiki_in_haskell.mdwn +++ b/doc/todo/rewrite_ikiwiki_in_haskell.mdwn @@ -62,8 +62,4 @@ Some other things to be scared about: a bunch of haskell libraries. OTOH, it might be possible to build a static binary at home and upload it, thus avoiding a messy installation procedure entirely. -* I can barely code in haskell yet. I'm probably about 100x faster at - programming in perl. I need to get some more practical experience before - I´m fast and seasoned enough in haskell to attempt such a project. - (And so far, progress at learning has been slow and I have not managed - to write anything serious in haskell.) --[[Joey]] + --[[Joey]] -- cgit v1.2.3 From 2b05dc69265b4a902ea46705707e005beb2a7c47 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Sun, 29 Jan 2012 05:34:45 -0400 Subject: comment about Haskell --- doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc') diff --git a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn index 1edebe4e8..d8e0e3eea 100644 --- a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn +++ b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn @@ -12,3 +12,10 @@ Congratulations for demonstrating that April fools jokes can still be subtle >>> It doesn't really. I recently (re-)read about couchdb and thought that >>> what it was trying to do had some comparisons with the thinking going on >>> in [[todo/structured_page_data]]. -- [[Jon]] + +----- + +I'm torn about this idea, if it's actually serious. I'm very comfortable programming in Perl, and have written quite a few modules for IkiWiki, and it would be a huge pain to have to start from scratch all over again. +On the other hand, this could be a motivation for me to learn Haskell. My only encounter with Haskell has been a brief time when I was using the Xmonad window manager, but it looks like an interesting language. Functional programming is cool. + +--[[KathrynAndersen]] -- cgit v1.2.3 From a47a18cde0571146b4814b0bbf234be4f234e185 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Sun, 29 Jan 2012 05:41:47 -0400 Subject: further thoughts --- doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn index d8e0e3eea..7ac1f4b3d 100644 --- a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn +++ b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn @@ -18,4 +18,6 @@ Congratulations for demonstrating that April fools jokes can still be subtle I'm torn about this idea, if it's actually serious. I'm very comfortable programming in Perl, and have written quite a few modules for IkiWiki, and it would be a huge pain to have to start from scratch all over again. On the other hand, this could be a motivation for me to learn Haskell. My only encounter with Haskell has been a brief time when I was using the Xmonad window manager, but it looks like an interesting language. Functional programming is cool. +There are a lot of interesting plusses for Haskell you note (in the parent page), but it's true that the idea is horribly daunting (as [[Joey]] said "If only I had a spare year"). Is there any way that you could "start small"? Because nothing will ever happen if the task is too daunting to even start. + --[[KathrynAndersen]] -- cgit v1.2.3 From d98f3ef9ac5ee8595c32547b1207892d4f1f312f Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Sun, 29 Jan 2012 07:42:02 -0400 Subject: even further thought --- doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn index 7ac1f4b3d..cf2725594 100644 --- a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn +++ b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn @@ -20,4 +20,6 @@ On the other hand, this could be a motivation for me to learn Haskell. My only There are a lot of interesting plusses for Haskell you note (in the parent page), but it's true that the idea is horribly daunting (as [[Joey]] said "If only I had a spare year"). Is there any way that you could "start small"? Because nothing will ever happen if the task is too daunting to even start. +On further thought... perhaps it would be easier to fork or contribute to an existing Haskell-based wiki, such as Hakyll? + --[[KathrynAndersen]] -- cgit v1.2.3 From 24e89c6462e4f8b7183bca59d9e55789c7251320 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI" Date: Sun, 29 Jan 2012 10:25:57 -0400 Subject: functional changes are underway --- doc/rcs/cvs/discussion.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'doc') diff --git a/doc/rcs/cvs/discussion.mdwn b/doc/rcs/cvs/discussion.mdwn index 2df2c1317..2e6468dd5 100644 --- a/doc/rcs/cvs/discussion.mdwn +++ b/doc/rcs/cvs/discussion.mdwn @@ -159,3 +159,12 @@ branch harder for you to pull. Before I go writing a whole swack of test cases, could you merge my latest? Through at least ad0e56cdcaaf76bc68d1b5c56e6845307b51c44a there should be no functional change. --[[schmonz]] + +Never mind, I was able to convince myself (by cloning `origin` +afresh and merging from `schmonz/cvs`). The history is a little +gross but the before-and-after diff looks right. + +Bugs found and fixed so far: + +* Stop treating text files as binary (`-kb`) on `rcs_add()` + (ac8eab29e8394aca4c0b23a6687ec947ea1ac869) -- cgit v1.2.3 From 522b24a0f1a468c60018ddcae1c9e79f1c96d246 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Jan 2012 14:31:26 -0400 Subject: comments --- .../rewrite_ikiwiki_in_haskell/discussion.mdwn | 38 ++++++++++++++++++---- 1 file changed, 32 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn index cf2725594..733d69db0 100644 --- a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn +++ b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn @@ -15,11 +15,37 @@ Congratulations for demonstrating that April fools jokes can still be subtle ----- -I'm torn about this idea, if it's actually serious. I'm very comfortable programming in Perl, and have written quite a few modules for IkiWiki, and it would be a huge pain to have to start from scratch all over again. -On the other hand, this could be a motivation for me to learn Haskell. My only encounter with Haskell has been a brief time when I was using the Xmonad window manager, but it looks like an interesting language. Functional programming is cool. - -There are a lot of interesting plusses for Haskell you note (in the parent page), but it's true that the idea is horribly daunting (as [[Joey]] said "If only I had a spare year"). Is there any way that you could "start small"? Because nothing will ever happen if the task is too daunting to even start. - -On further thought... perhaps it would be easier to fork or contribute to an existing Haskell-based wiki, such as Hakyll? +I'm torn about this idea, if it's actually serious. I'm very comfortable +programming in Perl, and have written quite a few modules for IkiWiki, and +it would be a huge pain to have to start from scratch all over again. On +the other hand, this could be a motivation for me to learn Haskell. My +only encounter with Haskell has been a brief time when I was using the +Xmonad window manager, but it looks like an interesting language. +Functional programming is cool. + +There are a lot of interesting plusses for Haskell you note (in the parent +page), but it's true that the idea is horribly daunting (as [[Joey]] said +"If only I had a spare year"). Is there any way that you could "start +small"? Because nothing will ever happen if the task is too daunting to +even start. + +> This seems destined to remain a thought experiment unless something like +> that can be done, or I get a serious case of second system disease. +> +> I've considered doing things like using the external plugin interface +> to run a separate haskell program, which would allow implementing +> arbitrary plugins in haskell (starting with a pandoc plugin..), +> and could perhaps grow to subsume the perl code. However, this would +> stick us with the perl data structures, which are not a very good fit +> for haskell. --[[Joey]] + +On further thought... perhaps it would be easier to fork or contribute to +an existing Haskell-based wiki, such as Hakyll? --[[KathrynAndersen]] + +> As far as I know there are no other wikis (haskell or otherwise) +> that are wiki compilers. Since we know from experience that dealing +> with static compilation turns out to be one of the trickiest parts of +> ikiwiki, I'm doubtful about trying to bolt that into one. --[[Joey]] -- cgit v1.2.3 From c475269a3627e204ee048e84e77676d024b14820 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Jan 2012 14:41:12 -0400 Subject: query --- doc/plugins/contrib/newpage/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/plugins/contrib/newpage/discussion.mdwn (limited to 'doc') diff --git a/doc/plugins/contrib/newpage/discussion.mdwn b/doc/plugins/contrib/newpage/discussion.mdwn new file mode 100644 index 000000000..d312ce458 --- /dev/null +++ b/doc/plugins/contrib/newpage/discussion.mdwn @@ -0,0 +1,4 @@ +How is this better than creating an inline with `rootpage` set, +which creates a similar new page form? I sometimes make the inline match +nothing, while still creating pages, in the odd cases where I have a map +or such displaying the pages. --[[Joey]] -- cgit v1.2.3 From 0ba0d0982455297446ed777aa89d1fbf8989d2ae Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Jan 2012 14:45:29 -0400 Subject: merged --- doc/rcs/cvs/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/rcs/cvs/discussion.mdwn b/doc/rcs/cvs/discussion.mdwn index 2e6468dd5..e10892e7d 100644 --- a/doc/rcs/cvs/discussion.mdwn +++ b/doc/rcs/cvs/discussion.mdwn @@ -168,3 +168,5 @@ Bugs found and fixed so far: * Stop treating text files as binary (`-kb`) on `rcs_add()` (ac8eab29e8394aca4c0b23a6687ec947ea1ac869) + +> Merged to current head. --[[Joey]] -- cgit v1.2.3 From f77784affdc9f05be06eb0be3c26bb81ef41ec8f Mon Sep 17 00:00:00 2001 From: tycho garen Date: Mon, 30 Jan 2012 13:49:19 -0500 Subject: comment on haskell rebuild --- doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn index 733d69db0..01910a97c 100644 --- a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn +++ b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn @@ -49,3 +49,7 @@ href="http://jaspervdj.be/hakyll">Hakyll? > that are wiki compilers. Since we know from experience that dealing > with static compilation turns out to be one of the trickiest parts of > ikiwiki, I'm doubtful about trying to bolt that into one. --[[Joey]] + +>> Haykll isn't a wiki but it does do static compilation. The missing +>> parts are: the web interface, the wiki link processing, and page +>> dependency stuff. -- [[tychoish]] -- cgit v1.2.3 From a78126c55ecbe014ab2a214f324b32762e6a268d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Jan 2012 15:08:50 -0400 Subject: calendar, prettydate: Fix strftime encoding bug strftime is a C function, it does not return decoded utf8. Several places in ikiwiki manually decoded it, but at least two forgot to. Also, strftime might not return even encoded utf8, if LC_TIME is set to a non-utf8 value. Went ahead and supported decoding whatever encoding it uses. The remaining direct calls to strftime() are all ones that first set LC_TIME=C, in order to get times that are not for human display. --- doc/bugs/Encoding_problem_in_calendar_plugin.mdwn | 4 ++++ doc/forum/Encoding_problem_in_french_with_ikiwiki-calendar.mdwn | 3 +++ 2 files changed, 7 insertions(+) (limited to 'doc') diff --git a/doc/bugs/Encoding_problem_in_calendar_plugin.mdwn b/doc/bugs/Encoding_problem_in_calendar_plugin.mdwn index 2ccc43c03..80e9f2c82 100644 --- a/doc/bugs/Encoding_problem_in_calendar_plugin.mdwn +++ b/doc/bugs/Encoding_problem_in_calendar_plugin.mdwn @@ -11,6 +11,10 @@ The problem is that I do not know Perl, encoding is one of the thing I would be Cheers, Louis +> Yes, this seems basically right. I've applied a modified version of this. +> [[done]] +> --[[Joey]] + diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index c7d2b7c..1345939 100644 diff --git a/doc/forum/Encoding_problem_in_french_with_ikiwiki-calendar.mdwn b/doc/forum/Encoding_problem_in_french_with_ikiwiki-calendar.mdwn index 7e21644ac..472412de1 100644 --- a/doc/forum/Encoding_problem_in_french_with_ikiwiki-calendar.mdwn +++ b/doc/forum/Encoding_problem_in_french_with_ikiwiki-calendar.mdwn @@ -15,3 +15,6 @@ Is someone could test it and verify if it works or not? Thanks. Zut + +> This was discussed in [[bugs/Encoding_problem_in_calendar_plugin]] +> and is now fixed. --[[Joey]] -- cgit v1.2.3 From 02898461f24530159b37fcae22a8b79c86b12091 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Jan 2012 15:16:13 -0400 Subject: cleanup --- doc/examples/blog/posts/Discussion.mdwn | 1 - 1 file changed, 1 deletion(-) delete mode 100644 doc/examples/blog/posts/Discussion.mdwn (limited to 'doc') diff --git a/doc/examples/blog/posts/Discussion.mdwn b/doc/examples/blog/posts/Discussion.mdwn deleted file mode 100644 index f04a9558d..000000000 --- a/doc/examples/blog/posts/Discussion.mdwn +++ /dev/null @@ -1 +0,0 @@ -foo bar. -- cgit v1.2.3 From b092831d8577b4c31125994786154510396e884e Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Mon, 30 Jan 2012 15:30:21 -0400 Subject: Added a comment --- .../comment_1_43758a232e4360561bc84f710862ff40._comment | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/forum/How_to_change_registration_page/comment_1_43758a232e4360561bc84f710862ff40._comment (limited to 'doc') diff --git a/doc/forum/How_to_change_registration_page/comment_1_43758a232e4360561bc84f710862ff40._comment b/doc/forum/How_to_change_registration_page/comment_1_43758a232e4360561bc84f710862ff40._comment new file mode 100644 index 000000000..5edd993d7 --- /dev/null +++ b/doc/forum/How_to_change_registration_page/comment_1_43758a232e4360561bc84f710862ff40._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 1" + date="2012-01-30T19:30:20Z" + content=""" +Sure.. You're looking for the file `IkiWiki/Plugin/passwordauth.pm` + +This line in particular is the text that gets modified and displayed to the user. + +
+                                        name => \"account_creation_password\",
+
+"""]] -- cgit v1.2.3 From 6c5e24f2a16a7e2ba6c46d231d5c5eaf31edd29b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Jan 2012 15:32:18 -0400 Subject: fix typo (doubled quote) --- doc/ikiwiki/directive/meta.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn index a7e86a7ed..72cfc6f56 100644 --- a/doc/ikiwiki/directive/meta.mdwn +++ b/doc/ikiwiki/directive/meta.mdwn @@ -109,7 +109,7 @@ Supported fields: \[[!meta openid="http://joeyh.myopenid.com/" server="http://www.myopenid.com/server" - xrds-location="http://www.myopenid.com/xrds?username=joeyh.myopenid.com""]] + xrds-location="http://www.myopenid.com/xrds?username=joeyh.myopenid.com"]] * link -- cgit v1.2.3 From 5b7730fd19a8f82ab386c831bdacb700f2e2f86d Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Mon, 30 Jan 2012 15:34:01 -0400 Subject: Added a comment --- .../comment_2_14a1b269be6dbcc9b2068d3e18b55711._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/OpenID_not_working___47___where_to_define_wiki__39__s_ID__63__/comment_2_14a1b269be6dbcc9b2068d3e18b55711._comment (limited to 'doc') diff --git a/doc/forum/OpenID_not_working___47___where_to_define_wiki__39__s_ID__63__/comment_2_14a1b269be6dbcc9b2068d3e18b55711._comment b/doc/forum/OpenID_not_working___47___where_to_define_wiki__39__s_ID__63__/comment_2_14a1b269be6dbcc9b2068d3e18b55711._comment new file mode 100644 index 000000000..3078a1473 --- /dev/null +++ b/doc/forum/OpenID_not_working___47___where_to_define_wiki__39__s_ID__63__/comment_2_14a1b269be6dbcc9b2068d3e18b55711._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 2" + date="2012-01-30T19:34:00Z" + content=""" +Yes, good spotting, [[ikiwiki/directive/meta]] had a doubled quote in the openid example. + +Otherwise, that example will work. You don't need anything installed on your server to add openid delegation to a page. +"""]] -- cgit v1.2.3 From ae55a2c9b6c13adbd922f039081c3036e420ec4e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Jan 2012 15:37:01 -0400 Subject: remove stealthy spam --- .../comment_8_054ff10998857bbb69d15ff17e6e9756._comment | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_054ff10998857bbb69d15ff17e6e9756._comment (limited to 'doc') diff --git a/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_054ff10998857bbb69d15ff17e6e9756._comment b/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_054ff10998857bbb69d15ff17e6e9756._comment deleted file mode 100644 index ee0c46fbd..000000000 --- a/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_054ff10998857bbb69d15ff17e6e9756._comment +++ /dev/null @@ -1,12 +0,0 @@ -[[!comment format=mdwn - username="https://me.yahoo.com/a/dh6LXMw6hZydhHOqgWKiORWXspNyeW9n1nk-#9ce8d" - nickname="shobo" - subject="comment 8" - date="2011-12-16T13:21:57Z" - content=""" -URLs containing /ikiwiki.cgi/ are dynamically-generated pages; everything else is static. - -How is this possible? Where can I find more about this? - -Shobo, Junior Software Developer -"""]] -- cgit v1.2.3 From 3bbf0bad572b1324c3b2a101f12b632948814dcf Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Jan 2012 15:47:09 -0400 Subject: remove non-ikiwiki site --- doc/ikiwikiusers.mdwn | 1 - 1 file changed, 1 deletion(-) (limited to 'doc') diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index bd85d6cf8..0b16618bf 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -165,7 +165,6 @@ Personal sites and blogs * [Jonas Smedegaard](http://dr.jones.dk/) multilingual "classic" website w/ blog * [Siri Reiter](http://sirireiter.dk/) portfolio website with a blog (in danish) * [L'Altro Wiki](http://laltromondo.dynalias.net/~iki/) Tutorials, reviews, miscellaneus articles in English and Italian. -* [STUPiD](http://lhzhang.com/) * gregoa's [p.r. - political rants](http://info.comodo.priv.at/pr/) * [Michael Hammer](http://www.michael-hammer.at/) * [Richardson Family Wiki](http://the4richardsons.com) A wiki, blog or some such nonsense for the family home page or something or other... I will eventually move the rest of my sites to ikiwiki. The source of the site is in git. -- cgit v1.2.3 From 1bae1bf4e6285d14bda9c5d5588432c684c30735 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Mon, 30 Jan 2012 18:39:34 -0400 Subject: there are actually reasons, yes --- doc/plugins/contrib/newpage/discussion.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/newpage/discussion.mdwn b/doc/plugins/contrib/newpage/discussion.mdwn index d312ce458..fb186463d 100644 --- a/doc/plugins/contrib/newpage/discussion.mdwn +++ b/doc/plugins/contrib/newpage/discussion.mdwn @@ -2,3 +2,9 @@ How is this better than creating an inline with `rootpage` set, which creates a similar new page form? I sometimes make the inline match nothing, while still creating pages, in the odd cases where I have a map or such displaying the pages. --[[Joey]] + +> I wanted something that would automatically be available on every page, but only when editing was enabled. +> One of the sites I maintain as webmaster () has a two-stage publication process. The "working" site is on an internal server, where it is set up as a wiki that authorized users in the company can edit. When they're satisfied with the changes they've made, the "working" site gets pushed (with git) to the "production" site, which is on a different server. The ikiwiki setup for the production site has editing completely disabled, because it is the site which is exposed to the outside world. +> For that site, I want all sign that it's a wiki to be hidden. Therefore using an inline directive would be unsuitable. + +> --[[KathrynAndersen]] -- cgit v1.2.3 From 49a60b04131923a24f7368d7b40b55bfd4377cd6 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Mon, 30 Jan 2012 18:52:27 -0400 Subject: agreed --- doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn index 01910a97c..b6495194a 100644 --- a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn +++ b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn @@ -53,3 +53,5 @@ href="http://jaspervdj.be/hakyll">Hakyll? >> Haykll isn't a wiki but it does do static compilation. The missing >> parts are: the web interface, the wiki link processing, and page >> 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]] -- cgit v1.2.3