@@ -8,6 +8,7 @@ class SessionsController < ApplicationController end def create + logger.warn "XXX openid_url: #{params[:openid_url]}" if using_open_id? open_id_authentication(params[:openid_url]) else @@ -26,7 +27,6 @@ class SessionsController < ApplicationController @person.email_verified = true if global_prefs.email_verifications? @person.save if !@person.errors.empty? - @body = "login single-col" err_message = "Your OpenID profile must provide" err_message += " nickname," if !@person.errors[:name].nil? err_message += " email," if !@person.errors[:email].nil? @@ -44,6 +44,7 @@ class SessionsController < ApplicationController end def failed_login(message = "Authentication failed.") + @body = "login single-col" flash.now[:error] = message render :action => 'new' end app/controllers/sessions_controller.rb @@ -2,6 +2,7 @@ <h2>Sign in</h2> <% form_tag session_path do -%> +<span id="standard"> <div class="form_row"> <label for="email">Email address</label> <%= text_field_tag 'email', params[:email], @@ -14,12 +15,8 @@ <%= password_field_tag 'password', params[:password], :maxlength => Person::MAX_PASSWORD %> </div> - - <p> - or use... - </p> - - <div class="form_row"> +</span> + <div class="form_row" id="openid"> <label for="openid_url">OpenID</label> <%= text_field_tag "openid_url" %> </div> @@ -31,11 +28,66 @@ <div class="form_row"> <%= submit_tag 'Sign in', :class => "button" %> - <p>or <%= link_to "Sign up", signup_path %></p> </div> - <p class="form_row"> - <%= link_to "I forgot my password!", new_password_reminder_path %> - </p> +<div style="text-align: center; font-size: 12px; padding: 10px;"> + <%= link_to "...or Sign up", signup_path %> :: + <%= link_to "I forgot my password!", new_password_reminder_path %> :: + <span id="noscript" style="display:none;"> + <span id="openid_link"><a href="#" onclick="show_openid(); return false;">Login using OpenID</a></span> + <span id="standard_link"><a href="#" onclick="show_standard(); return false;">Back to Regular Login</a></span> + </span> + +</div> <% end -%> <%- end -%> +<script type='text/javascript'> +show_openid = function() { + $('openid').show(); + $('standard').hide(); + $('openid_link').hide(); + $('standard_link').show(); + createCookie('use_openid', 1, 30); + $('openid_url').value = 'http://'; +} +show_standard = function() { + $('openid').hide(); + $('standard').show(); + $('openid_link').show(); + $('standard_link').hide(); + eraseCookie('use_openid'); + $('openid_url').value = ''; +} +$('openid').hide(); +$('standard_link').hide(); +$('noscript').show(); + +if (readCookie('use_openid')){ + show_openid(); +} + +function createCookie(name,value,days) { + if (days) { + var date = new Date(); + date.setTime(date.getTime()+(days*24*60*60*1000)); + var expires = "; expires="+date.toGMTString(); + } + else var expires = ""; + document.cookie = name+"="+value+expires+"; path=/"; +} + +function readCookie(name) { + var nameEQ = name + "="; + var ca = document.cookie.split(';'); + for(var i=0;i < ca.length;i++) { + var c = ca[i]; + while (c.charAt(0)==' ') c = c.substring(1,c.length); + if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length); + } + return null; +} + +function eraseCookie(name) { + createCookie(name,"",-1); +} +</script> app/views/sessions/new.html.erb b8998ffa033cedf8573931a090c189b9f2a2c25c Tom Brown herestomwiththeweather herestomwiththeweather@gmail.com http://github.com/herestomwiththeweather/insoshi/commit/0c3e4ba7af7aeffc24236d7e4294552804db4efa 0c3e4ba7af7aeffc24236d7e4294552804db4efa 2008-09-06T14:16:29-07:00 2008-09-06T14:16:29-07:00 javascript to toggle between openid and old school login cab2e3d0ce41ac14b6f2fb5ef291a5e7de881cc5 Tom Brown herestomwiththeweather herestomwiththeweather@gmail.com