Adding

app/models/user.rb

@@ -42,13 +42,11 @@ def full_name=(name)
     else
       self.lastname = split.last
     end
-
-
   end
 
 
-  def wants_to_be_reminded?(user, prayer)
-    user.reminders.find_by_prayer_id(prayer.id)
+  def wants_to_be_reminded?(prayer)
+    self.reminders.find_by_prayer_id(prayer.id)
   end
 
 

app/views/prayers/_complete.erb

@@ -0,0 +1,5 @@
+<div class="list prayer" id="prayer_id_<%= complete.id %>">
+	<%= render :partial => 'prayer', :locals => { :prayer => complete }%>
+	<%= render :partial => 'meta', :locals => { :prayer => complete }%>
+	<div class="clear"></div>
+</div>

app/views/prayers/_meta.erb

@@ -0,0 +1,13 @@
+<div class="meta" id="prayer_<%= prayer.id %>">
+	<span class="num_people_praying"><%= pluralize(prayer.num_responses, 'Person', 'People') %></span>  Praying |
+
+	<% if current_user.id == prayer.user_id %>
+		<%= link_to 'Edit', edit_prayer_path(prayer) %>
+		<%= link_to 'Prayer is Answered', answered_path(prayer) %>
+	<% else %>
+		<% if !current_user.wants_to_be_reminded?(prayer) %>
+			<%= render :partial => 'reminders/new', :locals => { :prayer => prayer } %>
+		<% end %>
+		<%= link_to 'Comments', prayer%>
+	<% end %>
+</div>

app/views/prayers/_prayer.erb

@@ -1,18 +1,2 @@
-<div class="list prayer" id="prayer_id_<%= prayer.id %>">
-	<div class="avatar left"><%= profile_pic(prayer.user) %></div>
-	<div class="item left"><%= format_output(prayer.prayer) %></div>
-	<div class="meta" id="prayer_<%= prayer.id %>">
-		<span class="num_people_praying"><%= pluralize(prayer.num_responses, 'Person', 'People') %></span>  Praying |
-
-		<% if current_user.id == prayer.user_id %>
-			<%= link_to 'Edit', edit_prayer_path(prayer) %>
-			<%= link_to 'Prayer is Answered', answered_path(prayer) %>
-		<% else %>
-			<% if !current_user.wants_to_be_reminded?(current_user, prayer) %>
-				<%= render :partial => 'reminders/new', :locals => { :prayer => prayer } %>
-			<% end %>
-			<%= link_to 'Comments', prayer%>
-		<% end %>
-	</div>
-	<div class="clear"></div>
-</div>
+<div class="avatar left"><%= profile_pic(prayer.user) %></div>
+<div class="item left"><%= format_output(prayer.prayer) %></div>

app/views/prayers/edit.html.erb

@@ -2,5 +2,5 @@
 
 <%= render :partial => 'form' %>
 <div id="prayers_list">
-	<%= render :partial => 'prayer' %>
+	<%= render :partial => 'complete' %>
 </div>

app/views/prayers/index.html.erb

@@ -6,7 +6,7 @@
 <% end %>
 
 <div id="prayers_list">
-	<%= render :partial => 'prayer', :collection => @prayers %>
+	<%= render :partial => 'complete', :collection => @prayers %>
 	
 	<% unless @prayers.next_page.nil? %>
 		<div id="pagination">

app/views/prayers/show.html.erb

@@ -1,10 +1,11 @@
 <%= sidebar(render :partial => 'reminders/box', :locals => { :user => current_user })  %>
-<%= render :partial => 'prayers/prayer' %>
+
+<div class="prayer list">
+	<%= render :partial => 'prayer', :locals => { :prayer => @prayer } %>
+</div>
 
 <h3>Comments</h3>
-<% if current_user %>
-	<%= render :partial => 'comments/form', :locals => { :comment => @prayer.comment.new } %>
-<% end %>
+<%= render :partial => 'comments/form', :locals => { :comment => @prayer.comment.new } %>
 <div id="comments">
 	<%= render :partial => 'comments/comment', :collection => @prayer.comment %>
 </div>

app/views/reminders/_destroy.erb

@@ -0,0 +1,3 @@
+<% form_for reminder, :html => { :method => 'delete' } do |f| %>
+    <%= f.submit 'Remove Reminder' %>
+<% end %>

app/views/reminders/_list.erb

@@ -1,5 +1,8 @@
 <% user.reminders.each do |reminder| %>
-	<div class="prayer_reminder">
-		<%= link_to format_output(reminder.prayer.prayer), prayer_url(reminder.prayer) %>
+	<div class="list prayer">
+		<%= render :partial => 'prayers/prayer', :locals => { :prayer => reminder.prayer }%>
+		<div class="meta">
+			<%= render :partial => 'reminders/destroy', :locals => { :reminder => reminder }%>
+		</div>
 	</div>
 <% end %>

app/views/reminders/index.html.erb

@@ -1,2 +1,4 @@
 <h1>Prayer Reminders</h1>
-<%= render :partial => 'list', :locals => { :user => @user } %>
+<div id="prayers_list">
+	<%= render :partial => 'list', :locals => { :user => @user } %>
+</div>