diff --git a/app/views/main/index.html.haml b/app/views/main/index.html.haml
index e150a90..1b4a814 100644
--- a/app/views/main/index.html.haml
+++ b/app/views/main/index.html.haml
@@ -5,11 +5,11 @@
= t("defaults.tagline")
= form_for :address, :html => {:id => "address_form"} do |f|
= label_tag "city_state", t("labels.city_state"), :id => "city_state_label"
- = select_tag "city_state", "".html_safe, :tabindex => 10
+ = select_tag "city_state", "".html_safe
= label_tag "address", t("labels.address"), :id => "address_label"
- = text_field_tag "address", params[:address], :tabindex => 11
+ = text_field_tag "address", params[:address]
= hidden_field_tag "limit", params[:limit] || 40
- = submit_tag t("buttons.find", :thing => t("defaults.thing").pluralize), :tabindex => 12
+ = submit_tag t("buttons.find", :thing => t("defaults.thing").pluralize)
#logos
= image_tag "logos/cfa.png", :alt => t("sponsors.cfa"), :title => t("sponsors.cfa")
= image_tag "logos/boston.png", :alt => t("sponsors.city"), :title => t("sponsors.city")
diff --git a/app/views/passwords/edit.html.haml b/app/views/passwords/edit.html.haml
index d2861dd..48dc2ba 100644
--- a/app/views/passwords/edit.html.haml
+++ b/app/views/passwords/edit.html.haml
@@ -3,5 +3,5 @@
= t("titles.edit_profile")
= f.hidden_field "reset_password_token"
= f.label "password", t("labels.password_new"), :id => "user_password_label"
- = f.password_field "password", :tabindex => 1
- = f.submit t("buttons.change_password"), :tabindex => 2
+ = f.password_field "password"
+ = f.submit t("buttons.change_password")
diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml
index 64186d0..cbc891d 100644
--- a/app/views/sessions/new.html.haml
+++ b/app/views/sessions/new.html.haml
@@ -5,43 +5,43 @@
= f.label "email", t("labels.email"), :id => "user_email_label"
%em
= image_tag "lock.svg", :class => "lock", :alt => t("captions.private"), :title => t("captions.private")
- = f.text_field "email", :value => params[:user] ? params[:user][:email] : nil, :tabindex => 1
- = f.label "new" , radio_button_tag("user", "new", true, :tabindex => 2).html_safe + t("labels.user_new")
+ = f.text_field "email", :value => params[:user] ? params[:user][:email] : nil
+ = f.label "new" , radio_button_tag("user", "new", true).html_safe + t("labels.user_new")
= f.label "existing", radio_button_tag("user", "existing").html_safe + t("labels.user_existing")
#user_sign_up_fields
= f.label "name", t("labels.name"), :id => "user_name_label"
%em
= t("captions.public")
- = f.text_field "name", :tabindex => 3
+ = f.text_field "name"
= f.label "organization", t("labels.organization"), :id => "user_organization_label"
%em
= t("captions.public")
- = f.text_field "organization", :tabindex => 4
+ = f.text_field "organization"
= f.label "voice_number", t("labels.voice_number"), :id => "user_voice_number_label"
%em
= image_tag "lock.svg", :class => "lock", :alt => t("captions.private"), :title => t("captions.private")
- = f.text_field "voice_number", :tabindex => 5
+ = f.text_field "voice_number"
= f.label "sms_number", t("labels.sms_number"), :id => "user_sms_number_label"
%em
= image_tag "lock.svg", :class => "lock", :alt => t("captions.private"), :title => t("captions.private")
- = f.text_field "sms_number", :tabindex => 6
+ = f.text_field "sms_number"
= f.label "password_confirmation", t("labels.password_choose"), :id => "user_password_confirmation_label"
%em
= image_tag "lock.svg", :class => "lock", :alt => t("captions.private"), :title => t("captions.private")
- = f.password_field "password_confirmation", :tabindex => 7
- = f.submit t("buttons.sign_up"), :tabindex => 8
+ = f.password_field "password_confirmation"
+ = f.submit t("buttons.sign_up")
%p
- = t("defaults.tos", :tos => link_to(t("titles.tos"), tos_path, :tabindex => 3, :id => "tos_link")).html_safe
+ = t("defaults.tos", :tos => link_to(t("titles.tos"), tos_path, :id => "tos_link")).html_safe
#user_sign_in_fields{:style => "display: none;"}
= f.label "password", t("labels.password"), :id => "user_password_label"
%em
= image_tag "lock.svg", :class => "lock", :alt => t("captions.private"), :title => t("captions.private")
- = f.password_field "password", :tabindex => 0
- = f.label "remember_me", (f.check_box("remember_me", :checked => true, :tabindex => 0).html_safe + t("labels.remember_me")), :id => "user_remember_me_label"
- = f.submit t("buttons.sign_in"), :tabindex => 0
+ = f.password_field "password"
+ = f.label "remember_me", (f.check_box("remember_me", :checked => true).html_safe + t("labels.remember_me")), :id => "user_remember_me_label"
+ = f.submit t("buttons.sign_in")
%p
- = link_to t("links.forgot_password"), "#", :id => "user_forgot_password_link", :tabindex => 0
+ = link_to t("links.forgot_password"), "#", :id => "user_forgot_password_link"
#user_forgot_password_fields{:style => "display: none;"}
- = f.submit t("buttons.email_password"), :tabindex => 0
+ = f.submit t("buttons.email_password")
%p
- = link_to t("links.remembered_password"), "#", :id => "user_remembered_password_link", :tabindex => 0
+ = link_to t("links.remembered_password"), "#", :id => "user_remembered_password_link"
diff --git a/app/views/things/adopt.html.haml b/app/views/things/adopt.html.haml
index f943254..64795d5 100644
--- a/app/views/things/adopt.html.haml
+++ b/app/views/things/adopt.html.haml
@@ -4,7 +4,7 @@
= f.hidden_field "id"
= f.hidden_field "user_id", :value => current_user.id
= f.label "name", t("labels.name_thing", :thing => t("defaults.thing")), :id => "thing_name_label"
- = f.text_field "name", :tabindex => 1
- = f.submit t("buttons.adopt"), :tabindex => 2
+ = f.text_field "name"
+ = f.submit t("buttons.adopt")
= render :partial => 'users/edit_profile'
= render :partial => 'sessions/sign_out'
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index 2a46bb6..794c94e 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -5,30 +5,30 @@
= f.label "email", t("labels.email"), :id => "user_email_label"
%em
= image_tag "lock.svg", :class => "lock", :alt => t("captions.private"), :title => t("captions.private")
- = f.text_field "email", :tabindex => 1
+ = f.text_field "email"
= f.label "name", t("labels.name"), :id => "user_name_label"
%em
= t("captions.public")
- = f.text_field "name", :tabindex => 2
+ = f.text_field "name"
= f.label "organization", t("labels.organization"), :id => "user_organization_label"
%em
= t("captions.public")
- = f.text_field "organization", :tabindex => 3
+ = f.text_field "organization"
= f.label "voice_number", t("labels.voice_number"), :id => "user_voice_number_label"
%em
= image_tag "lock.svg", :class => "lock", :alt => t("captions.private"), :title => t("captions.private")
- = f.text_field "voice_number", :tabindex => 4
+ = f.text_field "voice_number"
= f.label "sms_number", t("labels.sms_number"), :id => "user_sms_number_label"
%em
= image_tag "lock.svg", :class => "lock", :alt => t("captions.private"), :title => t("captions.private")
- = f.text_field "sms_number", :tabindex => 5
+ = f.text_field "sms_number"
= f.label "password", t("labels.password_new"), :id => "user_password_label"
%em
= t("captions.password")
- = f.password_field "password", :tabindex => 6
+ = f.password_field "password"
= f.label "current_password", t("labels.current_password"), :id => "user_current_password_label"
%em
= t("captions.current_password")
- = f.password_field "current_password", :tabindex => 7
- = f.submit t("buttons.update"), :tabindex => 8
+ = f.password_field "current_password"
+ = f.submit t("buttons.update")
= render :partial => 'things/back'