headstart 0.8.0 → 0.9.0

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.9.0

data/app/controllers/headstart/users_controller.rb

@@ -7,6 +7,13 @@ class Headstart::UsersController < ApplicationController
   # Before Filter on *only* the 'uninstalled' method 
   before_filter :verify_uninstall_signature, :only => [:facebook_remove] 
 
+  def resend_welcome_email
+    HeadstartMailer.deliver_welcome(current_user)
+    flash[:notice] = 'Your confirmation email has been resent.'
+    @user = current_user
+    render :template => 'users/edit'
+  end
+  
   def facebook_remove
     @fb_uid = params[:fb_sig_user] 
     if @fb_uid.present?
@@ -41,6 +48,9 @@ class Headstart::UsersController < ApplicationController
   
   def edit
     @user = current_user
+    if !@user.email_confirmed?
+      flash[:notice] = 'Your account has not been confirmed yet. Please confirm using the link in the Welcome email sent to you. Click <a href="/resend_welcome_email">here</a> to resend confirmation email.'
+    end
     render :template => 'users/edit'
   end
   

data/app/views/generic_mailer/change_password.text.html.erb

@@ -1,7 +1,7 @@
-Someone, hopefully you, has requested that we send you a link to change your password.
+<p>Someone, hopefully you, has requested that we send you a link to change your password.</p>
 
-Here's the link:
+<p>Here's the link:</p>
 
-<%= @url %>
+<p><%= @url %></p>
 
-If you didn't request this, ignore this email. Don't worry. Your password hasn't been changed.
+<p>If you didn't request this, ignore this email. Don't worry. Your password hasn't been changed.</p>

data/app/views/generic_mailer/welcome.text.html.erb

@@ -1,7 +1,7 @@
-Welcome to <%= Settings.title %>. Thanks for registering and trying it out. Please <%= link_to "click here", new_user_confirmation_url(
+<p>Welcome to <%= Settings.title %>. Thanks for registering and trying it out. Please <%= link_to "click here", new_user_confirmation_url(
       :user_id => @user,
       :token   => @user.confirmation_token,
-      :encode  => false) %> to confirm you received this email and activate your account.
+      :encode  => false) %> to confirm you received this email and activate your account.</p>
 
-Thank you,
-Team <%= Settings.title %>
+<p>Thank you,<br/>
+Team <%= Settings.title %></p>

data/generators/headstart/templates/app/helpers/users_helper.rb

@@ -1,7 +1,7 @@
 module UsersHelper
   
   def avatar_url(user)
-    if user.facebook_uid.present?
+    if user.facebook_uid.present? && user.avatar_file_name.blank?
       return "http://graph.facebook.com/#{user.facebook_uid}/picture?type=square"
     else
       return user.avatar.url(:thumb)

data/generators/headstart/templates/application.html.erb

@@ -43,7 +43,7 @@
 		      | <%= link_to 'Admin', "/admin" %>
 		    <% end %>
 
-		    | <%= link_to 'My Profile', user_path(current_user) %>
+		    | <%= link_to 'My Profile', edit_user_path(current_user) %>
 		  <% else %>
 		    <%= link_to 'Sign in', sign_in_path %> |
 		    <%= link_to 'Sign up', sign_up_path %>
@@ -55,7 +55,7 @@
 	<div id="content" class="container_12">
 		<div id="flash">
 	    <%- flash.each do |key, value| -%>
-	      <div class="<%= key %>_flash"><%=h value %></div>
+	      <div class="<%= key %>_flash"><%= value %></div>
 	    <%- end -%>
 	  </div>
 	  <%= yield %>

data/generators/headstart/templates/migrations/create_users.rb

@@ -12,7 +12,7 @@ class HeadstartCreateUsers < ActiveRecord::Migration
       t.string   :password_reset_token, :limit => 128
       t.string   :confirmation_token, :limit => 128
       t.boolean  :email_confirmed, :default => false, :null => false
-      t.boolean  :email_confirmation_sent_at, :datetime
+      t.datetime  :email_confirmation_sent_at
       
       t.string   :avatar_file_name
       t.string   :avatar_content_type

data/lib/headstart/routes.rb

@@ -40,6 +40,9 @@ module Headstart
         :controller => 'headstart/impersonations',
         :only       => :index
         
+      map.resend_welcome_email 'resend_welcome_email',
+      :controller   => 'headstart/users',
+      :action       => 'resend_welcome_email'
       map.sign_up    'sign_up',
         :controller   => 'headstart/users',
         :action       => 'new'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: headstart
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 59
   prerelease: false
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Bran Burridge
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -04:00
+date: 2010-10-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency