diff --git a/media/css/main.css b/media/css/main.css index 401b6135..9f649031 100644 --- a/media/css/main.css +++ b/media/css/main.css @@ -339,10 +339,12 @@ footer.footer { text-align: center; } +.protective-behaviors ol, .protective-behaviors-results ul { padding-left: 0; } +.protective-behaviors ol li, .protective-behaviors-results ul li { list-style: none; font-weight: bold; diff --git a/worth2/templates/quizblock/single_choice.html b/worth2/templates/quizblock/single_choice.html index 4446faa6..69ca0413 100644 --- a/worth2/templates/quizblock/single_choice.html +++ b/worth2/templates/quizblock/single_choice.html @@ -4,6 +4,39 @@ {% if 'likert' in question.quiz.pageblock.css_extra %} {% include 'quizblock/likert.html' %} {% else %} +{% if 'protective-behaviors' in question.quiz.pageblock.css_extra %} +
    + {% for answer in question.answer_set.all %} + {% if block.rhetorical %} +
  1. + +
  2. + {% else %} +
  3. + {% if response %} + {% ifequal response.value answer.value %} + {{answer.label}} + {% else %} + {{answer.label}} + {% endifequal %} + {% else %} + + {% endif %} +
  4. + {% endif %} + {% endfor %} +
+
+{% else %}
    {% for answer in question.answer_set.all %} {% if block.rhetorical %} @@ -27,6 +60,7 @@
{% endif %} +{% endif %}
diff --git a/worth2/templates/quizblock/single_choice_show_answer.html b/worth2/templates/quizblock/single_choice_show_answer.html index eaec2240..cdb7acc4 100644 --- a/worth2/templates/quizblock/single_choice_show_answer.html +++ b/worth2/templates/quizblock/single_choice_show_answer.html @@ -2,7 +2,10 @@ {% load quizresults %}
-{% if block.rhetorical %} + {% if 'protective-behaviors' in question.quiz.pageblock.css_extra %} +

{{question.explanation|markdown}}

+ {% else %} + {% if block.rhetorical %} Show answer >> -{% else %} + {% else %}
{% is_user_correct request.user question as is_correct %} {% if is_correct %} -
That's Correct
+
That's Correct
{% else %} -
That's Incorrect
+
That's Incorrect
{% endif %}

{{question.explanation|markdown}}

-{% endif %} -
\ No newline at end of file + {% endif %} + {% endif %} +