Improve display of openid in preferences page.

Now that openiduser is in IkiWiki core, it's ok to have passwordauth check
for it, and avoid displaying useless password fields when showing
preferences for an openid.

Also improved the styling of the display of the openid in the preferneces
page.

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index dc0e0f48ee98e70313abce4d195092989e5537c6..b60740c0e0c1489e9e69f2847a1958fb9ab5732d 100644 (file)
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -82,13 +82,13 @@ sub formbuilder_setup (@) {
                        }
                }
        }
-       elsif ($form->title eq "preferences") {
-               if (! defined $form->field(name => "name")) {
-                       $form->field(name => "OpenID", disabled => 1,
-                               value => $session->param("name"), 
-                               size => 50, force => 1,
-                               fieldset => "login");
-               }
+       elsif ($form->title eq "preferences" &&
+              IkiWiki::openiduser($session->param("name"))) {
+               $form->field(name => "openid_url", disabled => 1,
+                       label => htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
+                       value => $session->param("name"), 
+                       size => 50, force => 1,
+                       fieldset => "login");
        }
 }
 

diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index 1898030b58e9fca83496b6ca2c865ac0cdac62ac..b70f9b788ed90dc0a30fd6935b1f43389a29ac19 100644 (file)
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -206,7 +206,8 @@ sub formbuilder_setup (@) {
                        }
                }
        }
-       elsif ($form->title eq "preferences") {
+       elsif ($form->title eq "preferences" &&
+               IkiWiki::openiduser($session->param("name"))) {
                $form->field(name => "name", disabled => 1, 
                        value => $session->param("name"), force => 1,
                        fieldset => "login");

diff --git a/debian/changelog b/debian/changelog
index 7beb0db8211d78ec677893c4bdfe268d2088b390..9867cf75a3960b32b40a1082daf01b006fc66990 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
     than default underline. Closes: #517656
   * Allow jumping directly into account registration process by going to 
     ikiwiki.cgi?do=register
+  * Improve display of openid in preferences page.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500