Skip to content

Commit

Permalink
sign in and sign up looking pretty
Browse files Browse the repository at this point in the history
  • Loading branch information
amejiarosario committed Jun 3, 2012
1 parent eabeacb commit 25c07e7
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 17 deletions.
Binary file added app/assets/images/cables-arc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/cables.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions app/assets/stylesheets/users.css.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
// Place all the styles related to the users controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

#cables-img {
position: absolute;
right:0px;
bottom: 0px;

}
40 changes: 30 additions & 10 deletions app/views/devise/registrations/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,18 +1,38 @@
<h2>Sign up</h2>

<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), html: {class: 'well form-horizontal', style: 'position: relative;'}) do |f| %>
<%= devise_error_messages! %>

<div><%= f.label :email %><br />
<%= f.email_field :email %></div>
<div class="pull-right" id="cables-img">
<img class="cables-img" src="/assets/cables-arc.png" width="200px" />
</div>

<div class="control-group">
<%= f.label :email, class: 'control-label' %>
<div class="controls">
<%= f.email_field :email, class: 'text-field', autocomplete: 'off' %>
</div>
</div>

<div><%= f.label :password %><br />
<%= f.password_field :password %></div>

<div><%= f.label :password_confirmation %><br />
<%= f.password_field :password_confirmation %></div>

<div><%= f.submit "Sign up" %></div>
<div class="control-group">
<%= f.label :password, class: 'control-label' %>
<div class="controls">
<%= f.password_field :password, autocomplete: 'off' %>
</div>
</div>

<div class="control-group">
<%= f.label :password_confirmation, class: 'control-label' %>
<div class="controls">
<%= f.password_field :password_confirmation, autocomplete: 'off' %>
</div>
</div>

<div class="control-group">
<div class="controls">
<%= f.submit "Sign up", class: 'btn btn-success' %>
</div>
</div>
<% end %>

<%= render :partial => "devise/shared/links" %>
35 changes: 28 additions & 7 deletions app/views/devise/sessions/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,17 +1,38 @@
<h2>Sign in</h2>

<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<div><%= f.label :email %><br />
<%= f.email_field :email %></div>
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name), html: {class: 'well form-horizontal', style: 'position: relative;'}) do |f| %>

<div><%= f.label :password %><br />
<%= f.password_field :password %></div>
<div class="pull-right" id="cables-img">
<img class="cables-img" src="/assets/cables-arc.png" width="200px" />
</div>

<div class="control-group">
<%= f.label :email, class: 'control-label' %>
<div class="controls">
<%= f.email_field :email, class: 'text-field' %>
</div>
</div>

<div class="control-group">
<%= f.label :password, class: 'control-label' %>
<div class="controls">
<%= f.password_field :password %>
</div>
</div>

<% if devise_mapping.rememberable? -%>
<div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
<div class="control-group">
<div class="controls">
<%= f.check_box :remember_me %> Remember me
</div>
</div>
<% end -%>

<div><%= f.submit "Sign in" %></div>
<div class="control-group">
<div class="controls">
<%= f.submit "Sign in", class: 'btn btn-success' %>
</div>
</div>
<% end %>

<%= render :partial => "devise/shared/links" %>

0 comments on commit 25c07e7

Please sign in to comment.