devise-bootstrap-views 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de9c03f83d78e026c4acf19cb4e83a4413d5ad5377697721eac149d792605305
-  data.tar.gz: d0c235873bd5f6d7dda0bcc5e9cec00034c9add6a3847304b64c568fceaf5f14
+  metadata.gz: b47c89089de8e59d99b8b079b0940c36641302da08c864bdcf9238025fef8a30
+  data.tar.gz: 41ba8e295a54e00a0e5a715629b380e087b464c7e44d32c4dc53488910e1a7d2
 SHA512:
-  metadata.gz: 4e2a60f25b81b1fc8eca3fdc8fd8e6621b3b655d8605fc76d3f6585d39e42fc0c51c9854084f69d99937fddb1dfbae4a4c44780eb00e750c507942c321c8f455
-  data.tar.gz: 31fe3e80889eef3e54fba3ec43b6e40d9b6ca99cfec08e5ec587829557ec105b20cb0b90233d41e3c970cfc4c12c6c0c632b7c546abc5970107016153c4c6033
+  metadata.gz: 786198669ebef0845476a19fd62d233f9bd06fe1f613ecbc28642d6bd5d32ab1e4881ba0f7a050043a3a221caf4db6eeaa39552ffa186dbcac7adad50ce26f3d
+  data.tar.gz: 2aebe43849243c8670c51a4c805cad7dd319adcda7c19f54516f6381b92618237598f5e7b4043906fb9c4d2918b5c9ebcc64d59b10e10ff2d88429b7712b2af2

data/README.md

@@ -3,14 +3,8 @@
 Here are some of the highlights:
 
 - Devise views with Bootstrap 4
-- Used Bootstrap responsive columns
-- I18n Support
-
-***WARNING***
-
-This gem copies lots of its code from [devise-i18n-views](https://github.com/mcasimir/devise-i18n-views) gem.
-
-## Screenshot
+- Responsive layout
+- I18n support
 
 ![Screenshot](https://raw.githubusercontent.com/hisea/devise-bootstrap-views/master/Screenshot.png)
 
@@ -33,13 +27,9 @@ And then execute:
 
     $ bundle install
 
-Then you can install the required translations in your `config/locales`. Use [devise-i18n](https://github.com/tigrish/devise-i18n) — the best source for updated Devise translations. You can manually generate locale files by executing `rails generate devise:views:locale <chosen_locale>`:
-
-``` sh
-rails generate devise:views:locale de
-```
+## I18n
 
-will generate `config/locales/devise.views.de.yml`.
+Install [devise-i18n](https://github.com/tigrish/devise-i18n) for other locales. Make sure to insert `gem 'devise-i18n'` before `gem 'devise-bootstrap-view'`, see [#55](https://github.com/hisea/devise-bootstrap-views/issues/55).
 
 ## Customizing Views
 

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

@@ -1,15 +1,15 @@
-<h1><%= t('.resend_confirmation_instructions', default: 'Resend confirmation instructions') %></h1>
+<h1><%= t('.resend_confirmation_instructions') %></h1>
 
 <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
   <%= bootstrap_devise_error_messages! %>
 
   <div class="form-group">
     <%= f.label :email %>
-    <%= f.email_field :email, autofocus: true, class: "form-control"  %>
+    <%= f.email_field :email, autofocus: true, autocomplete: 'email', value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email), class: 'form-control' %>
   </div>
 
   <div class="form-group">
-    <%= f.submit t('.resend_confirmation_instructions', default: 'Resend confirmation instructions'), class: 'btn btn-primary' %>
+    <%= f.submit t('.resend_confirmation_instructions'), class: 'btn btn-primary' %>
   </div>
 <% end %>
 

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

@@ -1,22 +1,25 @@
-<h1><%= t('.change_your_password', default: 'Change your password') %></h1>
+<h1><%= t('.change_your_password') %></h1>
 
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
   <%= bootstrap_devise_error_messages! %>
-
   <%= f.hidden_field :reset_password_token %>
 
   <div class="form-group">
-    <%= f.label :password, t('.new_password', default: 'New password') %>
+    <%= f.label :password, t('.new_password') %>
     <%= f.password_field :password, autofocus: true, class: 'form-control'  %>
+
+    <% if @minimum_password_length %>
+      <small class="form-text text-muted"><%= t('devise.shared.minimum_password_length', count: @minimum_password_length) %></small>
+    <% end %>
   </div>
 
   <div class="form-group">
-    <%= f.label :password_confirmation, t('.confirm_new_password', default: 'Confirm new password') %>
-    <%= f.password_field :password_confirmation, class: 'form-control'  %>
+    <%= f.label :password_confirmation, t('.confirm_new_password') %>
+    <%= f.password_field :password_confirmation, autocomplete: 'off', class: 'form-control'  %>
   </div>
 
   <div class="form-group">
-    <%= f.submit t('.change_my_password', default: 'Change my password'), class: 'btn btn-primary' %>
+    <%= f.submit t('.change_my_password'), class: 'btn btn-primary' %>
   </div>
 <% end %>
 

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

@@ -1,15 +1,15 @@
-<h1><%= t('.forgot_your_password', default: 'Forgot your password?') %></h1>
+<h1><%= t('.forgot_your_password') %></h1>
 
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
   <%= bootstrap_devise_error_messages! %>
 
   <div class="form-group">
     <%= f.label :email %>
-    <%= f.email_field :email, autofocus: true, class: 'form-control' %>
+    <%= f.email_field :email, autofocus: true, autocomplete: 'email', class: 'form-control' %>
   </div>
 
   <div class="form-group">
-    <%= f.submit t('.send_me_reset_password_instructions', default: 'Send me reset password instructions'), class: 'btn btn-primary' %>
+    <%= f.submit t('.send_me_reset_password_instructions'), class: 'btn btn-primary' %>
   </div>
 <% end %>
 

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

@@ -1,33 +1,37 @@
-<h1><%= t('.title', resource: resource_class.model_name.human , default: "Edit #{resource_name.to_s.humanize}") %></h1>
+<h1><%= t('.title', resource: resource_name.to_s.humanize) %></h1>
 
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
   <%= bootstrap_devise_error_messages! %>
 
   <div class="form-group">
     <%= f.label :email %>
-    <%= f.email_field :email, autofocus: true, class: 'form-control' %>
+    <%= f.email_field :email, autofocus: true, autocomplete: 'email', class: 'form-control' %>
   </div>
 
   <div class="form-group">
-    <%= f.label :password %> <i>(<%= t('.leave_blank_if_you_don_t_want_to_change_it', default: "leave blank if you don't want to change it") %>)</i>
-    <%= f.password_field :password, autocomplete: "off", class: 'form-control' %>
+    <%= f.label :password %>
+    <%= f.password_field :password, autocomplete: 'new-password', class: 'form-control' %>
+
+    <small class="form-text text-muted"><%= t('.leave_blank_if_you_don_t_want_to_change_it') %></small>
   </div>
 
   <div class="form-group">
     <%= f.label :password_confirmation %>
-    <%= f.password_field :password_confirmation, class: 'form-control'  %>
+    <%= f.password_field :password_confirmation, autocomplete: 'new-password', class: 'form-control'  %>
   </div>
 
   <div class="form-group">
-    <%= f.label :current_password %> <i>(<%= t('.we_need_your_current_password_to_confirm_your_changes', default: 'we need your current password to confirm your changes') %>)</i>
-    <%= f.password_field :current_password, class: 'form-control' %>
+    <%= f.label :current_password %>
+    <%= f.password_field :current_password, autocomplete: 'current-password', class: 'form-control' %>
+
+    <small class="form-text text-muted"><%= t('.we_need_your_current_password_to_confirm_your_changes') %></small>
   </div>
 
   <div class="form-group">
-    <%= f.submit t('.update', default: 'Update'), class: 'btn btn-primary' %>
+    <%= f.submit t('.update'), class: 'btn btn-primary' %>
   </div>
 <% end %>
 
-<p><%= t('.unhappy', default: 'Unhappy') %>? <%= link_to t('.cancel_my_account', default: 'Cancel my account'), registration_path(resource_name), data: { confirm: t('.are_you_sure', default: "Are you sure?") }, method: :delete %>.</p>
+<p><%= t('.unhappy') %>? <%= link_to t('.cancel_my_account'), registration_path(resource_name), data: { confirm: t('.are_you_sure') }, method: :delete %>.</p>
 
-<%= link_to t('.back', default: 'Back'), :back %>
+<%= link_to t('.back'), :back %>

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

@@ -1,25 +1,29 @@
-<h1><%= t('.sign_up', default: 'Sign up') %></h1>
+<h1><%= t('.sign_up') %></h1>
 
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
   <%= bootstrap_devise_error_messages! %>
 
   <div class="form-group">
     <%= f.label :email %>
-    <%= f.email_field :email, autofocus: true, class: 'form-control' %>
+    <%= f.email_field :email, autofocus: true, autocomplete: 'email', class: 'form-control' %>
   </div>
 
   <div class="form-group">
     <%= f.label :password %>
-    <%= f.password_field :password, class: 'form-control' %>
+    <%= f.password_field :password, autocomplete: 'current-password', class: 'form-control' %>
+
+    <% if @minimum_password_length %>
+      <small class="form-text text-muted"><%= t('devise.shared.minimum_password_length', count: @minimum_password_length) %></small>
+    <% end %>
   </div>
 
   <div class="form-group">
     <%= f.label :password_confirmation %>
-    <%= f.password_field :password_confirmation, class: 'form-control' %>
+    <%= f.password_field :password_confirmation, autocomplete: 'current-password', class: 'form-control' %>
   </div>
 
   <div class="form-group">
-    <%= f.submit t('.sign_up', default: 'Sign up'), class: 'btn btn-primary' %>
+    <%= f.submit t('.sign_up'), class: 'btn btn-primary' %>
   </div>
 <% end %>
 

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

@@ -1,27 +1,27 @@
-<h1><%= t('.sign_in', default: 'Sign in') %></h1>
+<h1><%= t('.sign_in') %></h1>
 
 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="form-group">
     <%= f.label :email %>
-    <%= f.email_field :email, autofocus: true, class: 'form-control' %>
+    <%= f.email_field :email, autofocus: true, autocomplete: 'email', class: 'form-control' %>
   </div>
 
   <div class="form-group">
     <%= f.label :password %>
-    <%= f.password_field :password, autocomplete: 'off', class: 'form-control' %>
+    <%= f.password_field :password, autocomplete: 'current-password', class: 'form-control' %>
   </div>
 
   <% if devise_mapping.rememberable? %>
     <div class="form-group form-check">
       <%= f.check_box :remember_me, class: 'form-check-input' %>
       <%= f.label :remember_me, class: 'form-check-label' do %>
-        <%= t('activerecord.attributes.user.remember_me', default: 'Remember me') %>
+        <%= resource.class.human_attribute_name('remember_me') %>
       <% end %>
     </div>
   <% end %>
 
   <div class="form-group">
-    <%= f.submit  t('.sign_in', default: 'Sign in'), class: 'btn btn-primary' %>
+    <%= f.submit  t('.sign_in'), class: 'btn btn-primary' %>
   </div>
 <% end %>
 

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

@@ -1,27 +1,27 @@
 <div class="form-group">
-  <% if controller_name != 'sessions' %>
-    <%= link_to t('.sign_in', default: 'Sign in'), new_session_path(resource_name) %><br />
-  <% end %>
+  <%- if controller_name != 'sessions' %>
+    <%= link_to t(".sign_in"), new_session_path(resource_name) %><br />
+  <% end -%>
 
-  <% if devise_mapping.registerable? && controller_name != 'registrations' %>
-    <%= link_to t('.sign_up', default: 'Sign up'), new_registration_path(resource_name) %><br />
-  <% end %>
+  <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+    <%= link_to t(".sign_up"), new_registration_path(resource_name) %><br />
+  <% end -%>
 
-  <% if devise_mapping.recoverable? && controller_name != 'passwords' %>
-    <%= link_to t('.forgot_your_password', default: 'Forgot your password?'), new_password_path(resource_name) %><br />
-  <% end %>
+  <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+    <%= link_to t(".forgot_your_password"), new_password_path(resource_name) %><br />
+  <% end -%>
 
-  <% if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-    <%= link_to t('.didn_t_receive_confirmation_instructions', default: "Didn't receive confirmation instructions?"), new_confirmation_path(resource_name) %><br />
-  <% end %>
+  <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+    <%= link_to t('.didn_t_receive_confirmation_instructions'), new_confirmation_path(resource_name) %><br />
+  <% end -%>
 
-  <% if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-    <%= link_to t('.didn_t_receive_unlock_instructions', default: "Didn't receive unlock instructions?"), new_unlock_path(resource_name) %><br />
-  <% end %>
+  <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+    <%= link_to t('.didn_t_receive_unlock_instructions'), new_unlock_path(resource_name) %><br />
+  <% end -%>
 
-  <% if devise_mapping.omniauthable? %>
-    <% resource_class.omniauth_providers.each do |provider| %>
-      <%= link_to t('.sign_in_with_provider', provider: provider.to_s.titleize, default: "Sign in with #{provider.to_s.titleize}"), omniauth_authorize_path(resource_name, provider) %><br />
-    <% end %>
-  <% end %>
+  <%- if devise_mapping.omniauthable? %>
+    <%- resource_class.omniauth_providers.each do |provider| %>
+      <%= link_to t('.sign_in_with_provider', provider: OmniAuth::Utils.camelize(provider)), omniauth_authorize_path(resource_name, provider) %><br />
+    <% end -%>
+  <% end -%>
 </div>

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

@@ -1,15 +1,15 @@
-<h1><%= t('.resend_unlock_instructions', default: 'Resend unlock instructions') %></h1>
+<h1><%= t('.resend_unlock_instructions') %></h1>
 
 <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
   <%= bootstrap_devise_error_messages! %>
 
   <div class="form-group">
     <%= f.label :email %>
-    <%= f.email_field :email, autofocus: true, class: 'form-control' %>
+    <%= f.email_field :email, autofocus: true, autocomplete: 'email', class: 'form-control' %>
   </div>
 
   <div class="form-group">
-    <%= f.submit t('.resend_unlock_instructions', default: 'Resend unlock instructions'), class: 'btn btn-primary'%>
+    <%= f.submit t('.resend_unlock_instructions'), class: 'btn btn-primary'%>
   </div>
 <% end %>
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module DeviseBootstrapViews
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/locales/en.yml

@@ -2,13 +2,29 @@ en:
   activerecord:
     attributes:
       user:
+        confirmation_sent_at: Confirmation sent at
+        confirmation_token: Confirmation token
+        confirmed_at: Confirmed at
+        created_at: Created at
         current_password: Current password
+        current_sign_in_at: Current sign in at
+        current_sign_in_ip: Current sign in IP
         email: Email
+        encrypted_password: Encrypted password
+        failed_attempts: Failed attempts
+        last_sign_in_at: Last sign in at
+        last_sign_in_ip: Last sign in IP
+        locked_at: Locked at
         password: Password
         password_confirmation: Password confirmation
+        remember_created_at: Remember created at
         remember_me: Remember me
+        reset_password_sent_at: Reset password sent at
         reset_password_token: Reset password token
+        sign_in_count: Sign in count
+        unconfirmed_email: Unconfirmed email
         unlock_token: Unlock token
+        updated_at: Updated at
     models:
       user: User
   devise:
@@ -21,10 +37,10 @@ en:
     failure:
       already_authenticated: You are already signed in.
       inactive: Your account is not activated yet.
-      invalid: Invalid email or password.
+      invalid: Invalid %{authentication_keys} or password.
       last_attempt: You have one more attempt before your account is locked.
       locked: Your account is locked.
-      not_found_in_database: Invalid email address or password.
+      not_found_in_database: Invalid %{authentication_keys} or password.
       timeout: Your session expired. Please sign in again to continue.
       unauthenticated: You need to sign in or sign up before continuing.
       unconfirmed: You have to confirm your email address before continuing.
@@ -34,6 +50,10 @@ en:
         greeting: Welcome %{recipient}!
         instruction: 'You can confirm your account email through the link below:'
         subject: Confirmation instructions
+      email_changed:
+        greeting: Hello %{recipient}!
+        message: We're contacting you to notify you that your email is being changed to %{email}.
+        subject: Email Changed
       password_change:
         greeting: Hello %{recipient}!
         message: We're contacting you to notify you that your password has been changed.
@@ -76,7 +96,7 @@ en:
         currently_waiting_confirmation_for_email: 'Currently waiting confirmation for: %{email}'
         leave_blank_if_you_don_t_want_to_change_it: leave blank if you don't want to change it
         title: Edit %{resource}
-        unhappy: Unhappy
+        unhappy: Unhappy?
         update: Update
         we_need_your_current_password_to_confirm_your_changes: we need your current password to confirm your changes
       new:
@@ -90,7 +110,7 @@ en:
     sessions:
       already_signed_out: Signed out successfully.
       new:
-        sign_in: Sign in
+        sign_in: Log in
       signed_in: Signed in successfully.
       signed_out: Signed out successfully.
     shared:
@@ -99,9 +119,12 @@ en:
         didn_t_receive_confirmation_instructions: Didn't receive confirmation instructions?
         didn_t_receive_unlock_instructions: Didn't receive unlock instructions?
         forgot_your_password: Forgot your password?
-        sign_in: Sign in
+        sign_in: Log in
         sign_in_with_provider: Sign in with %{provider}
         sign_up: Sign up
+      minimum_password_length:
+        one: "(%{count} character minimum)"
+        other: "(%{count} characters minimum)"
     unlocks:
       new:
         resend_unlock_instructions: Resend unlock instructions

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-bootstrap-views
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Yinghai Zhao
@@ -65,61 +65,7 @@ files:
 - lib/generators/devise/views/bootstrap_templates/bootstrap_templates_generator.rb
 - lib/generators/devise/views/locale/locale_generator.rb
 - lib/version.rb
-- locales/af.yml
-- locales/ar.yml
-- locales/az.yml
-- locales/bg.yml
-- locales/bn.yml
-- locales/bs.yml
-- locales/ca.yml
-- locales/cs.yml
-- locales/da.yml
-- locales/de-CH.yml
-- locales/de.yml
-- locales/el.yml
-- locales/en-GB.yml
 - locales/en.yml
-- locales/es-AR.yml
-- locales/es-ES.yml
-- locales/es-MX.yml
-- locales/es.yml
-- locales/et.yml
-- locales/fa.yml
-- locales/fi.yml
-- locales/fr-CA.yml
-- locales/fr.yml
-- locales/he.yml
-- locales/hr.yml
-- locales/hu.yml
-- locales/id.yml
-- locales/is.yml
-- locales/it.yml
-- locales/ja.yml
-- locales/ko.yml
-- locales/lt.yml
-- locales/lv.yml
-- locales/my.yml
-- locales/nb.yml
-- locales/nl.yml
-- locales/nn-NO.yml
-- locales/no.yml
-- locales/pl.yml
-- locales/pt-BR.yml
-- locales/pt.yml
-- locales/ro.yml
-- locales/ru.yml
-- locales/sk.yml
-- locales/sl.yml
-- locales/sr-RS.yml
-- locales/sr.yml
-- locales/sv.yml
-- locales/th.yml
-- locales/tr.yml
-- locales/uk.yml
-- locales/vi.yml
-- locales/zh-CN.yml
-- locales/zh-HK.yml
-- locales/zh-TW.yml
 homepage: https://github.com/hisea/devise-bootstrap-views
 licenses:
 - MIT