diff --git a/app/views/quizzes/quizzes/_form_question.html.erb b/app/views/quizzes/quizzes/_form_question.html.erb index 3a3e030d9b4..87262728394 100644 --- a/app/views/quizzes/quizzes/_form_question.html.erb +++ b/app/views/quizzes/quizzes/_form_question.html.erb @@ -29,6 +29,29 @@
+ <%# explanations for ungraded quizzes - basically the same sans references to "correct" answers %> +
+ <%= t("Enter your question and multiple answers.") %> +
+
+ <%= t("Enter your question text.") %> +
+
+ <%= t("Enter your question text. \nStudents will see the question followed by a small text box to type their answer.") %> +
+
+ <%= t("Enter your question, specifying where each blank should go. Students must type answers into text boxes at each blank.") %> +
+
+ <%= t("This question will show a checkbox next to each answer.") %> +
+
+ <%= t("Enter your question, specifying where each dropdown should go. Then define possible answers for each dropdown.") %> +
+
+ <%= t("Define text to go before and after the dropdown and build a set of possible answers.") %> +
+
<%= t('explanations.multiple_choice', "Enter your question and multiple answers, then select the one correct answer.") %>
diff --git a/public/javascripts/quizzes.js b/public/javascripts/quizzes.js index b4c6717d7df..334d5fb3bed 100644 --- a/public/javascripts/quizzes.js +++ b/public/javascripts/quizzes.js @@ -654,12 +654,19 @@ define([ result.textValues = ['answer_weight', 'answer_text', 'answer_comment', 'blank_id', 'id', 'match_id']; result.htmlValues = ['answer_html', 'answer_match_left_html', 'answer_comment_html']; result.question_type = question_type; - $formQuestion.find(".explanation").hide().filter("." + question_type + "_explanation").show(); + + var is_survey_quiz = $("#questions").hasClass('survey_quiz'); + if (is_survey_quiz && $formQuestion.find("." + question_type + "_survey_quiz_explanation").length > 0) { + $formQuestion.find(".explanation").hide().filter("." + question_type + "_survey_quiz_explanation").show(); + } else { + $formQuestion.find(".explanation").hide().filter("." + question_type + "_explanation").show(); + } + $formQuestion.attr('class', 'question').addClass('selectable'); $formQuestion.find(".missing_word_after_answer").hide().end() .find(".matching_answer_incorrect_matches_holder").hide().end() .find(".question_comment").css('display', '').end(); - if ($("#questions").hasClass('survey_quiz')) { + if (is_survey_quiz) { $formQuestion.find(".question_comment").css('display', 'none').end() .find(".question_neutral_comment").css('display', ''); }