tenon 1.0.66 → 1.0.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c47ddfef8b5f95e621152747059627227194e6f
-  data.tar.gz: 630d65af384604dc27d82c2f3278a95c32718e98
+  metadata.gz: e83c7e86103a80528486fef7dc264e16e465048f
+  data.tar.gz: 637ffc3abfd7f5bda03ebc603d84aeb925fe8718
 SHA512:
-  metadata.gz: 3b948e2e9457a41add44da0dc23e41f8c177d176af11697de77de8718a4984eea17195a01f163b43718b721df5bf75c6218aa3effa0842d12aff2de41520e36a
-  data.tar.gz: 49ee9f9d28640cf25557e7f2abcde8e303fc983be161808f7d816aef67300640d58a58c9768a4d95a79a507e880590521cdda09dbc72901001b8f7080affd92a
+  metadata.gz: 540fa189161e7248d7cd6648ea5d043a943f5d3fc513ba19dd9f783fa9b0ea09ec252427dc7917a7614688981e93d898a3b8b40912d8807cdf191cc0c0ed4b8f
+  data.tar.gz: 05043c0ca2eea462525c122ddde922873b8cd5bf96ee78eebd6730bfce6b97c26816de78e7e8b9fcc89ef31e4fe5a3616a35d7499704e9f1923229d393bf718a

data/app/views/devise/mailer/confirmation_instructions.html.haml

@@ -0,0 +1,7 @@
+%p
+  Welcome
+  = @resource.email
+
+%p You can confirm your account through the link below:
+
+%p= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @token, host: Tenon::MySettings.full_url)

data/app/views/devise/mailer/reset_password_instructions.html.haml

@@ -0,0 +1,15 @@
+%p
+  Hello
+  = @resource.email
+
+%p
+  Someone has requested a link to change your password, and you can do this through the link below.
+
+%p
+  = link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token, host: Tenon::MySettings.full_url)
+
+%p
+  If you didn't request this, please ignore this email.
+
+%p
+  Your password won't change until you access the link above and create a new one.

data/app/views/devise/mailer/unlock_instructions.html.haml

@@ -0,0 +1,9 @@
+%p
+  Hello
+  = @resource.email
+
+%p Your account has been locked due to an excessive amount of unsuccessful sign in attempts.
+
+%p Click the link below to unlock your account:
+
+%p= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token, host: Tenon::MySettings.full_url)

data/app/views/devise/passwords/edit.html.haml

@@ -0,0 +1,22 @@
+= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
+  = f.hidden_field :reset_password_token
+  .row
+    %h4 Change your password
+
+  - unless resource.errors.empty?
+    .flash= resource.errors.full_messages.join('<br>').html_safe
+
+  .row.bordered
+    = f.label :password, class: "font"
+    = f.password_field :password, placeholder: '°°°°°°°°'
+
+  .row.bordered
+    = f.label :password_confirmation, class: "font"
+    = f.password_field :password_confirmation, placeholder: '°°°°°°°°'
+
+  .row.bordered
+    = f.submit "Change my password", class: 'btn btn-info'
+
+  .row.bordered
+    %p{:style => "text-align: right; margin-top: 10px; font-size: 12px;"}
+      = link_to "Sign In", new_user_session_path

data/app/views/devise/passwords/new.html.haml

@@ -6,10 +6,11 @@
     .flash= resource.errors.full_messages.join('<br>').html_safe
   .row.bordered
     = f.label :email, :class => "font"
-    = f.text_field :email, placeholder: 'user@example.com'
+    = f.text_field :email, placeholder: 'user@example.com', :autofocus => true
 
   .row.bordered
     = f.submit "Send reset instructions", class: 'btn btn-info'
+
   .row.bordered
     %p{:style => "text-align: right; margin-top: 10px; font-size: 12px;"}
       = link_to "Sign In", new_user_session_path

data/config/initializers/devise.rb

@@ -10,7 +10,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
+  config.mailer_sender = 'noreply@factore.ca'
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.66'
+  VERSION = '1.0.67'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.66
+  version: 1.0.67
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -1151,13 +1151,9 @@ files:
 - app/services/tenon/redirector.rb
 - app/views/devise/confirmations/new.html.erb
 - app/views/devise/confirmations/new.html.haml
-- app/views/devise/mailer/confirmation_instructions.html.erb
 - app/views/devise/mailer/confirmation_instructions.html.haml
-- app/views/devise/mailer/reset_password_instructions.html.erb
 - app/views/devise/mailer/reset_password_instructions.html.haml
-- app/views/devise/mailer/unlock_instructions.html.erb
 - app/views/devise/mailer/unlock_instructions.html.haml
-- app/views/devise/passwords/edit.html.erb
 - app/views/devise/passwords/edit.html.haml
 - app/views/devise/passwords/new.html.haml
 - app/views/devise/registrations/edit.html.haml

data/app/views/devise/mailer/confirmation_instructions.html.erb

@@ -1,5 +0,0 @@
-<p>Welcome <%= @resource.email %>!</p>
-
-<p>You can confirm your account through the link below:</p>
-
-<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>

data/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -1,8 +0,0 @@
-<p>Hello <%= @resource.email %>!</p>
-
-<p>Someone has requested a link to change your password, and you can do this through the link below.</p>
-
-<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>
-
-<p>If you didn't request this, please ignore this email.</p>
-<p>Your password won't change until you access the link above and create a new one.</p>

data/app/views/devise/mailer/unlock_instructions.html.erb

@@ -1,7 +0,0 @@
-<p>Hello <%= @resource.email %>!</p>
-
-<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p>
-
-<p>Click the link below to unlock your account:</p>
-
-<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p>

data/app/views/devise/passwords/edit.html.erb

@@ -1,16 +0,0 @@
-<h2>Change your password</h2>
-
-<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
-  <%= devise_error_messages! %>
-  <%= f.hidden_field :reset_password_token %>
-
-  <p><%= f.label :password %><br />
-  <%= f.password_field :password %></p>
-
-  <p><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></p>
-
-  <p><%= f.submit "Change my password" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>