From: Jess Robinson <j.robinson@shadowcat.co.uk>
Date: Tue, 15 May 2012 11:12:22 +0000 (+0000)
Subject: Complete support for openid and new built-in openid_identifier
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7d244e7de11f203aaa7ba6bff51438e2a502f9f2;hp=4dbd098b6a7d334cbda64e4ca5d3d7aca8bbc86e;p=scpubgit%2Fstemmatology.git

Complete support for openid and new built-in openid_identifier
---

diff --git a/stemmaweb/lib/stemmaweb.pm b/stemmaweb/lib/stemmaweb.pm
index 6cf1729..5a84bf3 100644
--- a/stemmaweb/lib/stemmaweb.pm
+++ b/stemmaweb/lib/stemmaweb.pm
@@ -89,7 +89,7 @@ __PACKAGE__->config(
         action_after_login => '/index',
         send_register_email => 0,
         realm => 'openid',
-        login_fields => { openid => [], # qw/openid_identifier/],
+        login_fields => { openid => [qw/openid_identifier/],
                           default => [qw/username password/],
         },
     },
diff --git a/stemmaweb/root/src/auth/login.tt b/stemmaweb/root/src/auth/login.tt
index 6af2f51..e653632 100644
--- a/stemmaweb/root/src/auth/login.tt
+++ b/stemmaweb/root/src/auth/login.tt
@@ -22,17 +22,16 @@
      <option value="openid">OpenID</option>
     </select>
 
+    [% form.field('openid_identifier').render %]
+<!--
 <div id="field-openid-identifier">
 <label for="openid_identifier">OpenID login/url</label>
 <input type="text" name="openid_identifier" id="openid_identifier"/><br>
 </div>
-
-<!--
-<div style="display:none">
+-->
 	[% form.field('username').render %]
 	[% form.field('password').render %]
-</div>
--->
+
     [% form.field('remember').render %]
 	[% form.field('submit').render %]