muck-users 3.2.3 → 3.2.4
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/app/controllers/admin/muck/access_code_requests_controller.rb +13 -0
- data/app/views/admin/access_code_requests/index.html.erb +9 -0
- data/app/views/admin/access_code_requests/send_code.erb +1 -0
- data/app/views/admin/access_codes/bulk.html.erb +1 -0
- data/app/views/user_mailer/access_code.html.erb +8 -3
- data/app/views/user_mailer/access_code.text.erb +8 -6
- data/config/locales/en.yml +12 -10
- data/config/routes.rb +3 -0
- data/lib/muck-users/mailers/user_mailer.rb +3 -0
- data/muck-users.gemspec +5 -5
- metadata +5 -7
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
3.2.
|
1
|
+
3.2.4
|
@@ -11,6 +11,19 @@ class Admin::Muck::AccessCodeRequestsController < Admin::Muck::BaseController
|
|
11
11
|
render :template => 'admin/access_code_requests/index'
|
12
12
|
end
|
13
13
|
|
14
|
+
def search
|
15
|
+
@is_search = true
|
16
|
+
query = "%#{params[:query]}%"
|
17
|
+
if params[:fullfilled]
|
18
|
+
@access_code_requests = AccessCodeRequest.where("name LIKE ? OR email LIKE ?", query, query).fullfilled.by_newest.paginate(:page => @page, :per_page => @per_page)
|
19
|
+
else
|
20
|
+
@access_code_requests = AccessCodeRequest.where("name LIKE ? OR email LIKE ?", query, query).unfullfilled.by_newest.paginate(:page => @page, :per_page => @per_page)
|
21
|
+
end
|
22
|
+
respond_to do |format|
|
23
|
+
format.html { render :template => 'admin/access_code_requests/index' }
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
14
27
|
def edit
|
15
28
|
@access_code_request = AccessCodeRequest.find(params[:id])
|
16
29
|
render :template => "admin/access_code_requests/edit", :layout => false
|
@@ -1,6 +1,15 @@
|
|
1
1
|
<h2><%=translate('muck.users.access_code_requests') %></h2>
|
2
2
|
<%= render :partial => 'admin/access_codes/access_code_nav' %>
|
3
3
|
<h3><%= @title %></h3>
|
4
|
+
|
5
|
+
<div id="search_box" class="search-box">
|
6
|
+
<%= form_tag search_admin_access_code_requests_path do -%>
|
7
|
+
<%= hidden_field_tag :fullfilled, true if params[:fullfilled]%>
|
8
|
+
<%= text_field_tag :query, '', :class => 'span-5' %>
|
9
|
+
<%= submit_tag t("muck.users.admin.search_access_code_requests") %>
|
10
|
+
<% end -%>
|
11
|
+
</div>
|
12
|
+
|
4
13
|
<table class="adminTable" cellspacing="0" cellpadding="0">
|
5
14
|
<thead>
|
6
15
|
<tr>
|
@@ -16,6 +16,7 @@
|
|
16
16
|
:class => 'date_pick' } -%>
|
17
17
|
<%= f.text_field :subject, { :label => translate('muck.users.bulk_access_code_subject') } -%>
|
18
18
|
<%= f.text_area :message, { :label => translate('muck.users.bulk_access_code_message') } -%>
|
19
|
+
<p><%=translate('muck.users.access_code_message_help') %></p>
|
19
20
|
</div>
|
20
21
|
<div class="span-11 column">
|
21
22
|
<div>
|
@@ -1,3 +1,8 @@
|
|
1
|
-
|
2
|
-
<p
|
3
|
-
|
1
|
+
<% signup = link_to(translate('muck.users.click_to_sign_up_now'), signup_url(:access_code => @code)) -%>
|
2
|
+
<p><%= @message.gsub('{signup_link}', signup).html_safe %></p>
|
3
|
+
<% if !@code_included -%>
|
4
|
+
<p>Access Code: <%= @code %></p>
|
5
|
+
<% end -%>
|
6
|
+
<% if !@signup_link_included -%>
|
7
|
+
<p><%= signup.html_safe %></p>
|
8
|
+
<% end -%>
|
@@ -1,6 +1,8 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
1
|
+
<% signup = "#{translate('muck.users.go_here_to_sign_up_now')}: #{signup_url(:access_code => @code)}".html_safe -%>
|
2
|
+
<%= @message.gsub('{signup_link}', signup).html_safe %>
|
3
|
+
<% if !@code_included -%>
|
4
|
+
Access Code: <%= @code %>
|
5
|
+
<% end -%>
|
6
|
+
<% if !@signup_link_included -%>
|
7
|
+
<%= signup.html_safe %>
|
8
|
+
<% end -%>
|
data/config/locales/en.yml
CHANGED
@@ -2,7 +2,6 @@
|
|
2
2
|
en:
|
3
3
|
muck:
|
4
4
|
users:
|
5
|
-
public_profile: Public Profile
|
6
5
|
add_access_code: Add Access Code
|
7
6
|
cant_delete_admin: You can't delete a user that is in the admin role. Remove the user from the administrator role and then try again. Please be careful when deleting administrators. If you delete all administrator accounts you will no longer be able to login to the administration system.
|
8
7
|
sign_in_now: Sign in now!
|
@@ -26,19 +25,21 @@ en:
|
|
26
25
|
view_your_account: View Your Account
|
27
26
|
password_mismatch: Password mismatch.
|
28
27
|
username_not_available: Username already in use. %{reset_password_help}
|
29
|
-
email_not_available: Email already in use. %{reset_password_help}
|
30
28
|
admin:
|
31
29
|
activate_all_inactive_users_confirm: Are you sure you want to activate all inactive users in the system? This cannot be undone!
|
32
30
|
activate_all_inactive_users: Activate All Inactive Users
|
33
31
|
show_emails: Show Emails
|
34
32
|
search_users: Search Users
|
35
33
|
unactivated_users: There are %{count} unactivated users
|
34
|
+
search_access_code_requests: Search Requests
|
35
|
+
access_code_used_by: Used By
|
36
36
|
invalid_username: Invalid username
|
37
37
|
last_name: Last Name
|
38
38
|
user_update: Your user information has been updated.
|
39
39
|
confirm_select_new_password: Confirm Password Change
|
40
40
|
email_invalid: Invalid email
|
41
41
|
user_disable_problem: There was a problem disabling this user.
|
42
|
+
email_not_available: Email already in use. %{reset_password_help}
|
42
43
|
total_users: "Total Users: %{total}"
|
43
44
|
add_role_dialog_title: Add Role
|
44
45
|
submit: Submit
|
@@ -55,10 +56,13 @@ en:
|
|
55
56
|
edit_role_dialog_title: Edit Role
|
56
57
|
already_logged_in: You are already logged in and don't need to recover your password.
|
57
58
|
forgot_your_username: Forgot your username?
|
59
|
+
public_profile: Public Profile
|
60
|
+
go_here_to_sign_up_now: "Go here to sign up now:"
|
58
61
|
access_code_created: Created
|
59
62
|
bulk_access_code_problem: Problem adding access code
|
60
63
|
signup_wait: Signing you up. Please wait.
|
61
64
|
password_not_reset: Password not reset.
|
65
|
+
access_code_not_found: We were unable to find the access code provided. Please %{contact_us_anchor}contact us%{contact_us_anchor_end} or %{access_request_anchor}request another code%{access_request_anchor_end}.
|
62
66
|
my_dashboard: My Dashboard
|
63
67
|
bulk_access_codes_description: This will generate a unique, single use access code for each of the emails provided.
|
64
68
|
cannot_deactivate_yourself: You cannot deactivate yourself!
|
@@ -71,6 +75,7 @@ en:
|
|
71
75
|
already_registered: Already a member?
|
72
76
|
all_users: All Users
|
73
77
|
login_out_success: You have been logged out.
|
78
|
+
access_code_provided_by: Provided By
|
74
79
|
validation_are_required: are required.
|
75
80
|
request_username: Request Username
|
76
81
|
send_access_code: Send Code
|
@@ -92,14 +97,12 @@ en:
|
|
92
97
|
search_users: Search Users
|
93
98
|
access_code_uses: Uses
|
94
99
|
access_code_sent_to: Sent To
|
95
|
-
access_code_provided_by: Provided By
|
96
|
-
access_code_used_by: Used By
|
97
100
|
select_new_password: Select a New Password
|
98
101
|
login: Login
|
99
102
|
access_code_requests_code_sent_on: Code Sent on
|
100
103
|
send_access_codes: Send Codes
|
104
|
+
access_code_message_help: (If you want to embed the code and sign up link inline use {code} and {signup_link} in your message.)
|
101
105
|
access_code_help: If you received a access code from us, please enter it in the box above. You may also %{access_request_anchor}request a access code%{access_request_anchor_end}.
|
102
|
-
access_code_not_found: We were unable to find the access code provided. Please %{contact_us_anchor}contact us%{contact_us_anchor_end} or %{access_request_anchor}request another code%{access_request_anchor_end}.
|
103
106
|
email_address: Email Address
|
104
107
|
delete: Delete
|
105
108
|
bulk_access_codes_created: Bulk access codes created and emailed to %{email_count} emails.
|
@@ -122,10 +125,10 @@ en:
|
|
122
125
|
user_not_deactivated_error: Could not deactivate user
|
123
126
|
account_activated: Your account has been activated! You can now login.
|
124
127
|
welcome: Welcome
|
128
|
+
edit_this_user: Edit User
|
125
129
|
update: Update
|
126
130
|
already_activated: Your account has already been activated. You can log in below.
|
127
131
|
welcome_email_subject: Welcome to %{application_name}
|
128
|
-
access_code_request_confirm_subject: Thank you for your beta code request for %{application_name}
|
129
132
|
deleting_user: deleting user...
|
130
133
|
add_user_to_role: Add User to Role
|
131
134
|
logout_required: ""
|
@@ -161,7 +164,6 @@ en:
|
|
161
164
|
user_account_deleted: You have successfully deleted your account.
|
162
165
|
password_reset: Password reset
|
163
166
|
delete_this_user: Delete User
|
164
|
-
edit_this_user: Edit User
|
165
167
|
use_limit: Number of Uses
|
166
168
|
user_successfully_deleted: User %{login} was successfully deleted.
|
167
169
|
access_code_requests: Access Code Requests
|
@@ -179,6 +181,7 @@ en:
|
|
179
181
|
expiration_date_tip: Enter the date upon which the access code will become invalid
|
180
182
|
signin_wait: Signing you in. Please wait.
|
181
183
|
remember_me: Remember me
|
184
|
+
access_code_request_confirm_subject: Thank you for your beta code request for %{application_name}
|
182
185
|
add_user_to_role_title: Add user to a new role.
|
183
186
|
access_code_edit_link: Edit Access Code
|
184
187
|
access_code_update_problem: There was a problem updating the access code.
|
@@ -228,10 +231,10 @@ en:
|
|
228
231
|
expiration_date: Expiration Date
|
229
232
|
add: Add
|
230
233
|
terms_of_service_required: You must accept the terms of service.
|
234
|
+
current_password: Current Password
|
235
|
+
access_request_email: Email
|
231
236
|
beta_code_not_required: You are already logged in and so you probably don't really want a beta code.
|
232
237
|
password: Password
|
233
|
-
access_request_email: Email
|
234
|
-
current_password: Current Password
|
235
238
|
sign_out_title: Sign Out
|
236
239
|
email_available: Email available
|
237
240
|
thanks_sign_up_check: Your account has been created. Please check your e-mail for your account activation instructions!
|
@@ -244,7 +247,6 @@ en:
|
|
244
247
|
access_code_edit_problem: Problem editing access code
|
245
248
|
access_codes: Access Codes
|
246
249
|
click_to_sign_up_now: Click here to sign up now.
|
247
|
-
go_here_to_sign_up_now: "Go here to sign up now:"
|
248
250
|
access_request_name: Name
|
249
251
|
cant_disable_admin: Can't disable an administrator. Please remove the user from the administrator role and try again.
|
250
252
|
roles:
|
data/config/routes.rb
CHANGED
@@ -57,6 +57,9 @@ module MuckUsers
|
|
57
57
|
def access_code(email, subject, message, code)
|
58
58
|
@message = message
|
59
59
|
@code = code
|
60
|
+
@code_included = @message.include?('{code}')
|
61
|
+
@signup_link_included = @message.include?('{signup_link}')
|
62
|
+
@message.gsub!('{code}', @code)
|
60
63
|
mail(:to => email, :subject => subject) do |format|
|
61
64
|
format.html
|
62
65
|
format.text
|
data/muck-users.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{muck-users}
|
8
|
-
s.version = "3.2.
|
8
|
+
s.version = "3.2.4"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
|
-
s.authors = [
|
12
|
-
s.date = %q{2011-05-
|
11
|
+
s.authors = [%q{Justin Ball}, %q{Joel Duffin}]
|
12
|
+
s.date = %q{2011-05-11}
|
13
13
|
s.description = %q{Easily add user signup, login and other features to your application}
|
14
14
|
s.email = %q{justin@tatemae.com}
|
15
15
|
s.extra_rdoc_files = [
|
@@ -497,8 +497,8 @@ Gem::Specification.new do |s|
|
|
497
497
|
"public/stylesheets/muck-users.css"
|
498
498
|
]
|
499
499
|
s.homepage = %q{http://github.com/jbasdf/muck_users}
|
500
|
-
s.require_paths = [
|
501
|
-
s.rubygems_version = %q{1.
|
500
|
+
s.require_paths = [%q{lib}]
|
501
|
+
s.rubygems_version = %q{1.8.1}
|
502
502
|
s.summary = %q{Easy to use user engine for Rails}
|
503
503
|
|
504
504
|
if s.respond_to? :specification_version then
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: muck-users
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 7
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 3
|
8
8
|
- 2
|
9
|
-
-
|
10
|
-
version: 3.2.
|
9
|
+
- 4
|
10
|
+
version: 3.2.4
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Justin Ball
|
@@ -16,8 +16,7 @@ autorequire:
|
|
16
16
|
bindir: bin
|
17
17
|
cert_chain: []
|
18
18
|
|
19
|
-
date: 2011-05-
|
20
|
-
default_executable:
|
19
|
+
date: 2011-05-11 00:00:00 Z
|
21
20
|
dependencies:
|
22
21
|
- !ruby/object:Gem::Dependency
|
23
22
|
name: authlogic
|
@@ -563,7 +562,6 @@ files:
|
|
563
562
|
- public/images/profile_default.jpg
|
564
563
|
- public/javascripts/muck-users.js
|
565
564
|
- public/stylesheets/muck-users.css
|
566
|
-
has_rdoc: true
|
567
565
|
homepage: http://github.com/jbasdf/muck_users
|
568
566
|
licenses: []
|
569
567
|
|
@@ -593,7 +591,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
593
591
|
requirements: []
|
594
592
|
|
595
593
|
rubyforge_project:
|
596
|
-
rubygems_version: 1.
|
594
|
+
rubygems_version: 1.8.1
|
597
595
|
signing_key:
|
598
596
|
specification_version: 3
|
599
597
|
summary: Easy to use user engine for Rails
|