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

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

Browse source
This commit is contained in:
Tom Hughes 2024-06-30 10:28:02 +01:00
commit 7ce5dffb6d
3 changed files with 11 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/views/sessions/new.html.erb
View file

@ -25,12 +25,8 @@
<div id="login_login" class="auth-container mx-auto my-0">
<% if @preferred_auth_provider %>
<%= render :partial => "auth_providers" %>
<div class="d-flex justify-content-center align-items-center mb-2">
<div class="border-bottom border-1 flex-grow-1"></div>
<div class="text-secondary mx-3"><%= t ".or" %></div>
<div class="border-bottom border-1 flex-grow-1"></div>
</div>
<% end %>
<%= render :partial => "shared/section_divider", :locals => { :text => t(".or") } %>
<% end %>
<%= bootstrap_form_tag(:action => "login", :html => { :id => "login_form" }) do |f| %>
<%= hidden_field_tag("referer", h(params[:referer]), :autocomplete => "off") %>
@ -57,11 +53,7 @@
<% end %>
<% unless @preferred_auth_provider %>
<div class="d-flex justify-content-center align-items-center">
<div class="border-bottom border-1 flex-grow-1"></div>
<div class="text-secondary mx-3"><%= t ".with external" %></div>
<div class="border-bottom border-1 flex-grow-1"></div>
</div>
<%= render :partial => "shared/section_divider", :locals => { :text => t(".with external") } %>
<%= render :partial => "auth_providers" %>
<% end %>
</div>

5
app/views/shared/_section_divider.html.erb Normal file
View file

@ -0,0 +1,5 @@
<div class="d-flex align-items-center my-1">
<hr class="flex-grow-1 border-secondary" role="separator">
<span class="mx-3 text-secondary"><%= text %></span>
<hr class="flex-grow-1 border-secondary" role="separator">
</div>

14
app/views/users/new.html.erb
View file

@ -31,12 +31,8 @@
<% unless @preferred_auth_provider.nil? %>
<%= render :partial => "auth_providers" %>
<div class="d-flex justify-content-center align-items-center mb-2">
<div class="border-bottom border-1 flex-grow-1"></div>
<div class="text-secondary mx-3"><%= t ".or" %></div>
<div class="border-bottom border-1 flex-grow-1"></div>
</div>
<% end %>
<%= render :partial => "shared/section_divider", :locals => { :text => t(".or") } %>
<% end %>
<% else %>
<h4><%= t ".about.welcome" %></h4>
<% end %>
@ -98,11 +94,7 @@
<% end %>
<% if current_user.auth_uid.nil? and @preferred_auth_provider.nil? %>
<div class="d-flex justify-content-center align-items-center">
<div class="border-bottom border-1 flex-grow-1"></div>
<div class="text-secondary mx-3"><%= t ".use external auth" %></div>
<div class="border-bottom border-1 flex-grow-1"></div>
</div>
<%= render :partial => "shared/section_divider", :locals => { :text => t(".use external auth") } %>
<%= render :partial => "auth_providers" %>
<% end %>
</div>