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

This commit is contained in:
Tom Hughes 2022-11-22 18:47:24 +00:00
commit 8cef62cd2c
16 changed files with 273 additions and 56 deletions

View file

@ -50,6 +50,9 @@
<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>
<li class="compact-hide nav-item <%= current_page_class(communities_path) %>">
<%= link_to t("layouts.communities"), communities_path, :class => "nav-link" %>
</li>
<li class="compact-hide nav-item <%= current_page_class(copyright_path) %>">
<%= link_to t("layouts.copyright"), copyright_path, :class => "nav-link" %>
</li>
@ -72,6 +75,7 @@
<% 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>

View file

@ -0,0 +1,23 @@
<% content_for :heading do %>
<h1><%= t ".title" %></h1>
<% end %>
<p class="lead"><%= t ".lede_text" %></p>
<h2><%= t ".local_chapters.title" %></h2>
<p><%= t ".local_chapters.about_text" %></p>
<p><%= t ".local_chapters.list_text" %></p>
<ul>
<% @local_chapters.each do |chapter| %>
<li>
<% if chapter.url %>
<a href="<%= chapter.url %>"><%= t "osm_community_index.communities.#{chapter.id}.name" %></a>
<% else %>
<%= t "osm_community_index.communities.#{chapter.id}.name" %>
<% end %>
</li>
<% end %>
</ul>
<h2><%= t ".other_groups.title" %></h2>
<p><%= t ".other_groups.about_html" %></p>