Skip to content

Commit 3247c36

Browse files
committed
Update setting menu label to social auth
Issue #131
1 parent 8053931 commit 3247c36

File tree

7 files changed

+15
-17
lines changed

7 files changed

+15
-17
lines changed

app/views/spree/admin/authentication_methods/_form.html.erb

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,24 @@
1010
</div>
1111

1212
<div class="col-12 col-lg-6">
13-
<div data-hook="environment" class="field">
13+
<div data-hook="provider" class="field">
1414
<%= f.field_container :provider do %>
15-
<%= f.label :provider, I18n.t('spree.social_provider') %>
16-
<%= f.select :provider,
17-
SolidusSocial::OAUTH_PROVIDERS.collect { |p| [ p.title, p.key ] },{},
18-
{ include_blank: false, class: 'select2' } %>
15+
<%= label_tag nil, I18n.t('spree.social_provider') %>
16+
<%= collection_select(:authentication_method, :provider, SolidusSocial::OAUTH_PROVIDERS, :key, :title, {}, { class: 'select2 fullwidth' }) %>
1917
<% end %>
2018
</div>
2119
</div>
2220
</div>
2321

2422
<div class="row">
2523
<div class="col-12 col-lg-6">
26-
<div data-hook="environment" class="form-group">
24+
<div data-hook="api_key" class="form-group">
2725
<%= f.label :api_key, I18n.t('spree.social_api_key') %>
2826
<%= f.text_field :api_key, class: 'form-control' %>
2927
</div>
3028
</div>
3129
<div class="col-12 col-lg-6">
32-
<div data-hook="environment" class="form-group">
30+
<div data-hook="api_secret" class="form-group">
3331
<%= f.label :api_secret, I18n.t('spree.social_api_secret') %>
3432
<%= f.text_field :api_secret, class: 'form-control' %>
3533
</div>

app/views/spree/admin/authentication_methods/edit.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<% admin_breadcrumb(t('spree.settings')) %>
2-
<% admin_breadcrumb(link_to I18n.t('spree.social_authentication_methods'), spree.admin_authentication_methods_path) %>
2+
<% admin_breadcrumb(link_to I18n.t('spree.social_auth'), spree.admin_authentication_methods_path) %>
33

44
<% content_for :page_title do %>
55
<%= I18n.t('spree.edit_social_method') %>

app/views/spree/admin/authentication_methods/index.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<% admin_breadcrumb(t('spree.settings')) %>
2-
<% admin_breadcrumb(I18n.t('spree.social_authentication_methods')) %>
2+
<% admin_breadcrumb(I18n.t('spree.social_auth')) %>
33

44
<% content_for :page_actions do %>
55
<% if can? :manage, Spree::AuthenticationMethod %>

app/views/spree/admin/authentication_methods/new.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<% admin_breadcrumb(t('spree.settings')) %>
2-
<% admin_breadcrumb(link_to I18n.t('spree.social_authentication_methods'), spree.admin_authentication_methods_path) %>
2+
<% admin_breadcrumb(link_to I18n.t('spree.social_auth'), spree.admin_authentication_methods_path) %>
33
<% admin_breadcrumb(t('spree.new_social_method')) %>
44

55
<%= render 'spree/shared/error_messages', target: @authentication_method %>

config/initializers/add_authentication_methods_to_settings_menu.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
if settings_menu
77
settings_menu.children << config.class::MenuItem.new(
8-
label: :social_authentication_methods,
8+
label: :social_auth,
99
url: :admin_authentication_methods_path,
1010
condition: -> { can?(:admin, Spree::AuthenticationMethod) }
1111
)

config/locales/en.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ en:
1818
sign_in_through_one_of_these_services: "Sign in through one of these services:"
1919
social_api_key: "API Key"
2020
social_api_secret: "API Secret"
21-
social_authentication_methods: "Social Authentication Methods"
22-
social_authentication_methods_description: "Setup OAuth Authentication Methods"
21+
social_auth: "Social Auth"
22+
social_auth_description: "Setup OAuth Authentication Methods"
2323
social_provider: "Social Provider"
2424
please_confirm_your_email: "Please confirm your email address to continue"
2525
sign_in_with: "Login with %{provider}"
2626
you_have_signed_in_with_these_services: "You Have Signed In With These Services"
2727
admin:
2828
tab:
29-
social_authentication_methods: "Social Authentication Methods"
29+
social_auth: "Social Auth"

spec/features/spree/admin/authentication_methods_configuration_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
it 'has configuration tab' do
88
visit spree.admin_path
99
click_link 'Settings'
10-
expect(page).to have_text(/Social Authentication Methods/i)
10+
expect(page).to have_text(/Social Auth/i)
1111
end
1212
end
1313

1414
context 'when no auth methods exists' do
1515
before do
1616
visit spree.admin_path
1717
click_link 'Settings'
18-
click_link 'Social Authentication Methods'
18+
click_link 'Social Auth'
1919
end
2020

2121
it 'can create new' do
@@ -46,7 +46,7 @@
4646
before do
4747
visit spree.admin_path
4848
click_link 'Settings'
49-
click_link 'Social Authentication Methods'
49+
click_link 'Social Auth'
5050
end
5151

5252
it 'can be updated' do

0 commit comments

Comments
 (0)