Fix labels on signin forms.

3 files changed, 16 insertions, 19 deletions

diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml
index 470c7709c..23eb9da4b 100644
--- a/app/views/user/_signin.rhtml
+++ b/app/views/user/_signin.rhtml
@@ -1,6 +1,6 @@
 <div id="signin">
 
-<% form_tag({:action => "signin"}, {:id => "accountForm"}) do %>
+<% form_tag({:action => "signin"}, {:id => "signin_form"}) do %>
     <%= foi_error_messages_for :user %>
 
     <% if not flash[:error] %>
@@ -8,13 +8,13 @@
     <% end %>
 
     <p>
-    <label for="user_email" id="signin_email"><strong>Your e-mail:</strong></label>
-    <%= text_field 'user', 'email', { :size => 20 } %>
+    <label for="signin_email"><strong>Your e-mail:</strong></label>
+    <%= text_field 'user', 'email', { :size => 20, :id => 'signin_email' } %>
     </p>
 
     <p>
-    <label for="user_password"><strong>Password:</strong></label>
-    <%= password_field 'user', 'password', { :size => 15 } %>
+    <label for="signin_password"><strong>Password:</strong></label>
+    <%= password_field 'user', 'password', { :size => 15, :id => 'signin_password' } %>
     </p>
 
     <p class="form_note">
@@ -22,7 +22,7 @@
     </p>
 
     <div class="form_button">
-    <%= hidden_field_tag 'token', params[:token] %>
+    <%= hidden_field_tag 'token', params[:token], { :id => 'signin_token' } %>
     <%= submit_tag "Sign in" %>
     </div>
 <% end %>
diff --git a/app/views/user/_signup.rhtml b/app/views/user/_signup.rhtml
index fb13f9b48..f172f9359 100644
--- a/app/views/user/_signup.rhtml
+++ b/app/views/user/_signup.rhtml
@@ -1,6 +1,6 @@
 <div id="signup">
 
-<% form_tag({:action => "signup"}, {:id => "accountForm"}) do %>
+<% form_tag({:action => "signup"}, {:id => "signup_form"}) do %>
     <%= foi_error_messages_for :user %>
 
     <% if not flash[:error] %>
@@ -8,16 +8,16 @@
     <% end %>
 
     <p>
-    <label for="user_email" id="signin_email"><strong>Your e-mail:</strong></label>
-    <%= text_field 'user', 'email', :size => 20 %>
+    <label for="signup_email"><strong>Your e-mail:</strong></label>
+    <%= text_field 'user', 'email', { :size => 20, :id => 'signup_email' } %>
     </p>
     <div class="form_item_note">
     We will not reveal your email address to anybody.
     </div>
 
     <p>
-    <label for="name"><strong>Your name:</strong></label>
-    <%= text_field 'user', 'name', { :size => 20 } %>
+    <label for="signup_name"><strong>Your name:</strong></label>
+    <%= text_field 'user', 'name', { :size => 20, :id => 'signup_name' } %>
     </p>
     <div class="form_item_note">Your <strong>name will appear
     publically</strong> on this website and in search engines. We encourage you
@@ -25,17 +25,17 @@
     anonymous.</div>
 
     <p>
-    <label for="password"><strong>Password:</strong></label>
-    <%= password_field 'user', 'password', { :size => 15 } %>
+    <label for="signup_password"><strong>Password:</strong></label>
+    <%= password_field 'user', 'password', { :size => 15, :id => 'signup_password' } %>
     </p>
 
     <p>
-    <label for="password"><strong>Password: (again)</strong></label>
-    <%= password_field 'user', 'password_confirmation', { :size => 15 } %>
+    <label for="signup_password_confirmation"><strong>Password: (again)</strong></label>
+    <%= password_field 'user', 'password_confirmation', { :size => 15, :id => 'signup_password_confirmation' } %>
     </p>
 
     <div class="form_button">
-    <%= hidden_field_tag 'token', params[:token] %>
+    <%= hidden_field_tag 'token', params[:token], { :id => 'signup_token' } %>
     <%= submit_tag "Sign up" %>
     </div>
 
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 34fcc2a15..e4728314e 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -247,9 +247,6 @@ table#list_requests .odd {
 
 /* User accounts */
 
-#accountForm {
-}
-
 .confirmation_message {
     font-size: 150%;
     font-weight: bold;