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

diff --git a/app/assets/images/banners/StateoftheMapEurope_2024.png b/app/assets/images/banners/StateoftheMapEurope_2024.png
index d0d1cee62d757aa636a9070aaccc854077481b45..2f35f7b9871f7fa24d94cc1de5ad68c55cf1910b 100644 (file)
Binary files a/app/assets/images/banners/StateoftheMapEurope_2024.png and b/app/assets/images/banners/StateoftheMapEurope_2024.png differ

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 3e779a00c9ea8cdc4b36f3a3c96fbeb31d7af2f6..26ba2c528bb99f229b8f654de9463f6dfefbae61 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -64,7 +64,7 @@ module UserHelper
                 :size => "36"),
       auth_path(options.merge(:provider => provider)),
       :method => :post,
-      :class => "auth_button btn btn-light p-2 d-block",
+      :class => "auth_button btn btn-light p-2",
       :title => t("application.auth_providers.#{name}.title")
     )
   end

diff --git a/app/views/application/_auth_providers.html.erb b/app/views/application/_auth_providers.html.erb
index e3e5123cc56310c1141d6be95f498e55f0a37b44..d2ff6865fcbfb4c1ec07f04e9161f071029b305a 100644 (file)
--- a/app/views/application/_auth_providers.html.erb
+++ b/app/views/application/_auth_providers.html.erb
@@ -1,5 +1,5 @@
 <div>
-  <div class="list-inline justify-content-center d-flex align-items-center flex-wrap w-100 mb-3" id="login_auth_buttons">
+  <div class="justify-content-center d-flex align-items-center flex-wrap mb-3" id="login_auth_buttons">
 
     <% prefered_auth_button_available = false %>
     <% %w[google facebook microsoft github wikipedia].each do |provider| %>
@@ -11,7 +11,7 @@
     <% end -%>
 
     <% if prefered_auth_button_available %>
-      <div class="list-inline justify-content-center d-flex align-items-center flex-wrap w-50">
+      <div class="justify-content-center d-flex align-items-center flex-wrap w-50">
         <% %w[google facebook microsoft github wikipedia].each do |provider| %>
           <% if Settings.key?("#{provider}_auth_id".to_sym) -%>
             <% if @preferred_auth_provider == provider %>
@@ -20,9 +20,9 @@
           <% end -%>
         <% end -%>
       </div>
-      <div class="list-inline justify-content-center d-flex align-items-center flex-wrap gap-2 w-50 px-1">
+      <div class="justify-content-center d-flex align-items-center flex-wrap gap-2 w-50 px-1">
     <% else %>
-      <div class="list-inline justify-content-center d-flex align-items-center flex-wrap gap-2 w-100">
+      <div class="justify-content-center d-flex align-items-center flex-wrap gap-2">
     <% end %>
 
       <%= link_to image_tag("openid.svg",
@@ -31,7 +31,7 @@
                   "#",
                   :id => "openid_open_url",
                   :title => t("application.auth_providers.openid.title"),
-                  :class => "btn btn-light p-2 d-block" %>
+                  :class => "btn btn-light p-2" %>
 
       <% %w[google facebook microsoft github wikipedia].each do |provider| %>
         <% unless @preferred_auth_provider == provider %>
@@ -48,7 +48,7 @@
     <div id="login_openid_url" class="mb-3">
       <label for="openid_url" class="form-label"><%= t ".openid_html", :logo => openid_logo %></label>
       <%= hidden_field_tag("referer", params[:referer], :autocomplete => "off") %>
-      <%= text_field_tag("openid_url", "", :tabindex => 20, :autocomplete => "on", :class => "openid_url form-control") %>
+      <%= text_field_tag("openid_url", "", :tabindex => 20, :autocomplete => "on", :class => "form-control") %>
       <span class="form-text text-body-secondary">(<a href="<%= t "accounts.edit.openid.link" %>" target="_new"><%= t "accounts.edit.openid.link text" %></a>)</span>
     </div>
 

diff --git a/config/banners.yml b/config/banners.yml
index bc5497a4cedc56a694dee94854ba52ab9bcbb337..2c8e1338af32d432ab56a51a6d4b15a7f00dbe90 100644 (file)
--- a/config/banners.yml
+++ b/config/banners.yml
@@ -11,7 +11,7 @@ donate_2023:
 sotmeu_2024:
   id: sotmeu_2024
   alt: State of the Map Europe 2024
-  link: https://stateofthemap.eu/
+  link: https://openstreetmap.org.pl/2024/sotm-eu-2024-community-tickets-70/
   img: banners/StateoftheMapEurope_2024.png
   enddate: 2024-jul-18
 sotmasia_2023:

diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb
index a415bd029ef79a4862292c7eea9d0aa45c4fb68a..eaf406a067b6941d93da7b380472d4c3ae9eb1a9 100644 (file)
--- a/test/helpers/user_helper_test.rb
+++ b/test/helpers/user_helper_test.rb
@@ -117,7 +117,7 @@ class UserHelperTest < ActionView::TestCase
   def test_auth_button
     button = auth_button("google", "google")
     img_tag = "<img alt=\"Google logo\" class=\"rounded-1\" src=\"/images/google.svg\" width=\"36\" height=\"36\" />"
-    assert_equal("<a class=\"auth_button btn btn-light p-2 d-block\" title=\"Log in with Google\" rel=\"nofollow\" data-method=\"post\" href=\"/auth/google\">#{img_tag}</a>", button)
+    assert_equal("<a class=\"auth_button btn btn-light p-2\" title=\"Log in with Google\" rel=\"nofollow\" data-method=\"post\" href=\"/auth/google\">#{img_tag}</a>", button)
   end
 
   private