7 files changed, 15 insertions, 15 deletions
diff --git a/app/assets/javascripts/components/features/ui/components/compose_form.jsx b/app/assets/javascripts/components/features/ui/components/compose_form.jsx
index 581e28fc9..e54641347 100644
--- a/app/assets/javascripts/components/features/ui/components/compose_form.jsx
+++ b/app/assets/javascripts/components/features/ui/components/compose_form.jsx
@@ -132,7 +132,7 @@ const ComposeForm = React.createClass({
 
     const inputProps = {
       placeholder: 'What is on your mind?',
-      ariaLabel: 'What is on your mind?',
+      arialabel: 'What is on your mind?',
       value: this.props.text,
       onKeyUp: this.handleKeyUp,
       onChange: this.handleChange,
diff --git a/app/views/auth/confirmations/new.html.haml b/app/views/auth/confirmations/new.html.haml
index fb1019def..f34135c63 100644
--- a/app/views/auth/confirmations/new.html.haml
+++ b/app/views/auth/confirmations/new.html.haml
@@ -4,7 +4,7 @@
 = simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
   = render 'shared/error_messages', object: resource
 
-  = f.input :email, autofocus: true, required: true, placeholder: 'E-mail address'
+  = f.input :email, autofocus: true, required: true, placeholder: 'E-mail address', input_html: { 'aria-label' => 'E-mail address' }
 
   .actions
     = f.button :button, "Resend confirmation instructions", type: :submit
diff --git a/app/views/auth/passwords/edit.html.haml b/app/views/auth/passwords/edit.html.haml
index 06c50445a..caae60f21 100644
--- a/app/views/auth/passwords/edit.html.haml
+++ b/app/views/auth/passwords/edit.html.haml
@@ -5,8 +5,8 @@
   = render 'shared/error_messages', object: resource
   = f.input :reset_password_token, as: :hidden
 
-  = f.input :password, autofocus: true, autocomplete: "off", placeholder: 'New password'
-  = f.input :password_confirmation, autocomplete: "off", placeholder: 'Confirm new password'
+  = f.input :password, autofocus: true, autocomplete: "off", placeholder: 'New password', input_html: { 'aria-label' => 'New password' }
+  = f.input :password_confirmation, autocomplete: "off", placeholder: 'Confirm new password', input_html: { 'aria-label' => 'Confirm new password' }
 
   .actions
     = f.button :button, "Change my password", type: :submit
diff --git a/app/views/auth/passwords/new.html.haml b/app/views/auth/passwords/new.html.haml
index 4c7ec8292..8bed953a5 100644
--- a/app/views/auth/passwords/new.html.haml
+++ b/app/views/auth/passwords/new.html.haml
@@ -4,7 +4,7 @@
 = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
   = render 'shared/error_messages', object: resource
 
-  = f.input :email, autofocus: true, required: true, placeholder: 'E-mail address'
+  = f.input :email, autofocus: true, required: true, placeholder: 'E-mail address', input_html: { 'aria-label' => 'E-mail address' }
 
   .actions
     = f.button :button, "Reset password", type: :submit
diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml
index 25ed58647..807b043fc 100644
--- a/app/views/auth/registrations/edit.html.haml
+++ b/app/views/auth/registrations/edit.html.haml
@@ -4,10 +4,10 @@
 = simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
   = render 'shared/error_messages', object: resource
 
-  = f.input :email, placeholder: 'E-mail address'
-  = f.input :password, autocomplete: "off", placeholder: 'New password'
-  = f.input :password_confirmation, autocomplete: "off", placeholder: 'Confirm new password'
-  = f.input :current_password, autocomplete: "off", placeholder: 'Current password'
+  = f.input :email, placeholder: 'E-mail address', input_html: { 'aria-label' => 'E-mail address' }
+  = f.input :password, autocomplete: "off", placeholder: 'New password', input_html: { 'aria-label' => 'New password' }
+  = f.input :password_confirmation, autocomplete: "off", placeholder: 'Confirm new password', input_html: { 'aria-label' => 'Confirm new password' }
+  = f.input :current_password, autocomplete: "off", placeholder: 'Current password', input_html: { 'aria-label' => 'Current password' }
 
   .actions
     = f.button :button, "Save changes", type: :submit
diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml
index 766cbf1a5..d78a8d06b 100644
--- a/app/views/auth/registrations/new.html.haml
+++ b/app/views/auth/registrations/new.html.haml
@@ -5,11 +5,11 @@
   = render 'shared/error_messages', object: resource
 
   = f.simple_fields_for :account do |ff|
-    = ff.input :username, autofocus: true, placeholder: 'Username', required: true
+    = ff.input :username, autofocus: true, placeholder: 'Username', required: true, input_html: { 'aria-label' => 'Username' }
 
-  = f.input :email, placeholder: 'E-mail address', required: true
-  = f.input :password, autocomplete: "off", placeholder: 'Password', required: true
-  = f.input :password_confirmation, autocomplete: "off", placeholder: 'Confirm password', required: true
+  = f.input :email, placeholder: 'E-mail address', required: true, input_html: { 'aria-label' => 'E-mail address' }
+  = f.input :password, autocomplete: "off", placeholder: 'Password', required: true, input_html: { 'aria-label' => 'Password' }
+  = f.input :password_confirmation, autocomplete: "off", placeholder: 'Confirm password', required: true, input_html: { 'aria-label' => 'Confirm password' }
 
   .actions
     = f.button :button, "Sign up", type: :submit
diff --git a/app/views/auth/sessions/new.html.haml b/app/views/auth/sessions/new.html.haml
index 2ca7bf690..ced85d20c 100644
--- a/app/views/auth/sessions/new.html.haml
+++ b/app/views/auth/sessions/new.html.haml
@@ -2,8 +2,8 @@
   Log in
 
 = simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
-  = f.input :email, autofocus: true, placeholder: 'E-mail address', required: true
-  = f.input :password, placeholder: 'Password', required: true
+  = f.input :email, autofocus: true, placeholder: 'E-mail address', required: true, input_html: { 'aria-label' => 'E-mail address' }
+  = f.input :password, placeholder: 'Password', required: true, input_html: { 'aria-label' => 'Password' }
 
   .actions
     = f.button :button, "Log in", type: :submit