bugfixen

diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index 03000c8004bd0ae0ad5187d4cba399f5d80cc8e0..1aac17a9ebcf326f48771799c06826076b28566a 100644 (file)
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -101,7 +101,7 @@ sub formbuilder_setup (@) { #{{{
                }
                else {
                        # First time settings.
                }
                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"));
                        }
                        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 7981d3701fed823d908b4a81f6f60a1b173136ec..92a89bd79fe70fa18715bf8451ddc9d831410d57 100644 (file)
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -62,10 +62,25 @@ sub import { #{{{
        hook(type => "format", id => "toggle", call => \&format);
 } # }}}
 
        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", @_);
 
 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 (@) { #{{{
 } # }}}
 
 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});
        # 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>.
 
        # 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 (@) { #{{{
 } # }}}
 
 sub format (@) { #{{{