Skip to content
Browse files

Improve markup and style sheets

* Fixes inconsistency with input wrapper classes.
* Improves markup for secondary links. Adds sign in link to sign up form
  for better navigation.

#252
  • Loading branch information...
1 parent 4198694 commit 9b96de47bc847113498635e0f1a9b150414cc9f9 Galen Frechette committed with croaky Feb 11, 2013
View
4 app/views/passwords/edit.html.erb
@@ -5,12 +5,12 @@
<%= form_for :password_reset,
:url => user_password_path(@user, :token => @user.confirmation_token),
:html => { :method => :put } do |form| %>
- <div class='password_field'>
+ <div class='password-field'>
<%= form.label :password %>
<%= form.password_field :password %>
</div>
- <div class='submit_field'>
+ <div class='submit-field'>
<%= form.submit %>
</div>
<% end %>
View
4 app/views/passwords/new.html.erb
@@ -3,12 +3,12 @@
<p><%= t '.description' %></p>
<%= form_for :password, :url => passwords_path do |form| %>
- <div class='text_field'>
+ <div class='text-field'>
<%= form.label :email %>
<%= form.text_field :email, :type => 'email' %>
</div>
- <div class='submit_field'>
+ <div class='submit-field'>
<%= form.submit %>
</div>
<% end %>
View
11 app/views/sessions/_form.html.erb
@@ -1,15 +1,20 @@
<%= form_for :session, :url => session_path do |form| %>
- <div class='text_field'>
+ <div class='text-field'>
<%= form.label :email %>
<%= form.text_field :email, :type => 'email' %>
</div>
- <div class='text_field'>
+ <div class='password-field'>
<%= form.label :password %>
<%= form.password_field :password %>
</div>
- <div class='submit_field'>
+ <div class='submit-field'>
<%= form.submit %>
</div>
+
+ <div class='other-links'>
+ <%= link_to t('.sign_up'), sign_up_path %>
+ <%= link_to t('.forgot_password'), new_password_path %>
+ </div>
<% end %>
View
10 app/views/sessions/new.html.erb
@@ -1,13 +1,3 @@
<h2><%= t '.title' %></h2>
<%= render :partial => '/sessions/form' %>
-
-<ul>
- <li>
- <%= link_to t('.sign_up'), sign_up_path %>
- </li>
-
- <li>
- <%= link_to t('.forgot_password'), new_password_path %>
- </li>
-</ul>
View
4 app/views/users/_form.html.erb
@@ -1,9 +1,9 @@
-<div class='text_field'>
+<div class='text-field'>
<%= form.label :email %>
<%= form.text_field :email, :type => 'email' %>
</div>
-<div class='password_field'>
+<div class='password-field'>
<%= form.label :password %>
<%= form.password_field :password %>
</div>
View
9 app/views/users/new.html.erb
@@ -2,5 +2,12 @@
<%= form_for @user do |form| %>
<%= render :partial => '/users/form', :object => form %>
- <%= form.submit %>
+
+ <div class='submit-field'>
+ <%= form.submit %>
+ </div>
+
+ <div class='other-links'>
+ <%= link_to t('.sign_in'), sign_in_path %>
+ </div>
<% end %>
View
3 config/locales/clearance.en.yml
@@ -36,6 +36,9 @@ en:
title: Sign in
sign_up: Sign up
forgot_password: Forgot password?
+ users:
+ new:
+ sign_in: Sign in
clearance_mailer:
change_password:
beginning_paragraph: 'Someone, hopefully you, requested we send you a link to change your password:'
View
2 gemfiles/3.0.20.gemfile.lock
@@ -1,5 +1,5 @@
PATH
- remote: /Users/mjankowski/Development/OpenSource/clearance
+ remote: /Users/croaky/dev/clearance
specs:
clearance (1.0.0.rc4)
bcrypt-ruby
View
2 gemfiles/3.1.10.gemfile.lock
@@ -1,5 +1,5 @@
PATH
- remote: /Users/mjankowski/Development/OpenSource/clearance
+ remote: /Users/croaky/dev/clearance
specs:
clearance (1.0.0.rc4)
bcrypt-ruby
View
2 gemfiles/3.2.11.gemfile.lock
@@ -1,5 +1,5 @@
PATH
- remote: /Users/mjankowski/Development/OpenSource/clearance
+ remote: /Users/croaky/dev/clearance
specs:
clearance (1.0.0.rc4)
bcrypt-ruby

0 comments on commit 9b96de4

Please sign in to comment.
Something went wrong with that request. Please try again.