tbone-devise 0.1.2 → 0.1.3
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/app/assets/javascripts/routers/sessions_router.js.coffee +2 -1
- data/app/assets/javascripts/tbone-devise.js.coffee +5 -5
- data/app/assets/javascripts/templates/sessions/new.jst.hamljs +14 -10
- data/app/assets/javascripts/views/sessions/new_view.js.coffee +4 -2
- data/app/views/devise/mailer/confirmation_instructions.html.erb +5 -0
- data/app/views/devise/mailer/reset_password_instructions.html.erb +8 -0
- data/app/views/devise/mailer/unlock_instructions.html.erb +7 -0
- data/config/routes.rb +6 -0
- data/lib/tbone/devise/engine.rb +5 -1
- data/tbone-devise.gemspec +6 -2
- metadata +13 -9
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.1.
|
1
|
+
0.1.3
|
@@ -26,6 +26,7 @@ define [
|
|
26
26
|
@user = options.user
|
27
27
|
@guest = options.guest
|
28
28
|
@token = options.token
|
29
|
+
@modules = options.modules
|
29
30
|
@session = new Session(@user)
|
30
31
|
@user.on('change', =>
|
31
32
|
@session = new Session(@user)
|
@@ -85,7 +86,7 @@ define [
|
|
85
86
|
|
86
87
|
newSession: ->
|
87
88
|
View = require 'views/sessions/new_view'
|
88
|
-
@view = new View(model: @session, user: @user, token: @token)
|
89
|
+
@view = new View(model: @session, user: @user, token: @token, modules: @modules)
|
89
90
|
Layout.setContent(@view)
|
90
91
|
|
91
92
|
destroy: ->
|
@@ -14,11 +14,11 @@ define [
|
|
14
14
|
App.Views.Confirmations = {}
|
15
15
|
|
16
16
|
class TboneDevise
|
17
|
-
constructor:
|
18
|
-
@currentUser = new User(
|
19
|
-
guest = new User(
|
17
|
+
constructor: ->
|
18
|
+
@currentUser = new User(App.Params.currentUser)
|
19
|
+
guest = new User(App.Params.guestUser)
|
20
20
|
view = new LoginBar(model: @currentUser)
|
21
21
|
$("#add-bar").html(view.render().el)
|
22
|
-
new SessionsRouter(user: @currentUser, guest: guest, token: Tbone.token)
|
22
|
+
new SessionsRouter(user: @currentUser, guest: guest, token: Tbone.token, modules: App.Params.devise_modules)
|
23
23
|
|
24
|
-
new TboneDevise(
|
24
|
+
new TboneDevise()
|
@@ -11,19 +11,23 @@
|
|
11
11
|
.controls
|
12
12
|
%input#password{name: "password", type: "password"}
|
13
13
|
|
14
|
-
.
|
15
|
-
|
16
|
-
|
17
|
-
|
14
|
+
:if $.inArray('rememberable', this.options.modules) != -1
|
15
|
+
.control-group
|
16
|
+
%label.control-label{for: "remember_me"}= I18n.t('remember_me')
|
17
|
+
.controls
|
18
|
+
%input#remember_me{name: "remember_me", type: "checkbox"}
|
18
19
|
|
19
20
|
.form-actions
|
20
21
|
%input#new-post.btn.btn-primary{type: "submit"}
|
21
22
|
|
22
|
-
|
23
|
-
%
|
23
|
+
:if $.inArray('registerable', this.options.modules) != -1
|
24
|
+
%p
|
25
|
+
%a{href: '#/signup'}= I18n.t('sign_up')
|
24
26
|
|
25
|
-
|
26
|
-
%
|
27
|
+
:if $.inArray('recoverable', this.options.modules) != -1
|
28
|
+
%p
|
29
|
+
%a{href: '#/forgot'}= I18n.t('forgot_password')
|
27
30
|
|
28
|
-
|
29
|
-
%
|
31
|
+
:if $.inArray('confirmable', this.options.modules) != -1
|
32
|
+
%p
|
33
|
+
%a{href: '#/confirm'}= I18n.t('confirm')
|
@@ -0,0 +1,5 @@
|
|
1
|
+
<p>Welcome <%= @resource.email %>!</p>
|
2
|
+
|
3
|
+
<p>You can confirm your account email through the link below:</p>
|
4
|
+
|
5
|
+
<p><%= link_to 'Confirm my account', "http://" + Rails.configuration.action_mailer.default_url_options[:host] + "/#/confirm?token=" + @resource.confirmation_token %></p>
|
@@ -0,0 +1,8 @@
|
|
1
|
+
<p>Hello <%= @resource.email %>!</p>
|
2
|
+
|
3
|
+
<p>Someone has requested a link to change your password, and you can do this through the link below.</p>
|
4
|
+
|
5
|
+
<p><%= link_to 'Change my password', "http://" + Rails.configuration.action_mailer.default_url_options[:host] + "/#/forgot?token=" + @resource.reset_password_token %></p>
|
6
|
+
|
7
|
+
<p>If you didn't request this, please ignore this email.</p>
|
8
|
+
<p>Your password won't change until you access the link above and create a new one.</p>
|
@@ -0,0 +1,7 @@
|
|
1
|
+
<p>Hello <%= @resource.email %>!</p>
|
2
|
+
|
3
|
+
<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p>
|
4
|
+
|
5
|
+
<p>Click the link below to unlock your account:</p>
|
6
|
+
|
7
|
+
<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p>
|
data/config/routes.rb
ADDED
data/lib/tbone/devise/engine.rb
CHANGED
data/tbone-devise.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{tbone-devise}
|
8
|
-
s.version = "0.1.
|
8
|
+
s.version = "0.1.3"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = [%q{Pavel Tatarsky}]
|
12
|
-
s.date = %q{2012-
|
12
|
+
s.date = %q{2012-07-08}
|
13
13
|
s.description = %q{Devise views for Tbone}
|
14
14
|
s.email = %q{fazzzenda@mail.ru}
|
15
15
|
s.extra_rdoc_files = [
|
@@ -50,7 +50,11 @@ Gem::Specification.new do |s|
|
|
50
50
|
"app/assets/javascripts/views/sessions/login_bar_view.js.coffee",
|
51
51
|
"app/assets/javascripts/views/sessions/new_view.js.coffee",
|
52
52
|
"app/controllers/users_controller.rb",
|
53
|
+
"app/views/devise/mailer/confirmation_instructions.html.erb",
|
54
|
+
"app/views/devise/mailer/reset_password_instructions.html.erb",
|
55
|
+
"app/views/devise/mailer/unlock_instructions.html.erb",
|
53
56
|
"config/locales/tbone-devise.en.yml",
|
57
|
+
"config/routes.rb",
|
54
58
|
"lib/tbone-devise.rb",
|
55
59
|
"lib/tbone/devise/engine.rb",
|
56
60
|
"tbone-devise.gemspec",
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: tbone-devise
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.3
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-
|
12
|
+
date: 2012-07-08 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rdoc
|
16
|
-
requirement: &
|
16
|
+
requirement: &70361528330060 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '0'
|
22
22
|
type: :development
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *70361528330060
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: bundler
|
27
|
-
requirement: &
|
27
|
+
requirement: &70361528329220 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: '0'
|
33
33
|
type: :development
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *70361528329220
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: jeweler
|
38
|
-
requirement: &
|
38
|
+
requirement: &70361528327780 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,7 +43,7 @@ dependencies:
|
|
43
43
|
version: '0'
|
44
44
|
type: :development
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *70361528327780
|
47
47
|
description: Devise views for Tbone
|
48
48
|
email: fazzzenda@mail.ru
|
49
49
|
executables: []
|
@@ -85,7 +85,11 @@ files:
|
|
85
85
|
- app/assets/javascripts/views/sessions/login_bar_view.js.coffee
|
86
86
|
- app/assets/javascripts/views/sessions/new_view.js.coffee
|
87
87
|
- app/controllers/users_controller.rb
|
88
|
+
- app/views/devise/mailer/confirmation_instructions.html.erb
|
89
|
+
- app/views/devise/mailer/reset_password_instructions.html.erb
|
90
|
+
- app/views/devise/mailer/unlock_instructions.html.erb
|
88
91
|
- config/locales/tbone-devise.en.yml
|
92
|
+
- config/routes.rb
|
89
93
|
- lib/tbone-devise.rb
|
90
94
|
- lib/tbone/devise/engine.rb
|
91
95
|
- tbone-devise.gemspec
|
@@ -106,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
106
110
|
version: '0'
|
107
111
|
segments:
|
108
112
|
- 0
|
109
|
-
hash:
|
113
|
+
hash: 2102245750480204451
|
110
114
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
111
115
|
none: false
|
112
116
|
requirements:
|