From 4a40b5f9d56e4a36112af0007f52357761a5b3fb Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Wed, 22 Nov 2006 04:26:44 +0000
Subject: bugfixen
---
IkiWiki/Plugin/passwordauth.pm | 2 +-
IkiWiki/Plugin/toggle.pm | 21 +++++++++++++++++++--
2 files changed, 20 insertions(+), 3 deletions(-)
(limited to 'IkiWiki')
diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index 03000c800..1aac17a9e 100644
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -101,7 +101,7 @@ sub formbuilder_setup (@) { #{{{
}
else {
# First time settings.
- $form->field(name => "name", comment => "use FirstnameLastName");
+ $form->field(name => "name", comment => "(use FirstnameLastName)");
if ($session->param("name")) {
$form->field(name => "name", value => $session->param("name"));
}
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index 7981d3701..92a89bd79 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -62,10 +62,25 @@ sub import { #{{{
hook(type => "format", id => "toggle", call => \&format);
} # }}}
+sub genid ($$) { #{{{
+ my $page=shift;
+ my $id=shift;
+
+ $id="$page.$id";
+
+ # make it a legal html id attribute
+ $id=~s/[^-a-zA-Z0-9.]/-/g;
+ if ($id !~ /^[a-zA-Z]/) {
+ $id="id$id";
+ }
+ return $id;
+} #}}}
+
sub preprocess_toggle (@) { #{{{
my %params=(id => "default", text => "more", @_);
- return "<a class=\"toggle\" href=\"#$params{page}.$params{id}\">$params{text}</a>";
+ my $id=genid($params{page}, $params{id});
+ return "<a class=\"toggle\" href=\"#$id\">$params{text}</a>";
} # }}}
sub preprocess_toggleable (@) { #{{{
@@ -75,10 +90,12 @@ sub preprocess_toggleable (@) { #{{{
# embedded inside it. This is why scan is set for this preprocessor
# directive, since it could expand to something with a link in it.
$params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, $params{text});
+
+ my $id=genid($params{page}, $params{id});
# Should really be a postprocessor directive, oh well. Work around
# markdown's dislike of markdown inside a <div>.
- return "<div class=\"toggleable\" id=\"$params{page}.$params{id}\"></div>\n\n$params{text}<div class=\"toggleableend\"></div>";
+ return "<div class=\"toggleable\" id=\"$id\"></div>\n\n$params{text}\n<div class=\"toggleableend\"></div>";
} # }}}
sub format (@) { #{{{
--
cgit v1.2.3