urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
joshtriplett 2007-04-30 04:08:06 +00:00
parent d52450ecff
commit fafaa119cf
9 changed files with 10 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IkiWiki/Plugin/passwordauth.pm
View File

@ -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");

1
basewiki/passwordauth.mdwn
View File

@ -1 +0,0 @@
../doc/passwordauth.mdwn

8
debian/changelog vendored
View File

@ -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

1
doc/basewiki.mdwn
View File

@ -11,7 +11,6 @@ It currently includes these pages:
* [[markdown]]
* [[openid]]
* [[pagespec]]
* [[passwordauth]]
* [[PreprocessorDirective]]
* [[shortcuts]]
* [[smileys]]

3
doc/bugs/login_page_non-obvious_with_openid.mdwn
View File

@ -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]]

9
doc/openid.mdwn
View File

@ -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,

24
doc/passwordauth.mdwn
View File

@ -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.
"""]]

1
doc/todo/conditional_underlay_files.mdwn
View File

@ -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.

12
po/ikiwiki.pot
View File

@ -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 ""