summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Plugin/passwordauth.pm8
l---------basewiki/passwordauth.mdwn1
-rw-r--r--debian/changelog10
-rw-r--r--doc/openid.mdwn9
-rw-r--r--doc/passwordauth.mdwn22
-rw-r--r--po/ikiwiki.pot12
6 files changed, 51 insertions, 11 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");
diff --git a/basewiki/passwordauth.mdwn b/basewiki/passwordauth.mdwn
new file mode 120000
index 000000000..d4a11019d
--- /dev/null
+++ b/basewiki/passwordauth.mdwn
@@ -0,0 +1 @@
+../doc/passwordauth.mdwn \ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index aa7e086e6..4b3ac01cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,14 @@ ikiwiki (2.00) UNRELEASED; urgency=low
[ Josh Triplett ]
* fieldset support appeared in CGI::FormBuilder 3.05, so increase
version in Depends on libcgi-formbuilder-perl to 3.05
-
- -- Josh Triplett <josh@freedesktop.org> Sun, 29 Apr 2007 19:52:16 -0700
+ * 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.
+
+ -- Josh Triplett <josh@freedesktop.org> Sun, 29 Apr 2007 19:58:24 -0700
ikiwiki (1.51) unstable; urgency=low
diff --git a/doc/openid.mdwn b/doc/openid.mdwn
index a8ce46f08..7e46bdf64 100644
--- a/doc/openid.mdwn
+++ b/doc/openid.mdwn
@@ -2,7 +2,11 @@
[[if test="enabled(openid)"
then="This wiki has OpenID **enabled**."
- else="This wiki has OpenID **disabled**."]]
+ else="""
+This wiki has OpenID **disabled**.
+[[if test="enabled(passwordauth) and passwordauth"
+ then="You can sign into this wiki using [[passwordauth]]."]]
+"""]]
[OpenID](http://openid.net) is a decentralized authentication mechanism
that allows you to have one login that you can use on a growing number of
@@ -23,6 +27,9 @@ signin form. You do not need to give this wiki a password or go through any
registration process when using OpenID.
"""]]
+[[if test="enabled(openid) and enabled(passwordauth) and passwordauth"
+ then="You can also sign into this wiki using [[passwordauth]]."]]
+
---
It's also possible to make a page in the wiki usable as an OpenID url,
diff --git a/doc/passwordauth.mdwn b/doc/passwordauth.mdwn
new file mode 100644
index 000000000..1c1358277
--- /dev/null
+++ b/doc/passwordauth.mdwn
@@ -0,0 +1,22 @@
+[[meta title="Password Authentication"]]
+
+[[if test="enabled(passwordauth)"
+ then="""
+This wiki has passwordauth **enabled**.
+
+You can sign into this wiki by entering a username and password in the login
+form. If you don't have an account, you can register for one from the login
+form by hitting the "Register" button.
+
+[[if test="enabled(openid) and openid"
+ then="You can also sign into this wiki using [[OpenID]]."]]
+"""
+else="""
+This wiki has passwordauth **disabled**.
+[[if test="enabled(openid) and openid"
+ then="You can sign into this wiki using [[OpenID]]."]]
+
+If this wiki had passwordauth enabled, you could sign into this wiki by
+entering the username and password for your account, or create an account from
+the login form by hitting the "Register" button.
+"""]]
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 6e4623765..2182a8186 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-29 19:27-0400\n"
+"POT-Creation-Date: 2007-04-29 19:26-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -228,7 +228,7 @@ msgstr ""
msgid "more"
msgstr ""
-#: ../IkiWiki/Plugin/openid.pm:34
+#: ../IkiWiki/Plugin/openid.pm:34 ../IkiWiki/Plugin/passwordauth.pm:26
msgid "Log in with"
msgstr ""
@@ -240,19 +240,19 @@ msgstr ""
msgid "All pages are linked to by other pages."
msgstr ""
-#: ../IkiWiki/Plugin/passwordauth.pm:147
+#: ../IkiWiki/Plugin/passwordauth.pm:151
msgid "Account creation successful. Now you can Login."
msgstr ""
-#: ../IkiWiki/Plugin/passwordauth.pm:150
+#: ../IkiWiki/Plugin/passwordauth.pm:154
msgid "Error creating account."
msgstr ""
-#: ../IkiWiki/Plugin/passwordauth.pm:171
+#: ../IkiWiki/Plugin/passwordauth.pm:175
msgid "Failed to send mail"
msgstr ""
-#: ../IkiWiki/Plugin/passwordauth.pm:173
+#: ../IkiWiki/Plugin/passwordauth.pm:177
msgid "Your password has been emailed to you."
msgstr ""