Skip to content

Commit

Permalink
Change devise pages to use bootstrap forms
Browse files Browse the repository at this point in the history
  • Loading branch information
@masaball
masaball committed Aug 31, 2022
1 parent 295d068 commit 75151b0
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 86 deletions.
31 changes: 13 additions & 18 deletions app/views/devise/passwords/edit.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,24 @@ Unless required by applicable law or agreed to in writing, software distributed
specific language governing permissions and limitations under the License.
--- END LICENSE_HEADER BLOCK ---
%>

<%= render "devise/shared/error_messages", resource: resource %>

<div class="omniauth-form container">
<h3 align='center'>Change your password</h3>

<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
<% devise_error_messages! %>
<%= bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }, inline_errors: false) do |f| %>
<%= f.hidden_field :reset_password_token %>

<div class="form-group <% if resource.errors[:password].any? %>invalid-feedback<% end %>">
<%= f.label :password, "New password" %><br />
<% if @minimum_password_length %>
<em>(<%= @minimum_password_length %> characters minimum)</em><br />
<% end %>
<%= f.password_field :password, autofocus: true, autocomplete: "off", class: (resource.errors[:password].any? ? 'form-control is-invalid' : 'form-control') %>
</div>

<div class="form-group <% if resource.errors[:password_confirmation].any? %>invalid-feedback<% end %>">
<%= f.label :password_confirmation, "Confirm new password" %><br />
<%= f.password_field :password_confirmation, autocomplete: "off", class: (resource.errors[:password_confirmation].any? ? 'form-control is-invalid' : 'form-control') %>
</div>

<div class="actions">
<%= f.submit "Change my password", class: 'btn btn-primary' %>
</div>
<% if @minimum_password_length %>
<%= f.password_field :password, label: "Password <i>(leave blank if you don't want to change it)</i>".html_safe, help: "#{@minimum_password_length} characters minimum", autocomplete: 'off' %>
<% else %>
<%= f.password_field :password, label: "Password <i>(leave blank if you don't want to change it)</i>".html_safe, autocomplete: 'off' %>
<% end %>

<%= f.password_field :password_confirmation, autocomplete: "off", label: "Confirm new password" %>

<%= f.submit "Change my password", class: 'btn btn-primary' %>
<% end %>

<%= render "devise/shared/links" %>
Expand Down
16 changes: 6 additions & 10 deletions app/views/devise/passwords/new.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,14 @@ Unless required by applicable law or agreed to in writing, software distributed
specific language governing permissions and limitations under the License.
--- END LICENSE_HEADER BLOCK ---
%>
<div class="omniauth-form container">
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
<% devise_error_messages! %>

<div class="form-group <% if resource.errors[:email].any? %>invalid-feedback<% end %>">
<%= f.label :email, 'Email:' %><br />
<%= f.email_field :email, autofocus: true, autocomplete: "email", class: (resource.errors[:email].any? ? 'form-control is-invalid' : 'form-control') %>
</div>
<%= render "devise/shared/error_messages", resource: resource %>

<div class="omniauth-form container">
<%= bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }, inline_errors: false) do |f| %>
<%= f.email_field :email, autofocus: true, autocomplete: "email", label: "Email:" %>

<div class="actions form-group">
<%= f.submit "Send me reset password instructions", class: 'btn btn-primary' %>
</div>
<%= f.submit "Send me reset password instructions", class: 'btn btn-primary' %>
<% end %>
<p align='center' class='devise-links'>
<%= render "devise/shared/links" %>
Expand Down
45 changes: 16 additions & 29 deletions app/views/devise/registrations/edit.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,44 +13,31 @@ Unless required by applicable law or agreed to in writing, software distributed
specific language governing permissions and limitations under the License.
--- END LICENSE_HEADER BLOCK ---
%>

<%= render "devise/shared/error_messages", resource: resource %>

<div class="omniauth-form container">

<h3 align='center'>Edit <%= resource_name.to_s.humanize %></h3>

<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
<% devise_error_messages! %>

<div class="form-group <% if resource.errors[:email].any? %>invalid-feedback<% end %>">
<%= f.label :email %><br />
<%= f.email_field :email, autofocus: true, autocomplete: "email", class: (resource.errors[:email].any? ? 'form-control is-invalid' : 'form-control') %>
</div>
<%= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }, inline_errors: false) do |f| %>
<%= f.email_field :email, autofocus: true, autocomplete: "email" %>

<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
<div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
<% end %>

<div class="form-group <% if resource.errors[:password].any? %>invalid-feedback<% end %>">
<%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
<%= f.password_field :password, autocomplete: "off", class: (resource.errors[:password].any? ? 'form-control is-invalid' : 'form-control') %>
<% if @minimum_password_length %>
<br />
<em><%= @minimum_password_length %> characters minimum</em>
<% end %>
</div>

<div class="form-group <% if resource.errors[:password_confirmation].any? %>invalid-feedback<% end %>">
<%= f.label :password_confirmation %><br />
<%= f.password_field :password_confirmation, autocomplete: "off", class: (resource.errors[:password_confirmation].any? ? 'form-control is-invalid' : 'form-control') %>
</div>

<div class="form-group <% if resource.errors[:current_password].any? %>invalid-feedback<% end %>">
<%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
<%= f.password_field :current_password, autocomplete: "off", class: (resource.errors[:current_password].any? ? 'form-control is-invalid' : 'form-control') %>
</div>

<div class="actions">
<%= f.submit "Update", class: 'btn btn-primary' %>
</div>
<% if @minimum_password_length %>
<%= f.password_field :password, label: "Password <i>(leave blank if you don't want to change it)</i>".html_safe, help: "#{@minimum_password_length} characters minimum", autocomplete: 'off' %>
<% else %>
<%= f.password_field :password, label: "Password <i>(leave blank if you don't want to change it)</i>".html_safe, autocomplete: 'off' %>
<% end %>

<%= f.password_field :password_confirmation, autocomplete: "off" %>

<%= f.password_field :current_password, autocomplete: "off", label: "Current password <i>(we need your current password to confirm your changes)</i>".html_safe %>

<%= f.submit "Update", class: 'btn btn-primary' %>
<% end %>
<%= link_to "Back", :back %>
</div>
44 changes: 15 additions & 29 deletions app/views/devise/registrations/new.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,24 @@ Unless required by applicable law or agreed to in writing, software distributed
specific language governing permissions and limitations under the License.
--- END LICENSE_HEADER BLOCK ---
%>

<%= render "devise/shared/error_messages", resource: resource %>

<div class="omniauth-form container">
<h3 align='center'>Sign up</h3>

<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<% devise_error_messages! %>

<div class="form-group <% if resource.errors[:username].any? %>invalid-feedback<% end %>">
<%= f.label :username, class: 'font-weight-bold' %><br />
<%= f.text_field :username, autofocus: true, autocomplete: 'username', class: (resource.errors[:username].any? ? 'form-control is-invalid' : 'form-control') %>
</div>

<div class="form-group <% if resource.errors[:email].any? %>invalid-feedback<% end %>">
<%= f.label :email, class: 'font-weight-bold' %><br />
<%= f.email_field :email, autofocus: true, autocomplete: "email", class: (resource.errors[:email].any? ? 'form-control is-invalid' : 'form-control') %>
</div>

<div class="form-group <% if resource.errors[:password].any? %>invalid-feedback<% end %>">
<%= f.label :password, class: 'font-weight-bold' %>
<% if @minimum_password_length %>
<em>(<%= @minimum_password_length %> characters minimum)</em>
<% end %><br />
<%= f.password_field :password, autocomplete: "off", class: (resource.errors[:password].any? ? 'form-control is-invalid' : 'form-control') %>
</div>

<div class="form-group <% if resource.errors[:password_confirmation].any? %>invalid-feedback<% end %>">
<%= f.label :password_confirmation, class: 'font-weight-bold' %><br />
<%= f.password_field :password_confirmation, autocomplete: "off", class: (resource.errors[:password_confirmation].any? ? 'form-control is-invalid' : 'form-control') %>
</div>

<div class="actions">
<%= f.submit "Sign up", class: 'btn btn-primary' %>
</div>
<%= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name), inline_errors: false) do |f| %>
<%= f.text_field :username, label_class: 'font-weight-bold', autofocus: true, autocomplete: 'username' %>
<%= f.email_field :email, label_class: 'font-weight-bold', autofocus: true, autocomplete: 'email' %>

<% if @minimum_password_length %>
<%= f.password_field :password, label_class: 'font-weight-bold', help: "#{@minimum_password_length} characters minimum", autocomplete: 'off' %>
<% else %>
<%= f.password_field :password, label_class: 'font-weight-bold', autocomplete: 'off' %>
<% end %>

<%= f.password_field :password_confirmation, label_class: 'font-weight-bold', autocomplete: 'off' %>
<%= f.submit "Sign up", class: 'btn btn-primary' %>
<% end %>

<%= render "devise/shared/links" %>
Expand Down

0 comments on commit 75151b0

Please sign in to comment.