From: Kai Krueger <kai@aiputerlx.(none)>
Date: Sat, 1 May 2010 17:48:20 +0000 (+0100)
Subject: Hide OpenID url on signup page to make it less confusing
X-Git-Tag: live~6323
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/799bbc3d9fececc84b3940d8a9cb8681551a9ec0

Hide OpenID url on signup page to make it less confusing
---

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 76c18595a..89a2ec458 100644
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -1,27 +1,4 @@
-<script type="text/javascript">
-function openid_signin(provider)
-{
-    if (provider == 'google') {
-        document.forms[0].user_openid_url.value="gmail.com";
-        document.forms[0].submit();
-    } else if (provider == 'yahoo') {
-        document.forms[0].user_openid_url.value="yahoo.com";
-        document.forms[0].submit();
-    } else if (provider == 'myopenid') {
-        document.forms[0].user_openid_url.value="myopenid.com";
-        document.forms[0].submit();
-    } else if (provider == 'wordpress') {
-        document.forms[0].user_openid_url.value="wordpress.com";
-        document.forms[0].submit();
-    } else if (provider == 'myspace') {
-        document.forms[0].user_openid_url.value="myspace.com";
-        document.forms[0].submit();
-    } else if (provider == 'openid') {
-        document.forms[0].user_openid_url.value="http://";
-    }
-
-}
-</script> 
+<%= javascript_include_tag 'openID.js' %>
 
 <h1><%= t 'user.login.heading' %></h1>
 
diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index ace79e446..ba068b6c3 100644
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -1,3 +1,5 @@
+<%= javascript_include_tag 'openID.js' %>
+
 <h1><%= t 'user.new.heading' %></h1>
 
 <% if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"}) %>
@@ -30,15 +32,21 @@
   <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
   <tr><td class="fieldName"><%= t 'user.new.password' %></td><td><%= password_field('user', 'pass_crypt',{:size => 30, :maxlength => 255, :tabindex => 4}) %></td></tr>
   <tr><td class="fieldName"><%= t 'user.new.confirm password' %></td><td><%= password_field('user', 'pass_crypt_confirmation',{:size => 30, :maxlength => 255, :tabindex => 5}) %></td></tr>
-  
-  <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
-  <tr><td class="fieldName"><%= t 'user.new.openID' %></td><td><%= text_field('user', 'openid_url',{:size => 50, :maxlength => 255, :tabindex => 6, :value => @openID, :class => "openid_url"}) %></td></tr>
-  <tr><td></td><td><span class="minorNote"><%= t 'user.new.openID description' %></span></td></tr>
   <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
+  <tr><td></td><td><span class="minorNote"><a href="javascript:unhideopenID()">Associate an OpenID with your account</a></span></td></tr>
+  <tr id="openID_row-1" style="display: none"><td class="fieldName"><%= t 'user.new.openID' %></td><td><%= text_field('user', 'openid_url',{:size => 50, :maxlength => 255, :tabindex => 6, :value => @openID, :class => "openid_url"}) %></td></tr>
+  <tr id="openID_row-2" style="display: none"><td></td><td><span class="minorNote"><%= t 'user.new.openID description' %></span></td></tr>
+  <tr><td colspan="2" >&nbsp;<!--vertical spacer--></td></tr>
   <tr><td></td><td align="right"><input type="submit" value="<%= t'user.new.signup' %>" tabindex="7"></td></tr>
 </table>
 <% end %>
 
+<% if @openID %>
+<script type="text/javascript">
+unhideopenID();
+</script>
+<% end %>
+
 <%= javascript_include_tag 'https://ethnio.com/remotes/62786' %>
 
 <% end %>