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

revamp saved search implementation

Browse Source
This commit is contained in:
r888888888
2017-03-15 15:36:48 -07:00
parent 79c0dc3647
commit da06bee0ab
24 changed files with 307 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/views/users/_post_summary.html.erb
View File

@@ -30,30 +30,17 @@
</div>
<% end %>
<% presenter.subscriptions.each do |subscription| %>
<div class="box user-subscription" data-name="<%= subscription.name %>">
<h2>
Subscription: <%= link_to subscription.pretty_name, posts_path(:tags => "sub:#{user.name}:#{subscription.name}") %>
</h2>
<div class="box">
<% presenter.posts_for_subscription(subscription).each do |post| %>
<%= PostPresenter.preview(post, :tags => "sub:#{user.name}:#{subscription.name}") %>
<% end %>
</div>
</div>
<% end %>
<% if CurrentUser.user.id == @user.id && @user.has_saved_searches? && @user.is_gold? %>
<% presenter.saved_search_categories.each do |category| %>
<div class="box user-saved-search" data-category="<%= category %>">
<% presenter.saved_search_labels.each do |label| %>
<div class="box user-saved-search" data-label="<%= label %>">
<h2>
Saved Search: <%= link_to category, posts_path(:tags => "search:#{category}") %>
Saved Search: <%= link_to label, posts_path(:tags => "search:#{label}") %>
(<%= link_to "manage", saved_searches_path(label: label) %>)
</h2>
<div class="box">
<% presenter.posts_for_saved_search_category(category).each do |post| %>
<%= PostPresenter.preview(post, :tags => "search:#{category}") %>
<% presenter.posts_for_saved_search_category(label).each do |post| %>
<%= PostPresenter.preview(post, :tags => "search:#{label}") %>
<% end %>
</div>
</div>

30
app/views/users/_statistics.html.erb
View File

@@ -122,19 +122,6 @@
<th>Feedback</th>
<td><%= presenter.feedbacks(self) %></td> </tbody>
</tr>
<tr>
<th>Subscriptions</th>
<td>
<% presenter.subscriptions.each do |subscription| %>
<p>
<strong><%= link_to subscription.pretty_name, posts_path(:tags => "sub:#{user.name}:#{subscription.name}") %></strong>
&ndash;
<%= presenter.tag_links_for_subscription(self, subscription) %>
</p>
<% end %>
</td>
</tr>
<% if presenter.previous_names(self).present? %>
<tr>
@@ -148,13 +135,26 @@
<tr>
<th>Saved Searches</th>
<td>
<% SavedSearch.categories_for(CurrentUser.user).each do |category| %>
<p><%= link_to category, posts_path(tags: "search:#{category}") %></p>
<% SavedSearch.labels_for(CurrentUser.user.id).each do |label| %>
<%= link_to label, posts_path(tags: "search:#{label}") %>
<% end %>
</td>
</tr>
<% end %>
<tr>
<th>Subscriptions</th>
<td>
<% presenter.subscriptions.each do |subscription| %>
<p>
<strong><%= link_to subscription.pretty_name, posts_path(:tags => "sub:#{user.name}:#{subscription.name}") %></strong>
&ndash;
<%= presenter.tag_links_for_subscription(self, subscription) %>
</p>
<% end %>
</td>
</tr>
<tr>
<th>API Key</th>
<td>