views: add html ids for main menu and subnav menu.

Also refactor secondary links to put the <menu> element in the default
layout instead of in each _secondary_links partial.

app/views/artist_commentaries/_secondary_links.html.erb

@@ -1,10 +1,8 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= quick_search_form_for(:text_matches, artist_commentaries_path, "commentaries") %>
   <%= subnav_link_to "Search", search_artist_commentaries_path %>
   <%= subnav_link_to "Listing", artist_commentaries_path %>
   <%= subnav_link_to "Recent changes", artist_commentary_versions_path %>
   <%= subnav_link_to "Translation requests", artist_commentaries_path(:search => {:post_tags_match => "commentary_request"}) %>
   <%= subnav_link_to "Help", wiki_pages_path(:title => "help:artist_commentary") %>
-  </menu>
 <% end %>

app/views/artist_versions/_secondary_links.html.erb

@@ -1,7 +1,5 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= subnav_link_to "Listing", artists_path %>
   <%= subnav_link_to "New", new_artist_path %>
   <%= subnav_link_to "Search", search_artist_versions_path %>
-  </menu>
 <% end %>

app/views/artists/_secondary_links.html.erb

@@ -1,5 +1,4 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= quick_search_form_for(:any_name_or_url_matches, artists_path, "artists", autocomplete: "artist") %>
   <%= subnav_link_to "Listing", artists_path %>
   <%= subnav_link_to "Banned", banned_artists_path %>
@@ -32,5 +31,4 @@
       <% end %>
     <% end %>
   <% end %>
-  </menu>
 <% end %>

app/views/bans/_secondary_links.html.erb

@@ -1,6 +1,4 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= subnav_link_to "Listing", bans_path %>
   <%= subnav_link_to "Ban", new_ban_path %>
-  </menu>
 <% end %>

app/views/bulk_update_requests/_secondary_links.html.erb

@@ -1,6 +1,4 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= subnav_link_to "Listing", bulk_update_requests_path %>
   <%= subnav_link_to "New", new_bulk_update_request_path %>
-  </menu>
 <% end %>

app/views/comments/_secondary_links.html.erb

@@ -1,8 +1,6 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= quick_search_form_for(:body_matches, comments_path, "comments") %>
   <%= subnav_link_to "Listing", comments_path(:group_by => "post") %>
   <%= subnav_link_to "Search", search_comments_path %>
   <%= subnav_link_to "Help", wiki_pages_path(:title => "help:comments") %>
-  </menu>
 <% end %>

app/views/dmails/_secondary_links.html.erb

@@ -1,5 +1,4 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= quick_search_form_for(:message_matches, dmails_path, "dmails") %>
   <%= subnav_link_to "All", all_dmails_path(set_default_folder: true) %>
   <%= subnav_link_to "Received", received_dmails_path(set_default_folder: true) %>
@@ -10,5 +9,4 @@
   <%= subnav_link_to "Mark all as read", {:controller => "dmails", :action => "mark_all_as_read"}, :method => :post, :remote => true %></li>
   <li>|</li>
   <%= subnav_link_to "Help", wiki_pages_path(title: "help:dmail") %>
-  </menu>
 <% end %>

app/views/favorite_groups/_secondary_links.html.erb

@@ -1,5 +1,4 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= subnav_link_to "Listing", favorite_groups_path %>
   <% if CurrentUser.is_member? %>
     <%= subnav_link_to "New", new_favorite_group_path %>
@@ -18,5 +17,4 @@
       <% end %>
     <% end %>
   <% end %>
-  </menu>
 <% end %>

app/views/forum_topics/_secondary_links.html.erb

@@ -1,5 +1,4 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= quick_search_form_for(:body_matches, forum_posts_path, "forum posts") %>
   <%= subnav_link_to "Listing", forum_topics_path %>
   
@@ -43,5 +42,4 @@
       <% end %>
     <% end %>
   <% end %>
-  </menu>
 <% end %>

app/views/ip_bans/_secondary_links.html.erb

@@ -1,6 +1,4 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= subnav_link_to "Listing", ip_bans_path %>
   <%= subnav_link_to "New", new_ip_ban_path %>
-  </menu>
 <% end %>

app/views/janitor_trials/_secondary_links.html.erb

@@ -1,6 +1,4 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= subnav_link_to "Listing", janitor_trials_path %>
   <%= subnav_link_to "New", new_janitor_trial_path %>
-  </menu>
 <% end %>

app/views/layouts/_main_links.html.erb

@@ -1,4 +1,4 @@
-<menu class="main">
+<menu id="main-menu" class="main">
   <% if CurrentUser.is_anonymous? %>
     <%= nav_link_to("Sign in", new_session_path) %>
   <% else %>

app/views/layouts/default.html.erb

@@ -101,7 +101,7 @@
   <%= render "news_updates/listing" %>
 
   <header id="top">
-    <h1><%= link_to Danbooru.config.app_name, "/" %></h1>
+    <h1 id="app-name-header"><%= link_to Danbooru.config.app_name, "/" %></h1>
     
     <div id="maintoggle">
       <a href="#"><i id="maintoggle-on" class="fas fa-bars"></i></a>
@@ -110,7 +110,11 @@
     
     <nav id="nav">
       <%= render "layouts/main_links" %>
+      <% if content_for(:secondary_links).present? %>
+        <menu id="subnav-menu">
           <%= yield :secondary_links %>
+        </menu>
+      <% end %>
     </nav>
   </header>
 

app/views/news_updates/_secondary_links.html.erb

@@ -1,6 +1,4 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= subnav_link_to "Listing", news_updates_path %>
   <%= subnav_link_to "New", new_news_update_path %>
-  </menu>
 <% end %>

app/views/notes/_secondary_links.html.erb

@@ -1,5 +1,4 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= quick_search_form_for(:body_matches, notes_path, "notes") %>
   <%= subnav_link_to "Listing", notes_path %>
   <%= subnav_link_to "Posts", posts_path(:tags => "order:note") %>
@@ -7,5 +6,4 @@
   <%= subnav_link_to "History", note_versions_path %>
   <%= subnav_link_to "Requests", posts_path(:tags => "translation_request") %>
   <%= subnav_link_to "Help", wiki_pages_path(:title => "help:notes") %>
-  </menu>
 <% end %>

app/views/pools/_secondary_links.html.erb

@@ -1,5 +1,4 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= quick_search_form_for(:name_matches, pools_path, "pools", autocomplete: "pool") %>
   <%= subnav_link_to "Gallery", gallery_pools_path %>
   <%= subnav_link_to "Listing", pools_path %>
@@ -26,5 +25,4 @@
       <%= subnav_link_to "Order", edit_pool_order_path(@pool) %>
     <% end %>
   <% end %>
-  </menu>
 <% end %>

app/views/post_versions/_secondary_links.html.erb

@@ -1,9 +1,7 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= subnav_link_to "Listing", posts_path %>
   <%= subnav_link_to "Upload", new_upload_path %>
   <%= subnav_link_to "Search", search_post_versions_path %>
   <%= subnav_link_to "Changes", post_versions_path %>
   <%= subnav_link_to "Help", wiki_pages_path(:title => "help:posts") %>
-  </menu>
 <% end %>

app/views/posts/partials/common/_secondary_links.html.erb

@@ -1,5 +1,4 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= subnav_link_to "Listing", posts_path %>
   <%= subnav_link_to "Upload", new_upload_path %>
   <%= subnav_link_to "Hot", posts_path(:tags => "order:rank", :d => "1") %>
@@ -18,5 +17,4 @@
     <%= subnav_link_to "Moderate", moderator_post_queue_path %>
   <% end %>
   <%= subnav_link_to "Help", wiki_pages_path(:title => "help:posts") %>
-  </menu>
 <% end %>

app/views/saved_searches/_secondary_links.html.erb

@@ -1,6 +1,4 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= subnav_link_to "View posts", posts_path(:tags => "search:all") %>
   <%= subnav_link_to "Manage saved searches", saved_searches_path %>
-  </menu>
 <% end %>

app/views/sessions/_secondary_links.html.erb

@@ -1,7 +1,5 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= subnav_link_to "Sign up", new_user_path %>
   <%= subnav_link_to "Reset Password", new_maintenance_user_password_reset_path %>
   <%= subnav_link_to "Login Reminder", new_maintenance_user_login_reminder_path %>
-  </menu>
 <% end %>

app/views/tag_aliases/_secondary_links.html.erb

@@ -1,9 +1,7 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= subnav_link_to "Listing", tag_aliases_path %>
   <%= subnav_link_to "MetaSearch", meta_searches_tags_path %>
   <%= subnav_link_to "Request alias", new_tag_alias_request_path %>
   <%= subnav_link_to "Request bulk update", new_bulk_update_request_path %>
   <%= subnav_link_to "Help", wiki_pages_path(:title => "help:tag_aliases") %>
-  </menu>
 <% end %>

app/views/tag_implications/_secondary_links.html.erb

@@ -1,9 +1,7 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= subnav_link_to "Listing", tag_implications_path %>
   <%= subnav_link_to "MetaSearch", meta_searches_tags_path %>
   <%= subnav_link_to "Request implication", new_tag_implication_request_path %>
   <%= subnav_link_to "Request bulk update", new_bulk_update_request_path %>
   <%= subnav_link_to "Help", wiki_pages_path(:title => "help:tag_implications") %>
-  </menu>
 <% end %>

app/views/tags/_secondary_links.html.erb

@@ -1,5 +1,4 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= quick_search_form_for(:name_matches, tags_path, "tags", autocomplete: "tag") %>
   <%= subnav_link_to "Listing", tags_path %>
   <%= subnav_link_to "MetaSearch", meta_searches_tags_path %>
@@ -14,5 +13,4 @@
       <%= subnav_link_to "Fix", new_tag_correction_path(:tag_id => @tag.id) %>
     <% end %>
   <% end %>
-  </menu>
 <% end %>

app/views/uploads/_secondary_links.html.erb

@@ -1,9 +1,7 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= subnav_link_to "Listing", uploads_path %>
   <%= subnav_link_to "New", new_upload_path %>
   <%= subnav_link_to "Batch Upload", batch_uploads_path %>
   <%= subnav_link_to "Similar Images Search", iqdb_queries_path %>
   <%= subnav_link_to "Help", wiki_pages_path(search: { title: "help:upload" }) %>
-  </menu>
 <% end %>

app/views/user_feedbacks/_secondary_links.html.erb

@@ -1,5 +1,4 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <% if CurrentUser.is_gold? %>
     <% if @user_feedback %>
       <%= subnav_link_to "New", new_user_feedback_path(:user_feedback => {:user_id => @user_feedback.user_id}) %>
@@ -11,5 +10,4 @@
   <% end %>
   <%= subnav_link_to "Listing", user_feedbacks_path %>
   <%= subnav_link_to "Search", search_user_feedbacks_path %>
-  </menu>
 <% end %>

app/views/user_name_change_requests/_secondary_links.html.erb

@@ -1,7 +1,5 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= subnav_link_to "Listing", user_name_change_requests_path %>
   <%= subnav_link_to "New", new_user_name_change_request_path %>
   <%= subnav_link_to "Help", wiki_pages_path(:search => {:title => "help:user_name_change_requests"}) %>
-  </menu>
 <% end %>

app/views/users/_secondary_links.html.erb

@@ -1,5 +1,4 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= quick_search_form_for(:name_matches, users_path, "users", autocomplete: "user") %>
   <%= subnav_link_to "Listing", users_path %>
   <%= subnav_link_to "Search", search_users_path %>
@@ -37,5 +36,4 @@
     <li>|</li>
     <%= subnav_link_to "Sign out", sign_out_session_path %>
   <% end %>
-  </menu>
 <% end %>

app/views/wiki_pages/_secondary_links.html.erb

@@ -1,49 +1,32 @@
 <% content_for(:secondary_links) do %>
-  <menu>
   <%= quick_search_form_for(:title, wiki_pages_path, "wiki pages", autocomplete: "wiki-page") %>
-
   <%= subnav_link_to "Listing", wiki_pages_path %>
-
   <%= subnav_link_to "Search", search_wiki_pages_path %>
-    
   <% if CurrentUser.is_member? %>
     <%= subnav_link_to "New", new_wiki_page_path %>
   <% end %>
-    
   <%= subnav_link_to "Help", wiki_pages_path(:search => {:title => "help:wiki"}) %>
-    
   <% if @wiki_page && @wiki_page.new_record? && @wiki_page.try(:tag).present? %>
     <li>|</li>
-
     <%= subnav_link_to "Posts (#{@wiki_page.tag.post_count})", posts_path(:tags => @wiki_page.title) %>
-
   <% elsif @wiki_page && !@wiki_page.new_record? %>
     <li>|</li>
-
     <%= subnav_link_to "Posts (#{@wiki_page.tag.try(:post_count) || 0})", posts_path(:tags => @wiki_page.title) %>
-
     <%= subnav_link_to "History", wiki_page_versions_path(:search => {:wiki_page_id => @wiki_page.id}) %>
-
     <% if CurrentUser.is_member? %>
       <%= subnav_link_to "Edit", edit_wiki_page_path(@wiki_page), "data-shortcut": "e" %>
     <% end %>
-
     <% if CurrentUser.is_builder? && !@wiki_page.is_deleted? %>
       <%= subnav_link_to "Delete", wiki_page_path(@wiki_page), :remote => true, :method => :delete, :"data-shortcut" => "shift+d", :"data-confirm" => "Are you sure you want to delete this wiki page?" %>
     <% end %>
-
   <% elsif @wiki_page_version %>
     <li>|</li>
-
     <%= subnav_link_to "Newest", wiki_page_path(@wiki_page_version.wiki_page_id) %>
-
     <% if @wiki_page_version.previous %>
       <%= subnav_link_to "Diff", diff_wiki_page_versions_path(:otherpage => @wiki_page_version.id, :thispage => @wiki_page_version.previous.id) %>
     <% end %>
-
     <% if CurrentUser.is_member? %>
       <%= subnav_link_to "Revert to", revert_wiki_page_path(@wiki_page_version.wiki_page_id, :version_id => @wiki_page_version.id), :method => :put, :data => {:confirm => "Are you sure you want to revert to this version?"} %>
     <% end %>
   <% end %>
-  </menu>
 <% end %>