Skip to content

Commit

Permalink
Added and styled forms.
Browse files Browse the repository at this point in the history
  • Loading branch information
Rian Rainey committed Jan 12, 2013
1 parent 0f5dbf9 commit d0baf28
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 22 deletions.
8 changes: 8 additions & 0 deletions app/assets/stylesheets/custom.css.scss
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ textarea {
resize: vertical; resize: vertical;
} }


.clear {
clear:both;
}

.center { .center {
text-align: center; text-align: center;
h1 { h1 {
Expand Down Expand Up @@ -195,5 +199,9 @@ input, textarea, select, .uneditable-input {
background-color: $btn-primary-color; background-color: $btn-primary-color;
} }


.checkbox.inline {
padding-top: 1em;
margin-bottom: 1em;
}




31 changes: 20 additions & 11 deletions app/views/devise/registrations/new.html.erb
Original file line number Original file line Diff line number Diff line change
@@ -1,18 +1,27 @@
<h2>Sign up</h2> <h2>Sign up</h2>


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


<div><%= f.label :email %><br /> <div class="offset4 span6">
<%= f.email_field :email %></div> <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>


<div><%= f.label :password %><br /> <div><%= f.label :email %>
<%= f.password_field :password %></div> <%= f.email_field :email, :class => "input-xlarge" %>
</div>


<div><%= f.label :password_confirmation %><br /> <div><%= f.label :password %>
<%= f.password_field :password_confirmation %></div> <%= f.password_field :password, :class => "input-xlarge" %>
</div>


<div><%= f.submit "Sign up" %></div> <div><%= f.label :password_confirmation %>
<% end %> <%= f.password_field :password_confirmation, :class => "input-xlarge" %>
</div>


<%= render "devise/shared/links" %> <div><%= f.submit "Sign up", :class => "btn btn-primary" %></div>

<% end %>
<%= render "devise/shared/links" %>
</div>

<div class="clear"></div>
31 changes: 20 additions & 11 deletions app/views/devise/sessions/new.html.erb
Original file line number Original file line Diff line number Diff line change
@@ -1,17 +1,26 @@
<h2>Sign in</h2> <h2>Sign in</h2>


<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> <div class="offset4 span6">
<div><%= f.label :email %><br /> <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<%= f.email_field :email %></div> <div><%= f.label :email %>
<%= f.email_field :email, :class => "input-xlarge" %></div>


<div><%= f.label :password %><br /> <div><%= f.label :password %>
<%= f.password_field :password %></div> <%= f.password_field :password, :class => "input-xlarge" %></div>


<% if devise_mapping.rememberable? -%> <% if devise_mapping.rememberable? -%>
<div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div> <div class="bottom">
<% end -%> <%= f.check_box :remember_me %> <%= f.label :remember_me, :class=> "checkbox inline" %>
</div>
<% end -%>


<div><%= f.submit "Sign in" %></div> <div>
<% end %> <%= f.submit "Sign in", :class => "btn btn-primary" %>
</div>
<% end %>
<%= render "devise/shared/links" %> <%= render "devise/shared/links" %>

</div>

<div class="clear"></div>
31 changes: 31 additions & 0 deletions app/views/users/_form.html.erb
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,31 @@
<%= form_for @user do |f| %>
<% if @user.errors.any? %>
<div id="error_explanation">
<h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>

<ul>
<% @user.errors.full_messages.each do |msg| %>
<li><%= msg %></li>
<% end %>
</ul>
</div>
<% end %>

<div class="field">
<%= f.label :firstName %>
<%= f.text_field :firstName %>
</div>
<div class="field">
<%= f.label :lastName %>
<%= f.text_field :lastName %>
</div>
<div class="field">
<%= f.label :email %>
<%= f.text_field :email %>
</div>


<div class="actions">
<%= f.submit :class => "btn btn-primary"%>
</div>
<% end %>
6 changes: 6 additions & 0 deletions app/views/users/edit.html.erb
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,6 @@
<h1>Editing user</h1>

<%= render 'form' %>
<%= link_to 'Show', edit_admin_user_path %> |
<%= link_to 'Back', user_path %>

0 comments on commit d0baf28

Please sign in to comment.