public/stylesheets/application.css public/stylesheets/blueprint/ie.css public/stylesheets/blueprint/plugins/fancy-type/readme.txt public/stylesheets/blueprint/plugins/fancy-type/screen.css public/stylesheets/blueprint/print.css public/stylesheets/blueprint/screen.css public/stylesheets/blueprint/src/forms.css public/stylesheets/blueprint/src/grid.css public/stylesheets/blueprint/src/grid.png public/stylesheets/blueprint/src/ie.css public/stylesheets/blueprint/src/print.css public/stylesheets/blueprint/src/reset.css public/stylesheets/blueprint/src/typography.css @@ -51,7 +51,7 @@ The application has been configured to use a Google gmail account to send confir Configure email by modifying config/initializers/mail.rb - config/config.yml (_or create_ "config/config.local.yml") + config/config.yml (or create "config/config.local.yml") ## Set Up the Database @@ -129,9 +129,7 @@ To run the RSpec examples: ## To Do -* Style with Blueprint CSS * Add RSpec examples and stories to cover "Bells and Whistles" features -* Add a "change password" feature for a user * Change "login" to use email addresses instead ## Done @@ -161,6 +159,8 @@ To run the RSpec examples: * Added views * Tagged step-3 * Added Eugene Bolshakov's AppConfig plugin +* Added Blueprint CSS framework +* Modified views and CSS to apply design elements ## Documentation and Support @@ -169,7 +169,8 @@ The forum discussion [Restful Authentication With All the Bells and Whistles](ht Here are useful blog postings: * [How to Install RESTful Authentication on a Ruby on Rails 2.1 Application](http://crazyrails.com/how-to-install-restful-authentication/). -* [How to Set Up Restful Authentication and acts_as_state_machine With Rails 2.1](http://fakingfantastic.com/2008/08/05/how-to-set-up-restful-authentication-and-acts_as_state_machine-with-rails-21/). +* Frank Lakatos's [How to Set Up Restful Authentication and acts_as_state_machine With Rails 2.1](http://fakingfantastic.com/2008/08/05/how-to-set-up-restful-authentication-and-acts_as_state_machine-with-rails-21/). +* Dan Engle's [My Take on Enhancing restful_authentication](http://morebs.com/2008/02/20/my-take-on-restful_authentication/). This application is provided without additional documentation or support. @@ -178,6 +179,7 @@ This application is provided without additional documentation or support. * Rick Olson (and contributors) for the Restful Authentication Generator plugin * "activefx" for "Restful Authentication With All the Bells and Whistles" * Scott Barron for the "acts as state machine" plugin +* Graphic design derived from [Bruno Bornsztein's CommunityEngine](http://www.missingmethod.com/) ## License README.markdown @@ -32,7 +32,7 @@ class UsersController < ApplicationController redirect_back_or_default('/') flash[:notice] = "Thanks for signing up! We're sending you an email with your activation code." else - flash[:error] = "We couldn't set up that account, sorry. Please try again, or contact an admin (link is above)." + flash[:error] = "Please check for errors." render :action => 'new' end end app/controllers/users_controller.rb @@ -75,5 +75,8 @@ class User < ActiveRecord::Base self.activation_code = self.class.make_token end + def make_password_reset_code + self.password_reset_code = Digest::SHA1.hexdigest( Time.now.to_s.split(//).sort_by {rand}.join ) + end end app/models/user.rb @@ -1,7 +1,7 @@ class UserMailer < ActionMailer::Base def signup_notification(user) setup_email(user) - @subject += 'Please activate your new account' + @subject = 'Please activate your new account' @body[:url] = "#{Conf.site_url}activate/#{user.activation_code}" @@ -9,19 +9,19 @@ class UserMailer < ActionMailer::Base def activation(user) setup_email(user) - @subject += 'Your account has been activated!' + @subject = 'Your account has been activated!' @body[:url] = "#{Conf.site_url}" end def forgot_password(user) setup_email(user) - @subject += 'You have requested to change your password' + @subject = 'You have requested to change your password' @body[:url] = "#{Conf.site_url}reset_password/#{user.password_reset_code}" end def reset_password(user) setup_email(user) - @subject += 'Your password has been reset.' + @subject = 'Your password has been reset.' end def message_to_admin(subject,body) @@ -30,7 +30,7 @@ class UserMailer < ActionMailer::Base @from = @admin.email @subject = "#{Conf.site_name}" @sent_on = Time.now - @subject += subject + @subject = subject @body[:body] = body end app/models/user_mailer.rb @@ -7,29 +7,68 @@ <%= controller.controller_name -%>: <%= controller.action_name -%> </title> + <%= stylesheet_link_tag 'blueprint/screen', :media => 'screen, projection' %> + <%= stylesheet_link_tag 'blueprint/print', :media => 'print' %> + <%= stylesheet_link_tag 'application' %> +  +<%= yield :head %> </head> <body> - <ul> - <% if logged_in? %> - <li>Logged in as:</li> - <li><%= link_to h(current_user.login.capitalize), user_path(current_user) %></li> - <ul> - <li><%= link_to 'Edit Profile', edit_user_path(current_user) %></li> - <li><%= link_to 'Log Out', logout_url %></li> - </ul> - <% if current_user.has_role?('administrator') %> - <li><%= link_to 'Administer Users', users_path %></li> - <% end %> - <% else %> - <li><%= link_to 'Log In', new_session_path %></li> - <li><%= link_to 'Sign Up', new_user_path %></li> - <li><%= link_to 'Forgot Password?', forgot_password_path %></li> - <% end %> - </ul> - <div id="flashes"> - <div id="errors" class="error" style="display:none"><%= flash[:error] %></div> - <div id="notice" class="notice" style="display:none"><%= flash[:notice] %></div> - </div> - <%= yield %> -</body> + <div class="container"> + <div id='container_hd'> + <div id='hd'> + <h1> + <a href="/"><%= Conf.site_name -%></a> + </h1> + <h2> + <% if logged_in? %> + Logged in as: + <%= link_to h(current_user.login.capitalize), user_path(current_user) %> + <%= link_to 'Log Out', logout_url %> + <% else %> + Welcome! + <%= link_to 'Log In', new_session_path %> + or + <%= link_to 'Sign Up', new_user_path %> + <% end %> + </h2> + </div> + </div> + <div id='container_bd'> + <div id='main'> + <div id="flashes"> + <% names = [:notice, :error, :warning, :message, :success] %> + <% for name in names %> + <% if flash[name] %> + <%= "<div id=\"#{name}\" class=\"#{name}\">#{flash[name]}</div>" %> + <% end %> + <% end %> + </div> + <%= yield :layout %> + </div> + <div id='sidebar'> + <%= yield :sidebar %> + </div> + </div> + <div id='container_ft'> + <div id='ft'> + <ul> + <li><%= link_to 'Home', root_url %></li> + <% if logged_in? %> + <li><%= link_to 'Profile', user_path(current_user) %></li> + <li><%= link_to 'Edit Profile', edit_user_path(current_user) %></li> + <% if current_user.has_role?('administrator') %> + <li><%= link_to 'All Users', users_path %></li> + <% end %> + <li><%= link_to 'Log Out', logout_url %></li> + <% else %> + <li><%= link_to 'Log In', new_session_path %></li> + <li><%= link_to 'Sign Up', new_user_path %></li> + <li><%= link_to 'Forgot Password?', forgot_password_path %></li> + <% end %> + </ul> + </div> + </div> + </div> + </body> </html> app/views/layouts/application.html.erb @@ -1,11 +1,27 @@ -<% form_tag password_path, :method => :put do %> -<%= hidden_field_tag :id, params[:id] %> -Password:<br /> -<%= password_field_tag :password %><br /> -Confirm Password:<br /> -<%= password_field_tag :password_confirmation %><br /> -<%= submit_tag "Reset Your Password" %> -<% end %> -<script type='text/javascript'> -document.getElementById('password').focus() -</script> +<h3>Create a New Password</h3> + +<% form_tag( password_path, {:method => :put, :class => 'MainForm'}) do -%> + <%= hidden_field_tag :id, params[:id] %> + + <%= label_tag 'password', 'Type a new password:' %> + <%= password_field_tag :password %> + + <%= label_tag 'password_confirmation', 'Re-type the new password to confirm:' %> + <%= password_field_tag :password_confirmation %> + + <p><%= submit_tag 'Create my new password' %></p> +<% end -%> + + +<% content_for(:sidebar) do %> + <div class="box"> + <h3>Help</h3> + <p> We've deleted your old password. Please create a new password. </p> + </div> +<% end -%> + +<% content_for(:head) do %> + <script type='text/javascript'> + document.getElementById('password').focus() + </script> +<% end -%> \ No newline at end of file app/views/passwords/edit.html.erb @@ -1,9 +1,35 @@ -<h2>Forgot Password</h2> -<% form_tag url_for(:action => 'create') do %> -What is the email address used to create your account?<br /> -<%= text_field_tag :email, "", :size => 50 %><br /> -<%= submit_tag 'Reset Password' %> -<% end %> -<script type='text/javascript'> -document.getElementById('email').focus() -</script> +<h3>Forgot Your Password?</h3> + +<% form_tag(url_for(:action => :create), {:class => 'MainForm'}) do -%> + + <%= label_tag 'email', "Enter your email address" %> + <%= text_field_tag :email %> + + <p><%= submit_tag 'Reset my password' %></p> +<% end -%> + + +<% content_for(:sidebar) do %> + <div class="box"> + <h3>Help</h3> + <p> + Don't have an account? + <br/> + <%= link_to '» Click here to sign up', new_user_path %> + </p> + </div> + <div class="box alt"> + <h3>Tips</h3> + <p> If you've forgotten your password, + we'll send you an email that contains an activation link. </p> + <p> Click the activation link in the e-mail to + confirm your address and go to a page where you + can create a new password. </p> + </div> +<% end -%> + +<% content_for(:head) do %> + <script type='text/javascript'> + document.getElementById('email').focus() + </script> +<% end -%> \ No newline at end of file app/views/passwords/new.html.erb @@ -1,7 +1,7 @@ -<h2>Roles for <%=h @user.login.capitalize %></h2> +<h3>Roles for User "<%=h @user.login%>"</h3> -<h3>Roles assigned:</h3> +<h4>Roles assigned:</h4> <ul><%= render :partial => 'role', :collection => @user.roles %></ul> -<h3>Roles available:</h3> +<h4>Roles available:</h4> <ul><%= render :partial => 'role', :collection => (@all_roles - @user.roles) %></ul> app/views/roles/index.html.erb @@ -1,17 +1,38 @@ -<h1>Log In</h1> +<h3>Log in</h3> -<% form_tag session_path do -%> -<p><%= label_tag 'login' %><br /> -<%= text_field_tag 'login', @login %></p> +<% form_tag(session_path, {:class => 'MainForm'}) do -%> -<p><%= label_tag 'password' %><br/> -<%= password_field_tag 'password', nil %></p> + <%= label_tag 'login' %> + <%= text_field_tag 'login', @login %> -<p><%= label_tag 'remember_me', 'Remember me' %> -<%= check_box_tag 'remember_me', '1', @remember_me %></p> + <%= label_tag 'password' %> + <%= password_field_tag 'password', nil %> -<p><%= submit_tag 'Log in' %></p> + <fieldset> + <%= check_box_tag 'remember_me', '1', @remember_me %> Remember me + </fieldset> + + <p><%= submit_tag 'Log in' %></p> +<% end -%> + +<% content_for(:sidebar) do %> + <div class="box"> + <h3>Help</h3> + <p> + Don't have an account? + <br/> + <%= link_to '» Click here to sign up', new_user_path %> + </p> + <p> + Forgot your password? + <br/> + <%= link_to '» Click here to retrieve it', forgot_password_path %> + </p> + </div> <% end -%> -<script type='text/javascript'> - document.getElementById('login').focus() -</script> \ No newline at end of file + +<% content_for(:head) do %> + <script type='text/javascript'> + document.getElementById('login').focus() + </script> +<% end -%> \ No newline at end of file app/views/sessions/new.html.erb @@ -3,11 +3,12 @@ <td><%=h user.email %></td> <td><%= user.state %> <% unless user == current_user %> -[<% if user.enabled %> -<%= link_to('disable', suspend_user_path(user.id), :method => :put) %> -<% else %> -<%= link_to('enable', unsuspend_user_path(user.id), :method => :put) %> -<% end %>] + <% if user.state == 'active' %> + <%= link_to('suspend', suspend_user_path(user.id), :method => :put) %> + <% end %> + <% if user.state == 'suspended' %> + <%= link_to('unsuspend', unsuspend_user_path(user.id), :method => :put) %> + <% end %> <% end %> </td> <td>[ <%= link_to 'edit roles', user_roles_path(user) %> ]</td> app/views/users/_user.html.erb @@ -1,14 +1,29 @@ -<h2>Edit Your Account</h2> -<p><%= link_to 'Show Profile', user_path(@user) %> | -<%= link_to 'Change Password', change_password_path %> -</p> +<% if @user == current_user %> + <h3>Edit Your Profile</h3> +<% else %> + <h3>Edit User's Profile</h3> +<% end %> + <%= error_messages_for :user %> -<% form_for :user, :url => user_url(@user), :html => { :method => :put } do |f| %> -<p>Email:<br /><%= f.text_field :email, :size => 60 %></p> +<% form_for :user, :url => user_url(@user), :html => { :method => :put, :class => 'MainForm' } do |f| %> + <%= hidden_field_tag :id, params[:id] %> + + <%= label_tag 'email', 'Email address:' %> + <%= f.text_field :email, :size => 60 %> -<%= submit_tag 'Save' %> -<% end %> -<script type='text/javascript'> -document.getElementById('user_email').focus() -</script> + <p><%= submit_tag 'Save' %></p> +<% end -%> + +<% content_for(:sidebar) do %> + <div class="box"> + <h3>Help</h3> + <p> You can change your email address here. </p> + </div> +<% end -%> + +<% content_for(:head) do %> + <script type='text/javascript'> + document.getElementById('user_email').focus() + </script> +<% end -%> app/views/users/edit.html.erb @@ -1,10 +1,11 @@ -<h2>All Users</h2> +<h3>All Users</h3> <table> <tr> <th>Username</th> <th>Email</th> -<th>Enabled?</th> +<th>Status</th> <th>Roles</th> +<th>Profile</th> </tr> <%= render :partial => 'user', :collection => @users %> </table> app/views/users/index.html.erb @@ -1,22 +1,45 @@ -<h1>Sign up as a new user</h1> -<% @user.password = @user.password_confirmation = nil %> +<h3>Sign up!</h3> +<% @user.password = @user.password_confirmation = nil %> <%= error_messages_for :user %> -<% form_for :user, :url => users_path do |f| -%> -<p><%= label_tag 'login' %><br/> -<%= f.text_field :login %></p> -<p><%= label_tag 'email' %><br/> -<%= f.text_field :email %></p> +<% form_for :user, :url => users_path, :html => { :class => 'MainForm' } do |f| -%> + + <%= label_tag 'login', 'Username' %> + <%= f.text_field :login %> + + <%= label_tag 'email', "Email address" %> + <%= f.text_field :email %> -<p><%= label_tag 'password' %><br/> -<%= f.password_field :password %></p> + <%= label_tag 'password', 'Type your password:' %> + <%= f.password_field :password %> -<p><%= label_tag 'password_confirmation', 'Confirm Password' %><br/> -<%= f.password_field :password_confirmation %></p> + <%= label_tag 'password_confirmation', 'Re-type your password to confirm:' %> + <%= f.password_field :password_confirmation %> -<p><%= submit_tag 'Sign up' %></p> + <p><%= submit_tag 'Sign up' %></p> <% end -%> -<script type='text/javascript'> -document.getElementById('user_login').focus() -</script> \ No newline at end of file + + +<% content_for(:sidebar) do %> + <div class="box"> + <h3> Why Sign up? </h3> + <ul class="list checks"> + <li>You'll have access to all the features</li> + </ul> + </div> + <div class="box alt"> + <h3>Tips</h3> + <p> After signing up, you'll receive an e-mail confirmation message. </p> + <p> Click the activation link in the e-mail to log in. </p> + <p> + <%= link_to 'Already have an account?', new_session_path %> + </p> + </div> +<% end -%> + +<% content_for(:head) do %> + <script type='text/javascript'> + document.getElementById('login').focus() + </script> +<% end -%> \ No newline at end of file app/views/users/new.html.erb @@ -1,3 +1,16 @@ -<h2>User: <%=h @user.login %></h2> -<p>email: <%=h @user.email %></p> -<p>Joined on: <%= @user.created_at.to_s(:long) %></p> +<% if @user == current_user %> + <h3>Your User Profile</h3> +<% else %> + <h3>User's Profile</h3> +<% end %> + +<p><strong>User:</strong> <%=h @user.login %></p> +<p><strong>Email:</strong> <%=h @user.email %></p> +<p><strong>Joined on:</strong> <%= @user.created_at.to_s(:long) %></p> + +<% content_for(:sidebar) do %> + <div class="box"> + <h3>Help</h3> + <p> This is your user profile. </p> + </div> +<% end -%> \ No newline at end of file app/views/users/show.html.erb 1f2fbf58a085894494e0cf77cefdface92fbe1bf Daniel Kehoe developer@fortuity.com http://github.com/fortuity/origin_restful_authentication/commit/3c6e2a02dadfb964ee17f9030787530334bac9b3 3c6e2a02dadfb964ee17f9030787530334bac9b3

2008-08-12T15:03:44-07:00

Modified views and added CSS to apply design elements 2fb7a6ab000c3f34faa5b0f644f9b97f04d449d7 Daniel Kehoe developer@fortuity.com