* Group passwordauth fields with a fieldset as well. Add a new

[ikiwiki.git] / IkiWiki / Plugin / passwordauth.pm

diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index 131b3a43e16f2d935067a10dbe3a7aa8b76ea09e..dac649bc86c81f38a8e6ae1386c880449524bb15 100644 (file)
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -21,8 +21,12 @@ sub formbuilder_setup (@) { #{{{
        my $cgi=$params{cgi};
 
        if ($form->title eq "signin" || $form->title eq "register") {
-               $form->field(name => "name", required => 0, size => 50);
-               $form->field(name => "password", type => "password", required => 0);
+               my %fieldset = ();
+               if ($form->title eq "signin") {
+                       $fieldset{"fieldset"} = gettext("Log in with")." ".htmllink("", "", "passwordauth", noimageinline => 1);
+               }
+               $form->field(name => "name", required => 0, size => 50, %fieldset);
+               $form->field(name => "password", type => "password", required => 0, %fieldset);
                
                if ($form->submitted eq "Register" || $form->submitted eq "Create Account") {
                        $form->field(name => "confirm_password", type => "password");
@@ -101,17 +105,20 @@ sub formbuilder_setup (@) { #{{{
                }
                else {
                        # First time settings.
-                       $form->field(name => "name", comment => gettext("(use FirstnameLastName)"));
+                       $form->field(name => "name", size => 30);
                        if ($session->param("name")) {
                                $form->field(name => "name", value => $session->param("name"));
                        }
                }
        }
        elsif ($form->title eq "preferences") {
-               $form->field(name => "name", disabled => 1, value =>
-                       $session->param("name"), force => 1);
-               $form->field(name => "password", type => "password");
+               $form->field(name => "name", disabled => 1, 
+                       value => $session->param("name"), force => 1,
+                       fieldset => "login");
+               $form->field(name => "password", type => "password",
+                       fieldset => "login");
                $form->field(name => "confirm_password", type => "password",
+                       fieldset => "login",
                        validate => sub {
                                shift eq $form->field("password");
                        });