devise_rails3_ennder 1.0.5 → 1.1.0

data/.gitignore

@@ -0,0 +1,11 @@
+#KDE
+.directory
+
+#Autogénéré
+*.gemspec
+
+#Génération du Gem avec bones
+pkg/devise_rails3_ennder-*/**/*
+pkg/devise_rails3_ennder-*/*
+
+pkg/devise_rails3_ennder-*.tgz

data/.rvmrc

@@ -1,2 +1,2 @@
 #Pour que le projet marche aussi avec passenger
-rvm use 1.9.2@devise_rails3_ennder --create
+rvm use 1.9.3@devise_rails3_ennder --create

data/History.txt

@@ -25,3 +25,8 @@
 * README.rdoc updated
 * shared/_user_nav.html.erb optimisé
 
+== 1.0.6 / 2011-08-31
+* fix app/views/devise/mailer/reset_password_instructions.html.erb if username does not exist
+
+== 1.1.0 / 2014-02-14
+* updated view with devise v3.2.2

data/README.rdoc

@@ -25,11 +25,11 @@ You will have to provide this partial filled with you User personal fields input
 
 * configure your smtp setting, you must add in your environment configration file (dev | test | production) something like:
 
-  //i.a.p. : Internet Access Provider
+  //i.s.p. : Internet Service Provider
   config.action_mailer.smtp_settings = {
-    :address => 'your_iap_smtp_server_name.your_iap_domain.com',
+    :address => 'your_iap_smtp_server_name.your_isp_domain.com',
     :port => 25,
-    :domain => 'your_iap_domain.com'
+    :domain => 'your_isp_domain.com'
    }
 
 * add the login / logout partial to your layout, you must insert the following instruction:

data/app/views/devise/confirmations/new.html.erb

@@ -4,11 +4,11 @@
 <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= devise_error_messages! %>
 
-  <p><%= f.label :email %><br />
-  <%= f.email_field :email %></p>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>
 
   <!-- TODO Ennder A TRADUIRE "Resend confirmation instructions/Renvoyer les instructions de confirmation" -->
-  <p><%= f.submit "Resend confirmation instructions" %></p>
+  <div><%= f.submit "Resend confirmation instructions" %></div>
 <% end %>
 
-<%= render :partial => "devise/shared/links" %>
+<%= render "devise/shared/links" %>

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

@@ -1,7 +1,7 @@
-<p>Welcome <%= @resource.email %>!</p>
+<p>Welcome <%= @email %>!</p>
 
 <!-- t("devise.registrations.confirm_link") -->
-<p>You can confirm your account through the link below:</p>
+<p>You can confirm your account email through the link below:</p>
 
 <!-- TODO Ennder TRANSLATION 'Confirm my account/Confirmer mon inscription'-->
-<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @token) %></p>

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

@@ -1,10 +1,10 @@
-<p>Hello <%= (@resource.username + ' : ') unless @resource.username.blank? %><%= @resource.email %>!</p>
+<p>Hello <%= (@resource.username + ' : ') unless (! defined?(@resource.username) || @resource.username.blank?) %><%= @resource.email %>!</p>
 
 <!-- t('devise.mailer.Someone_requested_change_password') -->
-<p>Someone has requested a link to change your password, and you can do this through the link below.</p>
+<p>Someone has requested a link to change your password. You can do this through the link below.</p>
 
 <!-- t('devise.mailer.Change_my_password') -->
-<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>
 
 <!-- t('devise.mailer.If_you_didnt_request_this') -->
 <p>If you didn't request this, please ignore this email.</p>

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

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

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

@@ -6,15 +6,15 @@
   <%= f.hidden_field :reset_password_token %>
 
   <!-- TODO Ennder Trad° "New password" -->
-  <p><%= f.label :password, "New password" %><br />
-  <%= f.password_field :password %></p>
+  <div><%= f.label :password, "New password" %><br />
+  <%= f.password_field :password, :autofocus => true %></div>
 
   <!-- TODO Ennder Trad° "Confirm new password" -->
-  <p><%= f.label :password_confirmation, "Confirm new password" %><br />
-  <%= f.password_field :password_confirmation %></p>
+  <div><%= f.label :password_confirmation, "Confirm new password" %><br />
+  <%= f.password_field :password_confirmation %></div>
 
   <!-- TODO Ennder Trad° "Change my password" -->
-  <p><%= f.submit "Change my password" %></p>
+  <div><%= f.submit "Change my password" %></div>
 <% end %>
 
-<%= render :partial => "devise/shared/links" %>
+<%= render "devise/shared/links" %>

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

@@ -4,11 +4,11 @@
 <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= devise_error_messages! %>
 
-  <p><%= f.label :email %><br />
-  <%= f.email_field :email %></p>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>
 
   <!-- t('devise.passwords.send_me_instructions') -->
-  <p><%= f.submit "Send me reset password instructions" %></p>
+  <div><%= f.submit "Send me reset password instructions" %></div>
 <% end %>
 
-<%= render :partial => "devise/shared/links" %>
+<%= render "devise/shared/links" %>

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

@@ -1,33 +1,64 @@
+<%
+    # Localized by Ennder, "Edit", activerecord.models
+-%>
 <h2><%= t('devise.registrations.edit_only') %> <%= t("activerecord.models.#{resource_name}") %></h2>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
 <%
-	if !resource.errors.empty?
+    # Ennder id : flash_error + test
 -%>
-	<div id="flash_error"><%= devise_error_messages! %></div>
 <%
-	end
+    if !resource.errors.empty?
 -%>
+  <div id="flash_error"><%= devise_error_messages! %></div>
+<%
+    end
+-%>
+
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>
 
-	<p><%= f.label :email %><br />
-	<%= f.email_field :email %></p>
+  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+    <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
+  <% end %>
 
-	<p><%= f.label :password %> <i>(<%= t('devise.registrations.leave_password_blank_dont_change') %>)</i><br />
-	<%= f.password_field :password %></p>
+<%
+    # Localized by Ennder, "leave blank if you don't want to change it"
+-%>
+  <div><%= f.label :password %> <i>(<%= t('devise.registrations.leave_password_blank_dont_change') %>)</i><br />
+  <%= f.password_field :password, :autocomplete => "off" %></div>
 
-	<p><%= f.label :password_confirmation %><br />
-	<%= f.password_field :password_confirmation %></p>
+  <div><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></div>
 
-	<p><%= f.label :current_password %> <i>(<%= t('devise.registrations.need_current_passord') %>)</i><br />
-	<%= f.password_field :current_password %></p>
+<%
+    # Localized by Ennder, "we need your current password to confirm your changes"
+-%>
+  <div><%= f.label :current_password %> <i>(<%= t('devise.registrations.need_current_passord') %>)</i><br />
+  <%= f.password_field :current_password %></div>
 
+<%
+    # Added by Ennder
+-%>
 <%= render :partial => 'users/form_personal_fields', :locals => { :f => f } %>
 
-	<p><%= f.submit t('Update') %></p>
+<%
+    # Localized by Ennder, "Update"
+-%>
+  <div><%= f.submit t('Update') %></div>
 <% end %>
 
+<%
+    # Localized by Ennder, "Cancel my account"
+-%>
 <h3><%= t('devise.registrations.cancel_account') %></h3>
 
-<p><%= t('devise.registrations.unhappy') %> <%= link_to t('devise.registrations.cancel_account'), registration_path(resource_name), :confirm => t('confirmation.are_you_sure'), :method => :delete %>.</p>
+<%
+    # Localized by Ennder, "Unhappy?", "Are you sure?"
+-%>
+<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>
 
+<%
+    # Localized by Ennder, "Back"
+-%>
 <%= link_to t('links.back'), :back %>

data/app/views/devise/registrations/new.html.erb

@@ -1,20 +1,26 @@
+<%
+    # Localized by Ennder, "Sign up"
+-%>
 <h2><%= t('devise.registrations.sign_up') %></h2>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
   <%= devise_error_messages! %>
 
-  <p><%= f.label :email %><br />
-  <%= f.email_field :email %></p>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>
 
-  <p><%= f.label :password %><br />
-  <%= f.password_field :password %></p>
+  <div><%= f.label :password %><br />
+  <%= f.password_field :password %></div>
 
-  <p><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></p>
+  <div><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></div>
 
-<%= render :partial => 'users/form_personal_fields', :locals => { :f => f } %>
+<%
+    # Added by Ennder
+-%>
+<%= render 'users/form_personal_fields', :locals => { :f => f } %>
 
-  <p><%= f.submit t('devise.registrations.sign_up') %></p>
+  <div><%= f.submit t('devise.registrations.sign_up') %></div>
 <% end %>
 
-<%= render :partial => "devise/shared/links" %>
+<%= render "devise/shared/links" %>

data/app/views/devise/sessions/new.html.erb

@@ -1,17 +1,20 @@
+<%
+    # Localized by Ennder, "Sign in"
+-%>
 <h2><%= t('devise.sessions.sign_in') %></h2>
 
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-  <p><%= f.label :email %><br />
-  <%= f.email_field :email %></p>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>
 
-  <p><%= f.label :password %><br />
-  <%= f.password_field :password %></p>
+  <div><%= f.label :password %><br />
+  <%= f.password_field :password %></div>
 
   <% if devise_mapping.rememberable? -%>
-    <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
+    <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
   <% end -%>
 
-  <p><%= f.submit t('devise.sessions.sign_in') %></p>
+  <div><%= f.submit t('devise.sessions.sign_in') %></div>
 <% end %>
 
-<%= render :partial => "devise/shared/links" %>
+<%= render "devise/shared/links" %>

data/app/views/devise/shared/_links.erb

@@ -1,20 +1,35 @@
 <%- if controller_name != 'sessions' %>
+<%
+    # Localized by Ennder, "Sign in"
+-%>
   <%= link_to t('devise.sessions.sign_in'), new_session_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+<%
+    # Localized by Ennder, "Sign up"
+-%>
   <%= link_to t('devise.registrations.sign_up'), new_registration_path(resource_name) %><br />
 <% end -%>
 
-<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+<%
+    # Localized by Ennder, "Forgot your password?"
+-%>
   <%= link_to t('devise.passwords.link'), new_password_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+<%
+    # Localized by Ennder, "Didn't receive confirmation instructions?"
+-%>
   <%= link_to t('devise.confirmations.link'), new_confirmation_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+<%
+    # Localized by Ennder, "Didn't receive unlock instructions?"
+-%>
   <%= link_to t('devise.unlocks.link'), new_unlock_path(resource_name) %><br />
 <% end -%>
 
@@ -22,4 +37,4 @@
   <%- resource_class.omniauth_providers.each do |provider| %>
     <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
   <% end -%>
-<% end -%>
+<% end -%>

data/app/views/devise/unlocks/new.html.erb

@@ -4,11 +4,11 @@
 <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= devise_error_messages! %>
 
-  <p><%= f.label :email %><br />
-  <%= f.email_field :email %></p>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>
 
   <!-- TODO Ennder TRANSLATION "Resend unlock instructions" -->
-  <p><%= f.submit "Resend unlock instructions" %></p>
+  <div><%= f.submit "Resend unlock instructions" %></div>
 <% end %>
 
-<%= render :partial => "devise/shared/links" %>
+<%= render "devise/shared/links" %>

data/version.txt

@@ -1 +1 @@
-1.0.5
+1.1.0

metadata

@@ -1,37 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: devise_rails3_ennder
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  version: 1.0.5
 platform: ruby
-authors: 
-- "Jos\xC3\xA9 VALIM, Carlos ANT\xC3\x94NIO, J\xC3\xA9r\xC3\xB4me BATAILLE"
+authors:
+- José VALIM, Carlos ANTÔNIO, Jérôme BATAILLE
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-14 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-02-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bones
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.7.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.7.3
   type: :development
-  version_requirements: *id001
-description: Devise (*translated* *in* *French* *by* *Ennder*, *in* *this* *gem*) is a flexible authentication solution for Rails based on Warden.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.7.3
+description: Devise (*translated* *in* *French* *by* *Ennder*, *in* *this* *gem*)
+  is a flexible authentication solution for Rails based on Warden.
 email: mel@ennder.fr
-executables: 
+executables:
 - .directory
 - devise_rails3_ennder.rb
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGELOG.rdoc
 - History.txt
 - README.rdoc
@@ -50,8 +53,9 @@ extra_rdoc_files:
 - lib/devise_rails3_ennder/config/locales/devise.fr.yml
 - lib/tasks/.directory
 - lib/tasks/devise_rails3_ennder_tasks.rake
-files: 
+files:
 - .bnsignore
+- .gitignore
 - .rvmrc
 - CHANGELOG.rdoc
 - History.txt
@@ -101,34 +105,31 @@ files:
 - lib/tasks/.directory
 - lib/tasks/devise_rails3_ennder_tasks.rake
 - version.txt
-has_rdoc: true
 homepage: http://www.ennder.fr
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: devise_rails3_ennder
-rubygems_version: 1.6.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Devise (*translated* *in* *French* *by* *Ennder*, *in* *this* *gem*) is a flexible authentication solution for Rails based on Warden.
+summary: Devise (*translated* *in* *French* *by* *Ennder*, *in* *this* *gem*) is a
+  flexible authentication solution for Rails based on Warden.
 test_files: []
-