refactored search

This commit is contained in:
albert
2013-01-10 17:45:52 -05:00
parent 13271e9bf5
commit 8749c43b3e
85 changed files with 946 additions and 304 deletions

View File

@@ -1,7 +1,7 @@
<% content_for(:secondary_links) do %>
<menu>
<li><%= link_to "Received", dmails_path(:search => {:owner_id_eq => CurrentUser.id, :to_id_eq => CurrentUser.id}, :folder => "received") %></li>
<li><%= link_to "Sent", dmails_path(:search => {:owner_id_eq => CurrentUser.id, :from_id_eq => CurrentUser.id}, :folder => "sent") %></li>
<li><%= link_to "Received", dmails_path(:search => {:owner_id => CurrentUser.id, :to_id => CurrentUser.id}, :folder => "received") %></li>
<li><%= link_to "Sent", dmails_path(:search => {:owner_id => CurrentUser.id, :from_id => CurrentUser.id}, :folder => "sent") %></li>
<li><%= link_to "New", new_dmail_path %></li>
<li><%= link_to "Search", search_dmails_path %></li>
</menu>

View File

@@ -1,13 +1,13 @@
<div id="c-dmails">
<div id="a-search">
<h1>Search Messages</h1>
<%= simple_form_for @search do |f| %>
<%= form_tag(dmails_path, :method => :get, :class => "simple_form") do %>
<%= hidden_field_tag :folder, params[:folder] %>
<%= f.input :title_contains, :required => false, :label => "Title" %>
<%= f.input :body_contains, :required => false, :label => "Body" %>
<%= f.input :to_name_matches, :required => false, :label => "To" %>
<%= f.input :from_name_matches, :required => false, :label => "From" %>
<%= f.button :submit, "Search" %>
<%= search_field :message_matches, :label => "Message" %>
<%= search_field :to_name, :label => "To" %>
<%= search_field :from_name, :label => "From" %>
<%= submit_tag "Search" %>
<% end %>
</div>
</div>