diff options
| author | Joey Hess <joey@kitenet.net> | 2011-05-13 18:44:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-05-13 18:44:11 -0400 |
| commit | b3720582abc46974715d019aa07d78828bc23062 (patch) | |
| tree | c795d108dd3cc7a11eb25057299284fdfd8833e4 | |
| parent | accd2491d8388350c5498cd4dcbcdf57c15f6486 (diff) | |
| download | ikiwiki-b3720582abc46974715d019aa07d78828bc23062.tar ikiwiki-b3720582abc46974715d019aa07d78828bc23062.tar.gz | |
allow for a html formatted description in websetup
w/o polluting setup file with the html
| -rw-r--r-- | IkiWiki/Plugin/websetup.pm | 5 | ||||
| -rw-r--r-- | doc/plugins/write.mdwn | 1 |
2 files changed, 5 insertions, 1 deletions
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="<a href=\"$info{link}\">$description</a>"; } 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 |