Skip to content

Update to Bootstrap 4 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
raghubetina wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Update to Bootstrap 4 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c3d4179
Update to Bootstrap 4
raghubetina Jul 13, 2016
e0b7aa0
Update new.html.erb
raghubetina Nov 2, 2016
cc0eb21
Update edit.html.erb
raghubetina Nov 2, 2016
d6d1e26
Update new.html.erb
raghubetina Nov 2, 2016
0803499
sessions new
Mar 23, 2017
19aa463
registrations new
Mar 23, 2017
9cdbdbd
registrations edit
Mar 23, 2017
ae27bf9
passwords new
Mar 23, 2017
7df8d46
passwords edit
Mar 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions passwords/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<div class="row mt-3">
<div class="col-lg-8 offset-lg-2">
<div class="card">
<h1 class="card-header h4">
Change your password
</h1>

<div class="card-block">
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
<%= f.hidden_field :reset_password_token %>

<div class="form-group row <%= "has-danger" if resource.errors.include?(:email) %>">
<%= f.label :password, "New password", class: "col-sm-2 form-control-label" %>
<div class="col-sm-10">
<%= f.password_field :password, class: "form-control" %>

<% if resource.errors.include?(:password) %>
<% resource.errors.full_messages_for(:password).each do |message| %>
<p class="text-danger mt-1 mb-0">
<%= message %>
</p>
<% end %>
<% end %>
</div>
</div>

<div class="form-group row <%= "has-danger" if resource.errors.include?(:password_confirmation) %>">
<%= f.label :password_confirmation, "Confirm new password", class: "col-sm-2 form-control-label" %>
<div class="col-sm-10">
<%= f.password_field :password_confirmation, class: "form-control" %>

<% if resource.errors.include?(:password_confirmation) %>
<% resource.errors.full_messages_for(:password_confirmation).each do |message| %>
<p class="text-danger mt-1 mb-0">
<%= message %>
</p>
<% end %>
<% end %>
</div>
</div>

<div class="form-group row">
<div class="col-sm-10 col-sm-offset-2">
<%= f.submit "Change my password", class: "btn btn-primary btn-block" %>
</div>
</div>

<div class="form-group row">
<div class="col-sm-10 offset-sm-2">
<%= render "devise/shared/links" %>
</div>
</div>
<% end %>
</div>
</div>
</div>
</div>
43 changes: 43 additions & 0 deletions passwords/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<div class="row mt-3">
<div class="offset-lg-2 col-lg-8">
<div class="card">
<h1 class="card-header h4">
Forgot your password?
</h1>

<div class="card-block">

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

<div class="form-group row <%= "has-danger" if resource.errors.include?(:email) %>">
<%= f.label :email, class: "col-sm-2 form-control-label" %>
<div class="col-sm-10">
<%= f.email_field :email, autofocus: true, class: "form-control" %>

<% if resource.errors.include?(:email) %>
<% resource.errors.full_messages_for(:email).each do |message| %>
<p class="text-danger mt-1 mb-0">
<%= message %>
</p>
<% end %>
<% end %>
</div>
</div>

<div class="form-group row">
<div class="col-sm-10 offset-sm-2">
<%= f.submit "Send me reset password instructions", class: "btn btn-primary btn-block" %>
</div>
</div>

<div class="form-group row">
<div class="col-sm-10 offset-sm-2">
<%= render "devise/shared/links" %>
</div>
</div>

<% end %>
</div>
</div>
</div>
</div>
87 changes: 49 additions & 38 deletions registrations/edit.html.erb
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,86 @@
<div class="row">
<div class="col-md-6 col-md-offset-3">
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title">Edit <%= resource_name.to_s.humanize %></h2>
</div>
<div class="row mt-2">
<div class="offset-lg-2 col-lg-8">
<div class="card">
<h1 class="card-header h4">
Edit <%= resource_name.to_s.humanize %>
</h1>

<div class="panel-body">
<div class="card-block">

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

<div class="form-group">
<%= f.label :email, class: "col-sm-2 control-label" %>
<div class="form-group row <%= "has-danger" if resource.errors.include?(:email) %>">
<%= f.label :email, class: "col-sm-2 form-control-label" %>
<div class="col-sm-10">
<%= f.email_field :email, autofocus: true, class: "form-control" %>

<% if resource.errors.include?(:email) %>
<% resource.errors.full_messages_for(:email).each do |message| %>
<p class="text-danger mt-1 mb-0">
<%= message %>
</p>
<% end %>
<% end %>
</div>
</div>

<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
<div class="form-group">
<div class="col-sm-10 col-sm-offset-2">
<p class="help-block">
<div class="form-group row">
<div class="offset-sm-2 col-sm-10">
<p class="text-danger mt-1 mb-0">
Currently waiting confirmation for: <%= resource.unconfirmed_email %>
</p>
</div>
</div>
<% end %>

<div class="form-group">
<%= f.label :password, class: "col-sm-2 control-label" %>
<div class="form-group row <%= "has-danger" if resource.errors.include?(:email) %>">
<%= f.label :password, class: "col-sm-2 form-control-label" %>
<div class="col-sm-10">
<%= f.password_field :password, autocomplete: "off", class: "form-control" %>
<p class="help-block">
Leave blank if you don't want to change it.
</p>
</div>
</div>
<%= f.password_field :password, class: "form-control" %>

<div class="form-group">
<%= f.label :password_confirmation, class: "col-sm-2 control-label" %>
<div class="col-sm-10">
<%= f.password_field :password_confirmation, autocomplete: "off", class: "form-control" %>
<% if resource.errors.include?(:password) %>
<% resource.errors.full_messages_for(:password).each do |message| %>
<p class="text-danger mt-1 mb-0">
<%= message %>
</p>
<% end %>
<% end %>
</div>
</div>

<div class="form-group">
<%= f.label :current_password, class: "col-sm-2 control-label" %>
<div class="form-group row <%= "has-danger" if resource.errors.include?(:email) %>">
<%= f.label :password_confirmation, class: "col-sm-2 form-control-label" %>
<div class="col-sm-10">
<%= f.password_field :current_password, autocomplete: "off", class: "form-control" %>
<p class="help-block">
We need your current password to confirm your changes.
</p>
<%= f.password_field :password_confirmation, class: "form-control" %>

<% if resource.errors.include?(:password_confirmation) %>
<% resource.errors.full_messages_for(:password_confirmation).each do |message| %>
<p class="text-danger mt-1 mb-0">
<%= message %>
</p>
<% end %>
<% end %>
</div>
</div>

<div class="form-group">
<div class="col-sm-10 col-sm-offset-2">
<%= f.submit "Update", class: "btn btn-success btn-block" %>
<div class="form-group row">
<div class="offset-sm-2 col-sm-10">
<%= f.submit "Update", class: "btn btn-primary btn-block" %>
</div>
</div>

<div class="form-group">
<div class="col-sm-10 col-sm-offset-2">
<div class="form-group row">
<div class="offset-sm-2 col-sm-10">
<%= link_to "Back", :back, class: "btn btn-link btn-block" %>
</div>
</div>

<% end %>

</div>

<div class="panel-footer">
<div class="card-footer">
<div class="row">
<div class="col-sm-2">
Unhappy?
Expand Down
95 changes: 58 additions & 37 deletions registrations/new.html.erb
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,73 @@
<div class="row">
<div class="col-md-6 col-md-offset-3">
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title">Sign up</h2>
</div>
<div class="row mt-2">
<div class="offset-lg-2 col-lg-8">
<div class="card">
<h1 class="card-header h4">
Sign up
</h1>

<div class="card-block">

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

<div class="panel-body">
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "form-horizontal", role: "form" }) do |f| %>
<%= devise_error_messages! %>
<div class="form-group row <%= "has-danger" if resource.errors.include?(:email) %>">
<%= f.label :email, class: "col-sm-2 form-control-label" %>
<div class="col-sm-10">
<%= f.email_field :email, autofocus: true, class: "form-control" %>

<div class="form-group">
<%= f.label :email, class: "col-sm-2 control-label" %>
<div class="col-sm-10">
<%= f.email_field :email, autofocus: true, class: "form-control" %>
<% if resource.errors.include?(:email) %>
<% resource.errors.full_messages_for(:email).each do |message| %>
<p class="text-danger mt-1 mb-0">
<%= message %>
</p>
<% end %>
<% end %>
</div>
</div>
</div>

<div class="form-group">
<%= f.label :password, class: "col-sm-2 control-label" %>
<div class="col-sm-10">
<%= f.password_field :password, autocomplete: "off", class: "form-control" %>
<p class="help-block">
<% if @validatable %>
(<%= @minimum_password_length %> characters minimum)

<div class="form-group row <%= "has-danger" if resource.errors.include?(:email) %>">
<%= f.label :password, class: "col-sm-2 form-control-label" %>
<div class="col-sm-10">
<%= f.password_field :password, class: "form-control" %>

<% if resource.errors.include?(:password) %>
<% resource.errors.full_messages_for(:password).each do |message| %>
<p class="text-danger mt-1 mb-0">
<%= message %>
</p>
<% end %>
<% end %>
</p>
</div>
</div>
</div>

<div class="form-group">
<%= f.label :password_confirmation, class: "col-sm-2 control-label" %>
<div class="col-sm-10">
<%= f.password_field :password_confirmation, autocomplete: "off", class: "form-control" %>
<div class="form-group row <%= "has-danger" if resource.errors.include?(:password_confirmation) %>">
<%= f.label :password_confirmation, class: "col-sm-2 form-control-label" %>
<div class="col-sm-10">
<%= f.password_field :password_confirmation, class: "form-control" %>

<% if resource.errors.include?(:password_confirmation) %>
<% resource.errors.full_messages_for(:password_confirmation).each do |message| %>
<p class="text-danger mt-1 mb-0">
<%= message %>
</p>
<% end %>
<% end %>
</div>
</div>
</div>

<div class="form-group">
<div class="col-sm-10 col-sm-offset-2">
<%= f.submit "Sign up", class: "btn btn-success btn-block" %>
<div class="form-group row">
<div class="offset-sm-2 col-sm-10">
<%= f.submit "Sign up", class: "btn btn-primary btn-block" %>
</div>
</div>
</div>

<div class="form-group">
<div class="col-sm-10 col-sm-offset-2">
<%= render "devise/shared/links" %>
<div class="form-group row">
<div class="offset-sm-2 col-sm-10">
<%= render "devise/shared/links" %>
</div>
</div>
</div>

<% end %>

</div>
</div>
</div>
Expand Down
Loading