Changes

app/controllers/prayers_controller.rb

@@ -21,6 +21,9 @@ def answered
     respond_to do |format|
       if @prayer.save
 
+        # Send out an email letting users know the prayer was answered
+        Reminder.send_prayer_answered(@prayer)
+
         # Remove reminders
         Reminder.remove_by_prayer(@prayer)
 

app/models/reminder.rb

@@ -16,4 +16,10 @@ def self.remove_by_prayer(prayer)
     self.delete_all(:prayer_id => prayer.id)
   end
 
+  def self.send_prayer_answered(prayer)
+    self.find_all_by_prayer_id(prayer.id).each do |reminder|
+      UserMailer.deliver_prayer_answered(reminder.user, prayer)
+    end
+  end
+
 end

app/models/user.rb

@@ -55,7 +55,7 @@ def self.search(search, page, per)
 
 
   def send_reminder
-    self.find(:all).each do |user|
+    self.find(:all, :conditions => ['remind_me = ?', true]).each do |user|
       UserMailer.deliver_reminder(self)
     end
   end

app/models/user_mailer.rb

@@ -20,6 +20,15 @@ def reminder(user)
   end
 
 
+  def prayer_answered(user, prayer)
+    from          default_url_options[:host]
+    recipients    user.email
+    content_type  "text/html"
+    subject       "Prayer Answered"
+    body          :prayer => prayer
+  end
+
+
   def password_reset_instructions(user)
     subject       "Password Reset Instructions"
     from          default_url_options[:host]

app/views/prayers/_nothing_found.erb

@@ -1,2 +1,4 @@
-<h2>Nothing was found here.</h2>
-<h3><%= link_to 'List all Prayers', root_path %></h3>
+<div id="nothingFound">
+  <h2>Nothing was found here.</h2>
+  <h3><%= link_to 'List all Prayers', root_path %></h3>
+</div>

app/views/prayers/_search.erb

@@ -2,7 +2,10 @@
 	<h2>Search Prayers</h2>
 	<form action="/" method="GET">
 		<div class="formFields">
-			<input type="text" name="search" id="search" value="<%= params[:search] || 'Search'%>" />
+			<input type="text" name="search" id="search" value="<%= params[:search] || 'Search' %>" />
 		</div>
 	</form>
+	<% if params[:search] %>
+	 <p><strong><%= pluralize(@prayers.count, 'Prayer') %> found</strong> <%= link_to 'Clear Search', root_path %></p>
+	<%end %>
 </div>

app/views/user_mailer/prayer_answered.html.erb

@@ -0,0 +1,12 @@
+<%= render :partial => 'layouts/email_header' %>
+
+<h1>Prayer Answered</h1>
+<p>The following prayer has been answered:</p>
+
+<blockquote>
+  <%= render :partial => 'prayers/prayer', :locals => { :prayer => @prayer }%>
+</blockquote>
+
+<p>Thank you for your constant prayer.</p>
+
+<%= render :partial => 'layouts/email_footer' %>

app/views/user_mailer/reminder.html.erb

@@ -3,7 +3,9 @@
 <h1>Today's Prayer Needs</h1>
 
 <% @user.reminders.each do |reminder| %>
-	<%= render :partial => 'prayers/prayer', :locals => { :prayer => reminder.prayer }%>
+  <blockquote>
+    <%= render :partial => 'prayers/prayer', :locals => { :prayer => reminder.prayer }%>
+  </blockquote>
 <% end %>
 
 <%= render :partial => 'layouts/email_footer' %>

app/views/users/edit.html.erb

@@ -1,6 +1,6 @@
 <%= sidebar(render :partial => 'settings')  %>
 
-<% form_for(@user, :html => { :multipart => true }) do |f| %>
+<% form_for(@user) do |f| %>
 	<fieldset class="clear">
 	  <legend>Account Information</legend>
 		<div class="formFields">
@@ -18,6 +18,11 @@
 			<%= f.text_field :email %>
 			<%= error_message_on :user, :email, :prepend_text => 'Email' %>
 		</div>
+		<div class="formFields">
+      <%= f.label :remind_me, 'Prayer Reminders' %>
+      <%= f.check_box :remind_me %> Send Me Daily Prayer Reminders
+      <%= error_message_on :user, :remind_me, :prepend_text => 'Send Reminder' %>
+    </div>
 	</fieldset>
 
 	<fieldset>

db/migrate/20100412043337_should_send_reminder.rb

@@ -0,0 +1,9 @@
+class ShouldSendReminder < ActiveRecord::Migration
+  def self.up
+    add_column :users, :remind_me, :boolean, :default => true
+  end
+
+  def self.down
+    remove_column :users, :remind_me
+  end
+end

db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100331222016) do
+ActiveRecord::Schema.define(:version => 20100412043337) do
 
   create_table "comments", :force => true do |t|
     t.integer  "prayer_id"
@@ -66,7 +66,8 @@
     t.integer  "profile_pic_file_size"
     t.datetime "profile_pic_updated_at"
     t.string   "activity_stream_token"
-    t.string   "perishable_token",         :default => "", :null => false
+    t.string   "perishable_token",         :default => "",   :null => false
+    t.boolean  "remind_me",                :default => true
   end
 
   add_index "users", ["email"], :name => "index_users_on_email"