nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use aria-labelledby for conversations

Browse source
This commit is contained in:
Steffen van Bergerem 2015-07-22 13:02:16 +02:00
parent 4819544030
commit 5fd89961c4
3 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/views/conversations/_messages.haml
View file

@ -7,8 +7,16 @@
= owner_image_tag(:thumb_small) = owner_image_tag(:thumb_small)
.media-body .media-body
= form_for [conversation, Message.new], html: {class: "control-group"} do |message| = form_for [conversation, Message.new], html: {class: "control-group"} do |message|
= message.text_area :text, rows: 5, tabindex: 1, class: "form-control form-group" .form-group
= message.submit t("conversations.show.reply").capitalize, %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"), "data-disable-with" => t("conversations.show.replying"),
class: "btn btn-primary pull-right", tabindex: 2 class: "btn btn-primary pull-right", tabindex: 2
.clearfix .clearfix

20
app/views/conversations/_new.haml
View file

@ -1,14 +1,22 @@
.container-fluid .container-fluid
= form_for Conversation.new, html: {class: "form-horizontal form_do_not_clear"}, remote: true do |conversation| = form_for Conversation.new, html: {class: "form-horizontal form_do_not_clear"}, remote: true do |conversation|
.form-group .form-group
%label{ for: 'contact_ids' } %label#toLabel{for: "contact_ids"}
= t('.to') = t(".to")
= text_field_tag "contact_autocomplete", nil, class: "form-control" = text_field_tag "contact_autocomplete", nil, class: "form-control"
.form-group .form-group
%label{ for: 'conversation_subject' } %label#subjectLabel{for: "conversation_subject"}
= t('.subject') = t(".subject")
= conversation.text_field :subject, class: 'input-block-level form-control' = conversation.text_field :subject,
class: "input-block-level form-control",
aria: {labelledby: "subjectLabel"}
.form-group .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 .form-group
= conversation.submit t('.send'), 'data-disable-with' => t('.sending'), class: 'btn btn-primary pull-right' = conversation.submit t('.send'), 'data-disable-with' => t('.sending'), class: 'btn btn-primary pull-right'

1
config/locales/diaspora/en.yml
View file

@ -352,6 +352,7 @@ en:
to: "To" to: "To"
subject: "Subject" subject: "Subject"
subject_default: "No subject" subject_default: "No subject"
message: "Message"
send: "Send" send: "Send"
sending: "Sending..." sending: "Sending..."
abandon_changes: "Abandon changes?" abandon_changes: "Abandon changes?"