decidim-friendly_signup 0.4.1 → 0.4.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/mailers/decidim/friendly_signup/confirmation_codes_mailer.rb +1 -1
- data/app/views/decidim/devise/sessions/new.html.erb +2 -2
- data/app/views/decidim/friendly_signup/shared/_password_fields.html.erb +13 -7
- data/config/locales/en.yml +5 -1
- data/lib/decidim/friendly_signup/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 156a94366f47dc7f364338feca03ba824d6e9d38a16b9c8f8a6fbac4774ccbd1
|
|
4
|
+
data.tar.gz: 131f4becfb5b981f0f026a970b0b38cf98fdb2d5970bc43873ad942d360df76d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0a384da56675c80fc63b1d3c8f1a197e5ac46658395caa5926dbedc6d3a20a37648dc7f50183ebe69d601940fa50b87f8ee124109a4dd44e12fdf137f79d2ec1
|
|
7
|
+
data.tar.gz: a5622ee4f5bbc17f42abbb24922007332df97361a7f00ca39702b4965e3117483170aafd15da5c68e38053606e9736bfae20b0f1414377eb1c522060a7f1e9da
|
|
@@ -14,7 +14,7 @@ module Decidim
|
|
|
14
14
|
@expires_at = @user.confirmation_sent_at + @user.class.confirm_within if @user.class.confirm_within
|
|
15
15
|
|
|
16
16
|
with_user(user) do
|
|
17
|
-
mail(to: "#{user.name} <#{@email}>", subject: I18n.t("decidim.friendly_signup.confirmation_codes.mailer.subject", organization: @organization.name))
|
|
17
|
+
mail(to: "#{user.name} <#{@email}>", subject: I18n.t("decidim.friendly_signup.confirmation_codes.mailer.subject", organization: @organization.name, code: @code))
|
|
18
18
|
end
|
|
19
19
|
end
|
|
20
20
|
end
|
|
@@ -33,10 +33,10 @@
|
|
|
33
33
|
<%= decidim_form_for(resource, namespace: "session", as: resource_name, url: session_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
|
|
34
34
|
<div>
|
|
35
35
|
<div class="field">
|
|
36
|
-
<%= f.email_field :email %>
|
|
36
|
+
<%= f.email_field :email, required: true, pattern: "email" %>
|
|
37
37
|
</div>
|
|
38
38
|
<div class="field">
|
|
39
|
-
<%= render("decidim/friendly_signup/shared/password_fields", form: f, options: { autocomplete: "off" }) %>
|
|
39
|
+
<%= render("decidim/friendly_signup/shared/password_fields", form: f, options: { autocomplete: "off" }, skip_confirmation: true) %>
|
|
40
40
|
</div>
|
|
41
41
|
</div>
|
|
42
42
|
<% if devise_mapping.rememberable? %>
|
|
@@ -9,17 +9,23 @@
|
|
|
9
9
|
</div>
|
|
10
10
|
</div>
|
|
11
11
|
|
|
12
|
-
|
|
13
|
-
<div class="
|
|
14
|
-
|
|
12
|
+
<% unless defined?(skip_confirmation) && skip_confirmation %>
|
|
13
|
+
<div class="user-password-confirmation">
|
|
14
|
+
<div class="field">
|
|
15
|
+
<%= form.password_field :password_confirmation %>
|
|
16
|
+
</div>
|
|
15
17
|
</div>
|
|
16
|
-
|
|
18
|
+
<% end %>
|
|
19
|
+
|
|
17
20
|
<% else %>
|
|
18
21
|
<div class="field">
|
|
19
22
|
<%= form.password_field :password, options %>
|
|
20
23
|
</div>
|
|
21
24
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
+
<% unless defined?(skip_confirmation) && skip_confirmation %>
|
|
26
|
+
<div class="field">
|
|
27
|
+
<%= form.password_field :password_confirmation %>
|
|
28
|
+
</div>
|
|
29
|
+
<% end %>
|
|
30
|
+
|
|
25
31
|
<% end %>
|
data/config/locales/en.yml
CHANGED
|
@@ -5,6 +5,10 @@ en:
|
|
|
5
5
|
confirmation_code:
|
|
6
6
|
code: Confirmation code
|
|
7
7
|
decidim:
|
|
8
|
+
forms:
|
|
9
|
+
errors:
|
|
10
|
+
decidim/user:
|
|
11
|
+
email: Please enter a valid email address
|
|
8
12
|
friendly_signup:
|
|
9
13
|
confirmation_code_form:
|
|
10
14
|
expired: Sorry, this code has expired, please generate a new one.
|
|
@@ -25,7 +29,7 @@ en:
|
|
|
25
29
|
title: One last step...
|
|
26
30
|
verify: Verify
|
|
27
31
|
mailer:
|
|
28
|
-
subject:
|
|
32
|
+
subject: "%{code} is your confirmation code for %{organization}"
|
|
29
33
|
resend_code:
|
|
30
34
|
sent: The confirmation code has been sent to %{email}.
|
|
31
35
|
confirmation_codes_mailer:
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: decidim-friendly_signup
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.4.
|
|
4
|
+
version: 0.4.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ivan Vergés
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2022-07-
|
|
11
|
+
date: 2022-07-28 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: decidim-core
|