@@ -1,16 +1,47 @@ -<h1>Log In</h1> +<h1>Log In </h1> <% form_tag session_path do -%> -<p><%= label_tag 'login' %><br /> -<%= text_field_tag 'login', @login %></p> +<div id="password_fields"<%= %( style="display:none") unless cookies['use_open_id'].blank? %>> +<p> + <label for="login"><%= 'Login'[:Login] %> or <%= link_to_function "login with OpenID", "LoginForm.setToOpenID()" %></label> + <br /> + <%= text_field_tag :login, @login %> + +</p> -<p><%= label_tag 'password' %><br/> -<%= password_field_tag 'password', nil %></p> + <%= hidden_field_tag :to, params[:to] if params[:to] %> -<!-- Uncomment this if you want this functionality -<p><%= label_tag 'remember_me', 'Remember me' %> -<%= check_box_tag 'remember_me', '1', @remember_me %></p> ---> +<p> + <label for="password"><%= 'Password'[:password_title] %></label><br /> + <%= password_field_tag :password %> +</p> +</div> -<p><%= submit_tag 'Log in' %></p> +<div id="openid_fields"<%= %( style="display:none") if cookies['use_open_id'].blank? %>> +<p> + <label for="openid_url"><%= 'OpenID'[:open_id_directions] %> + or <%= link_to_function "login with your password", "LoginForm.setToPassword()" %></label> + <br /> + <%= text_field_tag :openid_url, params[:openid_url] %> +</p> +</div> + +<p><label><%= check_box_tag "remember_me", "1", true %> <%= 'Remember me on this computer'[:remember_me] %></label></p> + + +<p><%= submit_tag 'Login'[:login_action], :or => link_to_function('reset password'[], "$('reset-password').toggle();") %></p> <% end -%> + +<% form_tag users_path, :id => 'reset-password', :style => 'display:none' do -%> + +<hr /> + +<h5><%= 'Reset Password'[] %></h5> + + <p><%= 'Enter your email, and a brand new login key will be sent to you. Click the link in the email to log in, and then change your password.'[:email_directions] %></p> + <p><%= text_field_tag :email, "", :size => 30 %> +<br /> +<%= submit_tag 'E-mail me the link'[:email_submit], :or => link_to_function('cancel'[], "$('reset-password').hide()") %></p> +<% end -%> + +<%= javascript_tag "$('login').focus();"%> \ No newline at end of file app/views/sessions/new.html.erb 9267c87ddeb06c4c1beebfd640c3a312368bb236 idonas spyridon.vasileiadis@gmail.com http://github.com/idonas/altered_beast/commit/5e5e1c25dde117540694f644945a4e5657fa4ab7 5e5e1c25dde117540694f644945a4e5657fa4ab7 2009-03-17T04:30:32-07:00 2009-03-17T04:30:32-07:00 updated login page to include openid fields 3db2559f95d14be9b75e7d0f783594134b868f81 idonas spyridon.vasileiadis@gmail.com