Messages display with markdown, and have a nicer interface.

steveklabnik · steveklabnik · commit f54543710850 · 2011-01-03T20:09:06.000-05:00
Messages didn't have the title for a while... I'm going to have to make real layouts soon.

They also have a handy reply button, and are in reverse chronological order.
diff --git a/controllers/messages.rb b/controllers/messages.rb
@@ -30,7 +30,9 @@
 #this is the page where you can see your messages
 get "/messages" do
   require_login!
-  @messages = Message.all({"recipient" => current_user.username})
+  @messages = Message.all({"recipient" => current_user.username}).sort do |a, b|
+    b.created_at <=> a.created_at
+  end
   haml :"messages/index"
 end
 
diff --git a/models/message.rb b/models/message.rb
@@ -12,6 +12,8 @@ class Message
   #this is the username of the person who sent the message
   key :sender, String
 
+  timestamps!
+
   after_create :send_notification
 
   private
diff --git a/views/messages/index.haml b/views/messages/index.haml
@@ -1,5 +1,33 @@
-%ul
-- @messages.each do |message|
-  %li From: #{message.sender}
-  %li Message: #{message.body}
+.span-9
+  %img{:height => "64", :src => "/images/logo.png", :style => "float:left"}/
+  %p.body{:style => "padding-top:20px;padding-left:80px"} Hackety Hack
+- if logged_in?
+  .span-6.prepend-3.last
+    %ul
+      %li{:style => "display:inline"}
+        %a{:href => "/download"} Download
+      |
+      %li{:style => "display:inline"}
+        %a{:href => "/hackers/#{current_user.username.to_slug}"} My Page
+      |
+      %li{:style => "display:inline"}
+        %a{:href => "/logout"} Log out
+- else
+  .span-4.prepend-5.last
+    %ul
+      %li{:style => "display:inline"}
+        %a{:href => "/download"} Download
+      |
+      %li{:style => "display:inline"}
+        %a{:href => "/login"} Log in
+.span-18.last
+  %h1 Your Messages
+  %ul
+  - @messages.each do |message|
+    %li{:style => "list-style:none"}
+      %h2 From: #{message.sender}
+      :markdown 
+        #{message.body} 
+      %a{:href => "/messages/new/to/#{message.sender}"} (reply)
+    %hr
 
diff --git a/views/messages/new.haml b/views/messages/new.haml
@@ -1,10 +1,33 @@
-%h2 Sending a message to #{@username}
-%form{:action => "/messages", :method => "POST"}
-  %input{:type => "hidden", :id => "message_recipient", :name => "message[recipient]", :value => @username}
-  %br/
-  %label{:for => "message_body" } Message text:
-  %br/
-  %textarea{:id => "message_body", :name => "message[body]"}
-  %br/
-  %input{:type => "submit", :value => "Send message", :class => "button"}
+.span-9
+  %img{:height => "64", :src => "/images/logo.png", :style => "float:left"}/
+  %p.body{:style => "padding-top:20px;padding-left:80px"} Hackety Hack
+- if logged_in?
+  .span-6.prepend-3.last
+    %ul
+      %li{:style => "display:inline"}
+        %a{:href => "/download"} Download
+      |
+      %li{:style => "display:inline"}
+        %a{:href => "/hackers/#{current_user.username.to_slug}"} My Page
+      |
+      %li{:style => "display:inline"}
+        %a{:href => "/logout"} Log out
+- else
+  .span-4.prepend-5.last
+    %ul
+      %li{:style => "display:inline"}
+        %a{:href => "/download"} Download
+      |
+      %li{:style => "display:inline"}
+        %a{:href => "/login"} Log in
+.span-18.last
+  %h2 Sending a message to #{@username}
+  %form{:action => "/messages", :method => "POST"}
+    %input{:type => "hidden", :id => "message_recipient", :name => "message[recipient]", :value => @username}
+    %br/
+    %label{:for => "message_body" } Message text:
+    %br/
+    %textarea{:id => "message_body", :name => "message[body]"}
+    %br/
+    %input{:type => "submit", :value => "Send message", :class => "button"}
 
