Merge pull request #3634 from AntonKhorev/map-key-tooltip

Fix tooltips

diff --combined app/assets/javascripts/application.js
index aea9e01a468df7646fd52ca3589175067c144d08,740990fb300521794789bbde90e089406e544ad7..89f60847fb9261f2432051e5c2441b32b96744e9
--- 1/app/assets/javascripts/application.js
--- 2/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@@ -13,7 -13,7 +13,7 @@@
  //= require leaflet.locationfilter
  //= require i18n
  //= require oauth
 -//= require piwik
 +//= require matomo
  //= require richtext
  //= require qs/dist/qs
  //= require bs-custom-file-input
@@@ -59,7 -59,7 +59,7 @@@ window.updateLinks = function (loc, zoo
    var editDisabled = zoom < 13;
    $("#edit_tab")
      .tooltip({ placement: "bottom" })
-     .attr("data-original-title", editDisabled ?
+     .attr("data-bs-original-title", editDisabled ?
        I18n.t("javascripts.site.edit_disabled_tooltip") : "")
      // Disable the button group and also the buttons to avoid
      // inconsistent behaviour when zooming

diff --combined app/assets/javascripts/leaflet.key.js
index b9b7c9c04e0bb74c677a1e38396b6a2be4acc458,e170ff35227d49b478d6674c87f73dea4c421b50..367c39c1462067ab74ed7fdad466b0814a5b75fa
--- 1/app/assets/javascripts/leaflet.key.js
--- 2/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@@ -19,8 -19,9 +19,8 @@@ L.OSM.key = function (options) 
        .attr("class", "sidebar_heading")
        .appendTo($ui)
        .append(
 -        $("<span>")
 -          .text(I18n.t("javascripts.close"))
 -          .attr("class", "icon close")
 +        $("<button type='button' class='btn-close float-end mt-1'>")
 +          .attr("aria-label", I18n.t("javascripts.close"))
            .bind("click", toggle))
        .append(
          $("<h4>")
@@@ -62,7 -63,7 +62,7 @@@
        var disabled = ["mapnik", "cyclemap"].indexOf(map.getMapBaseLayerId()) === -1;
        button
          .toggleClass("disabled", disabled)
-         .attr("data-original-title",
+         .attr("data-bs-original-title",
                I18n.t(disabled ?
                  "javascripts.key.tooltip_disabled" :
                  "javascripts.key.tooltip"));

diff --combined app/assets/javascripts/leaflet.layers.js
index 676cd960780fe6741809ba3e21ca0573644313d1,0f8e6c4d266dc1b986cb7e737f29699ac4b923d4..038205ca4975d16e593b89d4b0278fef61062367
--- 1/app/assets/javascripts/leaflet.layers.js
--- 2/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@@ -22,8 -22,9 +22,8 @@@ L.OSM.layers = function (options) 
        .attr("class", "sidebar_heading")
        .appendTo($ui)
        .append(
 -        $("<span>")
 -          .text(I18n.t("javascripts.close"))
 -          .attr("class", "icon close")
 +        $("<button type='button' class='btn-close float-end mt-1'>")
 +          .attr("aria-label", I18n.t("javascripts.close"))
            .bind("click", toggle))
        .append(
          $("<h4>")
@@@ -170,7 -171,7 +170,7 @@@
            }
  
            $(item).attr("class", disabled ? "disabled" : "");
-           item.attr("data-original-title", disabled ?
+           item.attr("data-bs-original-title", disabled ?
              I18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip") : "");
          });
        };