diff --git a/app/views/artist_commentaries/_secondary_links.html.erb b/app/views/artist_commentaries/_secondary_links.html.erb index d787883a6..ce6eee01b 100644 --- a/app/views/artist_commentaries/_secondary_links.html.erb +++ b/app/views/artist_commentaries/_secondary_links.html.erb @@ -1,7 +1,7 @@ <% content_for(:secondary_links) do %> <%= quick_search_form_for(:text_matches, artist_commentaries_path, "commentaries") %> - <%= subnav_link_to "Listing", artist_commentaries_path %> - <%= subnav_link_to "Recent changes", artist_commentary_versions_path %> + <%= subnav_link_to "Commentaries", artist_commentaries_path %> + <%= subnav_link_to "Changes", artist_commentary_versions_path %> <%= subnav_link_to "Translation requests", artist_commentaries_path(:search => {:post_tags_match => "commentary_request"}) %> <%= subnav_link_to "Help", wiki_page_path("help:artist_commentary") %> <% end %> diff --git a/app/views/artist_versions/_listing.html.erb b/app/views/artist_versions/_listing.html.erb index bc49e6fc0..5fdac2032 100644 --- a/app/views/artist_versions/_listing.html.erb +++ b/app/views/artist_versions/_listing.html.erb @@ -1,5 +1,10 @@ -
+<%= search_form_for(artist_versions_path) do |f| %> + <%= f.input :updater_name, label: "Updater", input_html: { value: params.dig(:search, :updater_name), "data-autocomplete": "user" } %> + <%= f.input :name, label: "Artist", input_html: { value: params.dig(:search, :name), "data-autocomplete": "artist" } %> + <%= f.submit "Search" %> +<% end %> +
<%= table_for @artist_versions, class: "striped autofit", width: "100%" do |t| %> <% t.column "Name", td: {class: "diff-body"} do |artist_version| %> <%= link_to artist_version.name, artist_path(artist_version.artist_id) %> diff --git a/app/views/artist_versions/_secondary_links.html.erb b/app/views/artist_versions/_secondary_links.html.erb deleted file mode 100644 index d49eb9149..000000000 --- a/app/views/artist_versions/_secondary_links.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -<% content_for(:secondary_links) do %> - <%= subnav_link_to "Listing", artists_path %> - <%= subnav_link_to "New", new_artist_path %> - <%= subnav_link_to "Search", search_artist_versions_path %> -<% end %> diff --git a/app/views/artist_versions/index.html.erb b/app/views/artist_versions/index.html.erb index 0e8559b0f..f63ee1c7e 100644 --- a/app/views/artist_versions/index.html.erb +++ b/app/views/artist_versions/index.html.erb @@ -11,4 +11,4 @@
-<%= render "secondary_links" %> +<%= render "artists/secondary_links" %> diff --git a/app/views/artists/_secondary_links.html.erb b/app/views/artists/_secondary_links.html.erb index 1639af50d..222653365 100644 --- a/app/views/artists/_secondary_links.html.erb +++ b/app/views/artists/_secondary_links.html.erb @@ -1,16 +1,15 @@ <% content_for(:secondary_links) do %> <%= quick_search_form_for(:any_name_or_url_matches, artists_path, "artists", autocomplete: "artist", redirect: true) %> - <%= subnav_link_to "Listing", artists_path %> - <%= subnav_link_to "Banned", artists_path(search: { is_banned: "true", order: "updated_at" }) %> + <%= subnav_link_to "Artists", artists_path %> <% if policy(Artist).create? %> <%= subnav_link_to "New", new_artist_path %> <% end %> - <%= subnav_link_to "Recent changes", artist_versions_path %> + <%= subnav_link_to "Banned", artists_path(search: { is_banned: "true", order: "updated_at" }) %> + <%= subnav_link_to "Changes", artist_versions_path %> <%= subnav_link_to "URLs", artist_urls_path %> <% if @artist && !@artist.new_record? && (!@artist.is_banned? || policy(@artist).can_view_banned?) %>
  • |
    • <%= subnav_link_to "Posts (#{@artist.tag.try(:post_count).to_i})", posts_path(:tags => @artist.name) %> - <%= subnav_link_to "Show", artist_path(@artist) %> <% if policy(@artist).update? %> <%= subnav_link_to "Edit", edit_artist_path(@artist), :"data-shortcut" => "e" %> <% end %> diff --git a/app/views/comments/_secondary_links.html.erb b/app/views/comments/_secondary_links.html.erb index b76fdc5a9..4577d9f7f 100644 --- a/app/views/comments/_secondary_links.html.erb +++ b/app/views/comments/_secondary_links.html.erb @@ -1,6 +1,6 @@ <% content_for(:secondary_links) do %> <%= quick_search_form_for(:body_matches, comments_path, "comments") %> - <%= subnav_link_to "Listing", comments_path(:group_by => "post") %> + <%= subnav_link_to "Comments", comments_path %> <%= subnav_link_to "Search", comments_path(group_by: "comment") %> <% if policy(CommentVote).can_see_votes? %> <%= subnav_link_to "Votes", comment_votes_path %> diff --git a/app/views/notes/_secondary_links.html.erb b/app/views/notes/_secondary_links.html.erb index c6b1c2b4c..c9703e818 100644 --- a/app/views/notes/_secondary_links.html.erb +++ b/app/views/notes/_secondary_links.html.erb @@ -1,8 +1,8 @@ <% content_for(:secondary_links) do %> <%= quick_search_form_for(:body_matches, notes_path, "notes") %> - <%= subnav_link_to "Listing", notes_path %> + <%= subnav_link_to "Notes", notes_path %> <%= subnav_link_to "Posts", posts_path(:tags => "order:note") %> - <%= subnav_link_to "History", note_versions_path %> + <%= subnav_link_to "Changes", note_versions_path %> <%= subnav_link_to "Requests", posts_path(:tags => "translation_request") %> <%= subnav_link_to "Help", wiki_page_path("help:notes") %> <% end %> diff --git a/app/views/pools/_secondary_links.html.erb b/app/views/pools/_secondary_links.html.erb index 09767c6cf..93e7d0785 100644 --- a/app/views/pools/_secondary_links.html.erb +++ b/app/views/pools/_secondary_links.html.erb @@ -6,12 +6,11 @@ <%= subnav_link_to "New", new_pool_path %> <% end %> <% if PoolVersion.enabled? %> - <%= subnav_link_to "Recent changes", pool_versions_path %> + <%= subnav_link_to "Changes", pool_versions_path %> <% end %> <%= subnav_link_to "Help", wiki_page_path("help:pools") %> <% if @pool && !@pool.new_record? %>
  • |
    • - <%= subnav_link_to "Show", pool_path(@pool) %> <%= subnav_link_to "Posts", posts_path(:tags => "pool:#{@pool.id}") %> <% if policy(@pool).update? %> <%= subnav_link_to "Edit", edit_pool_path(@pool), "data-shortcut": "e" %> diff --git a/app/views/tags/_secondary_links.html.erb b/app/views/tags/_secondary_links.html.erb index 8b5d3f262..cfab12109 100644 --- a/app/views/tags/_secondary_links.html.erb +++ b/app/views/tags/_secondary_links.html.erb @@ -1,7 +1,7 @@ <% content_for(:secondary_links) do %> <%= quick_search_form_for(:name_matches, tags_path, "tags", autocomplete: "tag") %> <%= subnav_link_to "Tags", tags_path %> - <%= subnav_link_to "History", tag_versions_path %> + <%= subnav_link_to "Changes", tag_versions_path %> <%= subnav_link_to("Aliases", tag_aliases_path) %> <%= subnav_link_to("Implications", tag_implications_path) %> <%= subnav_link_to "Request alias/implication", new_bulk_update_request_path %> @@ -13,5 +13,6 @@
  • |
    • <%= subnav_link_to "Posts (#{@tag.post_count})", posts_path(:tags => @tag.name) %> <%= subnav_link_to "Edit", edit_tag_path(@tag) %> + <%= subnav_link_to "History", tag_versions_path(search: { tag_id: @tag.id }) %> <% end %> <% end %> diff --git a/app/views/wiki_pages/_secondary_links.html.erb b/app/views/wiki_pages/_secondary_links.html.erb index 291cdc0e3..19b802e87 100644 --- a/app/views/wiki_pages/_secondary_links.html.erb +++ b/app/views/wiki_pages/_secondary_links.html.erb @@ -4,6 +4,7 @@ <% if policy(WikiPage).new? %> <%= subnav_link_to "New", new_wiki_page_path %> <% end %> + <%= subnav_link_to "Changes", wiki_page_versions_path %> <%= subnav_link_to "Help", wiki_page_path("help:wiki") %> <% if @wiki_page && @wiki_page.new_record? && @wiki_page.try(:tag).present? %>
  • |
    • diff --git a/config/routes.rb b/config/routes.rb index f85bc97be..293e9fb7f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -67,11 +67,7 @@ Rails.application.routes.draw do end end resources :artist_urls, only: [:index] - resources :artist_versions, :only => [:index, :show] do - collection do - get :search - end - end + resources :artist_versions, only: [:index, :show] resources :bans resources :bulk_update_requests do member do