X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/be8617dfdc9fdf941705272ec9ba152b95677249..677d129a2e3b6c8c67549f7e80b2d4d72a96a4f7:/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 0fbef1d8c..f3d6ef139 100644 --- a/app/views/message/read.html.erb +++ b/app/views/message/read.html.erb @@ -1,37 +1,36 @@ -
<% if @user == @message.recipient %> - + <% content_for :heading do %>

<%= h(@message.title) %>

- -
- <%= 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' %> -
+ <% end %> + +
+ <%= 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' %>
+
- <%= @message.body.to_html %> +
<%= @message.body.to_html %>
- <%= 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 %> -

<%= h(@message.title) %>

+

<%= h(@message.title) %>

-
- <%= 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 %> -
+
+ <%= 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 %> +
<%= @message.body.to_html %>
- <%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %> + <%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %> <% end %> -