From e0fed8f942af29eb7f0815d4b4f965bff6ee5308 Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Tue, 3 Dec 2024 22:57:53 -0800 Subject: [PATCH] Slogging through --- .github/workflows/ohm-tests.yml | 4 +- app/views/site/about.html.erb | 123 +++++++++++++++++++++----------- config/locales/en.yml | 6 +- 3 files changed, 88 insertions(+), 45 deletions(-) diff --git a/.github/workflows/ohm-tests.yml b/.github/workflows/ohm-tests.yml index 4bc4cc48ce..3c884e4fa1 100644 --- a/.github/workflows/ohm-tests.yml +++ b/.github/workflows/ohm-tests.yml @@ -13,8 +13,8 @@ jobs: name: Ubuntu ${{ matrix.ubuntu }}, Ruby ${{ matrix.ruby }} strategy: matrix: - ubuntu: [22.04, 24.04] - ruby: ['3.1', '3.2', '3.3'] + ubuntu: [22.04] + ruby: ['3.1'] runs-on: ubuntu-${{ matrix.ubuntu }} env: RAILS_ENV: test diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb index f6f6ba1370..56e82f8f8c 100644 --- a/app/views/site/about.html.erb +++ b/app/views/site/about.html.erb @@ -1,3 +1,4 @@ +<% content_for(:content_class) { "bg-body-secondary" } %> <% I18n.with_locale @locale do %> <%= tag.div :lang => @locale, :dir => t("html.dir") do %>
@@ -11,67 +12,109 @@
-
+

<%= t ".used_by_html", :name => tag.span("OpenStreetMap", :class => "user-name") %>

-
+

<%= t ".lede_text" %>

- <%= render :layout => "about_section", :locals => { :icon => "local", :title => "local_knowledge" } do %> -

<%= t "site.about.local_knowledge_html" %>

- <% end %> +
+
+ + + + +

<%= t ".local_knowledge_title" %>

+
+

<%= t ".local_knowledge_html" %>

+
- <%= render :layout => "about_section", :locals => { :icon => "community", :title => "community_driven" } do %> +
+
+ + + + +

<%= t ".community_driven_title" %>

+

- <%= t "site.about.community_driven_1_html", :osm_blog_link => link_to(t("site.about.community_driven_osm_blog"), - t("site.about.community_driven_osm_blog_url")), - :user_diaries_link => link_to(t("site.about.community_driven_user_diaries"), - diary_entries_path), - :community_blogs_link => link_to(t("site.about.community_driven_community_blogs"), - t("site.about.community_driven_community_blogs_url")), - :osm_foundation_link => link_to(t("site.about.community_driven_osm_foundation"), - t("site.about.community_driven_osm_foundation_url")) %> + <%= t ".community_driven_1_html", :osm_blog_link => link_to(t(".community_driven_osm_blog"), + t(".community_driven_osm_blog_url")), + :user_diaries_link => link_to(t(".community_driven_user_diaries"), + diary_entries_path), + :community_blogs_link => link_to(t(".community_driven_community_blogs"), + t(".community_driven_community_blogs_url")), + :osm_foundation_link => link_to(t(".community_driven_osm_foundation"), + t(".community_driven_osm_foundation_url")) %>

- <% end %> +
- <%= render :layout => "about_section", :locals => { :id => "open-data", :icon => "open", :title => "open_data" } do %> +
+
+ + + + +

<%= t ".open_data_title" %>

+

- <%= t "site.about.open_data_1_html", :open_data => tag.i(t("site.about.open_data_open_data")), - :copyright_license_link => link_to(t("site.about.open_data_copyright_license"), - copyright_path) %>

- <% end %> + <%= t ".open_data_1_html", :open_data => tag.i(t(".open_data_open_data")), + :copyright_license_link => link_to(t(".open_data_copyright_license"), + copyright_path) %>

+
- <%= render :layout => "about_section", :locals => { :id => "legal", :icon => "legal", :title => "legal" } do %> + - <%= render :layout => "about_section", :locals => { :id => "partners", :icon => "partners", :title => "partners" } do %> -

<%= t "layouts.hosting_partners_html", :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"), - :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"), - :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"), - :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %> +

+
+ + + + + + + +

<%= t ".partners_title" %>

+
+

<%= t "layouts.hosting_partners_2024_html", :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"), + :corpmembers => link_to(t("layouts.partners_corpmembers"), "https://osmfoundation.org/wiki/Corporate_Members"), + :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>

- <% end %> +
<% end %> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 2134b3c0f8..3ab321679e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1922,7 +1922,7 @@ en: about: heading_html: "%{copyright}OpenHistoricalMap %{br} contributors" copyright_symbol_html: "©" - used_by_html: "OpenHistoricalMap collaboratively stores and displays map data throughout the history of the world." + used_by_html: "OpenHistoricalMap collaboratively stores and displays map data throughout the history of the world." lede_text: | OpenHistoricalMap is built by a community of mappers and historians that contribute and maintain data about the history of the world. @@ -1934,7 +1934,7 @@ en: community_driven_1_html: | OpenHistoricalMap's community is diverse, passionate, and growing every day. Our contributors include enthusiast mappers, academics, digital historians, historical societies, - and many more. To learn more about the community, see the user diaries etc. + and many more. To learn more about the community, see the user diaries etc. community_driven_osm_blog: OpenStreetMap Blog community_driven_osm_blog_url: https://blog.openstreetmap.org community_driven_user_diaries: user diaries @@ -1949,7 +1949,7 @@ en: and citation requirements at the object level (if any). Credit or citation to OpenHistoricalMap for consolidating this data is appreciated, but not required. If you alter or build upon the data in certain ways, you may distribute the result only - under the same licence. See the Copyright and + under the same licence. See the Copyright and License page for details.

You can access OHM data through various services, beyond just this website. See a list of available production and staging websites and APIs on