Merge pull request #6227 from svbergerem/accessibility (5ecafa2b) · Commits · Gigadoc 2 / diaspora

Changelog.md

+1 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.

		## Bug fixes
		* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)
		* Improve accessibility of a couple pages [#6227](https://github.com/diaspora/diaspora/pull/6227)

		## Features
		* Support color themes [#6033](https://github.com/diaspora/diaspora/pull/6033)

app/assets/stylesheets/new_styles/_forms.scss

+0 −7

Original line number	Diff line number	Diff line
		@@ -27,13 +27,6 @@ input:-webkit-autofill{
		form.block-form {
		margin: 20px auto;

		label {
		color : $text-dark-grey;
		position: absolute;
		top: -9999px;
		left: -9999px;
		}

		fieldset {
		margin-bottom: 1em;
		background-color: #fff;

app/views/conversations/_messages.haml

+10 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,16 @@
		= owner_image_tag(:thumb_small)
		.media-body
		= form_for [conversation, Message.new], html: {class: "control-group"} do \|message\|
		= message.text_area :text, rows: 5, tabindex: 1, class: "form-control form-group"
		= message.submit t("conversations.show.reply").capitalize,
		.form-group
		%label#messageLabel.sr-only{for: "message_text"}
		= t("conversations.new.message")
		= message.text_area :text,
		rows: 5,
		tabindex: 1,
		class: "form-control form-group",
		aria: {labelledby: "messageLabel"}

		= message.submit t("conversations.show.reply"),
		"data-disable-with" => t("conversations.show.replying"),
		class: "btn btn-primary pull-right", tabindex: 2
		.clearfix

app/views/conversations/_new.haml

+14 −6

Original line number	Diff line number	Diff line
		.container-fluid
		= form_for Conversation.new, html: {class: "form-horizontal form_do_not_clear"}, remote: true do \|conversation\|
		.form-group
		%label{ for: 'contact_ids' }
		= t('.to')
		%label#toLabel{for: "contact_ids"}
		= t(".to")
		= text_field_tag "contact_autocomplete", nil, class: "form-control"
		.form-group
		%label{ for: 'conversation_subject' }
		= t('.subject')
		= conversation.text_field :subject, class: 'input-block-level form-control'
		%label#subjectLabel{for: "conversation_subject"}
		= t(".subject")
		= conversation.text_field :subject,
		class: "input-block-level form-control",
		aria: {labelledby: "subjectLabel"}
		.form-group
		= text_area_tag "conversation[text]", '', rows: 5, class: 'input-block-level form-control'
		%label#messageLabel.sr-only{for: "conversation_text"}
		= t(".message")
		= text_area_tag "conversation[text]",
		"",
		rows: 5,
		class: "input-block-level form-control",
		aria: {labelledby: "messageLabel"}
		.form-group
		= conversation.submit t('.send'), 'data-disable-with' => t('.sending'), class: 'btn btn-primary pull-right'

app/views/devise/passwords/edit.haml

+19 −6

Original line number	Diff line number	Diff line
		@@ -12,17 +12,30 @@
		= f.error_messages

		%fieldset.form
		%label{for: "user_password"}
		= t('devise.passwords.edit.new_password')
		%label#passwordLabel.sr-only{for: "user_password"}
		= t("devise.passwords.edit.new_password")
		%i.entypo-lock
		= f.password_field :password, class: "input-block-level form-control", required: true, placeholder: t('devise.passwords.edit.new_password'), autocapitalize: "none", autocorrect: "off", autofocus: true
		= f.password_field :password,
		class: "input-block-level form-control",
		required: true,
		placeholder: t("devise.passwords.edit.new_password"),
		autocapitalize: "none",
		autocorrect: "off",
		autofocus: true,
		aria: {labelledby: "passwordLabel"}

		= f.hidden_field :reset_password_token

		%label{for: "user_password_confirmation"}
		= t('devise.passwords.edit.confirm_password')
		%label#passwordConfirmationLabel.sr-only{for: "user_password_confirmation"}
		= t("devise.passwords.edit.confirm_password")
		%i.entypo-lock
		= f.password_field :password_confirmation, class: "input-block-level form-control", required: true, placeholder: t('devise.passwords.edit.confirm_password'), autocapitalize: "none", autocorrect: "off"
		= f.password_field :password_confirmation,
		class: "input-block-level form-control",
		required: true,
		placeholder: t("devise.passwords.edit.confirm_password"),
		autocapitalize: "none",
		autocorrect: "off",
		aria: {labelledby: "passwordConfirmationLabel"}

		= hidden_field(:user, :remember_me, value: 1)
		= f.submit t('devise.passwords.edit.change_password'), class: "btn btn-block btn-default"