devise_rails3_ennder 1.0.5 → 1.1.0
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +11 -0
- data/.rvmrc +1 -1
- data/History.txt +5 -0
- data/README.rdoc +3 -3
- data/app/views/devise/confirmations/new.html.erb +4 -4
- data/app/views/devise/mailer/confirmation_instructions.html.erb +3 -3
- data/app/views/devise/mailer/reset_password_instructions.html.erb +3 -3
- data/app/views/devise/mailer/unlock_instructions.html.erb +2 -2
- data/app/views/devise/passwords/edit.html.erb +6 -6
- data/app/views/devise/passwords/new.html.erb +4 -4
- data/app/views/devise/registrations/edit.html.erb +44 -13
- data/app/views/devise/registrations/new.html.erb +15 -9
- data/app/views/devise/sessions/new.html.erb +10 -7
- data/app/views/devise/shared/_links.erb +17 -2
- data/app/views/devise/unlocks/new.html.erb +4 -4
- data/bin/.directory +0 -0
- data/version.txt +1 -1
- metadata +41 -40
data/.gitignore
ADDED
data/.rvmrc
CHANGED
@@ -1,2 +1,2 @@
|
|
1
1
|
#Pour que le projet marche aussi avec passenger
|
2
|
-
rvm use 1.9.
|
2
|
+
rvm use 1.9.3@devise_rails3_ennder --create
|
data/History.txt
CHANGED
data/README.rdoc
CHANGED
@@ -25,11 +25,11 @@ You will have to provide this partial filled with you User personal fields input
|
|
25
25
|
|
26
26
|
* configure your smtp setting, you must add in your environment configration file (dev | test | production) something like:
|
27
27
|
|
28
|
-
//i.
|
28
|
+
//i.s.p. : Internet Service Provider
|
29
29
|
config.action_mailer.smtp_settings = {
|
30
|
-
:address => 'your_iap_smtp_server_name.
|
30
|
+
:address => 'your_iap_smtp_server_name.your_isp_domain.com',
|
31
31
|
:port => 25,
|
32
|
-
:domain => '
|
32
|
+
:domain => 'your_isp_domain.com'
|
33
33
|
}
|
34
34
|
|
35
35
|
* add the login / logout partial to your layout, you must insert the following instruction:
|
@@ -4,11 +4,11 @@
|
|
4
4
|
<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
|
5
5
|
<%= devise_error_messages! %>
|
6
6
|
|
7
|
-
<
|
8
|
-
<%= f.email_field :email %></
|
7
|
+
<div><%= f.label :email %><br />
|
8
|
+
<%= f.email_field :email, :autofocus => true %></div>
|
9
9
|
|
10
10
|
<!-- TODO Ennder A TRADUIRE "Resend confirmation instructions/Renvoyer les instructions de confirmation" -->
|
11
|
-
<
|
11
|
+
<div><%= f.submit "Resend confirmation instructions" %></div>
|
12
12
|
<% end %>
|
13
13
|
|
14
|
-
<%= render
|
14
|
+
<%= render "devise/shared/links" %>
|
@@ -1,7 +1,7 @@
|
|
1
|
-
<p>Welcome <%= @
|
1
|
+
<p>Welcome <%= @email %>!</p>
|
2
2
|
|
3
3
|
<!-- t("devise.registrations.confirm_link") -->
|
4
|
-
<p>You can confirm your account through the link below:</p>
|
4
|
+
<p>You can confirm your account email through the link below:</p>
|
5
5
|
|
6
6
|
<!-- TODO Ennder TRANSLATION 'Confirm my account/Confirmer mon inscription'-->
|
7
|
-
<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @
|
7
|
+
<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @token) %></p>
|
@@ -1,10 +1,10 @@
|
|
1
|
-
<p>Hello <%= (@resource.username + ' : ') unless @resource.username.blank? %><%= @resource.email %>!</p>
|
1
|
+
<p>Hello <%= (@resource.username + ' : ') unless (! defined?(@resource.username) || @resource.username.blank?) %><%= @resource.email %>!</p>
|
2
2
|
|
3
3
|
<!-- t('devise.mailer.Someone_requested_change_password') -->
|
4
|
-
<p>Someone has requested a link to change your password
|
4
|
+
<p>Someone has requested a link to change your password. You can do this through the link below.</p>
|
5
5
|
|
6
6
|
<!-- t('devise.mailer.Change_my_password') -->
|
7
|
-
<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @
|
7
|
+
<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %></p>
|
8
8
|
|
9
9
|
<!-- t('devise.mailer.If_you_didnt_request_this') -->
|
10
10
|
<p>If you didn't request this, please ignore this email.</p>
|
@@ -1,10 +1,10 @@
|
|
1
1
|
<p>Hello <%= @resource.email %>!</p>
|
2
2
|
|
3
3
|
<!-- TOTO Ennder TRANSLATION "Your account has been locked due to an excessive amount of unsuccessful sign in attempts." -->
|
4
|
-
<p>Your account has been locked due to an excessive
|
4
|
+
<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
|
5
5
|
|
6
6
|
<!-- TOTO Ennder TRANSLATION "Click the link below to unlock your account:" -->
|
7
7
|
<p>Click the link below to unlock your account:</p>
|
8
8
|
|
9
9
|
<!-- TOTO Ennder TRANSLATION "Unlock my account" -->
|
10
|
-
<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @
|
10
|
+
<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token) %></p>
|
@@ -6,15 +6,15 @@
|
|
6
6
|
<%= f.hidden_field :reset_password_token %>
|
7
7
|
|
8
8
|
<!-- TODO Ennder Trad° "New password" -->
|
9
|
-
<
|
10
|
-
<%= f.password_field :password %></
|
9
|
+
<div><%= f.label :password, "New password" %><br />
|
10
|
+
<%= f.password_field :password, :autofocus => true %></div>
|
11
11
|
|
12
12
|
<!-- TODO Ennder Trad° "Confirm new password" -->
|
13
|
-
<
|
14
|
-
<%= f.password_field :password_confirmation %></
|
13
|
+
<div><%= f.label :password_confirmation, "Confirm new password" %><br />
|
14
|
+
<%= f.password_field :password_confirmation %></div>
|
15
15
|
|
16
16
|
<!-- TODO Ennder Trad° "Change my password" -->
|
17
|
-
<
|
17
|
+
<div><%= f.submit "Change my password" %></div>
|
18
18
|
<% end %>
|
19
19
|
|
20
|
-
<%= render
|
20
|
+
<%= render "devise/shared/links" %>
|
@@ -4,11 +4,11 @@
|
|
4
4
|
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
|
5
5
|
<%= devise_error_messages! %>
|
6
6
|
|
7
|
-
<
|
8
|
-
<%= f.email_field :email %></
|
7
|
+
<div><%= f.label :email %><br />
|
8
|
+
<%= f.email_field :email, :autofocus => true %></div>
|
9
9
|
|
10
10
|
<!-- t('devise.passwords.send_me_instructions') -->
|
11
|
-
<
|
11
|
+
<div><%= f.submit "Send me reset password instructions" %></div>
|
12
12
|
<% end %>
|
13
13
|
|
14
|
-
<%= render
|
14
|
+
<%= render "devise/shared/links" %>
|
@@ -1,33 +1,64 @@
|
|
1
|
+
<%
|
2
|
+
# Localized by Ennder, "Edit", activerecord.models
|
3
|
+
-%>
|
1
4
|
<h2><%= t('devise.registrations.edit_only') %> <%= t("activerecord.models.#{resource_name}") %></h2>
|
2
5
|
|
3
6
|
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
|
4
7
|
<%
|
5
|
-
|
8
|
+
# Ennder id : flash_error + test
|
6
9
|
-%>
|
7
|
-
<div id="flash_error"><%= devise_error_messages! %></div>
|
8
10
|
<%
|
9
|
-
|
11
|
+
if !resource.errors.empty?
|
10
12
|
-%>
|
13
|
+
<div id="flash_error"><%= devise_error_messages! %></div>
|
14
|
+
<%
|
15
|
+
end
|
16
|
+
-%>
|
17
|
+
|
18
|
+
<div><%= f.label :email %><br />
|
19
|
+
<%= f.email_field :email, :autofocus => true %></div>
|
11
20
|
|
12
|
-
|
13
|
-
|
21
|
+
<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
|
22
|
+
<div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
|
23
|
+
<% end %>
|
14
24
|
|
15
|
-
|
16
|
-
|
25
|
+
<%
|
26
|
+
# Localized by Ennder, "leave blank if you don't want to change it"
|
27
|
+
-%>
|
28
|
+
<div><%= f.label :password %> <i>(<%= t('devise.registrations.leave_password_blank_dont_change') %>)</i><br />
|
29
|
+
<%= f.password_field :password, :autocomplete => "off" %></div>
|
17
30
|
|
18
|
-
|
19
|
-
|
31
|
+
<div><%= f.label :password_confirmation %><br />
|
32
|
+
<%= f.password_field :password_confirmation %></div>
|
20
33
|
|
21
|
-
|
22
|
-
|
34
|
+
<%
|
35
|
+
# Localized by Ennder, "we need your current password to confirm your changes"
|
36
|
+
-%>
|
37
|
+
<div><%= f.label :current_password %> <i>(<%= t('devise.registrations.need_current_passord') %>)</i><br />
|
38
|
+
<%= f.password_field :current_password %></div>
|
23
39
|
|
40
|
+
<%
|
41
|
+
# Added by Ennder
|
42
|
+
-%>
|
24
43
|
<%= render :partial => 'users/form_personal_fields', :locals => { :f => f } %>
|
25
44
|
|
26
|
-
|
45
|
+
<%
|
46
|
+
# Localized by Ennder, "Update"
|
47
|
+
-%>
|
48
|
+
<div><%= f.submit t('Update') %></div>
|
27
49
|
<% end %>
|
28
50
|
|
51
|
+
<%
|
52
|
+
# Localized by Ennder, "Cancel my account"
|
53
|
+
-%>
|
29
54
|
<h3><%= t('devise.registrations.cancel_account') %></h3>
|
30
55
|
|
31
|
-
|
56
|
+
<%
|
57
|
+
# Localized by Ennder, "Unhappy?", "Are you sure?"
|
58
|
+
-%>
|
59
|
+
<p><%= t('devise.registrations.unhappy') %> <%= button_to t('devise.registrations.cancel_account'), registration_path(resource_name), :data => { :confirm => t('confirmation.are_you_sure') }, :method => :delete %></p>
|
32
60
|
|
61
|
+
<%
|
62
|
+
# Localized by Ennder, "Back"
|
63
|
+
-%>
|
33
64
|
<%= link_to t('links.back'), :back %>
|
@@ -1,20 +1,26 @@
|
|
1
|
+
<%
|
2
|
+
# Localized by Ennder, "Sign up"
|
3
|
+
-%>
|
1
4
|
<h2><%= t('devise.registrations.sign_up') %></h2>
|
2
5
|
|
3
6
|
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
|
4
7
|
<%= devise_error_messages! %>
|
5
8
|
|
6
|
-
<
|
7
|
-
<%= f.email_field :email %></
|
9
|
+
<div><%= f.label :email %><br />
|
10
|
+
<%= f.email_field :email, :autofocus => true %></div>
|
8
11
|
|
9
|
-
<
|
10
|
-
<%= f.password_field :password %></
|
12
|
+
<div><%= f.label :password %><br />
|
13
|
+
<%= f.password_field :password %></div>
|
11
14
|
|
12
|
-
<
|
13
|
-
<%= f.password_field :password_confirmation %></
|
15
|
+
<div><%= f.label :password_confirmation %><br />
|
16
|
+
<%= f.password_field :password_confirmation %></div>
|
14
17
|
|
15
|
-
|
18
|
+
<%
|
19
|
+
# Added by Ennder
|
20
|
+
-%>
|
21
|
+
<%= render 'users/form_personal_fields', :locals => { :f => f } %>
|
16
22
|
|
17
|
-
<
|
23
|
+
<div><%= f.submit t('devise.registrations.sign_up') %></div>
|
18
24
|
<% end %>
|
19
25
|
|
20
|
-
<%= render
|
26
|
+
<%= render "devise/shared/links" %>
|
@@ -1,17 +1,20 @@
|
|
1
|
+
<%
|
2
|
+
# Localized by Ennder, "Sign in"
|
3
|
+
-%>
|
1
4
|
<h2><%= t('devise.sessions.sign_in') %></h2>
|
2
5
|
|
3
6
|
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
|
4
|
-
<
|
5
|
-
<%= f.email_field :email %></
|
7
|
+
<div><%= f.label :email %><br />
|
8
|
+
<%= f.email_field :email, :autofocus => true %></div>
|
6
9
|
|
7
|
-
<
|
8
|
-
<%= f.password_field :password %></
|
10
|
+
<div><%= f.label :password %><br />
|
11
|
+
<%= f.password_field :password %></div>
|
9
12
|
|
10
13
|
<% if devise_mapping.rememberable? -%>
|
11
|
-
<
|
14
|
+
<div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
|
12
15
|
<% end -%>
|
13
16
|
|
14
|
-
<
|
17
|
+
<div><%= f.submit t('devise.sessions.sign_in') %></div>
|
15
18
|
<% end %>
|
16
19
|
|
17
|
-
<%= render
|
20
|
+
<%= render "devise/shared/links" %>
|
@@ -1,20 +1,35 @@
|
|
1
1
|
<%- if controller_name != 'sessions' %>
|
2
|
+
<%
|
3
|
+
# Localized by Ennder, "Sign in"
|
4
|
+
-%>
|
2
5
|
<%= link_to t('devise.sessions.sign_in'), new_session_path(resource_name) %><br />
|
3
6
|
<% end -%>
|
4
7
|
|
5
8
|
<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
|
9
|
+
<%
|
10
|
+
# Localized by Ennder, "Sign up"
|
11
|
+
-%>
|
6
12
|
<%= link_to t('devise.registrations.sign_up'), new_registration_path(resource_name) %><br />
|
7
13
|
<% end -%>
|
8
14
|
|
9
|
-
<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
|
15
|
+
<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
|
16
|
+
<%
|
17
|
+
# Localized by Ennder, "Forgot your password?"
|
18
|
+
-%>
|
10
19
|
<%= link_to t('devise.passwords.link'), new_password_path(resource_name) %><br />
|
11
20
|
<% end -%>
|
12
21
|
|
13
22
|
<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
|
23
|
+
<%
|
24
|
+
# Localized by Ennder, "Didn't receive confirmation instructions?"
|
25
|
+
-%>
|
14
26
|
<%= link_to t('devise.confirmations.link'), new_confirmation_path(resource_name) %><br />
|
15
27
|
<% end -%>
|
16
28
|
|
17
29
|
<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
|
30
|
+
<%
|
31
|
+
# Localized by Ennder, "Didn't receive unlock instructions?"
|
32
|
+
-%>
|
18
33
|
<%= link_to t('devise.unlocks.link'), new_unlock_path(resource_name) %><br />
|
19
34
|
<% end -%>
|
20
35
|
|
@@ -22,4 +37,4 @@
|
|
22
37
|
<%- resource_class.omniauth_providers.each do |provider| %>
|
23
38
|
<%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
|
24
39
|
<% end -%>
|
25
|
-
<% end -%>
|
40
|
+
<% end -%>
|
@@ -4,11 +4,11 @@
|
|
4
4
|
<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
|
5
5
|
<%= devise_error_messages! %>
|
6
6
|
|
7
|
-
<
|
8
|
-
<%= f.email_field :email %></
|
7
|
+
<div><%= f.label :email %><br />
|
8
|
+
<%= f.email_field :email, :autofocus => true %></div>
|
9
9
|
|
10
10
|
<!-- TODO Ennder TRANSLATION "Resend unlock instructions" -->
|
11
|
-
<
|
11
|
+
<div><%= f.submit "Resend unlock instructions" %></div>
|
12
12
|
<% end %>
|
13
13
|
|
14
|
-
<%= render
|
14
|
+
<%= render "devise/shared/links" %>
|
data/bin/.directory
CHANGED
File without changes
|
data/version.txt
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.0
|
1
|
+
1.1.0
|
metadata
CHANGED
@@ -1,37 +1,40 @@
|
|
1
|
-
--- !ruby/object:Gem::Specification
|
1
|
+
--- !ruby/object:Gem::Specification
|
2
2
|
name: devise_rails3_ennder
|
3
|
-
version: !ruby/object:Gem::Version
|
3
|
+
version: !ruby/object:Gem::Version
|
4
|
+
version: 1.1.0
|
4
5
|
prerelease:
|
5
|
-
version: 1.0.5
|
6
6
|
platform: ruby
|
7
|
-
authors:
|
8
|
-
-
|
7
|
+
authors:
|
8
|
+
- José VALIM, Carlos ANTÔNIO, Jérôme BATAILLE
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
dependencies:
|
16
|
-
- !ruby/object:Gem::Dependency
|
12
|
+
date: 2014-02-15 00:00:00.000000000 Z
|
13
|
+
dependencies:
|
14
|
+
- !ruby/object:Gem::Dependency
|
17
15
|
name: bones
|
18
|
-
|
19
|
-
requirement: &id001 !ruby/object:Gem::Requirement
|
16
|
+
requirement: !ruby/object:Gem::Requirement
|
20
17
|
none: false
|
21
|
-
requirements:
|
22
|
-
- -
|
23
|
-
- !ruby/object:Gem::Version
|
24
|
-
version: 3.7.
|
18
|
+
requirements:
|
19
|
+
- - ! '>='
|
20
|
+
- !ruby/object:Gem::Version
|
21
|
+
version: 3.7.3
|
25
22
|
type: :development
|
26
|
-
|
27
|
-
|
23
|
+
prerelease: false
|
24
|
+
version_requirements: !ruby/object:Gem::Requirement
|
25
|
+
none: false
|
26
|
+
requirements:
|
27
|
+
- - ! '>='
|
28
|
+
- !ruby/object:Gem::Version
|
29
|
+
version: 3.7.3
|
30
|
+
description: Devise (*translated* *in* *French* *by* *Ennder*, *in* *this* *gem*)
|
31
|
+
is a flexible authentication solution for Rails based on Warden.
|
28
32
|
email: mel@ennder.fr
|
29
|
-
executables:
|
33
|
+
executables:
|
30
34
|
- .directory
|
31
35
|
- devise_rails3_ennder.rb
|
32
36
|
extensions: []
|
33
|
-
|
34
|
-
extra_rdoc_files:
|
37
|
+
extra_rdoc_files:
|
35
38
|
- CHANGELOG.rdoc
|
36
39
|
- History.txt
|
37
40
|
- README.rdoc
|
@@ -50,8 +53,9 @@ extra_rdoc_files:
|
|
50
53
|
- lib/devise_rails3_ennder/config/locales/devise.fr.yml
|
51
54
|
- lib/tasks/.directory
|
52
55
|
- lib/tasks/devise_rails3_ennder_tasks.rake
|
53
|
-
files:
|
56
|
+
files:
|
54
57
|
- .bnsignore
|
58
|
+
- .gitignore
|
55
59
|
- .rvmrc
|
56
60
|
- CHANGELOG.rdoc
|
57
61
|
- History.txt
|
@@ -101,34 +105,31 @@ files:
|
|
101
105
|
- lib/tasks/.directory
|
102
106
|
- lib/tasks/devise_rails3_ennder_tasks.rake
|
103
107
|
- version.txt
|
104
|
-
has_rdoc: true
|
105
108
|
homepage: http://www.ennder.fr
|
106
109
|
licenses: []
|
107
|
-
|
108
110
|
post_install_message:
|
109
|
-
rdoc_options:
|
111
|
+
rdoc_options:
|
110
112
|
- --main
|
111
113
|
- README.rdoc
|
112
|
-
require_paths:
|
114
|
+
require_paths:
|
113
115
|
- lib
|
114
|
-
required_ruby_version: !ruby/object:Gem::Requirement
|
116
|
+
required_ruby_version: !ruby/object:Gem::Requirement
|
115
117
|
none: false
|
116
|
-
requirements:
|
117
|
-
- -
|
118
|
-
- !ruby/object:Gem::Version
|
119
|
-
version:
|
120
|
-
required_rubygems_version: !ruby/object:Gem::Requirement
|
118
|
+
requirements:
|
119
|
+
- - ! '>='
|
120
|
+
- !ruby/object:Gem::Version
|
121
|
+
version: '0'
|
122
|
+
required_rubygems_version: !ruby/object:Gem::Requirement
|
121
123
|
none: false
|
122
|
-
requirements:
|
123
|
-
- -
|
124
|
-
- !ruby/object:Gem::Version
|
125
|
-
version:
|
124
|
+
requirements:
|
125
|
+
- - ! '>='
|
126
|
+
- !ruby/object:Gem::Version
|
127
|
+
version: '0'
|
126
128
|
requirements: []
|
127
|
-
|
128
129
|
rubyforge_project: devise_rails3_ennder
|
129
|
-
rubygems_version: 1.
|
130
|
+
rubygems_version: 1.8.25
|
130
131
|
signing_key:
|
131
132
|
specification_version: 3
|
132
|
-
summary: Devise (*translated* *in* *French* *by* *Ennder*, *in* *this* *gem*) is a
|
133
|
+
summary: Devise (*translated* *in* *French* *by* *Ennder*, *in* *this* *gem*) is a
|
134
|
+
flexible authentication solution for Rails based on Warden.
|
133
135
|
test_files: []
|
134
|
-
|