jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dmails: add unread folder, show only received messages by default.

Browse Source 
* Add unread and deleted dmail folders.
* Remove dmail_folder cookie (wasn't used).
* Default to the received folder so that we don't show sent messages by default.
This commit is contained in:
evazion
2020-01-30 22:51:26 -06:00
parent f8db577c25
commit d8eba59cfa
7 changed files with 37 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/dmails/_search.html.erb
View File

@@ -1,5 +1,5 @@
<%= search_form_for(dmails_path) do |f| %>
<%= f.hidden_field :folder, value: params[:folder] %>
<%= f.input :folder, as: :hidden, input_html: { value: params[:search][:folder] } %>
<%= f.input :title_matches, label: "Title", hint: "Use * for wildcard", input_html: { value: params[:search][:title_matches] } %>
<%= f.input :message_matches, label: "Message", hint: "Use * for wildcard", input_html: { value: params[:search][:messages_matches] } %>
<%= f.input :to_name, label: "To", input_html: { value: params[:search][:to_name], data: { autocomplete: "user" } } %>

11
app/views/dmails/_secondary_links.html.erb
View File

@@ -1,10 +1,11 @@
<% content_for(:secondary_links) do %>
<%= quick_search_form_for(:message_matches, dmails_path, "dmails") %>
<%= subnav_link_to "All", all_dmails_path(set_default_folder: true) %>
<%= subnav_link_to "Received", received_dmails_path(set_default_folder: true) %>
<%= subnav_link_to "Sent", sent_dmails_path(set_default_folder: true) %>
<%= subnav_link_to "Spam", spam_dmails_path %>
<%= subnav_link_to "Deleted", dmails_path(search: { is_deleted: true }) %>
<%= subnav_link_to "All", dmails_path(search: { folder: "all" }) %>
<%= subnav_link_to "Received", dmails_path(search: { folder: "received" }) %>
<%= subnav_link_to "Unread", dmails_path(search: { folder: "unread" }) %>
<%= subnav_link_to "Sent", dmails_path(search: { folder: "sent" }) %>
<%= subnav_link_to "Spam", dmails_path(search: { folder: "spam" }) %>
<%= subnav_link_to "Deleted", dmails_path(search: { folder: "deleted" }) %>
<li>|</li>
<%= subnav_link_to "New", new_dmail_path %>
<%= subnav_link_to "Mark all as read", {:controller => "dmails", :action => "mark_all_as_read"}, :method => :post, :remote => true %></li>

6
app/views/dmails/index.html.erb
View File

@@ -3,10 +3,8 @@
<div id="c-dmails">
<div id="a-index">
<% if params[:folder] == "sent" %>
<h1>Sent Messages</h1>
<% elsif params[:folder] == "received" %>
<h1>Received Messages</h1>
<% if params[:search][:folder].present? %>
<h1><%= params[:search][:folder].titleize %> Messages</h1>
<% else %>
<h1>Messages</h1>
<% end %>