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

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

Browse source
This commit is contained in:
Tom Hughes 2024-06-02 10:54:37 +01:00
commit 6baa2ad39f
6 changed files with 53 additions and 436 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/about/sprite.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 11 KiB

388
app/assets/images/about/sprite.svg
View file

File diff suppressed because one or more lines are too long
Side by side

Before

Width:  |  Height:  |  Size: 66 KiB

BIN
app/assets/images/about/sprite@2x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 25 KiB

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

@ -887,37 +887,6 @@ div.secondary-actions {
margin-left: -1em;
}
}
.icon {
width: 30px;
height: 30px;
background: 40px 40px image-url('about/sprite.png') no-repeat;
&.local {
/*rtl:ignore*/
background-position: 0px 0px;
}
&.community {
/*rtl:ignore*/
background-position: 0px -40px;
}
&.open {
/*rtl:ignore*/
background-position: 0px -80px;
}
&.partners {
/*rtl:ignore*/
background-position: 0px -120px;
}
&.infringement {
/*rtl:ignore*/
background-position: 0px -160px;
}
&.legal {
/*rtl:ignore*/
background-position: -45px -160px;
}
}
}
.auth-container {

7
app/views/site/_about_section.html.erb
View file

@ -1,7 +0,0 @@
<%= tag.section :id => local_assigns[:id] do %>
<div class='d-flex align-items-center gap-2 mb-2'>
<div class='flex-shrink-0 icon <%= icon %>'></div>
<h2 class='flex-grow-1 mb-0'><%= t "site.about.#{title}_title" %></h2>
</div>
<%= yield %>
<% end %>

63
app/views/site/about.html.erb
View file

@ -21,11 +21,25 @@
<div class='bg-body px-5 py-4'>
<p class="lead"><%= t ".lede_text" %></p>
<%= render :layout => "about_section", :locals => { :icon => "local", :title => "local_knowledge" } do %>
<section>
<div class="d-flex align-items-center gap-2 mb-2">
<svg width="30" height="30" class="flex-shrink-0">
<circle cx="15" cy="15" r="13" fill="none" stroke="#c0c0c0" stroke-width="4" />
<path d="m 15,22 c 0,0 5,-4.5199 5,-8 0,-3 -2,-5 -5,-5 -3,0 -5,2 -5,5 0,3.4801 5,8 5,8 z" fill="#c0c0c0" />
</svg>
<h2 class="flex-grow-1 mb-0"><%= t "site.about.local_knowledge_title" %></h2>
</div>
<p><%= t "site.about.local_knowledge_html" %></p>
<% end %>
</section>
<%= render :layout => "about_section", :locals => { :icon => "community", :title => "community_driven" } do %>
<section>
<div class="d-flex align-items-center gap-2 mb-2">
<svg width="30" height="30" class="flex-shrink-0">
<circle cx="15" cy="15" r="13" fill="none" stroke="#c0c0c0" stroke-width="4" />
<path d="m 15,7 -6,6 0,7 4,0 0,-4 4,0 0,4 4,0 0,-7 z" fill="#c0c0c0" />
</svg>
<h2 class="flex-grow-1 mb-0"><%= t "site.about.community_driven_title" %></h2>
</div>
<p>
<%= 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")),
@ -36,16 +50,35 @@
:osm_foundation_link => link_to(t("site.about.community_driven_osm_foundation"),
t("site.about.community_driven_osm_foundation_url")) %>
</p>
<% end %>
</section>
<%= render :layout => "about_section", :locals => { :id => "open-data", :icon => "open", :title => "open_data" } do %>
<section id="open-data">
<div class="d-flex align-items-center gap-2 mb-2">
<svg width="30" height="30" class="flex-shrink-0">
<circle cx="15" cy="15" r="13" fill="none" stroke="#c0c0c0" stroke-width="4" />
<path d="M20.196 18 a6 6 0 1 1 0 -6" fill="none" stroke="#c0c0c0" stroke-width="3" />
</svg>
<h2 class="flex-grow-1 mb-0"><%= t "site.about.open_data_title" %></h2>
</div>
<p>
<%= 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) %></p>
<% end %>
</section>
<%= render :layout => "about_section", :locals => { :id => "legal", :icon => "legal", :title => "legal" } do %>
<section id="legal">
<div class="d-flex align-items-center gap-2 mb-2">
<svg width="30" height="30" class="flex-shrink-0">
<circle cx="15" cy="15" r="13" fill="none" stroke="#c0c0c0" stroke-width="4" />
<g fill="none" stroke="#c0c0c0" stroke-width="1.125" stroke-linecap="round">
<path transform="translate(15 15) scale(2.2 1.75) rotate(45)"
d="M.5 1 a1 1 0 0 0 0 -2 h-2.5 a1 1 0 0 1 0 -2 h.5" />
<path transform="translate(15 15) scale(-2.2 -1.75) rotate(45)"
d="M.5 1 a1 1 0 0 0 0 -2 h-2.5 a1 1 0 0 1 0 -2 h.5" />
</g>
</svg>
<h2 class="flex-grow-1 mb-0"><%= t "site.about.legal_title" %></h2>
</div>
<p>
<%= t "site.about.legal_1_1_html", :openstreetmap_foundation_link => link_to(t("site.about.legal_1_1_openstreetmap_foundation"),
t("site.about.legal_1_1_openstreetmap_foundation_url")),
@ -64,14 +97,24 @@
<%= t "site.about.legal_2_2_html", :registered_trademarks_link => link_to(t("site.about.legal_2_2_registered_trademarks"),
t("site.about.legal_2_2_registered_trademarks_url")) %>
</p>
<% end %>
</section>
<%= render :layout => "about_section", :locals => { :id => "partners", :icon => "partners", :title => "partners" } do %>
<section id="partners">
<div class="d-flex align-items-center gap-2 mb-2">
<svg width="30" height="30" class="flex-shrink-0">
<circle cx="15" cy="15" r="13" fill="none" stroke="#c0c0c0" stroke-width="4" />
<g stroke="#c0c0c0" stroke-width="4" stroke-linecap="round">
<line x1="11" y1="15" x2="19" y2="15" />
<line x1="15" y1="11" x2="15" y2="19" />
</g>
</svg>
<h2 class="flex-grow-1 mb-0"><%= t "site.about.partners_title" %></h2>
</div>
<p><%= 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/") %>
</p>
<% end %>
</section>
</div>
<% end %>
<% end %>