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.

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

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

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