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

Put message read/unread/delete buttons in one column

Browse source
This commit is contained in:
Anton Khorev 2023-08-11 18:46:51 +03:00
parent f47eeb0632
commit e290df896e
5 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1147,21 +1147,15 @@ tr.turn:hover {
} }
.inbox-row .inbox-mark-read { .inbox-row .inbox-mark-read {
display: none; display: none !important;
} }
.inbox-sent { .inbox-sent {
white-space: nowrap; white-space: nowrap;
} }
.inbox-mark-unread,
.inbox-mark-read,
.inbox-delete {
width: 1%;
}
.inbox-row-unread .inbox-mark-unread { .inbox-row-unread .inbox-mark-unread {
display: none; display: none !important;
} }
.search_form { .search_form {

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

@ -2,7 +2,9 @@
<td class="inbox-sender"><%= link_to message_summary.sender.display_name, user_path(message_summary.sender) %></td> <td class="inbox-sender"><%= link_to message_summary.sender.display_name, user_path(message_summary.sender) %></td>
<td class="inbox-subject"><%= link_to message_summary.title, message_path(message_summary) %></td> <td class="inbox-subject"><%= link_to message_summary.title, message_path(message_summary) %></td>
<td class="inbox-sent"><%= l message_summary.sent_on, :format => :friendly %></td> <td class="inbox-sent"><%= l message_summary.sent_on, :format => :friendly %></td>
<td class="inbox-mark-unread"><%= button_to t(".unread_button"), message_mark_path(message_summary, :mark => "unread"), :remote => true, :class => "btn btn-sm btn-primary" %></td> <td class="text-end">
<td class="inbox-mark-read"><%= button_to t(".read_button"), message_mark_path(message_summary, :mark => "read"), :remote => true, :class => "btn btn-sm btn-primary" %></td> <%= button_to t(".unread_button"), message_mark_path(message_summary, :mark => "unread"), :remote => true, :class => "btn btn-sm btn-primary", :form_class => "d-inline-block inbox-mark-unread" %>
<td class="inbox-destroy"><%= button_to t(".destroy_button"), message_path(message_summary, :referer => request.fullpath), :method => :delete, :remote => true, :class => "btn btn-sm btn-danger" %></td> <%= button_to t(".read_button"), message_mark_path(message_summary, :mark => "read"), :remote => true, :class => "btn btn-sm btn-primary", :form_class => "d-inline-block inbox-mark-read" %>
<%= button_to t(".destroy_button"), message_path(message_summary, :referer => request.fullpath), :method => :delete, :remote => true, :class => "btn btn-sm btn-danger", :form_class => "d-inline-block inbox-destroy" %>
</td>
</tr> </tr>

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

@ -2,5 +2,7 @@
<td class="inbox-sender"><%= link_to sent_message_summary.recipient.display_name, user_path(sent_message_summary.recipient) %></td> <td class="inbox-sender"><%= link_to sent_message_summary.recipient.display_name, user_path(sent_message_summary.recipient) %></td>
<td class="inbox-subject"><%= link_to sent_message_summary.title, message_path(sent_message_summary) %></td> <td class="inbox-subject"><%= link_to sent_message_summary.title, message_path(sent_message_summary) %></td>
<td class="inbox-sent"><%= l sent_message_summary.sent_on, :format => :friendly %></td> <td class="inbox-sent"><%= l sent_message_summary.sent_on, :format => :friendly %></td>
<td class="inbox-destroy"><%= button_to t(".destroy_button"), message_path(sent_message_summary, :referer => request.fullpath), :method => :delete, :remote => true, :class => "btn btn-sm btn-danger" %></td> <td class="text-end">
<%= 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 => "d-inline-block inbox-destroy" %>
</td>
</tr> </tr>

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

@ -25,8 +25,6 @@
<th><%= t ".from" %></th> <th><%= t ".from" %></th>
<th><%= t ".subject" %></th> <th><%= t ".subject" %></th>
<th><%= t ".date" %></th> <th><%= t ".date" %></th>
<th></th>
<th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

1
app/views/messages/outbox.html.erb
View file

@ -26,7 +26,6 @@
<th><%= t ".to" %></th> <th><%= t ".to" %></th>
<th><%= t ".subject" %></th> <th><%= t ".subject" %></th>
<th><%= t ".date" %></th> <th><%= t ".date" %></th>
<th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>