From d53d87f1bcac10aef7f63cda47e3e7e6bcb6105e Mon Sep 17 00:00:00 2001
From: Mark Moser <mark.moser@perficient.com>
Date: Tue, 18 Apr 2017 17:15:38 -0500
Subject: [PATCH] a11y polish

---
 .../javascripts/live-coder/editor.js.erb      |  2 ++
 app/views/quiz/_checkbox.html.erb             | 14 +++++++----
 app/views/quiz/_checkbox_other.html.erb       | 12 ++++++----
 app/views/quiz/_live_code.html.erb            | 22 ++++++++---------
 app/views/quiz/_radio.html.erb                | 24 +++++++++++--------
 app/views/quiz/_radio_other.html.erb          | 13 ++++++----
 app/views/quiz/_text.html.erb                 |  4 ++--
 app/views/quiz/summary.html.erb               |  6 ++---
 test/integration/question_live_coder_test.rb  |  2 +-
 9 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/app/assets/javascripts/live-coder/editor.js.erb b/app/assets/javascripts/live-coder/editor.js.erb
index 3f9652d..d9f918d 100644
--- a/app/assets/javascripts/live-coder/editor.js.erb
+++ b/app/assets/javascripts/live-coder/editor.js.erb
@@ -12,6 +12,7 @@ function updateResults(elem) {
   var iBody = document.createElement('body');
 
   var codeFrame = document.createElement('iframe');
+  codeFrame.setAttribute("title", "live-code-results-" + resultsContainer.getAttribute("data-qid"));
   codeFrame.setAttribute("width", "100%");
   codeFrame.setAttribute("height", "100%");
   resultsContainer.appendChild(codeFrame);
@@ -27,6 +28,7 @@ function updateResults(elem) {
   codeStyle.appendChild(rulesNode);
   iHead.appendChild(codeStyle);
 
+  iDoc.setAttribute('lang', 'en');
   iDoc.appendChild(iHead);
   iBody.innerHTML = codeHtml;
   iDoc.appendChild(iBody);
diff --git a/app/views/quiz/_checkbox.html.erb b/app/views/quiz/_checkbox.html.erb
index 030c526..f6d8b0c 100644
--- a/app/views/quiz/_checkbox.html.erb
+++ b/app/views/quiz/_checkbox.html.erb
@@ -1,14 +1,18 @@
-<%  answers = Array(question.answer) %>
-<%= form.collection_check_boxes(:answer_array, question.input_options, :to_s, :to_s, {}, {class: ""}) do | option | %>
+<% answers = Array(question.answer) %>
+
+<div role="group" aria-labelledby="<%= question.question_id %>">
+  <div id="<%= question.question_id %>">Check all that apply:</div>
+  <%= form.collection_check_boxes(:answer_array, question.input_options, :to_s, :to_s, {}, {class: ""}) do | option | %>
     <%
       option_id = "#{question.question_id}#{sanitize_to_id(option.value)}"
       checked = answers.include?(option.value) ? 'checked' : ''
     %>
 
-    <div class="">
+    <div>
       <%= option.check_box( id: option_id, checked: checked, data: { last: checked } ) %>
-      <%= option.label(for: option_id) %>
+      <%= option.label( for: option_id, "aria-label" => option_id ) %>
     </div>
-<% end %>
+  <% end %>
+</div>
 
 <%= render partial: "quiz/answer_errors", locals: {question: question, answer: answer} %>
diff --git a/app/views/quiz/_checkbox_other.html.erb b/app/views/quiz/_checkbox_other.html.erb
index db6b4e1..fae8fd1 100644
--- a/app/views/quiz/_checkbox_other.html.erb
+++ b/app/views/quiz/_checkbox_other.html.erb
@@ -1,19 +1,22 @@
 <%
   answers = question.answer.nil? ? [] : Array(question.answer['options'])
   other_value = question.answer.nil? ? '' : question.answer['other']
+%>
+<div role="group" aria-labelledby="<%= question.question_id %>">
+  <div id="<%= question.question_id %>">Select all that apply:</div>
 
-  question.input_options.each do | option |
+  <% question.input_options.each do | option |
     option_id = "#{option.parameterize}_#{question.to_i}"
     checkbox_html = {class: "", id: option_id, data: { last: answers.include?(option) ? 'checked' : '' } }
     %>
-      <div class="">
+      <div>
         <%= check_box_tag('answer[answer_hash][options][]', option, answers.include?(option), checkbox_html) %>
         <%= label_tag(option_id, option) %>
       </div>
     <%
   end %>
 
-  <div class="">
+  <div>
     <%
       option_id = "other_#{question.to_i}"
       checkbox_html = {class: "", id: option_id, data: { last: answers.include?('other') ? 'checked' : '' } }
@@ -21,7 +24,8 @@
     %>
     <%= check_box_tag('answer[answer_hash][options][]', 'other', answers.include?('other'), checkbox_html) %>
     <%= label_tag(option_id, 'Other') %>
-    <%= text_field_tag 'answer[answer_hash][other]', other_value, text_html %>
+    <%= text_field_tag 'answer[answer_hash][other]', other_value, text_html.merge(id: "#{option_id}_value") %>
   </div>
+</div>
 
 <%= render partial: "quiz/answer_errors", locals: {question: question, answer: answer} %>
diff --git a/app/views/quiz/_live_code.html.erb b/app/views/quiz/_live_code.html.erb
index cce5495..219923d 100644
--- a/app/views/quiz/_live_code.html.erb
+++ b/app/views/quiz/_live_code.html.erb
@@ -46,8 +46,8 @@
 </div>
 
 <div class="accordion" id="accordion<%= question.question_id %>" style="display: none;">
-  <input type="checkbox" class="accordion__toggle" id="accordion-toggle-live-coder" />
-  <label class="accordion__label" for="accordion-toggle-live-coder">How to use the live coder</label>
+  <input type="checkbox" class="accordion__toggle" id="accordion-toggle-live-coder_<%=question.question_id%>" />
+  <label class="accordion__label" for="accordion-toggle-live-coder_<%=question.question_id%>">How to use the live coder</label>
   <p class="accordion__copy">
     This is our own nifty creation, and it works similarly to CodePen. To use: type any HTML, CSS,
     or JS inside their corresponding boxes, and watch the Results window below the boxes update
@@ -57,26 +57,26 @@
 </div>
 
 <div id="answer<%= question.question_id %>" data-id="live-coder-answer" style="display: none;">
-  <label for="answer_answer_hash_text">Enter answer here</label>
-  <%= text_area_tag 'answer[answer_hash][text]', value_text, { disabled: true, data: {last: answers['text']}} %>
+  <label for="answer_answer_hash_text_<%= question.question_id %>">Enter answer here</label>
+  <%= text_area_tag 'answer[answer_hash][text]', value_text, { disabled: true, data: {last: answers['text']}, id: "answer_answer_hash_text_#{question.question_id}"} %>
 
   <div class="code-input">
-    <label for="answer_answer_hash_html">index.html</label>
-    <%= text_area_tag 'answer[answer_hash][html]', value_html, { disabled: true, data: {id: 'code-html', last: answers['html']}, class: 'code-answer code-html' } %>
+    <label for="answer_answer_hash_html_<%= question.question_id %>">index.html</label>
+    <%= text_area_tag 'answer[answer_hash][html]', value_html, { disabled: true, data: {id: 'code-html', last: answers['html']}, class: 'code-answer code-html', id: "answer_answer_hash_html_#{question.question_id}"} %>
   </div>
 
   <div class="code-input">
-    <label for="answer_answer_hash_css">styles.css</label>
-    <%= text_area_tag 'answer[answer_hash][css]', value_css, { disabled: true, data: {id: 'code-css', last: answers['css']}, class: 'code-answer code-css' } %>
+    <label for="answer_answer_hash_css_<%= question.question_id %>">styles.css</label>
+    <%= text_area_tag 'answer[answer_hash][css]', value_css, { disabled: true, data: {id: 'code-css', last: answers['css']}, class: 'code-answer code-css', id: "answer_answer_hash_css_#{question.question_id}" } %>
   </div>
 
   <div class="code-input">
-    <label for="answer_answer_hash_js">main.js</label>
-    <%= text_area_tag 'answer[answer_hash][js]', value_js, { disabled: true, data: {id: 'code-js', last: answers['js']}, class: 'code-answer code-js' } %>
+    <label for="answer_answer_hash_js_<%= question.question_id %>">main.js</label>
+    <%= text_area_tag 'answer[answer_hash][js]', value_js, { disabled: true, data: {id: 'code-js', last: answers['js']}, class: 'code-answer code-js', id: "answer_answer_hash_js_#{question.question_id}" } %>
   </div>
 
   <label class="code-results">Results</label>
-  <div class="results" data-id="results"></div>
+  <div class="results" data-id="results" data-qid="<%= question.question_id %>"></div>
 </div>
 
 <script>
diff --git a/app/views/quiz/_radio.html.erb b/app/views/quiz/_radio.html.erb
index 1edc412..590b3af 100644
--- a/app/views/quiz/_radio.html.erb
+++ b/app/views/quiz/_radio.html.erb
@@ -1,15 +1,19 @@
 <%  answer_string = answer.try(:answer) || answer %>
-<%= form.collection_radio_buttons(:answer, question.input_options, :to_s, :to_s, {}, {class: ""}) do | option | %>
-    <%
-      option_id = "#{question.question_id}#{sanitize_to_id(option.value)}"
-      checked = answer_string == option.value ? 'checked' : ''
-    %>
+<div role="group" aria-labelledby="<%= question.question_id %>">
+  <div id="<%= question.question_id %>">Select the best option:</div>
 
-    <div class="">
-      <%= option.radio_button( id: option_id, checked: checked, data: { last: checked } ) %>
-      <%= option.label(for: option_id) %>
-    </div>
+  <%= form.collection_radio_buttons(:answer, question.input_options, :to_s, :to_s, {}, {class: ""}) do | option | %>
+      <%
+        option_id = "#{question.question_id}#{sanitize_to_id(option.value)}"
+        checked = answer_string == option.value ? 'checked' : ''
+      %>
 
-<% end %>
+      <div>
+        <%= option.radio_button( id: option_id, checked: checked, data: { last: checked } ) %>
+        <%= option.label(for: option_id) %>
+      </div>
+
+  <% end %>
+</div>
 
 <%= render partial: "quiz/answer_errors", locals: {question: question, answer: answer} %>
diff --git a/app/views/quiz/_radio_other.html.erb b/app/views/quiz/_radio_other.html.erb
index c48784a..c5d0b3c 100644
--- a/app/views/quiz/_radio_other.html.erb
+++ b/app/views/quiz/_radio_other.html.erb
@@ -1,19 +1,23 @@
 <%
   answer_string = question.answer.nil? ? '' : Array(question.answer['options']).first
   other_value = question.answer.nil? ? '' : question.answer['other']
+%>
 
-  question.input_options.each do | option |
+<div role="group" aria-labelledby="<%= question.question_id %>">
+  <div id="<%= question.question_id %>">Select the best option:</div>
+
+  <% question.input_options.each do | option |
     option_id = "#{option.parameterize}_#{question.to_i}"
     radio_html = {class: "", id: option_id, data: {last: (answer_string == option) ? 'checked' : '' }}
     %>
-      <div class="">
+      <div>
         <%= radio_button_tag('answer[answer_hash][options][]', option, (answer_string == option), radio_html) %>
         <%= label_tag(option_id, option) %>
       </div>
     <%
   end %>
 
-  <div class="">
+  <div>
     <%
       option_id = "other_#{question.to_i}"
       radio_html = {class: "", id: option_id, data: { last: answer_string }}
@@ -21,7 +25,8 @@
     %>
     <%= radio_button_tag('answer[answer_hash][options][]', 'other', (answer_string == 'other'), radio_html) %>
     <%= label_tag option_id, 'Other' %>
-    <%= text_field_tag 'answer[answer_hash][other]', other_value, text_html %>
+    <%= text_field_tag 'answer[answer_hash][other]', other_value, text_html.merge(id: "value_#{option_id}") %>
   </div>
+</div>
 
 <%= render partial: "quiz/answer_errors", locals: {question: question, answer: answer} %>
diff --git a/app/views/quiz/_text.html.erb b/app/views/quiz/_text.html.erb
index 289a455..cedc218 100644
--- a/app/views/quiz/_text.html.erb
+++ b/app/views/quiz/_text.html.erb
@@ -1,7 +1,7 @@
 <% answer_string = answer.respond_to?(:answer) ? answer.answer : answer %>
 
-<label for="answer_answer">Enter answer here</label>
-<%= text_area_tag 'answer[answer]', answer_string, {rows: 10, data: { last: answer_string } } %>
+<label for="answer_answer-<%= question.question_id %>">Enter answer here</label>
+<%= text_area_tag 'answer[answer]', answer_string, {rows: 10, data: { last: answer_string }, id: "answer_answer-#{question.question_id}" } %>
 
 <div class="<%= params[:action] == 'summary' ? 'hidden' : '' %>">
   Max 1000 characters.
diff --git a/app/views/quiz/summary.html.erb b/app/views/quiz/summary.html.erb
index de885cd..edd5d18 100644
--- a/app/views/quiz/summary.html.erb
+++ b/app/views/quiz/summary.html.erb
@@ -35,9 +35,9 @@
       <li><button>Cancel</button></li>
     </ul>
 
-    <%= hidden_field_tag 'answer[question_id]', question.question_id %>
-    <%= hidden_field_tag 'answer[answer_id]', question.answer_id %>
-    <%= hidden_field_tag 'submit', true %>
+    <%= hidden_field_tag 'answer[question_id]', question.question_id, id: "answer_question_id_#{question.question_id}" %>
+    <%= hidden_field_tag 'answer[answer_id]', question.answer_id, id: "answer_answer_id_#{question.question_id}" %>
+    <%= hidden_field_tag 'submit', true, id: "submit_#{question.question_id}"%>
   <% end %>
 <% end %>
 
diff --git a/test/integration/question_live_coder_test.rb b/test/integration/question_live_coder_test.rb
index 9d296b3..f6ee8d0 100644
--- a/test/integration/question_live_coder_test.rb
+++ b/test/integration/question_live_coder_test.rb
@@ -17,6 +17,6 @@ class QuestionLiveCoderTest < ActionDispatch::IntegrationTest
 
     get question_path(question.id)
     assert_response :success
-    assert_select '#answer_answer_hash_html', question.input_options['html']
+    assert_select "textarea", question.input_options['html']
   end
 end