glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into tvw

Browse source
This commit is contained in:
Connor Turland 2014-10-27 18:24:50 -04:00
parent 21ebc41a02 12e65c638b
commit 54584fb064
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/application.css
View file

@ -242,6 +242,12 @@ input[type="submit"]:active {
margin-top: -83px; margin-top: -83px;
line-height: 18px; line-height: 18px;
} }
.forgotPasswordReset {
height: 215px !important;
}
.forgotPasswordReset input[type="submit"] {
top: 200px !important;
}
/* forgot password fix */ /* forgot password fix */

4
app/views/users/mailer/reset_password_instructions.html.erb
View file

@ -2,10 +2,10 @@
<p>Please create a new password. Your password needs to contain a capital letter, a number, an emoji, 7 elements from the Periodic Table, and a plot containing a protagonist with some character development and a surprise twist ending.</p> <p>Please create a new password. Your password needs to contain a capital letter, a number, an emoji, 7 elements from the Periodic Table, and a plot containing a protagonist with some character development and a surprise twist ending.</p>
<p>Just kidding. But it does have to be between 8 and 128 characters.</p> <p>Just kidding. But it does have to be between 8 and 40 characters.</p>
<p>Change your password using the link below.</p> <p>Change your password using the link below.</p>
<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p> <p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %></p>
<p>If you didn't request this, click your heels three times and pretend nothing ever happened.</p> <p>If you didn't request this, click your heels three times and pretend nothing ever happened.</p>

8
app/views/users/passwords/edit.html.erb
View file

@ -1,15 +1,15 @@
<% content_for :title, "Change Password | Metamaps" %> <% content_for :title, "Change Password | Metamaps" %>
<div id="yield"> <div id="yield">
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put, :class => "forgotPassword centerGreyForm" }) do |f| %> <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put, :class => "forgotPassword centerGreyForm forgotPasswordReset" }) do |f| %>
<%= f.hidden_field :reset_password_token %> <%= f.hidden_field :reset_password_token %>
<h3>Change your password</h3> <h3>Change password</h3>
<div><%= f.label :password, "New password" %> <div><%= f.label :password, "New password", :class => "firstFieldText" %>
<%= f.password_field :password, :autofocus => true %></div> <%= f.password_field :password, :autofocus => true %></div>
<div><%= f.label :password_confirmation, "Confirm new password" %> <div><%= f.label :password_confirmation, "Confirm new password", :class => "firstFieldText" %>
<%= f.password_field :password_confirmation %></div> <%= f.password_field :password_confirmation %></div>
<div><%= f.submit "Change my password" %></div> <div><%= f.submit "Change my password" %></div>

2
config/environments/production.rb
View file

@ -34,7 +34,7 @@ Metamaps::Application.configure do
authentication: 'plain', authentication: 'plain',
enable_starttls_auto: true, enable_starttls_auto: true,
openssl_verify_mode: 'none' } openssl_verify_mode: 'none' }
config.action_mailer.default_url_options = { :host => 'metamaps.cc' } config.action_mailer.default_url_options = { :host => 'metamaps.herokuapp.com' }
# Don't care if the mailer can't send # Don't care if the mailer can't send
config.action_mailer.raise_delivery_errors = true config.action_mailer.raise_delivery_errors = true