bike/BikeShed-1
1
0
Fork 0
mirror of https://github.com/fspc/BikeShed-1.git synced 2025-11-03 17:15:34 -05:00
Code Issues Projects Releases Wiki Activity

update sign in page with bootstrap 3

Browse Source
This commit is contained in:
Brigitte Warner 2014-08-07 20:43:26 -04:00
parent c2e2ce5b1b
commit d9ed9feec1
4 changed files with 76 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/velo_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

27
app/assets/stylesheets/application.css
View File

@ -11,8 +11,31 @@
*= require_self *= require_self
*= require datepicker *= require datepicker
*= require bootstrap *= require bootstrap
*= require bootstrap-responsive
*= require bootstrap-timepicker *= require bootstrap-timepicker
*= require bootstrap_and_overrides *= require bootstrap_and_overrides
*= require bootstrap-fontawesome
*/ */
.container {
max-width: 940px;
margin: 0 auto;
}
.container img {
display: block;
margin: 0 auto;
}
p {
text-align: center;
padding: 20px 0;
}
.check_box {
width: 30px;
height: 30px;
background-color: white;
}
label {
font-size: x-large;
}

4
app/views/devise/_links.erb
View File

@ -6,13 +6,13 @@
<%- if devise_mapping.registerable? && controller_name != 'registrations' %> <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
<p> <p>
<%= link_to "Sign up", new_registration_path(resource_name), class: "btn btn-block btn-default" %><br /> <%= link_to "Sign up", new_registration_path(resource_name), class: "btn btn-block btn-default btn-lg" %><br />
</p> </p>
<% end -%> <% end -%>
<%- if devise_mapping.recoverable? && controller_name != 'passwords' %> <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
<p> <p>
<%= link_to "Forgot your password?", new_password_path(resource_name), class: "btn btn-block btn-default" %><br /> <%= link_to "Forgot your password?", new_password_path(resource_name), class: "btn btn-block btn-default btn-lg" %><br />
</p> </p>
<% end -%> <% end -%>

94
app/views/devise/sessions/new.html.erb
View File

@ -1,48 +1,52 @@
<%= stylesheet_link_tag "bootstrap_and_overrides", :media => "all" %> <%= stylesheet_link_tag "bootstrap", :media => "all" %>
<%= stylesheet_link_tag "application", :media => "all" %>
<div class="container">
<%= image_tag 'velo_logo.png' %>
<p><a href="http://madewithloveinbaltimore.org" class="made">Made with &hearts; in Baltimore</a></p>
<br>
<br>
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12">
<div class="form-group">
<%= f.text_field :username, placeholder: "Username", class: "form-control input-lg", autofocus: true %>
</div>
<h2>Velocipede</h2> <div class="form-group">
<a href="http://madewithloveinbaltimore.org">Made with &hearts; in Baltimore</a> <%= f.password_field :password, placeholder: "Password", class: "form-control input-lg" %>
<br> </div>
<br>
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<div class="form-group">
<%= f.text_field :username, placeholder: "Username", class: "form-control input-lg"%>
</div>
<div class="form-group"> <div class="form-group remember">
<%= f.password_field :password, placeholder: "Password", class: "form-control input-lg" %> <% if devise_mapping.rememberable? -%>
</div> <label>
<%= f.check_box :remember_me, class: 'check_box' %> Remember Me
<div class="form-group"> </label>
<% if devise_mapping.rememberable? -%> <% end -%>
<label> </div>
<%= f.check_box :remember_me %> Remember Me </div> <!-- end column -->
</label> </div> <!-- end row -->
<% end -%> <div class="row">
</div> <div class="col-xs-12 col-sm-12 col-md-12">
<div class="form-group">
<div class="form-group"> <p>
<p> <%= f.submit "Sign in", class:"btn btn-lg btn-primary col-xs-12 col-sm-12 col-md-12" %>
<%= f.submit "Sign in", class:"btn btn-lg btn-primary" %> </p>
</p> </div>
<p> Or quickly... </p> </div> <!-- end column -->
<div class="btn-group"> </div> <!-- end row -->
<input id="checkin" name="checkin" type="button" value="CHECK IN" class="btn btn-lg btn-success">
<input id="checkout" name="checkout" type="button" value="CHECK OUT" class="btn btn-lg btn-danger">
</div>
</div>
<% end %>
<%= render "links" %>
<% if Rails.env.development? %>
<p>
<% User.all.each do |user| %>
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<%= f.hidden_field :username, :value => user.username%>
<%= f.hidden_field :password, :value => 'password' %>
<%= f.submit "Sign in as #{user.username}", class:"btn btn-info" %>
<% end %>
<% end %> <% end %>
</p>
<% end %> <%= render "links" %>
<% if Rails.env.development? %>
<p>
<% User.all.each do |user| %>
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<%= f.hidden_field :username, :value => user.username%>
<%= f.hidden_field :password, :value => 'password' %>
<%= f.submit "Sign in as #{user.username}", class:"btn btn-info" %>
<% end %>
<% end %>
</p>
<% end %>
</div>