diff options
| -rw-r--r-- | IkiWiki/Plugin/htmltidy.pm | 14 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/forum/Dump_plugin/comment_1_bfce80b3f5be78ec28692330843d4ae1._comment | 14 | ||||
| -rw-r--r-- | doc/tips/dot_cgi.mdwn | 2 | ||||
| -rw-r--r-- | doc/todo/configurable_tidy_command_for_htmltidy.mdwn | 2 | ||||
| -rw-r--r-- | doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 12 | ||||
| -rw-r--r-- | doc/usage.mdwn | 2 | ||||
| -rw-r--r-- | po/fr.po | 61 |
8 files changed, 73 insertions, 37 deletions
diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index e6d377f8a..185d01dd6 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -23,6 +23,18 @@ sub getsetup () { safe => 1, rebuild => undef, }, + htmltidy => { + type => "string", + description => "tidy command line", + safe => 0, # path + rebuild => undef, + }, +} + +sub checkconfig () { + if (! defined $config{htmltidy}) { + $config{htmltidy}="tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no --markup yes"; + } } sub sanitize (@) { @@ -31,7 +43,7 @@ sub sanitize (@) { my $pid; my $sigpipe=0; $SIG{PIPE}=sub { $sigpipe=1 }; - $pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no --markup yes 2>/dev/null'); + $pid=open2(*IN, *OUT, "$config{htmltidy} 2>/dev/null"); # open2 doesn't respect "use open ':utf8'" binmode (IN, ':utf8'); diff --git a/debian/changelog b/debian/changelog index 527dd7884..1d12d0558 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low * Fix test suite failure on other side of date line. + * htmltidy: Allow configuring tidy parameters in setup file. + (W. Trevor King) + * Updated French program translation. Closes: #598918 -- Joey Hess <joeyh@debian.org> Wed, 29 Sep 2010 11:58:23 -0400 diff --git a/doc/forum/Dump_plugin/comment_1_bfce80b3f5be78ec28692330843d4ae1._comment b/doc/forum/Dump_plugin/comment_1_bfce80b3f5be78ec28692330843d4ae1._comment new file mode 100644 index 000000000..855b72bbb --- /dev/null +++ b/doc/forum/Dump_plugin/comment_1_bfce80b3f5be78ec28692330843d4ae1._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" + nickname="Glenn" + subject="New dump plugin" + date="2010-10-03T00:45:47Z" + content=""" +I took my own advice and rewrote the dump plugin so that it uses a template. A sample template has been added to my [[Dropbox|http://dl.dropbox.com/u/11256359/dump.tmpl]]. + +### Issues: + +* Dumps appear at the end of the page rather than where the directive occurs. +* For some reason I haven't yet figured out, dumps don't appear in page previews. +* I haven't tested inlined content and the dump plugin. +"""]] diff --git a/doc/tips/dot_cgi.mdwn b/doc/tips/dot_cgi.mdwn index da55c1f1c..42a0aa7bf 100644 --- a/doc/tips/dot_cgi.mdwn +++ b/doc/tips/dot_cgi.mdwn @@ -26,6 +26,8 @@ configuration changes should work anywhere. Or, if you've put it in a `~/public_html`, edit `/etc/apache2/mods-available/userdir.conf`. + You may also want to install some dependencies to enable CGI in apache2 setup as: `libcgi-formbuilder-perl` and `libcgi-session-perl`. + * You may also want to enable the [[plugins/404]] plugin. To make apache use it, the apache config file will need a further modification to make it use ikiwiki's CGI as the apache 404 handler. diff --git a/doc/todo/configurable_tidy_command_for_htmltidy.mdwn b/doc/todo/configurable_tidy_command_for_htmltidy.mdwn index 51991393e..e317184b5 100644 --- a/doc/todo/configurable_tidy_command_for_htmltidy.mdwn +++ b/doc/todo/configurable_tidy_command_for_htmltidy.mdwn @@ -4,3 +4,5 @@ I was trying to get htmltidy to [play nicely with MathML][play]. Unfortunately, [play]: http://lists.w3.org/Archives/Public/html-tidy/2006JanMar/0052.html [patch]: http://www.physics.drexel.edu/~wking/code/git/git.php?p=ikiwiki.git&a=commitdiff&h=408ee89fd7c1dc70510385a7cf263a05862dda97&hb=e65ce4f0937eaf622846c02a9d39fa7aebe4af12 + +> Thanks, [[done]] --[[Joey]] diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 262d5c22d..20d22b9ab 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -147,10 +147,12 @@ you don't like my approach: ---- -[[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]] +[[!template id=gitbranch branch=smcv/ready/localurl author="[[smcv]]"]] +[[!tag patch]] OK, here's an alternative approach, closer in spirit to what was initially -requested. I haven't tested this on a full website with the CGI yet. +requested. I included a regression test for `urlto`, `baseurl` and `cgiurl`, +now that they have slightly more complex behaviour. The idea is that in the common case, the CGI and the pages will reside on the same server, so they can use "semi-absolute" URLs (`/ikiwiki.cgi`, `/style.css`, @@ -169,6 +171,12 @@ suppot that. fully relative nor fully absolute, and there doesn't seem to be a good name for them... +I've tested this on a demo website with the CGI enabled, and it seems to +work nicely (there might be bugs in some plugins, I didn't try all of them). +The `$config{url}` and `$config{cgiurl}` are both HTTP, but if I enable +`httpauth`, set `cgiauthurl` to a HTTPS version of the same site and log +in via that, links all end up in the HTTPS version. + New API added by this branch: * `urlto(x, y, 'local')` uses `$local_url` instead of `$config{url}` diff --git a/doc/usage.mdwn b/doc/usage.mdwn index 840d105d2..2325b6502 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -350,7 +350,7 @@ also be configured using a setup file. * ikiwiki --setup my.setup - Completly (re)build the wiki using the specified setup file. + Completely (re)build the wiki using the specified setup file. * ikiwiki --setup my.setup --refresh @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-09-15 16:30-0400\n" -"PO-Revision-Date: 2010-07-17 18:13+0200\n" +"PO-Revision-Date: 2010-10-03 10:42+0200\n" "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "Language: fr\n" @@ -146,15 +146,15 @@ msgstr "Vous devez spécifier %s" #: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " -msgstr "Impossible de créer un compartiment S3 :" +msgstr "Impossible de créer un compartiment S3 : " #: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " -msgstr "Impossible de sauvegarder le fichier dans le compartiment S3 :" +msgstr "Impossible de sauvegarder le fichier dans le compartiment S3 : " #: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " -msgstr "Échec lors de la suppression du fichier sur S3 :" +msgstr "Échec lors de la suppression du fichier sur S3 : " #: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format @@ -195,14 +195,13 @@ msgid "There are no broken links!" msgstr "Aucun lien cassé !" #: ../IkiWiki/Plugin/comments.pm:113 -#, fuzzy, perl-format +#, perl-format msgid "this comment needs %s" -msgstr "Faire un commentaire sur %s" +msgstr "Ce commentaire demande %s" #: ../IkiWiki/Plugin/comments.pm:116 -#, fuzzy msgid "moderation" -msgstr "Modération du commentaire" +msgstr "Modération" #: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format @@ -218,7 +217,6 @@ msgid "Anonymous" msgstr "Anonyme" #: ../IkiWiki/Plugin/comments.pm:256 -#, fuzzy msgid "Comment Moderation" msgstr "Modération du commentaire" @@ -337,9 +335,8 @@ msgstr "edittemplate %s enregistré pour %s" #: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy msgid "failed to process template:" -msgstr "Échec du traitement :" +msgstr "Échec du traitementdu modèle :" #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" @@ -510,9 +507,8 @@ msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" #: ../IkiWiki/Plugin/meta.pm:396 -#, fuzzy msgid "sort=meta requires a parameter" -msgstr "les paramètres « from » et « to » sont nécessaires." +msgstr "sort=meta demande un paramètre." #: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" @@ -531,9 +527,9 @@ msgid "more" msgstr "lire la suite" #: ../IkiWiki/Plugin/openid.pm:70 -#, fuzzy, perl-format +#, perl-format msgid "failed to load openid module: " -msgstr "Échec de la compilation de %s" +msgstr "Impossible de charger le module openid" #: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." @@ -704,7 +700,7 @@ msgstr "" #: ../IkiWiki/Plugin/po.pm:1252 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" +msgstr "La syntaxe de %s n'est pas correcte : il faut utiliser CODE|NOM" #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" @@ -899,7 +895,7 @@ msgid "rsync_command exited %d" msgstr "la commande rsync s'est terminée avec le code : %d" #: ../IkiWiki/Plugin/search.pm:195 -#, fuzzy, perl-format +#, perl-format msgid "need Digest::SHA to index %s" msgstr "Digest::SHA1 est nécessaire pour indexer %s" @@ -925,9 +921,9 @@ msgid "shortcut %s points to <i>%s</i>" msgstr "Le raccourci %s pointe vers <i>%s</i>" #: ../IkiWiki/Plugin/smiley.pm:30 -#, fuzzy, perl-format +#, perl-format msgid "smiley plugin will not work without %s" -msgstr "Le greffon « shortcut » ne fonctionnera pas sans %s" +msgstr "Le module smiley ne fonctionne pas sans %s" #: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" @@ -987,7 +983,7 @@ msgid "parse fail at line %d: %s" msgstr "Erreur d'analyse à la ligne %d : %s" #: ../IkiWiki/Plugin/tag.pm:83 -#, fuzzy, perl-format +#, perl-format msgid "creating tag page %s" msgstr "Création de la nouvelle page %s" @@ -996,9 +992,9 @@ msgid "missing id parameter" msgstr "Paramètre d'identification manquant" #: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format +#, perl-format msgid "%s not found" -msgstr "Flux introuvable " +msgstr "%s introuvable" #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" @@ -1089,12 +1085,12 @@ msgstr "%s peut être associé à plusieurs pages source." #: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." -msgstr "" +msgstr "recherche de %s pour les dates de modification et de création des fichiers..." #: ../IkiWiki/Render.pm:446 -#, fuzzy, perl-format +#, perl-format msgid "removing obsolete %s" -msgstr "Suppression de l'ancienne page %s" +msgstr "Suppression de %s obsolète" #: ../IkiWiki/Render.pm:520 #, perl-format @@ -1134,14 +1130,14 @@ msgid "cannot read %s: %s" msgstr "Lecture impossible de %s : %s" #: ../IkiWiki/Setup.pm:34 -#, fuzzy, perl-format +#, perl-format msgid "cannot load %s in safe mode" -msgstr "Lecture impossible de %s : %s" +msgstr "Impossible de charger %s de façon sécurisée" #: ../IkiWiki/Setup.pm:47 -#, fuzzy, perl-format +#, perl-format msgid "failed to parse %s" -msgstr "Impossible de mettre à jour %s" +msgstr "Impossible d'analyser %s" #: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" @@ -1208,9 +1204,8 @@ msgid "usage: --set var=value" msgstr "Syntaxe : -- set var=valeur" #: ../ikiwiki.in:109 -#, fuzzy msgid "usage: --set-yaml var=value" -msgstr "Syntaxe : -- set var=valeur" +msgstr "Syntaxe : --set-yaml var=valeur" #: ../ikiwiki.in:215 msgid "rebuilding wiki.." @@ -1248,7 +1243,7 @@ msgid "yes" msgstr "oui" #: ../IkiWiki.pm:2130 -#, fuzzy, perl-format +#, perl-format msgid "invalid sort type %s" msgstr "Type de tri %s inconnu" @@ -1260,7 +1255,7 @@ msgstr "Type de tri %s inconnu" #: ../IkiWiki.pm:2287 #, perl-format msgid "cannot match pages: %s" -msgstr "Impossible de trouver les pages %s" +msgstr "Impossible de trouver les pages : %s" #: ../auto.setup:16 msgid "What will the wiki be named?" |