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

Use resourceful routes for web mailboxes

Browse source
This commit is contained in:
Anton Khorev 2024-12-29 08:27:09 +03:00
parent 99af52b478
commit c7e038a4d0
21 changed files with 205 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/messages/inbox.html.erb → app/views/messages/inboxes/show.html.erb
View file

@ -2,12 +2,12 @@
<%= javascript_include_tag "messages" %>
<% end %>
<%= render :partial => "heading", :locals => { :active_link_path => inbox_messages_path } %>
<%= render :partial => "heading", :locals => { :active_link_path => messages_inbox_path } %>
<h4><%= t "messages.inbox.messages", :new_messages => t(".new_messages", :count => current_user.new_messages.size), :old_messages => t(".old_messages", :count => current_user.messages.size - current_user.new_messages.size) %></h4>
<h4><%= t ".messages", :new_messages => t(".new_messages", :count => current_user.new_messages.size), :old_messages => t(".old_messages", :count => current_user.messages.size - current_user.new_messages.size) %></h4>
<% if current_user.messages.size > 0 %>
<%= render :partial => "messages_table", :locals => { :columns => %w[from subject date], :messages => current_user.messages, :inner_partial => "message_summary" } %>
<%= render :partial => "messages_table", :locals => { :columns => %w[from subject date], :messages => current_user.messages } %>
<% else %>
<div><%= t(".no_messages_yet_html", :people_mapping_nearby_link => link_to(t(".people_mapping_nearby"), dashboard_path)) %></div>
<% end %>

4
app/views/messages/_heading.html.erb → app/views/messages/mailboxes/_heading.html.erb
View file

@ -3,8 +3,8 @@
<% content_for :heading do %>
<h1><%= t("users.show.my messages") %></h1>
<ul class="nav nav-tabs">
<% { t(".my_inbox") => inbox_messages_path, t(".my_outbox") => outbox_messages_path, t(".muted_messages") => muted_messages_path }.each do |label, path| %>
<% next if path == muted_messages_path && current_user.muted_messages.none? %>
<% { t(".my_inbox") => messages_inbox_path, t(".my_outbox") => messages_outbox_path, t(".muted_messages") => messages_muted_inbox_path }.each do |label, path| %>
<% next if path == messages_muted_inbox_path && current_user.muted_messages.none? %>
<li class="nav-item">
<% if path == active_link_path %>

0
app/views/messages/_message_summary.html.erb → app/views/messages/mailboxes/_message.html.erb
View file

2
app/views/messages/_messages_table.html.erb → app/views/messages/mailboxes/_messages_table.html.erb
View file

@ -8,6 +8,6 @@
</tr>
</thead>
<tbody>
<%= render :partial => inner_partial, :collection => messages, :as => "message" %>
<%= render :partial => "message", :collection => messages %>
</tbody>
</table>

4
app/views/messages/muted.html.erb → app/views/messages/muted_inboxes/show.html.erb
View file

@ -2,8 +2,8 @@
<%= javascript_include_tag "messages" %>
<% end %>
<%= render :partial => "heading", :locals => { :active_link_path => muted_messages_path } %>
<%= render :partial => "heading", :locals => { :active_link_path => messages_muted_inbox_path } %>
<h4><%= t ".messages", :count => current_user.muted_messages.size %></h4>
<%= render :partial => "messages_table", :locals => { :columns => %w[from subject date], :messages => current_user.muted_messages, :inner_partial => "message_summary" } %>
<%= render :partial => "messages_table", :locals => { :columns => %w[from subject date], :messages => current_user.muted_messages } %>

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

@ -8,5 +8,5 @@
<%= f.richtext_field :body, :cols => 80, :rows => 20 %>
<%= f.primary %>
<%= link_to t(".back_to_inbox"), inbox_messages_path, :class => "btn btn-link" %>
<%= link_to t(".back_to_inbox"), messages_inbox_path, :class => "btn btn-link" %>
<% end %>

0
app/views/messages/_sent_message_summary.html.erb → app/views/messages/outboxes/_message.html.erb
View file

4
app/views/messages/outbox.html.erb → app/views/messages/outboxes/show.html.erb
View file

@ -2,12 +2,12 @@
<%= javascript_include_tag "messages" %>
<% end %>
<%= render :partial => "heading", :locals => { :active_link_path => outbox_messages_path } %>
<%= render :partial => "heading", :locals => { :active_link_path => messages_outbox_path } %>
<h4><%= t ".messages", :count => current_user.sent_messages.size %></h4>
<% if current_user.sent_messages.size > 0 %>
<%= render :partial => "messages_table", :locals => { :columns => %w[to subject date], :messages => current_user.sent_messages, :inner_partial => "sent_message_summary" } %>
<%= render :partial => "messages_table", :locals => { :columns => %w[to subject date], :messages => current_user.sent_messages } %>
<% else %>
<div class="messages"><%= t(".no_sent_messages_html", :people_mapping_nearby_link => link_to(t(".people_mapping_nearby"), dashboard_path)) %></div>
<% end %>