1 files changed, 11 insertions, 3 deletions

diff --git a/app/views/discussions/show.html.haml b/app/views/discussions/show.html.haml
index 8c13728..903d8fd 100644
--- a/app/views/discussions/show.html.haml
+++ b/app/views/discussions/show.html.haml
@@ -1,5 +1,13 @@
-= @discussion.users.map { |u| u.name }.join(", ")
-= debug @discussion.speakers 
+%h3
+  Chat with
+  = @discussion.users.map { |u| u[Inboxes::config.user_name] }.join(", ")
 
+%h3 Messages
 - @discussion.messages.each do |message|
-  = message.body
\ No newline at end of file
+  %p
+    = "[#{message.user[Inboxes::config.user_name]}]"
+    = message.body
+    = "@ #{l(message.created_at)}"
+    
+= render "messages/form"
+= link_to "All discussions", discussions_path
\ No newline at end of file