X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2e2f2124728ca755b2db8f83f022eaea24b647f0..9d2fed811fd37577bf5cce8e8fe03d2097852428:/app/views/message/read.html.erb?ds=sidebyside
diff --git a/app/views/message/read.html.erb b/app/views/message/read.html.erb
index 8a7b6b156..f3d6ef139 100644
--- a/app/views/message/read.html.erb
+++ b/app/views/message/read.html.erb
@@ -1,70 +1,36 @@
<% if @user == @message.recipient %>
+ <% content_for :heading do %>
+
<%= h(@message.title) %>
+ <% end %>
-<%= t'message.read.reading_your_messages' %>
+
+ <%= user_thumbnail_tiny @message.sender %>
+ <%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %>
+
+ <%= l @message.sent_on, :format => :friendly %>
+ <%= button_to t('message.read.reply_button'), :controller => 'message', :action => 'reply', :message_id => @message.id %>
+ <%= button_to t('message.read.unread_button'), :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %>
+
+
-
-
- <%= t'message.read.from' %> |
-
- <% if @message.sender.image %>
- <%= image_tag url_for_file_column(@message.sender, "image") %>
- <% end %>
-
-<%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %> |
-
-
- <%= t'message.read.subject' %> |
- <%= h(@message.title) %> |
-
-
- <%= t'message.read.date' %> |
- <%= l @message.sent_on %> |
-
-
- |
- <%= htmlize(@message.body) %> |
-
-
+ <%= @message.body.to_html %>
-
-
-
-
- <%= button_to t('message.read.reply_button'), :controller => 'message', :action => 'reply', :message_id => @message.id %> |
- <%= button_to t('message.read.unread_button'), :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %> |
- <%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %> |
-
-
+ <%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %>
<% else %>
-<%= t'message.read.reading_your_sent_messages' %>
+ <%= h(@message.title) %>
-
-
- <%= t'message.read.to' %> |
- <%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %> |
-
-
- <%= t'message.read.subject' %> |
- <%= h(@message.title) %> |
-
-
- <%= t'message.read.date' %> |
- <%= l @message.sent_on %> |
-
-
- |
- <%= htmlize(@message.body) %> |
-
-
+
+ <%= user_thumbnail_tiny @message.recipient %>
+ <%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %>
+
+ <%= l @message.sent_on, :format => :friendly %>
+
+
-
+ <%= @message.body.to_html %>
-
-
- <%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %> |
-
-
+ <%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %>
<% end %>