X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d36fab2913d10bef4eae2cee7c34875f20311af9..4cc2b63d5c38158e6beb114147be723425ec412e:/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 576403170..0c9b622e8 100644 --- a/app/views/message/read.html.erb +++ b/app/views/message/read.html.erb @@ -1,73 +1,39 @@ <% 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 %> +
+
- - - - - - - - - - - - - - - - - - - - - -
<%= t'message.read.from' %><%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %><%= user_thumbnail @message.sender %>
<%= t'message.read.subject' %><%= h(@message.title) %>
<%= t'message.read.date' %><%= l @message.sent_on, :format => :friendly %>
<%= 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 %>
+
+ <%= button_to t('message.read.reply_button'), {:controller => 'message', :action => 'reply', :message_id => @message.id}, :class => 'reply-button' %> + <%= button_to t('message.read.unread_button'), {:controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread'}, :class => 'mark-unread-button' %> <% 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 %><%= user_thumbnail @message.recipient %>
<%= t'message.read.subject' %><%= h(@message.title) %>
<%= t'message.read.date' %><%= l @message.sent_on, :format => :friendly %>
<%= 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 %>
+
<% end %> + + <%= link_to t('message.read.back'), {:controller => 'message', :action => 'outbox', :display_name => @user.display_name }, :class => "button deemphasize" %> +