devise-bootstrap-form 0.1.0 → 1.0.0.alpha.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eba5fdc6f0531e026e8aca13381f2befd5a99c5b9489aa5ebd3e8b0281ef890d
-  data.tar.gz: 3966109984c9cd2f861a7151c23e0958600babe2c5756f1518d5bfa91f2ef78c
+  metadata.gz: 15bc335b3fe1c26d69757d7f3a8f0ec576b256f46b28af3ed55704053cf223e5
+  data.tar.gz: 4f2c6270e99305531bd0b883e04adc0788860097a73441efa1398da785f5972d
 SHA512:
-  metadata.gz: 07e793153c7ad34be04a8da081259d06c89350e7ffe7767ae9faf8fdfa1da097de640b2dfa2bf62c2c3d3a9c261696eaa64410849667afd13d32f58e5af891ed
-  data.tar.gz: a5d4025d26e22fa603600e1ee5146e5d0b53603f3534f20b3200dfb0e456cbaa030f5d73b53e428f5dba830cf2bae397f6a7b709bf22bc69c94de92c8fba9cbf
+  metadata.gz: 301fc9fd13d272c6e2123c91a9e710c041eedac49dabc2f45e791431dfeea2a8638650ddc35c278f2cf0b57bb00d7b06930af5abb676240c412fa8d1881544fb
+  data.tar.gz: fba754597c59efe3ad7defe844bc0c4658d5e877586898d732993d2301f6feb40bf81840519c6ca2ba4848772f7efcbad27af626ef9389aae1bc7653b82bb7cb

data/.github/workflows/ruby.yml

@@ -0,0 +1,46 @@
+name: Ruby
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  Lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7.2
+          bundler-cache: true
+      - name: Danger
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          gem install danger
+          export DANGER_GITHUB_API_TOKEN=${{ github.token }}
+          danger
+      - name: Rubocop
+        run: bundle exec rubocop --auto-correct
+  Test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: [ '3.1', '3.0', '2.7', '2.6' ]
+        gemfile: [ '7.0', '6.1', '6.0', '5.2', 'edge' ]
+        exclude:
+          - { ruby-version: '3.1', gemfile: "6.1" } # Triggers some deprecations that might never get fixed
+          - { ruby-version: '3.1', gemfile: "6.0" }
+          - { ruby-version: '3.1', gemfile: "5.2" }
+          - { ruby-version: '3.0', gemfile: "5.2" }
+          - { ruby-version: '2.6', gemfile: "edge" }
+          - { ruby-version: '2.6', gemfile: "7.0" }
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rake test

data/.gitignore

@@ -1,15 +1,32 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+*.gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
 /pkg/
 /tmp/
 *.gem
+.cache/
+
+.netrc
+.node_repl_history
+.yarnrc
 
 .vagrant/
 # For some reason, the test cases generate the mailer views in this directory,
 # as well as the `test/rails_app/app/views/devise/mailer` directory.
 # TODO: Figure out why and stop it from happening.
 # app/views/devise/mailer/
+
+# or .local/share/pry/pry_history if you need to be more exact
+.local/
+.irb_history
+.byebug_history
+# For Debian images with Bash
+.bash_history
+# For Alpine images
+.ash_history
+
+vendor/bundle

data/.rubocop.yml

@@ -8,8 +8,9 @@ Style/StringLiterals:
   ConsistentQuotesInMultiline: false
   Exclude:
     - "test/rails_app/app/mailers/*"
+    - "test/es_rails_app/app/mailers/*"
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   # Alignment of parameters in multi-line method calls.
   #
   # The `with_first_parameter` style aligns the following lines along the same
@@ -31,7 +32,7 @@ Layout/AlignParameters:
   # But it can be overridden by setting this parameter
   # IndentationWidth: ~
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 132
   # To make it possible to copy or click on URIs in the code, we allow lines
   # containing a URI to be longer than Max.
@@ -50,12 +51,11 @@ Metrics/LineLength:
 
 # Rails 5 only requires 2.2.2.
 AllCops:
+  NewCops: enable
   DisplayCopNames: true
   DisplayStyleGuide: true
-  TargetRubyVersion: 2.2
-  # TargetRubyVersion: <%= RUBY_VERSION[/\d+\.\d+/] %>
+  TargetRubyVersion: 2.6
   Exclude:
-    # - "test/rails_app/**/*"
     - Capfile
     - Gemfile
     - "test/rails_app/bin/**/*"
@@ -65,24 +65,43 @@ AllCops:
     - "test/rails_app/log/**/*"
     - "test/rails_app/tmp/**/*"
     - "test/rails_app/vendor/**/*"
-    # - test/rails_app/config/boot.rb
-    # - test/rails_app/config/application.rb
-    # - test/rails_app/config/environment.rb
-    # - "test/rails_app/config/environments/*"
-    # - "test/rails_app/config/initializers/*"
-    # - test/rails_app/db/schema.rb
     - "test/rails_app/node_modules/**/*"
     - "test/rails_app/bower_components/**/*"
     - test/rails_app/Gemfile
     - test/rails_app/Guardfile
     - test/rails_app/Rakefile
+    - "test/es_rails_app/bin/**/*"
+    - "test/es_rails_app/config/**/*"
+    - test/es_rails_app/config.ru
+    - "test/es_rails_app/db/**/*"
+    - "test/es_rails_app/log/**/*"
+    - "test/es_rails_app/tmp/**/*"
+    - "test/es_rails_app/vendor/**/*"
+    - "test/es_rails_app/node_modules/**/*"
+    - "test/es_rails_app/bower_components/**/*"
+    - test/es_rails_app/Gemfile
+    - test/es_rails_app/Guardfile
+    - test/es_rails_app/Rakefile
+    - vendor/bundle/**/*
 
 Metrics/BlockLength:
   Exclude:
     - devise-bootstrap-form.gemspec
 
+Metrics/AbcSize:
+  Exclude:
+    - test/**/*.rb
+
+Metrics/ClassLength:
+  Exclude:
+    - test/**/*.rb
+
+Metrics/MethodLength:
+  Exclude:
+    - test/**/*.rb
+
 # TODO: Remove this when minimum Ruby is 2.3.
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Exclude:
     - Dangerfile
     - devise-bootstrap-form.gemspec

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## [Pending Release][0.1.0]
+## [Pending Release][0.0.0]
 
 ### Breaking changes
 
@@ -11,3 +11,56 @@
 ### Bugfixes
 
 * Your contribution here!
+
+## [0.4.0][] (2022-01-02)
+
+### New features
+
+* Use GitHub actions instead of Travis.
+* New RuboCop rules.
+
+### Bugfixes
+
+* Fix dependencies so we only use Bootstrap 4.
+
+## [0.3.0]
+
+### New features
+
+* Remove `devise_error_messages!` and use `_error_messages.html.erb`.
+
+## [0.2.0][] (2018-09-30)
+
+### Breaking changes
+
+* None.
+
+### New features
+
+* Initial support for internationalization.
+
+### Bugfixes
+
+* None.
+
+## [0.1.0][] (2018-08-27)
+
+### Breaking changes
+
+* N/A.
+
+### New features
+
+* Devise forms using [`bootstrap_form`](https://github.com/bootstrap-ruby/bootstrap_form).
+
+### Bugfixes
+
+* N/A.
+
+```
+    [Pending Release]: https://github.com/lcreid/devise-bootstrap-form/compare/.v0.4.0...HEAD
+    [0.4.0]: https://github.com/lcreid/devise-bootstrap-form/compare/v0.3.0..v0.4.0
+    [0.3.0]: https://github.com/lcreid/devise-bootstrap-form/compare/v0.2.0..v0.3.0
+    [0.2.0]: https://github.com/lcreid/devise-bootstrap-form/compare/v0.1.0..v0.2.0
+    [0.1.0]: https://github.com/lcreid/devise-bootstrap-form/compare/...v0.2.0
+```

data/CONTRIBUTING.md

@@ -1,4 +1,5 @@
-## Contributing
+# Contributing
+
 If you find a bug or have an idea for a feature:
 
 1. Search the issues to see if the bug has been found, or the feature has already been requested. If so, feel free to add your constructive input to the existing issue. Otherwise...
@@ -7,38 +8,61 @@ If you find a bug or have an idea for a feature:
 4. If you don't want to submit your own pull request, your issue is still welcome and we'll review it and respond appropriately.
 
 ## Testing
+
+There are automated tests, and test apps that allow you do manual testing and explore the gem.
+
 ### Manual and Exploratory Testing
-There is a test app in `test/rails_app`.
 
-To use the `devise-bootstrap-form` gem:
+There are test apps in `test/rails_app`, for the default locale, and `es_rails_app` for a Spanish locale.
 
-```
-cd rails_app
+To use the `devise-bootstrap-form` gem in a test app:
+
+```bash
+cd test/rails_app # or cd test/es_rails_app
 # Generate the view in the test app
 rails g devise:views:bootstrap_form
 rails s -b 0.0.0.0 &
 # Navigate to localhost:3000/people/sign_in
 ```
 
-### Automated Testing
+To change the version of Rails for the test app:
 
+```bash
+export BUNDLE_GEMFILE=gemfiles/7.0.gemfile # change this to the version of Rails you need
+bundle update
+rails s -b 0.0.0.0 &
 ```
+
+### Automated Testing
+
+To test locally against a specific version of Rails, do the following:
+
+```bash
+export BUNDLE_GEMFILE=gemfiles/7.0.gemfile # change this to the version of Rails you need
+bundle update
 rake test
 ```
 
+To run the tests and the RuboCop checks, assuming you've set the `BUNDLE_GEMFILE` as above:
+
+```bash
+rake
+```
+
 ## Gotchas
-To test that the views work for a model other than the default `User`, the test app uses `Person` as the Devise model. It's a bit frustrating to remember that you can't just cut and paste examples that assume the model is `User`.
 
-## Coding guidelines
+To test that the views work for a model other than the default `User`, the test apps use `Person` as the Devise model. It's a bit frustrating to remember that you can't just cut and paste examples that assume the model is `User`.
+
+## Coding Guidelines
 
 This project uses [RuboCop](https://github.com/bbatsov/rubocop) to enforce standard Ruby coding
 guidelines. The coding standards are close to the out-of-the-box RuboCop standards. The main differences are:
 
-* We prefer double-quoted strings
-* We allow 132 characters per line
-* We don't lint most of the Rails-generated files in the test application
+* We prefer double-quoted strings.
+* We allow 132 characters per line.
+* We don't lint most of the Rails-generated files in the test application.
 
-Note the Travis build will fail and your PR cannot be merged if the linter finds errors
+Note the GitHub actions build will fail and your PR cannot be merged if the linter finds errors.
 
-* Test that your contributions pass with `rake lint`
-* The linter is also run as part of the default rake task `rake`
+* Test that your contributions pass with `rake lint`.
+* The linter is also run as part of the default rake task `rake`.

data/Dangerfile

@@ -24,19 +24,19 @@ if has_lib_changes && !has_test_changes
   warn("There are code changes, but no corresponding tests. "\
        "Please include tests if this PR introduces any modifications in "\
        "#{project_name}'s behavior.",
-    sticky: false)
+       sticky: false)
 end
 
 # ------------------------------------------------------------------------------
 # Have you updated CHANGELOG.md?
 # ------------------------------------------------------------------------------
 if !has_changelog_changes && has_lib_changes
-  markdown <<-MARKDOWN
-Here's an example of a CHANGELOG.md entry (place it immediately under the `* Your contribution here!` line):
+  markdown <<~MARKDOWN
+  Here's an example of a CHANGELOG.md entry (place it immediately under the `* Your contribution here!` line):
 
-```markdown
-* [##{pr_number}](#{pr_url}): #{github.pr_title} - [@#{github.pr_author}](https://github.com/#{github.pr_author}).
-```
+  ```markdown
+  * [##{pr_number}](#{pr_url}): #{github.pr_title} - [@#{github.pr_author}](https://github.com/#{github.pr_author}).
+  ```
   MARKDOWN
   warn("Please update CHANGELOG.md with a description of your changes. "\
        "If this PR is not a user-facing change (e.g. just refactoring), "\
@@ -46,11 +46,9 @@ end
 # ------------------------------------------------------------------------------
 # Did you remove the CHANGELOG's "Your contribution here!" line?
 # ------------------------------------------------------------------------------
-if has_changelog_changes
-  if IO.read("CHANGELOG.md").scan(/^\s*[-\*] Your contribution here/i).count < 3
-    raise(
-      "Please put the `- Your contribution here!` line back into CHANGELOG.md.",
-      sticky: false
-    )
-  end
+if has_changelog_changes && File.read("CHANGELOG.md").scan(/^\s*[-*] Your contribution here/i).count < 3
+  raise(
+    "Please put the `- Your contribution here!` line back into CHANGELOG.md.",
+    sticky: false
+  )
 end

data/Gemfile

@@ -4,10 +4,10 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in devise-bootstrap-form.gemspec
 gemspec
-# eval_gemfile("test/rails_app/Gemfile")
 
 group :development do
   gem "chandler", ">= 0.7.0"
   # gem "htmlbeautifier"
   gem "rubocop", require: false
+  gem "rubocop-rake", require: false
 end

data/README.md

@@ -4,11 +4,9 @@ This gem gives you a nicer place to start customizing views for your Devise mode
 
 It also makes the Devise views simpler, because the code to define forms using `bootstrap_form` is simpler than the code for a "raw" Rails form. So any customization you do to the Devise views will be simpler.
 
-You can find usage information below, but the gist of it is you'll run `rails g devise:views:bootstrap-form` instead of the normal `rails g devise:views`.
+You can find usage information below, but the gist of it is you'll run `rails g devise:views:bootstrap_form` instead of the normal `rails g devise:views`.
 
-If you want to switch back to what Devise gives you, no problem. Just remove the `app/views/devise` folder. You will then use the default Devise views, or you can run the normal Devise `rails g devise:views` generator command and customize the default Devise views.
-
-If you're just looking for Bootstrap markup on your Devise views, and don't want to use `bootstrap_form`, then you should look into the [`devise-bootstrapped`](https://github.com/king601/devise-bootstrapped) gem, or one of its forks.
+If you're just looking for Bootstrap markup on your Devise views, and don't want to use `bootstrap_form`, then you should look into the [`devise-bootstrapped`](https://github.com/king601/devise-bootstrapped) gem, or [`devise-bootstrap-views`](https://github.com/hisea/devise-bootstrap-views).
 
 ## Installation
 
@@ -16,24 +14,34 @@ Add these lines to your application's `Gemfile`:
 
 ```ruby
 gem 'bootstrap', '~> 4.0'
-gem "bootstrap_form", ">= 4.0.0.alpha1"
+gem "bootstrap_form", "~> 4.0"
 gem 'devise'
-gem 'devise-bootstrap-form', github: "lcreid/devise-bootstrap-form"
+# gem 'devise-i18n'
+# gem 'devise_invitable'
+gem 'devise-bootstrap-form'
 ```
 
 And then execute:
+
 ```bash
 bundle install
 ```
 
-There are additional installation instructions for both [`bootstrap_form`](https://github.com/bootstrap-ruby/bootstrap_form#installation) and [`bootstrap`](https://github.com/twbs/bootstrap-rubygem#a-ruby-on-rails) that yu must complete before using `devise-bootstrap-form`.
+There are additional installation instructions for [`bootstrap_form`](https://github.com/bootstrap-ruby/bootstrap_form#installation),  [`bootstrap`](https://github.com/twbs/bootstrap-rubygem#a-ruby-on-rails), [`devise`](https://github.com/plataformatec/devise) that you must complete before using `devise-bootstrap-form`, and
+[`devise-i18n`](https://github.com/tigrish/devise-i18n).
+
+Note that as of Devise 4.6.0, `devise_error_messages!` is deprecated in favour of the `_error_messages.html.erb` partial. `devise-bootstrap-form` versions 0.3.0 and higher generate views that use the `_error_messages.html.erb` partial. If you need to use `devise_error_messages!`, use this line in your `Gemfile`:
+
+```ruby
+gem 'devise-bootstrap-form', '<= 0.2.0'
+```
 
 ## Usage
 
-To use the Bootstrap views generator you'll want to have Devise installed per normal installation. Once you've installed Devise and generated your user model you can generate the views with:
+Once all the gems are installed and configured, and the user model is generated, you can generate the Bootstrap Form views with:
 
 ```bash
-rails generate devise:views:bootstrap-form
+rails generate devise:views:bootstrap_form
 ```
 
 If you've already generated the Devise views you can use the `-f` argument to force an override, but that will erase any of the changes you've made to the views.
@@ -44,57 +52,72 @@ Generate the mailer views from normal Devise, as they're not included in `devise
 rails generate devise:views -v mailer
 ```
 
+To switch back to what Devise gives you, remove the `app/views/devise` folder. Your application will then use the default Devise views, or you can run the normal Devise `rails g devise:views` generator command and customize the default Devise views.
+
 ## Generated Layout
 
-Each of the forms in enclosed in the following:
+The generated view is just like the default Devise, but any form elements (e.g. e-mail field) are created using the `bootstrap_form` helpers rather than the stock Rails helpers. This ensures that your Devise forms will have a consistent look with the rest of the forms in your application.
 
-```
-<div class="devise-bootstrap-form">
-  <div class="devise-bootstrap-form-row">
-    <div class="devise-bootstrap-form-col">
-      <!-- the form... -->
-    </div>
-  </div>
+The generated view provides a pretty simple vertical layout. You can, and probably will, customize the generated views to your own tastes.
+
+Here's what the sign in view looks like (internationalized version):
+
+```html
+<h2 class="text-center"><%= t(".sign_in") %></h2>
+<%= bootstrap_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+<%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+<%= f.password_field :password, autocomplete: "current-password", placeholder: "Password" %>
+
+<% if devise_mapping.rememberable? -%>
+  <%= f.form_group do %>
+  <%= f.check_box :remember_me %>
+<% end %>
+<% end -%>
+
+<%= f.form_group class: "d-grid" do %>
+  <%= f.submit t(".sign_in"), class: "btn btn-primary btn-lg" %>
+<% end %>
+<% end %>
+<div class="text-center">
+  <%= render "devise/shared/links" %>
 </div>
 ```
 
-The generator also generates `app/assets/stylesheets/devise_bootstrap_form.scss` that contains the following:
+## Internationalization
 
-```
-.devise-bootstrap-form {
-  @extend .container;
-}
-
-.devise-bootstrap-form-col {
-  @extend .col-12;
-  @extend .col-sm-8;
-  @extend .col-lg-6;
-}
-
-.devise-bootstrap-form-row {
-  @extend .row;
-  @extend .justify-content-around;
-}
-```
+If your `Gemfile` includes `devise-i18n`, `devise-bootstrap-form` will generate views with translations. If you're also using `devise_invitable`, you have to manually copy its translations into your application from the [`devise_invitable` wiki](https://github.com/scambra/devise_invitable/wiki/I18n).
 
-You may want to adjust to your own tastes. For example, if the layout used by your Devise views already wraps the view in a `.container`, you can remove the:
+Also, don't forget to add `gem "rails-i18n"` to your `Gemfile`.
 
-```
-.devise-bootstrap-form {
-  @extend .container;
-}
-```
+## Differences from the Previous Version
 
-from `app/assets/stylesheets/devise_bootstrap_form.scss` file.
+- The generator no longer provides styles to format the Devise pages.
+- The generator no longer makes assumptions about the asset pipeline you're using, i.e. it doesn't assume you're using SASS, and it doesn't modify `app/assets/stylesheets/application.scss`.
+- The views are no longer wrapped in rows and columns. Out of the box the views are easier to drop into whatever formatting and layout you want.
+- Bootstrap 5 dropped the `btn-block` class, and `devise-bootstrap-form` used it on the default button in each view. See below for the view change.
 
-Of course, you can also modify the views to change the surrounding `div`s to your needs.
+### Changes in the Generated Views
 
-If you don't want the `devise_bootstrap_form`-generated styles at all, remove the following line from `app/asserts/application.scss`:
+Each view has a submit button, and the Bootstrap 4 mark-up looks like this:
 
+```ruby
+<%= f.form_group do %>
+  <%= f.submit t('.sign_up'), class: "btn btn-primary btn-block btn-lg" %>
+<% end %>
 ```
-@include "devise_bootstrap_form.scss";
+
+With Bootstrap 5, it looks like this:
+
+```ruby
+<%= f.form_group class: "d-grid" do %>
+  <%= f.submit t(".sign_up"), class: "btn btn-primary btn-lg" %>
+<% end %>
 ```
 
+## Upgrading an Existing App to Bootstrap 5
+
+If you're upgrading an existing app to Bootstrap 5, it's probably easiest to just apply the [changes to the views](changes-in-the-generated-views) manually. The only time it would be worthwhile to regenerate the Bootstrap 5 forms would be if hadn't modified the generated forms.
+
 ## Contributing
 
 This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Code of Conduct](CODE_OF_CONDUCT.md).

data/RELEASING.md

@@ -12,7 +12,7 @@ Follow these steps to release a new version of `devise-bootstrap-form` to `rubyg
 ## How to release
 
 1. Run `bundle install` to make sure that you have all the gems necessary for testing and releasing.
-2.  **Ensure the tests are passing** by running `rake`.
+2. **Ensure the tests are passing** by running `rake`.
 3. Determine which would be the correct next version number according to [semver](http://semver.org/).
 4. Update the version in `./lib/devise_bootstrap_form/version.rb`.
 5. Update the `CHANGELOG.md` (for an illustration of these steps, refer to the [bootstrap_form 4.0.0.alpha1 commit](https://github.com/bootstrap-ruby/devise-bootstrap-form/commit/8aac3667931a16537ab68038ec4cebce186bd596#diff-4ac32a78649ca5bdd8e0ba38b7006a1e) as an example):
@@ -25,6 +25,7 @@ Follow these steps to release a new version of `devise-bootstrap-form` to `rubyg
     [Pending Release]: https://github.com/lcreid/devise-bootstrap-form/compare/.v0.0.1...HEAD
     [0.0.1]: https://github.com/lcreid/devise-bootstrap-form/compare/...v0.0.1
 ```
+
 6. Update the installation instructions in `README.md` to use the new version.
 7. Commit the CHANGELOG and version changes in a single commit; the message should be "Preparing vX.Y.Z" where `X.Y.Z` is the version being released.
 8. Run `bundle exec rake release`; this will tag, push to GitHub, publish to `rubygems.org`, and upload the latest CHANGELOG entry to the [GitHub releases page](https://github.com/lcreid/devise-bootstrap-form/releases).

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

@@ -1,23 +1,17 @@
-<div class="devise-bootstrap-form">
-  <div class="devise-bootstrap-form-row">
-    <div class="devise-bootstrap-form-col">
-      <h2 class="text-center">Resend confirmation instructions</h2>
+<h2 class="text-center">Resend confirmation instructions</h2>
 
-      <%= bootstrap_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
-        <%= devise_error_messages! %>
+<%= bootstrap_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
 
-        <%= f.email_field :email,
-                          autofocus: true,
-                          autocomplete: "email",
-                          value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
-        <%= f.form_group do %>
-          <%= f.submit "Resend confirmation instructions", class: 'btn btn-primary btn-lg btn-block' %>
-        <% end %>
-      <% end %>
+  <%= f.email_field :email,
+                    autofocus: true,
+                    autocomplete: "email",
+                    value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
+  <%= f.form_group class: "d-grid" do %>
+    <%= f.submit "Resend confirmation instructions", class: "btn btn-primary btn-lg btn-block" %>
+  <% end %>
+<% end %>
 
-      <div class="text-center">
-        <%= render "devise/shared/links" %>
-      </div>
-    </div>
-  </div>
+<div class="text-center">
+  <%= render "devise/shared/links" %>
 </div>

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

@@ -1,19 +1,13 @@
-<div class="devise-bootstrap-form">
-  <div class="devise-bootstrap-form-row">
-    <div class="devise-bootstrap-form-col">
-      <h2><%= t 'devise.invitations.edit.header' %></h2>
+<h2><%= t "devise.invitations.edit.header" %></h2>
 
-      <%= bootstrap_form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f| %>
-        <%= devise_error_messages! %>
-        <%= f.hidden_field :invitation_token, readonly: true %>
+<%= bootstrap_form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
+  <%= f.hidden_field :invitation_token, readonly: true %>
 
-        <% if f.object.class.require_password_on_accepting %>
-        <%= f.password_field :password %>
-        <%= f.password_field :password_confirmation, class: "required" %>
-        <% end %>
+  <% if f.object.class.require_password_on_accepting %>
+  <%= f.password_field :password %>
+  <%= f.password_field :password_confirmation, class: "required" %>
+  <% end %>
 
-        <%= f.submit t("devise.invitations.edit.submit_button"), class: "btn btn-primary btn-lg btn-block" %>
-      <% end %>
-    </div>
-  </div>
-</div>
+  <%= f.submit t("devise.invitations.edit.submit_button"), class: "btn btn-primary btn-lg btn-block" %>
+<% end %>

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

@@ -1,17 +1,11 @@
-<div class="devise-bootstrap-form">
-  <div class="devise-bootstrap-form-row">
-    <div class="devise-bootstrap-form-col">
-      <h2 class="text-center"><%= t "devise.invitations.new.header" %></h2>
+<h2 class="text-center"><%= t "devise.invitations.new.header" %></h2>
 
-      <%= bootstrap_form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :post} do |f| %>
-        <%= devise_error_messages! %>
+<%= bootstrap_form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :post} do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
 
-      <% resource.class.invite_key_fields.each do |field| -%>
-        <%= f.text_field field %>
-      <% end -%>
+<% resource.class.invite_key_fields.each do |field| -%>
+  <%= f.text_field field %>
+<% end -%>
 
-        <%= f.submit t("devise.invitations.new.submit_button"), class: "btn btn-primary btn-lg btn-block" %>
-      <% end %>
-    </div>
-  </div>
-</div>
+  <%= f.submit t("devise.invitations.new.submit_button"), class: "btn btn-primary btn-lg btn-block" %>
+<% end %>