Merge pull request #3471 from BrokenEagle/fix-controller-views

Various fixes for controller views
This commit is contained in:
Albert Yi
2017-12-28 11:18:44 -08:00
committed by GitHub
55 changed files with 429 additions and 381 deletions

View File

@@ -41,19 +41,6 @@
<%= render "posts/partials/index/posts", :post_set => @post_set %>
</section>
<% content_for(:page_title) do %>
<% if @post_set.tag_string.present? %>
<%= @post_set.humanized_tag_string %> - <%= Danbooru.config.app_name %>
<% else %>
<%= Danbooru.config.app_name %>
<% end %>
<% end %>
<% if params[:tags] =~ /search:/ %>
<%= render "saved_searches/secondary_links" %>
<% else %>
<%= render "posts/partials/common/secondary_links" %>
<% end %>
<%= post_search_count_js %>
@@ -63,6 +50,20 @@
</div>
</div>
<% if params[:tags] =~ /search:/ %>
<%= render "saved_searches/secondary_links" %>
<% else %>
<%= render "posts/partials/common/secondary_links" %>
<% end %>
<% content_for(:page_title) do %>
<% if @post_set.tag_string.present? %>
<%= @post_set.humanized_tag_string %> - <%= Danbooru.config.app_name %>
<% else %>
<%= Danbooru.config.app_name %>
<% end %>
<% end %>
<%= content_for(:html_header) do %>
<link href="<%= posts_path(:format => 'atom', :tags => params[:tags]) %>" rel="alternate" title="ATOM" type="application/atom+xml" />
<%= content_tag(:link, nil, rel: "prefetch", href: next_page_url, as: "html", crossorigin: "use-credentials") %>