summaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/anonok.pm3
-rw-r--r--IkiWiki/Plugin/attachment.pm6
-rw-r--r--IkiWiki/Plugin/lockedit.pm3
-rw-r--r--IkiWiki/Plugin/websetup.pm11
4 files changed, 13 insertions, 10 deletions
diff --git a/IkiWiki/Plugin/anonok.pm b/IkiWiki/Plugin/anonok.pm
index 9d21fe367..ccc0d59b9 100644
--- a/IkiWiki/Plugin/anonok.pm
+++ b/IkiWiki/Plugin/anonok.pm
@@ -16,8 +16,7 @@ sub getsetup () { #{{{
type => "pagespec",
example => "*/discussion",
description => "PageSpec to limit which pages anonymous users can edit",
- description_html => htmllink("", "", "ikiwiki/PageSpec", noimageinline => 1).
- " to limit which pages anonymous users can edit",
+ link => "ikiwiki/PageSpec",
safe => 1,
rebuild => 0,
},
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 27f984c29..63f0b73c3 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -25,11 +25,7 @@ sub getsetup () { #{{{
type => "pagespec",
example => "mimetype(image/*) and maxsize(50kb)",
description => "enhanced PageSpec specifying what attachments are allowed",
- description_html => htmllink("", "",
- "ikiwiki/PageSpec/attachment",
- noimageinline => 1,
- linktext => "enhanced PageSpec",
- )." specifying what attachments are allowed",
+ link => "ikiwiki/PageSpec/attachment",
safe => 1,
rebuild => 0,
},
diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 93a525677..525fcb0e5 100644
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -18,8 +18,7 @@ sub getsetup () { #{{{
type => "pagespec",
example => "!*/Discussion",
description => "PageSpec controlling which pages are locked",
- description_html => htmllink("", "", "ikiwiki/PageSpec", noimageinline => 1).
- " controlling which pages are locked",
+ link => "ikiwiki/PageSpec",
safe => 1,
rebuild => 0,
},
diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index c22516eec..8ef336b03 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -100,7 +100,16 @@ sub showfields ($$$@) { #{{{
my $key=shift @show;
my %info=%{shift @show};
- my $description=exists $info{description_html} ? $info{description_html} : $info{description};
+ my $description=$info{description};
+ if (exists $info{link} && length $info{link}) {
+ if ($info{link} =~ /^\w+:\/\//) {
+ $description="<a href=\"$info{link}\">$description</a>";
+ }
+ else {
+ $description=htmllink("", "", $info{link}, noimageinline => 1, linktext => $description);
+ }
+ }
+
my $value=$config{$key};
# multiple plugins can have the same field
my $name=defined $plugin ? $plugin.".".$key : $key;