Merge pull request #793 from opf/fix/new-message-checkbox-labels-2152

app/views/messages/_form.html.erb

@@ -36,8 +36,12 @@ See doc/COPYRIGHT.rdoc for more details.
 <%= f.text_field :subject, :size => 120, :id => "message_subject" %>
 
 <% if !replying && User.current.allowed_to?(:edit_messages, @project) %>
-    <label><%= f.check_box :sticky %><%= l(:label_board_sticky) %></label>
+    <%= f.label :sticky do %>
-    <label><%= f.check_box :locked %><%= l(:label_board_locked) %></label>
+      <%= f.check_box :sticky %><%= l(:label_board_sticky) %>
+    <% end %>
+    <%= f.label :locked do %>
+      <%= f.check_box :locked %><%= l(:label_board_locked) %>
+    <% end %>
 <% end %>
 </p>
 

doc/CHANGELOG.md

@@ -30,6 +30,7 @@ See doc/COPYRIGHT.rdoc for more details.
 # Changelog
 
 * `#1951` Layout for ## and ### textile link help is broken
+* `#2152` [Accessibility] Link form elements to their label - new forum message
 * `#2161` [Accessibility] Link form elements to their label - new color
 * `#2500` Change default configuration in new OpenProject application so new projects are not public by default
 * `#3528` [Data Migration] Type 'none' is not migrated properly in Timelines