diff --git a/anatomy/templates/anatomy/partials/mark2_question_marked_fragment.html b/anatomy/templates/anatomy/partials/mark2_question_marked_fragment.html index a235f890..d3d14048 100644 --- a/anatomy/templates/anatomy/partials/mark2_question_marked_fragment.html +++ b/anatomy/templates/anatomy/partials/mark2_question_marked_fragment.html @@ -18,7 +18,7 @@ {% endfor %} -
+
1 mark
-
+
0 marks
    {% for answer in incorrect_answers %} diff --git a/anatomy/templates/anatomy/question_detail.html b/anatomy/templates/anatomy/question_detail.html index 3abaf15f..4716284b 100644 --- a/anatomy/templates/anatomy/question_detail.html +++ b/anatomy/templates/anatomy/question_detail.html @@ -3,116 +3,129 @@ {% block content %} {% load static %} {% include 'anatomy/question_link_header.html' %} -
    -
    - Help -

    Annotate the image using the right mouse button to click and drag an arrow. To remove an arrow drag it out of the image boundaries. To save the changes click the "Save Annotations" button.

    -

    There is no limit to the number of arrows that can be added to the image.

    -
    - +
    +
    +
    +
    +
    +
    +
    +
    + Image help +
    Annotate the image using the right mouse button to click and drag an arrow. To remove an arrow drag it out of the image boundaries. Click Save Annotations to persist.
    +
    -
    -
    -
    - Created: {{ question.created_date|date:"d/m/Y" }} + +
    +
    +
    -

    Question type: {{question.question_type}}

    -

    Primary answer: {{ question.get_primary_answer }}

    -
    -
    - - Answers: - - - - {% for answer in question.answers.all|dictsortreversed:"status" %} - - - {% if answer.proposed %} - - {% endfor %} -
    AnswerScore
    - - {{ answer }} - - - {{answer.status}} - - + +
    +
    +
    +
    +
    +
    Question
    +
    Created: {{ question.created_date|date:"d/m/Y" }}
    +
    +
    +
    Type: {{ question.question_type }}
    +
    +
    + +
    Primary answer
    +
    {{ question.get_primary_answer }}
    + +
    Answers
    +
    + Show answers + + + + + + {% for answer in question.answers.all|dictsortreversed:"status" %} + + - {% endif %} + + + + {% empty %} + + {% endfor %} + +
    AnswerScore
    + 
    {{ answer.answer }}
    		{{ answer.get_status_display|default:answer.status }} + {% if answer.proposed %} +
    + + +
    + {% endif %} +
    No stored answers
    +
    - -
    -
    -
    -
    - Answer help: {{ question.answer_help|safe }} -
    -
    - {% partialdef suggest-incorrect-form inline %} - - Answer suggest incorrect: {{ question.answer_suggest_incorrect }} - - - {% endpartialdef %} -
    -
    - Description: {{ question.description }} -
    -
    - Exams: {% for exam in question.exams.all %} - {{ exam }} - {% endfor %} - - -
    -
    - Modality: {{ question.modality }} -
    -
    - Region: {{ question.region }} -
    -
    - Structure: {{ question.structure }} -
    -
    - Body Part: {{ question.body_part }} -
    -
    - Author: {% for author in question.author.all %} - {{ author }}, - {% endfor %} -
    -
    - Open access: {{ question.open_access }} -
    - {% include 'question_notes.html' %} -
    -
    - - Annotation JSON (+/-): - - - {% if question.image_annotations %} - 
    {{ question.image_annotations }}
    - {% else %} - No saved annotations. + {% if question.answer_help %} +
    +
    Answer help
    +
    {{ question.answer_help|safe }}
    +
    {% endif %} - -
    + +
    + {% partialdef suggest-incorrect-form inline %} +
    + Answer suggest incorrect: {{ question.answer_suggest_incorrect }} +
    +
    + {% endpartialdef %} +
    + +
    +
    Description
    +
    {{ question.description }}
    +
    + +
    +
    +
    Modality: {{ question.modality }}
    +
    Region: {{ question.region }}
    +
    Structure: {{ question.structure }}
    +
    +
    +
    Body part: {{ question.body_part }}
    +
    Open access: {{ question.open_access }}
    +
    Author: {% for author in question.author.all %}{{ author }}{% if not forloop.last %}, {% endif %}{% endfor %}
    +
    +
    + +
    +
    Exams
    +
    + {% for exam in question.exams.all %} + {{ exam }} + {% empty %} + No exams + {% endfor %} +
    +
    +
    +
    + + {% include 'question_notes.html' %} + +
    +
    + Annotation JSON +
    {% if question.image_annotations %}
    {{ question.image_annotations }}
    {% else %}No saved annotations.{% endif %}
    +
    +
    + +
    +