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

Merge remote-tracking branch 'upstream/pull/4154'

Browse source
This commit is contained in:
Tom Hughes 2023-08-10 22:42:39 +01:00
commit f47eeb0632
2 changed files with 17 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/assets/stylesheets/common.scss
View file

@ -1144,30 +1144,12 @@ tr.turn:hover {
.inbox-row-unread {
background: #CBEEA7;
}
.right {
float: right;
}
}
.inbox-row .inbox-mark-read {
display: none;
}
.info-line {
margin-bottom: $lineheight;
padding: $lineheight/4 0px 4px 0px;
border-bottom: 1px solid $grey;
form, form div {
display: inline;
}
}
.info-line .user_thumbnail_tiny {
vertical-align: middle;
}
.inbox-sent {
white-space: nowrap;
}

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

@ -2,36 +2,29 @@
<h1><%= @message.title %></h1>
<% end %>
<% if current_user == @message.recipient %>
<div class='info-line clearfix'>
<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) %></td>
<div class='right'>
<%= l @message.sent_on, :format => :friendly %>
</div>
</div>
<%= link_to @message.sender.display_name, user_path(@message.sender) %>
<% else %>
<%= user_thumbnail_tiny @message.recipient %>
<%= link_to @message.recipient.display_name, user_path(@message.recipient) %>
<% end %>
<span class="ms-auto">
<%= l @message.sent_on, :format => :friendly %>
</span>
</div>
<div class="richtext text-break"><%= @message.body.to_html %></div>
<div class="richtext text-break"><%= @message.body.to_html %></div>
<div>
<div>
<% if current_user == @message.recipient %>
<%= link_to t(".reply_button"), message_reply_path(@message), :class => "btn btn-primary" %>
<%= link_to t(".unread_button"), message_mark_path(@message, :mark => "unread"), :method => "post", :class => "btn btn-primary" %>
<%= link_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "btn btn-danger" %>
<%= link_to t(".back"), inbox_messages_path, :class => "btn btn-link" %>
</div>
<% else %>
<div class='info-line clearfix'>
<%= user_thumbnail_tiny @message.recipient %>
<%= link_to @message.recipient.display_name, user_path(@message.recipient) %></td>
<div class='right'>
<%= l @message.sent_on, :format => :friendly %>
</div>
</div>
<div class="richtext text-break"><%= @message.body.to_html %></div>
<div>
<% else %>
<%= link_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "btn btn-danger" %>
<%= link_to t(".back"), outbox_messages_path, :class => "btn btn-link" %>
</div>
<% end %>
<% end %>
</div>