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

dmail fixes

Browse Source
This commit is contained in:
albert
2011-10-16 02:02:21 -04:00
parent 899fd32ab1
commit 80642734e8
4 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +0,0 @@
<tr>
<td><%= link_to dmail.to_name, user_path(dmail.to) %></td>
<td><%= link_to dmail.from_name, user_path(dmail.from) %></td>
<td><%= link_to dmail.title, dmail_path(dmail) %></td>
<td><%= compact_time(dmail.created_at) %></td>
</tr>

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

@@ -1,7 +1,7 @@
<% content_for(:secondary_links) do %> <% content_for(:secondary_links) do %>
<menu> <menu>
<li><%= link_to "Received", dmails_path(:folder => "received") %></li> <li><%= link_to "Received", dmails_path(:search => {:to_id_eq => CurrentUser.id}) %></li>
<li><%= link_to "Sent", dmails_path(:folder => "sent") %></li> <li><%= link_to "Sent", dmails_path(:search => {:from_id_eq => CurrentUser.id}) %></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 "Search", search_dmails_path %></li>
</menu> </menu>

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

@@ -1,6 +0,0 @@
<tr>
<td><%= link_to dmail.to_name, user_path(dmail.to) %></td>
<td><%= link_to dmail.from_name, user_path(dmail.from) %></td>
<td><%= link_to dmail.title, dmail_path(dmail) %></td>
<td><%= compact_time(dmail.created_at) %></td>
</tr>

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

@@ -5,19 +5,20 @@
<table class="striped" width="100%"> <table class="striped" width="100%">
<thead> <thead>
<tr> <tr>
<th>To</th>
<th>From</th>
<th>Subject</th>
<th>Date</th> <th>Date</th>
<th>From</th>
<th>To</th>
<th>Subject</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<% @dmails.each do |dmail| %> <% @dmails.each do |dmail| %>
<% if params[:folder] == "sent" %> <tr>
<%= render "sent", :dmail => dmail %> <td><%= compact_time(dmail.created_at) %></td>
<% else %> <td><%= link_to dmail.from_name, user_path(dmail.from) %></td>
<%= render "received", :dmail => dmail %> <td><%= link_to dmail.to_name, user_path(dmail.to) %></td>
<% end %> <td><%= link_to dmail.title, dmail_path(dmail) %></td>
</tr>
<% end %> <% end %>
</tbody> </tbody>
</table> </table>