Merge 90f76ce into e976784

app/views/controllers/application/_sidebar.html.erb

@@ -14,13 +14,10 @@ classes = {
 
   <a id="logo_link" href="<%= browser.bot? ? "/sitemap/index.html" : "/" %>">
     <img class="logo-trim img-responsive py-10px" alt="Mushroom Observer Logo"
-         src="/logo-trim.png"/>
+          src="/logo-trim.png"/>
   </a><!-- #logo_link -->
 
-  <div class="<%= classes[:wrapper] %>">
-
-    <%= render(partial: "application/sidebar/info",
-                locals: { classes: classes }) %>
+  <div class="<%= classes[:wrapper] %>" data-controller="nav-active">
 
     <% if in_admin_mode? %>
       <%= render(partial: "application/sidebar/admin",
@@ -39,15 +36,15 @@ classes = {
                 locals: { classes: classes }) %>
 
     <%= render(partial: "application/sidebar/latest",
-                locals: { classes: classes }) %>
+                locals: { classes: classes }) if @user %>
 
     <%= render(partial: "application/sidebar/species_lists",
-                locals: { classes: classes }) %>
+                locals: { classes: classes }) if @user %>
 
     <%= render(partial: "application/sidebar/indexes",
-                locals: { classes: classes }) %>
+                locals: { classes: classes }) if @user %>
 
-    <%= render(partial: "application/sidebar/more",
+    <%= render(partial: "application/sidebar/info",
                 locals: { classes: classes }) %>
 
     <%= render(partial: "application/sidebar/languages",

app/views/controllers/application/sidebar/_indexes.html.erb

@@ -2,26 +2,16 @@
 tag.div("#{:INDEXES.t}:", class: classes[:heading])
 %>
 <%=
+[
 active_link_to(:GLOSSARY.t, glossary_terms_path,
-               class: classes[:indent], id: "nav_glossary_terms_link")
-%>
-<%=
+               class: classes[:indent], id: "nav_glossary_terms_link"),
 active_link_to(:HERBARIA.t, herbaria_path(flavor: :all),
-               class: classes[:indent], id: "nav_herbaria_link")
-%>
-<%=
+               class: classes[:indent], id: "nav_herbaria_link"),
 active_link_to(:LOCATIONS.t, locations_path,
-               class: classes[:indent], id: "nav_locations_link")
-%>
-<%=
+               class: classes[:indent], id: "nav_locations_link"),
 active_link_to(:NAMES.t, names_path(with_observations: true),
-               class: classes[:indent], id: "nav_name_observations_link")
-%>
-<%=
-active_link_to(:NEWS.t, articles_path,
-               class: classes[:indent], id: "nav_articles_link")
-%>
-<%=
+               class: classes[:indent], id: "nav_name_observations_link"),
 active_link_to(:PROJECTS.t, projects_path(by: "updated_at"),
                class: classes[:indent], id: "nav_projects_link")
+].safe_join
 %>

app/views/controllers/application/sidebar/_info.html.erb

@@ -1,12 +1,27 @@
+<%= tag.div("#{:app_more.t}:", class: classes[:heading]) %>
 <%=
 [
 active_link_to(:app_intro.t, info_intro_path,
-               class: classes[:item], id: "nav_intro_link"),
+               class: classes[:indent], id: "nav_intro_link"),
 active_link_to(:app_how_to_use.t, info_how_to_use_path,
-               class: classes[:item], id: "nav_how_to_use_link"),
-active_link_to(:app_privacy_policy.t, policy_privacy_path,
-               class: classes[:item], id: "nav_privacy_link"),
+               class: classes[:indent], id: "nav_how_to_use_link"),
 active_link_to(:app_donate.t, support_donate_path,
-               class: classes[:item], id: "nav_donate_link")
+               class: classes[:indent], id: "nav_donate_link"),
+active_link_to(:app_how_to_help.t, info_how_to_help_path,
+               class: classes[:indent], id: "nav_how_to_help_link"),
+active_link_to(:app_report_a_bug.t, emails_ask_webmaster_question_path,
+               class: classes[:indent], id: "nav_bug_report_link"),
+active_link_to(:app_send_a_comment.t, emails_ask_webmaster_question_path,
+               class: classes[:indent], id: "nav_ask_webmaster_link"),
+active_link_to(:app_contributors.t, contributors_path,
+               class: classes[:indent], id: "nav_contributors_link"),
+active_link_to(:app_site_stats.t, info_site_stats_path,
+               class: classes[:indent], id: "nav_site_stats_link"),
+active_link_to(:translators_note_title.t, info_translators_note_path,
+               class: classes[:indent], id: "nav_translators_note_link"),
+active_link_to(:app_publications.t, publications_path,
+               class: classes[:indent], id: "nav_publications_link"),
+active_link_to(:app_privacy_policy.t, policy_privacy_path,
+               class: classes[:indent], id: "nav_privacy_link"),
 ].safe_join
 %>

app/views/controllers/application/sidebar/_latest.html.erb

@@ -1,7 +1,13 @@
 <%= tag.div("#{:app_latest.t}:", class: classes[:heading]) %>
-<%= active_link_to(:app_latest_changes.t, activity_logs_path,
-                   class: classes[:indent], id: "nav_activity_logs_link") %>
-<%= active_link_to(:app_newest_images.t, images_path,
-                   class: classes[:indent], id: "nav_images_link") %>
-<%= active_link_to(:app_comments.t, comments_path,
-                   class: classes[:indent], id: "nav_comments_link") %>
+<%=
+[
+active_link_to(:NEWS.t, articles_path,
+               class: classes[:indent], id: "nav_articles_link"),
+active_link_to(:app_latest_changes.t, activity_logs_path,
+               class: classes[:indent], id: "nav_activity_logs_link"),
+active_link_to(:app_newest_images.t, images_path,
+               class: classes[:indent], id: "nav_images_link"),
+active_link_to(:app_comments.t, comments_path,
+               class: classes[:indent], id: "nav_comments_link")
+].safe_join
+%>

app/views/controllers/application/sidebar/_observations.html.erb

@@ -1,12 +1,13 @@
 <%= tag.div("#{:app_observations_left.t}:", class: classes[:heading]) %>
+<%= active_link_to(:app_latest.t, root_path,
+                   class: classes[:indent], id: "nav_observations_link") %>
 <%= active_link_to(:app_create_observation.t, new_observation_path,
-                   class: classes[:indent], id: "nav_new_observation_link") %>
+                   class: classes[:indent],
+                   id: "nav_new_observation_link") if @user %>
 <%= active_link_to(:app_your_observations.t,
                    observations_path(user: @user.id),
                    class: classes[:indent],
                    id: "nav_your_observations_link") if @user %>
 <%= active_link_with_query(:app_help_id_obs.t, identify_observations_path,
                            class: classes[:indent],
                            id: "nav_identify_observations_link") %>
-<%= active_link_to(:app_sort_by_date_obs.t, observations_path,
-                   class: classes[:indent], id: "nav_observations_link") %>