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

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

Browse source
This commit is contained in:
Tom Hughes 2022-10-31 22:19:16 +00:00
commit a8db515f13
5 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/index/browse.js
View file

@ -54,6 +54,7 @@ OSM.initializeBrowse = function (map) {
.text(I18n.t("browse.start_rjs.load_data")), .text(I18n.t("browse.start_rjs.load_data")),
$("<div>").append( $("<div>").append(
$("<button type='button' class='btn-close'>") $("<button type='button' class='btn-close'>")
.attr("aria-label", I18n.t("javascripts.close"))
.click(cancel))), .click(cancel))),
$("<p class='alert alert-warning'>") $("<p class='alert alert-warning'>")
.text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })), .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })),

3
app/assets/javascripts/index/directions.js
View file

@ -265,7 +265,8 @@ OSM.Directions = function (map) {
} }
var turnByTurnTable = $("<table class='mb-3'>"); var turnByTurnTable = $("<table class='mb-3'>");
var directionsCloseButton = $("<button type='button' class='btn-close'>"); var directionsCloseButton = $("<button type='button' class='btn-close'>")
.attr("aria-label", I18n.t("javascripts.close"));
$("#sidebar_content") $("#sidebar_content")
.empty() .empty()

2
app/views/application/_sidebar_header.html.erb
View file

@ -1,6 +1,6 @@
<div class="d-flex w-100"> <div class="d-flex w-100">
<h2 class="flex-grow-1 text-break"><%= title %></h2> <h2 class="flex-grow-1 text-break"><%= title %></h2>
<div> <div>
<button type="button" class="btn-close"></button> <button type="button" class="btn-close" aria-label="<%= t("javascripts.close") %>"></button>
</div> </div>
</div> </div>

2
app/views/layouts/_banner.html.erb
View file

@ -1,4 +1,4 @@
<% unless (banner = next_banner()).nil? %> <% unless (banner = next_banner()).nil? %>
<%= link_to (image_tag banner[:img], :alt => banner[:alt], :title => banner[:alt]), banner[:link] %> <%= link_to (image_tag banner[:img], :alt => banner[:alt], :title => banner[:alt]), banner[:link] %>
<button type="button" class="btn-close position-absolute top-0 end-0 p-4" id="<%= banner_cookie(banner[:id]) %>"></button> <button type="button" class="btn-close position-absolute top-0 end-0 p-4" id="<%= banner_cookie(banner[:id]) %>" aria-label="<%= t("javascripts.close") %>"></button>
<% end %> <% end %>

2
app/views/layouts/_search.html.erb
View file

@ -19,7 +19,7 @@
</form> </form>
<form method="GET" action="<%= directions_path %>" class="directions_form pb-3"> <form method="GET" action="<%= directions_path %>" class="directions_form pb-3">
<div class="d-flex flex-row-reverse px-3 py-3"><button type="button" class="btn-close"></button></div> <div class="d-flex flex-row-reverse px-3 py-3"><button type="button" class="btn-close" aria-label="<%= t("javascripts.close") %>"></button></div>
<div class="row gx-2 m-1"> <div class="row gx-2 m-1">
<div class="col-1"> <div class="col-1">