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

dmails: inline search form on /dmails page.

Browse Source
This commit is contained in:
evazion
2017-04-29 11:43:02 -05:00
parent d1216f260e
commit 0652b907a9
5 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/dmails_controller.rb
View File

@@ -27,9 +27,6 @@ class DmailsController < ApplicationController
end end
end end
def search
end
def show def show
@dmail = Dmail.find(params[:id]) @dmail = Dmail.find(params[:id])
check_privilege(@dmail) check_privilege(@dmail)

8
app/views/dmails/_search.html.erb Normal file
View File

@@ -0,0 +1,8 @@
<%= simple_form_for(:search, url: dmails_path, method: :get, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
<%= f.hidden_field :folder, value: params[: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] } %>
<%= f.input :from_name, label: "From", input_html: { value: params[:search][:from_name] } %>
<%= f.submit "Search" %>
<% end %>

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

@@ -6,7 +6,6 @@
<li><%= link_to "Sent", sent_dmails_path(set_default_folder: true) %></li> <li><%= link_to "Sent", sent_dmails_path(set_default_folder: true) %></li>
<li>|</li> <li>|</li>
<li><%= link_to "New", new_dmail_path %></li> <li><%= link_to "New", new_dmail_path %></li>
<li><%= link_to "Search", search_dmails_path %></li>
<li><%= link_to "Mark all as read", {:controller => "dmails", :action => "mark_all_as_read"}, :method => :post, :remote => true %></li> <li><%= link_to "Mark all as read", {:controller => "dmails", :action => "mark_all_as_read"}, :method => :post, :remote => true %></li>
<li>|</li> <li>|</li>
<li><%= link_to "Help", wiki_pages_path(title: "help:dmail") %></li> <li><%= link_to "Help", wiki_pages_path(title: "help:dmail") %></li>

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

@@ -8,6 +8,8 @@
<h1>Messages</h1> <h1>Messages</h1>
<% end %> <% end %>
<%= render "search" %>
<table class="striped" width="100%"> <table class="striped" width="100%">
<thead> <thead>
<tr> <tr>

20
app/views/dmails/search.html.erb
View File

@@ -1,20 +0,0 @@
<div id="c-dmails">
<div id="a-search">
<h1>Search Messages</h1>
<%= simple_form_for(:search, url: dmails_path, method: :get, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
<%= f.hidden_field :folder, value: params[: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] } %>
<%= f.input :from_name, label: "From", input_html: { value: params[:search][:from_name] } %>
<%= f.submit "Search" %>
<% end %>
</div>
</div>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Search Messages - <%= Danbooru.config.app_name %>
<% end %>