Revert passwordauth fieldset and doc to avoid 2.0 regressions; need to re-evaluate...

diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index dac649bc86c81f38a8e6ae1386c880449524bb15..d1a965dc889c144f62a01bcba826ae192ec37b10 100644 (file)
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -21,12 +21,8 @@ sub formbuilder_setup (@) { #{{{
        my $cgi=$params{cgi};
 
        if ($form->title eq "signin" || $form->title eq "register") {
-               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);
+               $form->field(name => "name", required => 0, size => 50);
+               $form->field(name => "password", type => "password", required => 0);
                
                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
deleted file mode 120000 (symlink)
index d4a1101..0000000
--- a/basewiki/passwordauth.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-../doc/passwordauth.mdwn
\ No newline at end of file

diff --git a/debian/changelog b/debian/changelog
index 4b3ac01cdb4953ec0c6f79ca3a5d4357e93bbd3a..aa7e086e6a638420720dff0b961fa074f2b6acc1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,14 +15,8 @@ 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
-  * 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
+
+ -- Josh Triplett <josh@freedesktop.org>  Sun, 29 Apr 2007 19:52:16 -0700
 
 ikiwiki (1.51) unstable; urgency=low
 

diff --git a/doc/basewiki.mdwn b/doc/basewiki.mdwn
index 912508c9e77f9ffbb520bf5cb6a8e5ff6181434b..acc1b3a6098a6a46a34cf35ed74bb0c46785c578 100644 (file)
--- a/doc/basewiki.mdwn
+++ b/doc/basewiki.mdwn
@@ -11,7 +11,6 @@ It currently includes these pages:
 * [[markdown]]
 * [[openid]]
 * [[pagespec]]
-* [[passwordauth]]
 * [[PreprocessorDirective]]
 * [[shortcuts]]
 * [[smileys]]

diff --git a/doc/bugs/login_page_non-obvious_with_openid.mdwn b/doc/bugs/login_page_non-obvious_with_openid.mdwn
index 3978bc526829a91557a7a70b8e569703b94293d4..5cffde7f46c940d4794e7b503e9ea04b5cba47f2 100644 (file)
--- a/doc/bugs/login_page_non-obvious_with_openid.mdwn
+++ b/doc/bugs/login_page_non-obvious_with_openid.mdwn
@@ -43,6 +43,3 @@ If you want to keep it as one form, then perhaps using some javascript to disabl
 
 > I've improved the form, I think it's more obvious now that the openid
 > stuff is separate. Good enough to call this [[done]]. I think. --[[Joey]]
-
-> I put the [[passwordauth]] fields in a fieldset as well, which should help
-> for login forms with both OpenID and passwordauth enabled. --[[JoshTriplett]]

diff --git a/doc/openid.mdwn b/doc/openid.mdwn
index 9624b6c3f82ef55880a6b25a5d0b772c317ce914..f02a0a62ccbceb1909cbd5c8179d82daa9448b29 100644 (file)
--- a/doc/openid.mdwn
+++ b/doc/openid.mdwn
@@ -2,11 +2,7 @@
 
 [[if test="enabled(openid)"
      then="This wiki has OpenID **enabled**."
-     else="""
-This wiki has OpenID **disabled**.
-[[if test="enabled(passwordauth) and passwordauth"
-     then="You can sign into this wiki using [[passwordauth]]."]]
-"""]]
+     else="This wiki has OpenID **disabled**."]]
 
 [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
@@ -27,9 +23,6 @@ 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
deleted file mode 100644 (file)
index cc7eab2..0000000
--- a/doc/passwordauth.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-[[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 you have an account, but you have
-forgotten your password, you can hit the "Mail Password" button to receive your
-password via an email to the address you supplied when you registered.
-
-[[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/doc/todo/conditional_underlay_files.mdwn b/doc/todo/conditional_underlay_files.mdwn
index fc721de086b9696d3295931a053365d3a3e14668..87f70696bd9b4e7e184d7da9805911ced1426b46 100644 (file)
--- a/doc/todo/conditional_underlay_files.mdwn
+++ b/doc/todo/conditional_underlay_files.mdwn
@@ -2,7 +2,6 @@ I'd like to see some way to include certain files from the underlay only when th
 
 * Only include smileys.mdwn and the smileys subdirectory if you enable the [[plugins/smiley]] plugin.
 * Exclude openid.mdwn if you disable the [[plugins/openid]] plugin.
-* Exclude passwordauth.mdwn if you disable the [[plugins/passwordauth]] plugin.
 * Include shortcuts.mdwn only if you enable the [[plugins/shortcut]] plugin.
 * Include blog.mdwn only if you don't disable the [[plugins/inline]] plugin.
 * Include favicon.ico only if you enable the [[plugins/favicon]] plugin.

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 2182a818602e28e9a53a9fb556a08cec7233ff6e..6e46237658c59f38aaf6fe3a644ca74544123b38 100644 (file)
--- 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:26-0700\n"
+"POT-Creation-Date: 2007-04-29 19:27-0400\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/passwordauth.pm:26
+#: ../IkiWiki/Plugin/openid.pm:34
 msgid "Log in with"
 msgstr ""
 
@@ -240,19 +240,19 @@ msgstr ""
 msgid "All pages are linked to by other pages."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:151
+#: ../IkiWiki/Plugin/passwordauth.pm:147
 msgid "Account creation successful. Now you can Login."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:154
+#: ../IkiWiki/Plugin/passwordauth.pm:150
 msgid "Error creating account."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:175
+#: ../IkiWiki/Plugin/passwordauth.pm:171
 msgid "Failed to send mail"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:177
+#: ../IkiWiki/Plugin/passwordauth.pm:173
 msgid "Your password has been emailed to you."
 msgstr ""