devise-bootstrap-views 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17d2b09d65c1e7e8e5066fe7d3ddba7866acece6
-  data.tar.gz: a6f9222c112a2c170f6a07b676ef244737193ef8
+  metadata.gz: dc96997e73a642df698260b82db4d756791b2056
+  data.tar.gz: a833625e3d1f0fb93c2c3618f17efa42413a98fe
 SHA512:
-  metadata.gz: 8a8a2f10ea00d3a4c5240a87a84368f6442f7cae0df796900ab435e1e5f6a975f48622820a9adf6da15b1cb4e46840a30577f0f805165a8a2ab0a46c62a769c1
-  data.tar.gz: a594563618590acf6e949268e9de6eda85c6982b887be1c91f54b56f1c8b148c087319f409a2c17e4e0b9674f99ed03e5b106078cd1f1094871d7ff12df5806d
+  metadata.gz: e8ca196f87c72b080dd9adf1ea22599ad7dcc81eab14fa79ea233e32f5147eafd39566147fbb69e42e3c4b2171ab3aadd3d81c295ce53b48847bba3285e0d7dc
+  data.tar.gz: d15ce8ed7e08fc5e190560167872047067d7a7a6b14727858647f0d71453cc7d2db31ed859e3e9a51880781db4015d996bbcf8c83e1ee225850d871b6f4101b4

data/README.md

@@ -30,7 +30,7 @@ Add some minor css fix to your rails asset pipeline manifest
     # LESS
     *= require devise_bootstrap_views_less
 
-Then you need to install the required translations in your `config/locales`. You can do this either manually (downloading them from [devise-i18n-views/locales](https://github.com/mcasimir/devise-i18n-views/tree/master/locales)) or through the apposite generator `devise:views:locale`, eg.
+Then you need to install the required translations in your `config/locales`. The  [devise-i18n-views](https://github.com/mcasimir/devise-i18n-views) project is no longer maintained after being merged into [devise-i18n](https://github.com/tigrish/devise-i18n), which is currently the best source for updated Devise translations. You can manually download locale dictionaries from [devise-i18n/rails/locales](https://github.com/tigrish/devise-i18n/tree/master/rails/locales) or generate them by running `devise:views:locale <chosen_locale>`:
 
 ``` sh
 rails g devise:views:locale it
@@ -45,7 +45,15 @@ The `devise:views:bootstrap_templates` generator will copy all views to your app
 ``` sh
 rails g devise:views:bootstrap_templates
 ```
+Alternatively, you can also generate Haml or Slim templates instead of traditional ERB. Both can be generated with their respective commands below.
 
+``` sh
+rails g devise:views:bootstrap_haml_templates
+```
+
+``` sh
+rails g devise:views:bootstrap_slim_templates
+```
 ## Example
 
 Sample Application can be found at this link - [Devise Boostrap Views Application](https://github.com/ethiraj-srinivasan/devise-boostrap-views)

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

@@ -0,0 +1,18 @@
+<%= bootstrap_devise_error_messages! %>
+<div class="panel panel-default devise-bs">
+  <div class="panel-heading">
+    <h4><%= t('.resend_confirmation_instructions', default: 'Resend confirmation instructions') %></h4>
+  </div>
+  <div class="panel-body">
+    <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, role: 'form' }) do |f| %>
+      <div class="form-group">
+        <%= f.label :email %>
+        <%= f.email_field :email, autofocus: true, class: "form-control"  %>
+      </div>
+
+      <%= f.submit t('.resend_confirmation_instructions', default: 'Resend confirmation instructions'), class: 'btn btn-primary' %>
+    <% end %>
+  </div>
+</div>
+
+<%= render 'devise/shared/links' %>

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

@@ -0,0 +1,6 @@
+<p><%= t('.greeting', recipient: @resource.email, default: "Welcome #{@resource.email}!") %></p>
+
+<p><%= t('.instruction', default: 'You can confirm your account email through the link below:') %></p>
+
+<p><%= link_to t('.action', default: 'Confirm my account'),
+         confirmation_url(@resource, confirmation_token: @token, locale: I18n.locale) %></p>

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

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

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

@@ -0,0 +1,7 @@
+<p><%= t('.greeting', recipient: @resource.email, default: "Hello #{@resource.email}!") %></p>
+
+<p><%= t('.message', default: 'Your account has been locked due to an excessive amount of unsuccessful sign in attempts.') %></p>
+
+<p><%= t('.instruction', default: 'Click the link below to unlock your account:') %></p>
+
+<p><%= link_to t('.action', default: 'Unlock my account'), unlock_url(@resource, unlock_token: @resource.unlock_token, locale: I18n.locale) %></p>

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

@@ -0,0 +1,24 @@
+<%= bootstrap_devise_error_messages! %>
+<div class="panel panel-default devise-bs">
+  <div class="panel-heading">
+    <h4><%= t('.change_your_password', default: 'Change your password') %></h4>
+  </div>
+  <div class="panel-body">
+    <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, role: 'form' }) do |f| %>
+      <%= f.hidden_field :reset_password_token %>
+
+      <div class="form-group">
+        <%= f.label :password, t('.new_password', default: 'New password') %>
+        <%= f.password_field :password, autofocus: true, class: 'form-control'  %>
+      </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'  %>
+      </div>
+
+      <%= f.submit t('.change_my_password', default: 'Change my password'), class: 'btn btn-primary' %>
+    <% end %>
+  </div>
+</div>
+<%= render 'devise/shared/links' %>

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

@@ -0,0 +1,17 @@
+<%= bootstrap_devise_error_messages! %>
+<div class="panel panel-default devise-bs">
+  <div class="panel-heading">
+    <h4><%= t('.forgot_your_password', default: 'Forgot your password?') %></h4>
+  </div>
+  <div class="panel-body">
+    <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post, role: "form" }) do |f| %>
+      <div class="form-group">
+        <%= f.label :email %>
+        <%= f.email_field :email, autofocus: true, class: 'form-control' %>
+      </div>
+
+      <%= f.submit t('.send_me_reset_password_instructions', default: 'Send me reset password instructions'), class: 'btn btn-primary' %>
+    <% end %>
+  </div>
+</div>
+<%= render 'devise/shared/links' %>

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

@@ -0,0 +1,31 @@
+<%= bootstrap_devise_error_messages! %>
+<div class="panel panel-default devise-bs">
+  <div class="panel-heading">
+    <h4><%= t('.title', resource: resource_class.model_name.human , default: "Edit #{resource_name.to_s.humanize}") %></h4>
+  </div>
+  <div class="panel-body">
+    <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+      <div class="form-group">
+        <%= f.label :email %>
+        <%= f.email_field :email, autofocus: true, 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' %>
+      </div>
+      <div class="form-group">
+        <%= f.label :password_confirmation %>
+        <%= f.password_field :password_confirmation, 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' %>
+      </div>
+      <%= f.submit t('.update', default: 'Update'), class: 'btn btn-primary' %>
+    <% end %>
+  </div>
+</div>
+
+<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>
+
+<%= link_to t('.back', default: 'Back'), :back %>

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

@@ -0,0 +1,24 @@
+<%= bootstrap_devise_error_messages! %>
+<div class="panel panel-default devise-bs">
+  <div class="panel-heading">
+    <h4><%= t('.sign_up', default: 'Sign up') %></h4>
+  </div>
+  <div class="panel-body">
+    <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { role: 'form' }) do |f| %>
+      <div class="form-group">
+        <%= f.label :email %>
+        <%= f.email_field :email, autofocus: true, class: 'form-control' %>
+      </div>
+      <div class="form-group">
+        <%= f.label :password %>
+        <%= f.password_field :password, class: 'form-control' %>
+      </div>
+      <div class="form-group">
+        <%= f.label :password_confirmation %>
+        <%= f.password_field :password_confirmation, class: 'form-control' %>
+      </div>
+      <%= f.submit t('.sign_up', default: 'Sign up'), class: 'btn btn-primary' %>
+    <% end %>
+  </div>
+</div>
+<%= render 'devise/shared/links' %>

data/app/views/{devise → erb}/sessions/new.html.erb

@@ -1,26 +1,26 @@
 <div class="panel panel-default devise-bs">
   <div class="panel-heading">
-    <h4><%= t('.sign_in', :default => "Sign in") %></h4>
+    <h4><%= t('.sign_in', default: 'Sign in') %></h4>
   </div>
   <div class="panel-body">
-    <%= form_for(resource, as: resource_name, url: session_path(resource_name), html: { role: "form" }) do |f| %>
+    <%= form_for(resource, as: resource_name, url: session_path(resource_name), html: { role: 'form' }) do |f| %>
       <div class="form-group">
         <%= f.label :email %>
-        <%= f.email_field :email, autofocus: true, class: "form-control" %>
+        <%= f.email_field :email, autofocus: true, 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: 'off', class: 'form-control' %>
       </div>
       <% if devise_mapping.rememberable? %>
         <div class="checkbox">
           <%= f.label :remember_me do %>
-            <%= f.check_box :remember_me %> <%= t('.remember_me', :default => "Remember me") %>
+            <%= f.check_box :remember_me %> <%= t('.remember_me', default: 'Remember me') %>
           <% end %>
         </div>
       <% end %>
-      <%= f.submit  t('.sign_in', :default => "Sign in"), class: "btn btn-primary" %>
+      <%= f.submit  t('.sign_in', default: 'Sign in'), class: 'btn btn-primary' %>
     <% end %>
   </div>
 </div>
-<%= render "devise/shared/links" %>
+<%= render 'devise/shared/links' %>

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

@@ -0,0 +1,25 @@
+<% if controller_name != 'sessions' %>
+  <%= link_to t('.sign_in', default: '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.recoverable? && controller_name != 'passwords' %>
+  <%= link_to t('.forgot_your_password', default: '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.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.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 %>

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

@@ -0,0 +1,16 @@
+<%= bootstrap_devise_error_messages! %>
+<div class="panel panel-default devise-bs">
+  <div class="panel-heading">
+    <h4><%= t('.resend_unlock_instructions', default: 'Resend unlock instructions') %></h4>
+  </div>
+  <div class="panel-body">
+    <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post, html: { role: "form" } }) do |f| %>
+      <div class="form-group">
+        <%= f.label :email %>
+        <%= f.email_field :email, autofocus: true, class: 'form-control' %>
+      </div>
+      <%= f.submit t('.resend_unlock_instructions', default: 'Resend unlock instructions'), class: 'btn btn-primary'%>
+    <% end %>
+  </div>
+</div>
+<%= render 'devise/shared/links' %>

data/app/views/haml/confirmations/new.html.haml

@@ -0,0 +1,11 @@
+= bootstrap_devise_error_messages!
+.panel.panel-default.devise-bs
+  .panel-heading
+    %h4= t('.resend_confirmation_instructions', default: 'Resend confirmation instructions')
+  .panel-body
+    = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, role: 'form' }) do |f|
+      .form-group
+        = f.label :email
+        = f.email_field :email, autofocus: true, class: "form-control"
+      = f.submit t('.resend_confirmation_instructions', default: 'Resend confirmation instructions'), class: 'btn btn-primary'
+= render 'devise/shared/links'

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

@@ -0,0 +1,4 @@
+%p= t('.greeting', recipient: @resource.email, default: "Welcome #{@resource.email}!")
+%p= t('.instruction', default: 'You can confirm your account email through the link below:')
+%p= link_to t('.action', default: 'Confirm my account'),                         |
+    confirmation_url(@resource, confirmation_token: @token, locale: I18n.locale) |

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

@@ -0,0 +1,5 @@
+%p= t('.greeting', recipient: @resource.email, default: "Hello #{@resource.email}!")
+%p= t('.instruction', default: 'Someone has requested a link to change your password, and you can do this through the link below.')
+%p= link_to t('.action', default: 'Change my password'), edit_password_url(@resource, reset_password_token: @token, locale: I18n.locale)
+%p= t('.instruction_2', default: "If you didn't request this, please ignore this email.")
+%p= t('.instruction_3', default: "Your password won't change until you access the link above and create a new one.")

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

@@ -0,0 +1,4 @@
+%p= t('.greeting', recipient: @resource.email, default: "Hello #{@resource.email}!")
+%p= t('.message', default: 'Your account has been locked due to an excessive amount of unsuccessful sign in attempts.')
+%p= t('.instruction', default: 'Click the link below to unlock your account:')
+%p= link_to t('.action', default: 'Unlock my account'), unlock_url(@resource, unlock_token: @resource.unlock_token, locale: I18n.locale)

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

@@ -0,0 +1,15 @@
+= bootstrap_devise_error_messages!
+.panel.panel-default.devise-bs
+  .panel-heading
+    %h4= t('.change_your_password', default: 'Change your password')
+  .panel-body
+    = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, role: 'form' }) do |f|
+      = f.hidden_field :reset_password_token
+      .form-group
+        = f.label :password, t('.new_password', default: 'New password')
+        = f.password_field :password, autofocus: true, class: 'form-control'
+      .form-group
+        = f.label :password_confirmation, t('.confirm_new_password', default: 'Confirm new password')
+        = f.password_field :password_confirmation, class: 'form-control'
+      = f.submit t('.change_my_password', default: 'Change my password'), class: 'btn btn-primary'
+= render 'devise/shared/links'

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

@@ -0,0 +1,11 @@
+= bootstrap_devise_error_messages!
+.panel.panel-default.devise-bs
+  .panel-heading
+    %h4= t('.forgot_your_password', default: 'Forgot your password?')
+  .panel-body
+    = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post, role: "form" }) do |f|
+      .form-group
+        = f.label :email
+        = f.email_field :email, autofocus: true, class: 'form-control'
+      = f.submit t('.send_me_reset_password_instructions', default: 'Send me reset password instructions'), class: 'btn btn-primary'
+= render 'devise/shared/links'

data/app/views/haml/registrations/edit.html.haml

@@ -0,0 +1,27 @@
+= bootstrap_devise_error_messages!
+.panel.panel-default.devise-bs
+  .panel-heading
+    %h4= t('.title', resource: resource_class.model_name.human , default: "Edit #{resource_name.to_s.humanize}")
+  .panel-body
+    = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
+      .form-group
+        = f.label :email
+        = f.email_field :email, autofocus: true, class: 'form-control'
+      .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")})
+        = f.password_field :password, autocomplete: "off", class: 'form-control'
+      .form-group
+        = f.label :password_confirmation
+        = f.password_field :password_confirmation, class: 'form-control'
+      .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')})
+        = f.password_field :current_password, class: 'form-control'
+      = f.submit t('.update', default: 'Update'), class: 'btn btn-primary'
+%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}.
+= link_to t('.back', default: 'Back'), :back

data/app/views/haml/registrations/new.html.haml

@@ -0,0 +1,17 @@
+= bootstrap_devise_error_messages!
+.panel.panel-default.devise-bs
+  .panel-heading
+    %h4= t('.sign_up', default: 'Sign up')
+  .panel-body
+    = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { role: 'form' }) do |f|
+      .form-group
+        = f.label :email
+        = f.email_field :email, autofocus: true, class: 'form-control'
+      .form-group
+        = f.label :password
+        = f.password_field :password, class: 'form-control'
+      .form-group
+        = f.label :password_confirmation
+        = f.password_field :password_confirmation, class: 'form-control'
+      = f.submit t('.sign_up', default: 'Sign up'), class: 'btn btn-primary'
+= render 'devise/shared/links'

data/app/views/haml/sessions/new.html.haml

@@ -0,0 +1,18 @@
+.panel.panel-default.devise-bs
+  .panel-heading
+    %h4= t('.sign_in', default: 'Sign in')
+  .panel-body
+    = form_for(resource, as: resource_name, url: session_path(resource_name), html: { role: 'form' }) do |f|
+      .form-group
+        = f.label :email
+        = f.email_field :email, autofocus: true, class: 'form-control'
+      .form-group
+        = f.label :password
+        = f.password_field :password, autocomplete: 'off', class: 'form-control'
+      - if devise_mapping.rememberable?
+        .checkbox
+          = f.label :remember_me do
+            = f.check_box :remember_me
+            = t('.remember_me', default: 'Remember me')
+      = f.submit  t('.sign_in', default: 'Sign in'), class: 'btn btn-primary'
+= render 'devise/shared/links'

data/app/views/haml/shared/_links.html.haml

@@ -0,0 +1,19 @@
+- if controller_name != 'sessions'
+  = link_to t('.sign_in', default: 'Sign in'), new_session_path(resource_name)
+  %br/
+- if devise_mapping.registerable? && controller_name != 'registrations'
+  = link_to t('.sign_up', default: 'Sign up'), new_registration_path(resource_name)
+  %br/
+- if devise_mapping.recoverable? && controller_name != 'passwords'
+  = link_to t('.forgot_your_password', default: 'Forgot your password?'), new_password_path(resource_name)
+  %br/
+- 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/
+- 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/
+- 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/

data/app/views/haml/unlocks/new.html.haml

@@ -0,0 +1,11 @@
+= bootstrap_devise_error_messages!
+.panel.panel-default.devise-bs
+  .panel-heading
+    %h4= t('.resend_unlock_instructions', default: 'Resend unlock instructions')
+  .panel-body
+    = form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post, html: { role: "form" } }) do |f|
+      .form-group
+        = f.label :email
+        = f.email_field :email, autofocus: true, class: 'form-control'
+      = f.submit t('.resend_unlock_instructions', default: 'Resend unlock instructions'), class: 'btn btn-primary'
+= render 'devise/shared/links'

data/app/views/slim/confirmations/new.html.slim

@@ -0,0 +1,12 @@
+= bootstrap_devise_error_messages!
+.panel.panel-default.devise-bs
+  .panel-heading
+    h4
+      = t('.resend_confirmation_instructions', default: 'Resend confirmation instructions')
+  .panel-body
+    = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, role: 'form' }) do |f|
+      .form-group
+        = f.label :email
+        = f.email_field :email, autofocus: true, class: "form-control"
+      = f.submit t('.resend_confirmation_instructions', default: 'Resend confirmation instructions'), class: 'btn btn-primary'
+= render 'devise/shared/links'

data/app/views/slim/mailer/confirmation_instructions.html.slim

@@ -0,0 +1,7 @@
+p
+  = t('.greeting', recipient: @resource.email, default: "Welcome #{@resource.email}!")
+p
+  = t('.instruction', default: 'You can confirm your account email through the link below:')
+p
+  = link_to t('.action', default: 'Confirm my account'),
+  -          confirmation_url(@resource, confirmation_token: @token, locale: I18n.locale)