cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify link_to calls on message pages

Browse source
This commit is contained in:
Anton Khorev 2024-03-20 04:48:02 +03:00
parent 188a6e175e
commit 332fad14bb
5 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/messages/_message_summary.html.erb
View file

@ -1,6 +1,6 @@
<tr id="inbox-<%= message_summary.id %>" class="inbox-row<%= "-unread" unless message_summary.message_read? %>">
<td><%= link_to message_summary.sender.display_name, user_path(message_summary.sender) %></td>
<td><%= link_to message_summary.title, message_path(message_summary) %></td>
<td><%= link_to message_summary.sender.display_name, message_summary.sender %></td>
<td><%= link_to message_summary.title, message_summary %></td>
<td class="text-nowrap"><%= l message_summary.sent_on, :format => :friendly %></td>
<td class="text-nowrap d-flex justify-content-end gap-1">
<%= button_to t(".unread_button"), message_mark_path(message_summary, :mark => "unread"), :remote => true, :class => "btn btn-sm btn-primary", :form => { :class => "inbox-mark-unread", :hidden => !message_summary.message_read? } %>

4
app/views/messages/_sent_message_summary.html.erb
View file

@ -1,6 +1,6 @@
<tr class="inbox-row">
<td><%= link_to sent_message_summary.recipient.display_name, user_path(sent_message_summary.recipient) %></td>
<td><%= link_to sent_message_summary.title, message_path(sent_message_summary) %></td>
<td><%= link_to sent_message_summary.recipient.display_name, sent_message_summary.recipient %></td>
<td><%= link_to sent_message_summary.title, sent_message_summary %></td>
<td class="text-nowrap"><%= l sent_message_summary.sent_on, :format => :friendly %></td>
<td class="text-nowrap d-flex justify-content-end gap-1">
<%= button_to t(".destroy_button"), message_path(sent_message_summary, :referer => request.fullpath), :method => :delete, :remote => true, :class => "btn btn-sm btn-danger", :form_class => "inbox-destroy" %>

2
app/views/messages/new.html.erb
View file

@ -1,5 +1,5 @@
<% content_for :heading do %>
<h1><%= t(".send_message_to_html", :name => link_to(@message.recipient.display_name, user_path(@message.recipient))) %></h1>
<h1><%= t(".send_message_to_html", :name => link_to(@message.recipient.display_name, @message.recipient)) %></h1>
<% end %>
<%= bootstrap_form_for @message do |f| %>

4
app/views/messages/show.html.erb
View file

@ -5,10 +5,10 @@
<div class='mb-3 border-bottom border-grey py-1 d-flex gap-1 flex-wrap'>
<% if current_user == @message.recipient %>
<%= user_thumbnail_tiny @message.sender %>
<%= link_to @message.sender.display_name, user_path(@message.sender) %>
<%= link_to @message.sender.display_name, @message.sender %>
<% else %>
<%= user_thumbnail_tiny @message.recipient %>
<%= link_to @message.recipient.display_name, user_path(@message.recipient) %>
<%= link_to @message.recipient.display_name, @message.recipient %>
<% end %>
<span class="ms-auto">
<%= l @message.sent_on, :format => :friendly %>