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

Change mark message buttons visibility with hidden attr

Browse source
This commit is contained in:
Anton Khorev 2023-08-11 20:35:36 +03:00
parent 179c70f725
commit c751967d0e
3 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/messages.js
View file

@ -27,6 +27,8 @@ $(document).ready(function () {
function updateReadState(target, isRead) { function updateReadState(target, isRead) {
$(target).closest("tr") $(target).closest("tr")
.toggleClass("inbox-row", isRead) .toggleClass("inbox-row", isRead)
.toggleClass("inbox-row-unread", !isRead); .toggleClass("inbox-row-unread", !isRead)
.find(".inbox-mark-unread button").prop("hidden", !isRead).end()
.find(".inbox-mark-read button").prop("hidden", isRead);
} }
}); });

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

@ -1141,14 +1141,6 @@ tr.turn:hover {
} }
} }
.inbox-row .inbox-mark-read {
display: none !important;
}
.inbox-row-unread .inbox-mark-unread {
display: none !important;
}
.search_form { .search_form {
background-color: $lightgrey; background-color: $lightgrey;

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

@ -3,8 +3,8 @@
<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="text-nowrap"><%= l message_summary.sent_on, :format => :friendly %></td> <td class="text-nowrap"><%= l message_summary.sent_on, :format => :friendly %></td>
<td class="text-nowrap text-end"> <td class="text-nowrap text-end">
<%= 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" %> <%= 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", :hidden => !message_summary.message_read? %>
<%= 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(".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", :hidden => message_summary.message_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" %> <%= 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> </td>
</tr> </tr>