cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/4661'

Browse source
This commit is contained in:
Tom Hughes 2024-04-08 20:12:48 +01:00
commit 8e648e7b26
4 changed files with 24 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/assets/stylesheets/common.scss
View file

@ -150,11 +150,6 @@ nav.primary {
nav.secondary {
.nav-link {
padding: 0.2rem;
color: $darkgrey;
}
> ul li.current a {
color: darken($darkgrey, 25%);
}
#inboxanchor {

4
app/helpers/application_helper.rb
View file

@ -41,8 +41,8 @@ module ApplicationHelper
end
end
def current_page_class(path)
:current if current_page?(path)
def header_nav_link_class(path)
["nav-link", current_page?(path) ? "text-secondary-emphasis" : "text-secondary"]
end
def application_data

42
app/views/layouts/_header.html.erb
View file

@ -34,48 +34,48 @@
<nav class='secondary'>
<ul class='mx-1 px-0'>
<% if Settings.status != "database_offline" && can?(:index, Issue) %>
<li class="compact-hide nav-item <%= current_page_class(issues_path) %>">
<%= link_to issues_path(:status => "open"), :class => "nav-link" do %>
<li class="compact-hide nav-item">
<%= link_to issues_path(:status => "open"), :class => header_nav_link_class(issues_path) do %>
<%= t("layouts.issues") %>
<%= open_issues_count %>
<% end -%>
</li>
<% end %>
<li class="compact-hide nav-item <%= current_page_class(traces_path) %>">
<%= link_to t("layouts.gps_traces"), traces_path, :class => "nav-link" %>
<li class="compact-hide nav-item">
<%= link_to t("layouts.gps_traces"), traces_path, :class => header_nav_link_class(traces_path) %>
</li>
<li class="compact-hide nav-item <%= current_page_class(diary_entries_path) %>">
<%= link_to t("layouts.user_diaries"), diary_entries_path, :class => "nav-link" %>
<li class="compact-hide nav-item">
<%= link_to t("layouts.user_diaries"), diary_entries_path, :class => header_nav_link_class(diary_entries_path) %>
</li>
<li class="compact-hide nav-item <%= current_page_class(communities_path) %>">
<%= link_to t("layouts.communities"), communities_path, :class => "nav-link" %>
<li class="compact-hide nav-item">
<%= link_to t("layouts.communities"), communities_path, :class => header_nav_link_class(communities_path) %>
</li>
<li class="compact-hide nav-item <%= current_page_class(copyright_path) %>">
<%= link_to t("layouts.copyright"), copyright_path, :class => "nav-link" %>
<li class="compact-hide nav-item">
<%= link_to t("layouts.copyright"), copyright_path, :class => header_nav_link_class(copyright_path) %>
</li>
<li class="compact-hide nav-item <%= current_page_class(help_path) %>">
<%= link_to t("layouts.help"), help_path, :class => "nav-link" %>
<li class="compact-hide nav-item">
<%= link_to t("layouts.help"), help_path, :class => header_nav_link_class(help_path) %>
</li>
<li class="compact-hide nav-item <%= current_page_class(about_path) %>">
<%= link_to t("layouts.about"), about_path, :class => "nav-link" %>
<li class="compact-hide nav-item">
<%= link_to t("layouts.about"), about_path, :class => header_nav_link_class(about_path) %>
</li>
<li id="compact-secondary-nav" class="dropdown nav-item">
<button class="dropdown-toggle nav-link btn btn-outline-secondary border-0 bg-white text-secondary" type="button" data-bs-toggle="dropdown"><%= t "layouts.more" %></button>
<ul class="dropdown-menu">
<% if Settings.status != "database_offline" && can?(:index, Issue) %>
<li class="<%= current_page_class(issues_path) %>">
<li>
<%= link_to issues_path(:status => "open"), :class => "dropdown-item" do %>
<%= t("layouts.issues") %>
<%= open_issues_count %>
<% end -%>
</li>
<% end %>
<li class="<%= current_page_class(traces_path) %>"><%= link_to t("layouts.gps_traces"), traces_path, :class => "dropdown-item" %></li>
<li class="<%= current_page_class(diary_entries_path) %>"><%= link_to t("layouts.user_diaries"), diary_entries_path, :class => "dropdown-item" %></li>
<li class="<%= current_page_class(communities_path) %>"><%= link_to t("layouts.communities"), communities_path, :class => "dropdown-item" %></li>
<li class="<%= current_page_class(copyright_path) %>"><%= link_to t("layouts.copyright"), copyright_path, :class => "dropdown-item" %></li>
<li class="<%= current_page_class(help_path) %>"><%= link_to t("layouts.help"), help_path, :class => "dropdown-item" %></li>
<li class="<%= current_page_class(about_path) %>"><%= link_to t("layouts.about"), about_path, :class => "dropdown-item" %></li>
<li><%= link_to t("layouts.gps_traces"), traces_path, :class => "dropdown-item" %></li>
<li><%= link_to t("layouts.user_diaries"), diary_entries_path, :class => "dropdown-item" %></li>
<li><%= link_to t("layouts.communities"), communities_path, :class => "dropdown-item" %></li>
<li><%= link_to t("layouts.copyright"), copyright_path, :class => "dropdown-item" %></li>
<li><%= link_to t("layouts.help"), help_path, :class => "dropdown-item" %></li>
<li><%= link_to t("layouts.about"), about_path, :class => "dropdown-item" %></li>
</ul>
</li>
</ul>