aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorjoshtriplett <joshtriplett@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-30 02:26:50 +0000
committerjoshtriplett <joshtriplett@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-30 02:26:50 +0000
commit40365e1aee6740f12243b33e93962a6396ed27a6 (patch)
tree25c7ff062e5922609754d45c391f76e2a3393d8a /IkiWiki
parente739073c386603bbaac05f409381b58761942597 (diff)
downloadikiwiki-40365e1aee6740f12243b33e93962a6396ed27a6.tar
ikiwiki-40365e1aee6740f12243b33e93962a6396ed27a6.tar.gz
* Group passwordauth fields with a fieldset as well. Add a new
passwordauth page to the basewiki describing password authentication; like openid, it uses conditional to check which forms of authentication the wiki allows. Add conditional cross- links between the openid and passwordauth pages, to help the user understand how they can log in.
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/passwordauth.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index d1a965dc8..dac649bc8 100644
--- 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");