X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fa52a730ff3b30c7d2cdd8cd5f9c8c25a0c0a2a5..1612dce6bbb050eacf6843b972ffaf9816d724be:/IkiWiki/Plugin/openid.pm

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 65b884814..ab9fc560b 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::openid;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 sub import { #{{{
 	hook(type => "getopt", id => "openid", call => \&getopt);
@@ -26,16 +26,26 @@ sub formbuilder_setup (@) { #{{{
 	my $form=$params{form};
 	my $session=$params{session};
 	my $cgi=$params{cgi};
+	
+	# Give up if module is unavailable to avoid needing to depend on
+	# it.
+	eval q{use Net::OpenID::Consumer};
+	if ($@) {
+		debug("unable to load Net::OpenID::Consumer, not enabling OpenID login");
+		return;
+	}
 
 	if ($form->title eq "signin") {
+		# This avoids it displaying a redundant label for the
+		# OpenID fieldset.
+		$form->fieldsets("OpenID");
+
  		$form->field(
 			name => "openid_url",
-			label => "OpenID",
+			label => gettext("Log in with")." ".htmllink("", "", "OpenID", noimageinline => 1),
+			fieldset => "OpenID",
 			size => 30,
-			comment => '('.
-				htmllink("", "", "OpenID", noimageinline => 1, linktext => gettext("What's this?"))
-				.($config{openidsignup} ? " | <a href=\"$config{openidsignup}\">".gettext("Get an OpenID")."</a>" : "")
-				.')'
+			comment => ($config{openidsignup} ? " | <a href=\"$config{openidsignup}\">".gettext("Get an OpenID")."</a>" : "")
 		);
 
 		# Handle submission of an OpenID as validation.
@@ -58,8 +68,10 @@ 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);
+			$form->field(name => "OpenID", disabled => 1,
+				value => $session->param("name"), 
+				size => 50, force => 1,
+				fieldset => "login");
 		}
 	}
 }