cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace openID.js with funky rails generated javascript

Browse source
This commit is contained in:
Tom Hughes 2010-05-09 12:25:50 +01:00
parent 75c7f46a00
commit ebd109c946
3 changed files with 21 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/helpers/user_helper.rb
View file

@ -1,2 +1,12 @@
module UserHelper module UserHelper
def openid_button(name, url)
link_to_function(
image_tag("#{name}.png", :alt => t("user.login.openid_providers.#{name}.alt")),
nil,
:title => t("user.login.openid_providers.#{name}.title")
) do |page|
page[:login_form][:user_openid_url][:value] = url
page[:login_form].submit()
end
end
end end

32
app/views/user/login.html.erb
View file

@ -1,10 +1,8 @@
<%= javascript_include_tag 'openID.js' %>
<h1><%= t 'user.login.heading' %></h1> <h1><%= t 'user.login.heading' %></h1>
<p><%= t 'user.login.please login', :create_user_link => link_to(t('user.login.create_account'), :controller => 'user', :action => 'new', :referer => params[:referer]) %></p> <p><%= t 'user.login.please login', :create_user_link => link_to(t('user.login.create_account'), :controller => 'user', :action => 'new', :referer => params[:referer]) %></p>
<% form_tag :action => 'login' do %> <% form_tag({ :action => "login" }, { :id => "login_form" }) do %>
<%= hidden_field_tag('referer', h(params[:referer])) %> <%= hidden_field_tag('referer', h(params[:referer])) %>
<div style="position: relative;"> <div style="position: relative;">
<div class="loginBox"> <div class="loginBox">
@ -37,24 +35,16 @@
</td> </td>
</tr> </tr>
</table> </table>
<a href="javascript: openid_signin('openid');" title="<%= h(t 'user.login.openid_providers.openid.title') %>"> <%=
<%= image_tag "openid_logo.png", :alt => t('user.login.openid_providers.openid.title') %> link_to_function(image_tag("openid_logo.png", :alt => t("user.login.openid_providers.openid.title")), nil, :title => t("user.login.openid_providers.openid.title")) do |page|
</a> page[:login_form][:user_openid_url][:value] = "http://"
<a href="javascript: openid_signin('yahoo');" title="<%= h(t 'user.login.openid_providers.yahoo.title') %>"> end
<%= image_tag "yahoo.png", :alt => t('user.login.openid_providers.yahoo.alt') %> %>
</a> <%= openid_button "yahoo", "yahoo.com" %>
<a href="javascript: openid_signin('google');" title="<%= h(t 'user.login.openid_providers.google.title') %>"> <%= openid_button "google", "gmail.com" %>
<%= image_tag "google.png", :alt => t('user.login.openid_providers.google.alt') %> <%= openid_button "myopenid", "myopenid.com" %>
</a> <%= openid_button "wordpress", "wordpress.com" %>
<a href="javascript: openid_signin('myopenid');" title="<%= h(t 'user.login.openid_providers.myopenid.title') %>"> <%= openid_button "myspace", "myspace.com" %>
<%= image_tag "myopenid.png", :alt => t('user.login.openid_providers.myopenid.alt') %>
</a>
<a href="javascript: openid_signin('wordpress');" title="<%= h(t 'user.login.openid_providers.wordpress.title') %>">
<%= image_tag "wordpress.png", :alt => t('user.login.openid_providers.wordpress.alt') %>
</a>
<a href="javascript: openid_signin('myspace');" title="<%= h(t 'user.login.openid_providers.myspace.title') %>">
<%= image_tag "myspace.png", :alt => t('user.login.openid_providers.myspace.alt') %>
</a>
</div> </div>
<div style="clear: both"> <div style="clear: both">

22
public/javascripts/openID.js
View file

@ -1,22 +0,0 @@
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://";
}
}