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

Merge 874f59ed54 into 95b8297955

Browse source
This commit is contained in:
Emin Kocan 2025-03-08 18:49:11 +01:00 • committed by GitHub
commit 6dd2cc1446
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/views/layouts/_content.html.erb
View file

@ -15,5 +15,12 @@
<%= yield %> <%= yield %>
</div> </div>
</div> </div>
<% if content_for? :footer %>
<footer class="content-footer bg-body-secondary border-top border-secondary-subtle <%= yield :footer_outer_class %>">
<div class="content-inner <%= yield :footer_class %>">
<%= yield :footer %>
</div>
</footer>
<% end %>
<% end %> <% end %>
</div> </div>

19
app/views/site/welcome.html.erb
View file

@ -77,17 +77,20 @@
<%= render "any_questions" %> <%= render "any_questions" %>
<div class='text-center mb-3'>
<% if params[:oauth_return_url] %>
<a class="btn btn-primary" href="<%= params[:oauth_return_url] %>"><%= t ".continue_authorization" %></a>
<% else %>
<a class="btn btn-primary start-mapping" href="<%= edit_path %>"><%= t ".start_mapping" %></a>
<% end %>
</div>
<div class='alert alert-primary'> <div class='alert alert-primary'>
<h2><%= t ".add_a_note.title" %></h2> <h2><%= t ".add_a_note.title" %></h2>
<p><%= t ".add_a_note.para_1" %></p> <p><%= t ".add_a_note.para_1" %></p>
<p><%= t ".add_a_note.para_2_html", :map_link => link_to(t(".add_a_note.the_map"), root_path), <p><%= t ".add_a_note.para_2_html", :map_link => link_to(t(".add_a_note.the_map"), root_path),
:note_icon => tag.span(:class => "icon note bg-dark rounded-1") %></p> :note_icon => tag.span(:class => "icon note bg-dark rounded-1") %></p>
</div> </div>
<% content_for :footer_outer_class, "sticky-bottom" %>
<% content_for :footer do %>
<div class='d-flex justify-content-center align-items-center'>
<% if params[:oauth_return_url] %>
<a class="btn btn-primary" href="<%= params[:oauth_return_url] %>"><%= t ".continue_authorization" %></a>
<% else %>
<a class="btn btn-primary start-mapping" href="<%= edit_path %>"><%= t ".start_mapping" %></a>
<% end %>
</div>
<% end %>