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

Preserve background colour when marking messages read/unread

Browse source
This commit is contained in:
Tom Hughes 2012-08-09 00:26:38 +01:00
parent 3445f447cd
commit ada8b184ea
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/views/message/_message_summary.html.erb
View file

@ -4,11 +4,8 @@
<td class="inbox-sender" bgcolor="<%= this_colour %>"><%= link_to h(message_summary.sender.display_name), :controller => 'user', :action => 'view', :display_name => message_summary.sender.display_name %></td>
<td class="inbox-subject" bgcolor="<%= this_colour %>"><%= link_to h(message_summary.title), :controller => 'message', :action => 'read', :message_id => message_summary.id %></td>
<td class="inbox-sent nowrap" bgcolor="<%= this_colour %>"><%= l message_summary.sent_on, :format => :friendly %></td>
<% if message_summary.message_read? %>
<td><%= button_to t('message.message_summary.unread_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'unread'}, { :remote => true } %></td>
<% else %>
<td><%= button_to t('message.message_summary.read_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'read'}, { :remote => true } %></td>
<% end %>
<td class="inbox-mark-unread"><%= button_to t('message.message_summary.unread_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'unread'}, { :remote => true } %></td>
<td class="inbox-mark-read"><%= button_to t('message.message_summary.read_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'read'}, { :remote => true } %></td>
<td><%= button_to t('message.message_summary.reply_button'), :controller => 'message', :action => 'reply', :message_id => message_summary.id %></td>
<td><%= button_to t('message.message_summary.delete_button'), :controller => 'message', :action => 'delete', :message_id => message_summary.id, :referer => request.fullpath %></td>
</tr>

6
app/views/message/mark.js.erb
View file

@ -1,3 +1,7 @@
$("#inboxanchor").replaceWith("<%=j render :partial => "layouts/inbox" %>");
$("#inbox-count").replaceWith("<%=j render :partial => "message_count" %>");
$("#inbox-<%= @message.id %>").replaceWith("<%=j render :partial => "message_summary", :object => @message %>");
<% if @message.message_read? -%>
$("#inbox-<%= @message.id %>").removeClass("inbox-row-unread").addClass("inbox-row");
<% else -%>
$("#inbox-<%= @message.id %>").removeClass("inbox-row").addClass("inbox-row-unread");
<% end -%>