X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3c79240a6ab23e4103826dd1cec7a12a19e948db..9eb2d86824fa5475634d78446243234345213b40:/app/views/message/read.rhtml?ds=sidebyside diff --git a/app/views/message/read.rhtml b/app/views/message/read.rhtml index b84fea4c7..8a7b6b156 100644 --- a/app/views/message/read.rhtml +++ b/app/views/message/read.rhtml @@ -1,21 +1,61 @@ -

Reading your messages

+<% if @user == @message.recipient %> + +

<%= t'message.read.reading_your_messages' %>

+ + + + + + + + + + + + + + + + + + +
<%= 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) %>
+ +
- - + + + +
From<%= link_to @message.sender.display_name, :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %><%= 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 %>
+ +<% else %> + +

<%= t'message.read.reading_your_sent_messages' %>

+ + - - + + - - + + - - + + + + + +
Subject<%= @message.title %><%= t'message.read.to' %><%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %>
Date<%= @message.sent_on %><%= t'message.read.subject' %><%= h(@message.title) %>
Message<%= @message.body %><%= t'message.read.date' %><%= l @message.sent_on %>
<%= htmlize(@message.body) %>
@@ -23,8 +63,8 @@ - - - +
<%= button_to 'Reply', :controller => 'message', :action => 'new', :user_id => @message.from_user_id %><%= button_to 'Mark as unread', :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %><%= link_to '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 %>