Skip to content

Commit

Permalink
28系に対応するためのui変更
Browse files Browse the repository at this point in the history
  • Loading branch information
sion908 committed Nov 18, 2024
1 parent 319ed46 commit e3e1465
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 22 deletions.
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
<% is_horizontal = false unless local_assigns.has_key?(:is_horizontal) %>
<% if Devise.mappings[:user].omniauthable? && current_organization.enabled_omniauth_providers.any? %>
<% labelField = :label %>
<div class="row">
<div class="columns large-4 mediumlarge-6 medium-8 medium-centered">
<%- current_organization.enabled_omniauth_providers.keys.each do |provider| %>
<div class="social-register">
<%= link_to decidim.send("user_#{provider}_omniauth_authorize_path"), class: "button button--social button--#{normalize_provider_name(provider)}", method: :post do %>
<span class="button--social__icon">
<%= oauth_icon provider %>
</span>
<span class="button--social__text">
<% Rails.logger.debug "RenderOmniauthButton: #{provider} -> label #{current_organization.enabled_omniauth_providers[provider][labelField]}"%>
<%= t("devise.shared.links.sign_in_with_provider", provider: current_organization.enabled_omniauth_providers[provider][labelField] ? current_organization.enabled_omniauth_providers[provider][labelField] : normalize_provider_name(provider).titleize) %>
</span>
<% end %>
</div>
<div class="login__omniauth<%= " login__omniauth__horizontal" if is_horizontal %>">
<%- current_organization.enabled_omniauth_providers.keys.each do |provider| %>
<% link_classes = "login__omniauth-button button--#{normalize_provider_name(provider)}" %>
<%= link_to decidim.send("user_#{provider}_omniauth_authorize_path"), class: link_classes, method: :post, title: t("devise.shared.links.log_in_with_provider", provider: normalize_provider_name(provider).titleize) do %>
<% labelField = :label %>
<%- if current_organization.enabled_omniauth_providers[provider][labelField] %>
<span>
<%= t("devise.shared.links.log_in_with_provider", provider: current_organization.enabled_omniauth_providers[provider][labelField]) %>
</span>
<%- else %>
<%= oauth_icon provider %>
<span>
<%= normalize_provider_name(provider).titleize %>
</span>
<%- end %>
<% end %>
<%- if current_organization.sign_in_enabled? %>
<span class="register__separator">
<span class="register__separator__text"><%= t(".or") %></span>
</span>
<%- end %>
</div>
<% end %>
</div>
<%- if current_organization.sign_in_enabled? %>
<span class="login__omniauth-separator"><%= t(".or") %></span>
<%- end %>
<% end %>
2 changes: 1 addition & 1 deletion omniauth-cityos-dcp.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ Gem::Specification.new do |spec|
spec.metadata['rubygems_mfa_required'] = 'true'

# decidimのバージョンを27系のみとする
spec.add_dependency "decidim", ">= 0.27.0", "< 0.28.0"
spec.add_dependency "decidim", ">= 0.28.0"

end

0 comments on commit e3e1465

Please sign in to comment.