Merge branch 'master' of https://github.com/LukeShu/leaguer

1 files changed, 36 insertions, 15 deletions

diff --git a/app/views/pms/show.html.erb b/app/views/pms/show.html.erb
index 6f81d1b..64dd66e 100644
--- a/app/views/pms/show.html.erb
+++ b/app/views/pms/show.html.erb
@@ -1,26 +1,47 @@
 <p>
-  <strong>Author:</strong>
-  <%# @conversation.last_sender.user_name %>
+  <strong>Participants:</strong>
+  <% receps = @pm.conversation.participants %>
+  <% receps.each do |recep| %>
+    <% #unless recep == @pm.conversation.last_sender %>
+      <%= recep.user_name %>
+      <%= "and" %>
+    <% #end %>
+  <% end %>
+  <%= "the NSA" %>
 </p>
 
 <p>
-  <strong>Recipient:</strong>
-  <%#@pm.recipient.user_name %>
+  <strong>Subject:</strong>
+  <%= @pm.conversation.subject %>
 </p>
 
-<p>
-  <strong>Message:</strong>
-  <%# @pm.message %>
-</p>
+<% receipts = @pm.conversation.receipts_for current_user %>
+<% receipts.each do |receipt| %>
+  <% message = receipt.message %>
 
-<p>
-  <strong>Subject:</strong>
-  <%= @pm.subject %>
-</p>
+  <p> ________________________________________________ </p>
 
-<p>
-  <strong>Conversation:</strong>
-  <%= @pm.conversation %>
+  <p>
+    <%= message.sender.user_name %>
+    <%= ":" %>
+    <%= message.body %>
+  </p>
+
+<% end %>
+
+<p> ________________________________________________ </p>
+<p> 
+  <%= form_for(@pm) do |f| %>
+    <div class="field">
+    <%= f.text_area :message %>
+    </div>
+
+    <div class="actions">
+    <%= submit_tag("Reply", :class => "signup") %>
+    </div>
+
+ <% end %>
 </p>
 
+
 <%= link_to 'Back', pms_path %>