From b3720582abc46974715d019aa07d78828bc23062 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 May 2011 18:44:11 -0400 Subject: [PATCH] allow for a html formatted description in websetup w/o polluting setup file with the html --- IkiWiki/Plugin/websetup.pm | 5 ++++- doc/plugins/write.mdwn | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index 0a3d90aec..f95017c90 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -151,7 +151,10 @@ sub showfields ($$$@) { my %info=%{shift @show}; my $description=$info{description}; - if (exists $info{link} && length $info{link}) { + if (exists $info{htmldescription}) { + $description=$info{htmldescription}; + } + elsif (exists $info{link} && length $info{link}) { if ($info{link} =~ /^\w+:\/\//) { $description="$description"; } diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index f0f79ebc7..9a5ca60a0 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -580,6 +580,7 @@ describes the plugin as a whole. For example: * `description` is a short description of the option. * `link` is a link to further information about the option. This can either be a [[ikiwiki/WikiLink]], or an url. +* `htmldescription` is displayed instead of the description by websetup. * `advanced` can be set to true if the option is more suitable for advanced users. * `safe` should be false if the option should not be displayed in unsafe -- 2.26.2