X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/00375024263970a43ea7d39e3c65dfd0f32e8869..edd6235b45164bff20cbe8f2a0c9d10027211cf4:/app/views/message/read.html.erb?ds=inline diff --git a/app/views/message/read.html.erb b/app/views/message/read.html.erb index de36cafe8..0c9b622e8 100644 --- a/app/views/message/read.html.erb +++ b/app/views/message/read.html.erb @@ -1,37 +1,39 @@ -
<% if @user == @message.recipient %> - + <% content_for :heading do %>

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

+ <% 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' %> -
+
+ <%= 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 %>
+
- <%= @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 %> +
+ <%= 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 %> -

<%= 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_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" %> +