X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c04e9ccf954737f9a3bb475100e2234e7ac5c17d..9b04cebf3cb9190cb46996b100a4dc3659638210:/app/views/message/_message_summary.rhtml
diff --git a/app/views/message/_message_summary.rhtml b/app/views/message/_message_summary.rhtml
index 81e21454f..6d45d33dd 100644
--- a/app/views/message/_message_summary.rhtml
+++ b/app/views/message/_message_summary.rhtml
@@ -1,17 +1,13 @@
+<% this_colour = cycle('lightgrey', 'white') # can only call once for some dumb reason %>
+
">
- <%= link_to message_summary.sender.display_name , :controller => 'user', :action => message_summary.sender.display_name %> |
-
- <% if message_summary.title.nil? or message_summary.title == '' %>
- <%= link_to '(no subject)' , :controller => 'message', :action => 'read', :message_id => message_summary.id %>
- <% else %>
- <%= link_to message_summary.title , :controller => 'message', :action => 'read', :message_id => message_summary.id %>
- <% end %>
- |
- <%= message_summary.sent_on %> |
+ <%= link_to h(message_summary.sender.display_name), :controller => 'user', :action => message_summary.sender.display_name %> |
+ <%= link_to h(message_summary.title), :controller => 'message', :action => 'read', :message_id => message_summary.id %> |
+ <%= message_summary.sent_on %> |
<% if message_summary.message_read? %>
<%= button_to 'Mark as unread', :controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'unread' %> |
<% else %>
<%= button_to 'Mark as read', :controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'read' %> |
<% end %>
- <%= button_to 'Reply', :controller => 'message', :action => 'new', :user_id => message_summary.from_user_id %> |
+ <%= button_to 'Reply', :controller => 'message', :action => 'reply', :message_id => message_summary.id %> |