Skip to content

E
edx-ora2
Commit 71395afb by Albert (AJ) St. Aubin Committed by GitHub
Options

Merge pull request #947 from edx/aj/TNL-5196_headers 

Header updated for accessibility
parents de57ee99 f2039cdd
Showing with 167 additions and 223 deletions
openassessment/templates/openassessmentblock/grade/oa_assessment_feedback.html
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
{% if assessment.individual_assessments %} {% if assessment.individual_assessments %}
{% for individual_assessment in assessment.individual_assessments %} {% for individual_assessment in assessment.individual_assessments %}
{% if individual_assessment.feedback %} {% if individual_assessment.feedback %}
<h5 class="answer_title"> <div class="answer_title">
<span class="answer__source"> <span class="answer__source">
{% if individual_assessment.option %} {% if individual_assessment.option %}
{% blocktrans with title=individual_assessment.title grade=individual_assessment.option.label start_tag='<span class="answer__source__value">'|safe end_tag="</span>"|safe %} {% blocktrans with title=individual_assessment.title grade=individual_assessment.option.label start_tag='<span class="answer__source__value">'|safe end_tag="</span>"|safe %}
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</span> </span>
{% endif %} {% endif %}
</span> </span>
</h5> </div>
<div class="feedback__value"> <div class="feedback__value">
<p class="feedback__value__raw">{{ individual_assessment.feedback }}</p> <p class="feedback__value__raw">{{ individual_assessment.feedback }}</p>
...@@ -25,11 +25,11 @@ ...@@ -25,11 +25,11 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% else %} {% else %}
<h5 class="answer_title"> <div class="answer_title">
<span class="answer__source"> <span class="answer__source">
<span class="answer__source__value">{{ title }}</span> <span class="answer__source__value">{{ title }}</span>
</span> </span>
</h5> </div>
<div class="feedback__value"> <div class="feedback__value">
<p class="feedback__value__raw">{{ assessment.feedback }}</p> <p class="feedback__value__raw">{{ assessment.feedback }}</p>
......
openassessment/templates/openassessmentblock/grade/oa_grade_cancelled.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% spaceless %} {% spaceless %}
<li id="openassessment__grade__{{ xblock_id }}" class="openassessment__steps__step step--grade is--initially--collapsed has--error ui-slidable__container" tabindex="-1"> <li id="openassessment__grade__{{ xblock_id }}" class="openassessment__steps__step step--grade is--initially--collapsed has--error ui-slidable__container" tabindex="-1">
<header class="step__header ui-slidable__control"> <header class="step__header ui-slidable__control">
<h2 class="step__title"> <h4 class="step__title">
<button class="ui-slidable" aria-expanded="false" id="oa_grade_{{ xblock_id }}" aria-controls="oa_grade_{{ xblock_id }}_content"> <button class="ui-slidable" aria-expanded="false" id="oa_grade_{{ xblock_id }}" aria-controls="oa_grade_{{ xblock_id }}_content">
<span class="wrapper--copy"> <span class="wrapper--copy">
<span class="step__label">{% trans "Your Grade" %}: </span> <span class="step__label">{% trans "Your Grade" %}: </span>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</span> </span>
</span> </span>
</button> </button>
</h2> </h4>
</header> </header>
<div class="ui-slidable__content" id="oa_grade_{{ xblock_id }}_content" aria-labelledby="oa_grade_{{ xblock_id }}"> <div class="ui-slidable__content" id="oa_grade_{{ xblock_id }}_content" aria-labelledby="oa_grade_{{ xblock_id }}">
......
openassessment/templates/openassessmentblock/grade/oa_grade_complete.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% spaceless %} {% spaceless %}
<li id="openassessment__grade__{{ xblock_id }}" class="openassessment__steps__step step--grade is--complete is--showing has--grade ui-slidable__container {% if allow_latex %}allow--latex{% endif %}" tabindex="-1"> <li id="openassessment__grade__{{ xblock_id }}" class="openassessment__steps__step step--grade is--complete is--showing has--grade ui-slidable__container {% if allow_latex %}allow--latex{% endif %}" tabindex="-1">
<header class="step__header ui-slidable__control"> <header class="step__header ui-slidable__control">
<h2 class="step__title"> <h4 class="step__title">
<button class="ui-slidable" aria-expanded="true" id="oa_grade_{{ xblock_id }}" aria-controls="oa_grade_{{ xblock_id }}_content"> <button class="ui-slidable" aria-expanded="true" id="oa_grade_{{ xblock_id }}" aria-controls="oa_grade_{{ xblock_id }}_content">
<span class="wrapper--copy"> <span class="wrapper--copy">
{% if score %} {% if score %}
...@@ -21,16 +21,15 @@ ...@@ -21,16 +21,15 @@
{% endif %} {% endif %}
</span> </span>
</button> </button>
</h2> </h4>
</header> </header>
<div class="ui-slidable__content" id="oa_grade_{{ xblock_id }}_content" aria-labelledby="oa_grade_{{ xblock_id }}"> <div class="ui-slidable__content" id="oa_grade_{{ xblock_id }}_content" aria-labelledby="oa_grade_{{ xblock_id }}">
<div class="wrapper--step__content"> <div class="wrapper--step__content">
<div class="step__content"> <div class="step__content">
<article class="submission__answer__display step__content__section"> <article class="submission__answer__display step__content__section">
<h3 class="submission__answer__display__title">{% trans "Your Response" %}</h3>
{% trans "Your response to the question above:" as translated_label %} {% trans "Your Response" as translated_label %}
{% include "openassessmentblock/oa_submission_answer.html" with answer=student_submission.answer answer_text_label=translated_label %} {% include "openassessmentblock/oa_submission_answer.html" with answer=student_submission.answer answer_text_label=translated_label %}
{% trans "Your Upload" as translated_header %} {% trans "Your Upload" as translated_header %}
...@@ -38,13 +37,13 @@ ...@@ -38,13 +37,13 @@
</article> </article>
<article class="submission__peer-evaluations step__content__section"> <article class="submission__peer-evaluations step__content__section">
<h3 class="submission__peer-evaluations__title">{% trans "Assessments of Your Response" %}</h3> <h5 class="submission__peer-evaluations__title">{% trans "Assessments of Your Response" %}</h5>
<ol class="list submission__peer-evaluations__questions"> <ol class="list submission__peer-evaluations__questions">
{% for criterion in grade_details.criteria %} {% for criterion in grade_details.criteria %}
{% with criterion_num=forloop.counter %} {% with criterion_num=forloop.counter %}
<li class="question question--{{ criterion_num }} ui-slidable__container is--showing"> <li class="question question--{{ criterion_num }} ui-slidable__container is--showing">
<h4 class="question__title ui-slidable__control"> <div class="question__title ui-slidable__control">
<button class="ui-slidable" id="oa_grade_{{ xblock_id }}_criteria_{{ criterion_num }}" aria-expanded="true" aria-controls="oa_grade_{{ xblock_id }}_criteria_{{ criterion_num }}_content"> <button class="ui-slidable" id="oa_grade_{{ xblock_id }}_criteria_{{ criterion_num }}" aria-expanded="true" aria-controls="oa_grade_{{ xblock_id }}_criteria_{{ criterion_num }}_content">
<span class="icon fa fa-caret-right" aria-hidden="true"></span> <span class="icon fa fa-caret-right" aria-hidden="true"></span>
<span class="question__title__copy">{{ criterion.label }}</span> <span class="question__title__copy">{{ criterion.label }}</span>
...@@ -60,7 +59,7 @@ ...@@ -60,7 +59,7 @@
</span> </span>
</span> </span>
{% endif %} {% endif %}
</h4> </div>
<div class="ui-slidable__content" aria-labelledby="oa_grade_{{ xblock_id }}_criteria_{{ criterion_num }}" id="oa_grade_{{ xblock_id }}_criteria_{{ criterion_num }}_content"> <div class="ui-slidable__content" aria-labelledby="oa_grade_{{ xblock_id }}_criteria_{{ criterion_num }}" id="oa_grade_{{ xblock_id }}_criteria_{{ criterion_num }}_content">
{% if criterion.options %} {% if criterion.options %}
...@@ -84,12 +83,12 @@ ...@@ -84,12 +83,12 @@
{% endfor %} {% endfor %}
{% if grade_details.additional_feedback %} {% if grade_details.additional_feedback %}
<li class="question question--feedback ui-slidable__container is--showing"> <li class="question question--feedback ui-slidable__container is--showing">
<h4 class="question__title ui-slidable__control"> <div class="question__title ui-slidable__control">
<button class="ui-slidable" aria-expanded="true" id="oa_grade_{{ xblock_id }}_feedback" aria-controls="oa_grade_{{ xblock_id }}_feedback_content"> <button class="ui-slidable" aria-expanded="true" id="oa_grade_{{ xblock_id }}_feedback" aria-controls="oa_grade_{{ xblock_id }}_feedback_content">
<span class="icon fa fa-caret-right" aria-hidden="true"></span> <span class="icon fa fa-caret-right" aria-hidden="true"></span>
<span class="question__title__copy">{% trans "Additional comments on your response" %}</span> <span class="question__title__copy">{% trans "Additional comments on your response" %}</span>
</button> </button>
</h4> </div>
<ul class="question__answers ui-slidable__content" id="oa_grade_{{ xblock_id }}_feedback_content" aria-labelledby="oa_grade_{{ xblock_id }}_feedback"> <ul class="question__answers ui-slidable__content" id="oa_grade_{{ xblock_id }}_feedback_content" aria-labelledby="oa_grade_{{ xblock_id }}_feedback">
{% for feedback in grade_details.additional_feedback %} {% for feedback in grade_details.additional_feedback %}
...@@ -103,12 +102,12 @@ ...@@ -103,12 +102,12 @@
{% if peer_assessments %} {% if peer_assessments %}
<form class="submission__feedback submission__feedback step__content__section ui-slidable__container is--showing" method="post"> <form class="submission__feedback submission__feedback step__content__section ui-slidable__container is--showing" method="post">
<h3 class="submission__feedback__title ui-slidable__control"> <div class="submission__feedback__title ui-slidable__control">
<button class="ui-slidable" aria-expanded="true" id="oa_grade_feedback_{{ xblock_id }}" aria-controls="oa_grade_feedback_{{ xblock_id }}__content"> <button class="ui-slidable" aria-expanded="true" id="oa_grade_feedback_{{ xblock_id }}" aria-controls="oa_grade_feedback_{{ xblock_id }}__content">
<span class="icon fa fa-caret-right" aria-hidden="true"></span> <span class="icon fa fa-caret-right" aria-hidden="true"></span>
<span class="submission__feedback__title__copy">{% trans "Provide Feedback on Peer Assessments" %}</span> <span class="submission__feedback__title__copy">{% trans "Provide feedback on peer assessments" %}</span>
</button> </button>
</h3> </div>
<div class="ui-slidable__content" aria-labelledby="oa_grade_feedback_{{ xblock_id }}" id="oa_grade_feedback_{{ xblock_id }}__content"> <div class="ui-slidable__content" aria-labelledby="oa_grade_feedback_{{ xblock_id }}" id="oa_grade_feedback_{{ xblock_id }}__content">
<div class="submission__feedback__content {{ has_submitted_feedback|yesno:"is--submitted," }}"> <div class="submission__feedback__content {{ has_submitted_feedback|yesno:"is--submitted," }}">
...@@ -121,7 +120,7 @@ ...@@ -121,7 +120,7 @@
<div class="message message--complete {{ has_submitted_feedback|yesno:",is--hidden" }}" <div class="message message--complete {{ has_submitted_feedback|yesno:",is--hidden" }}"
{{ has_submitted_feedback|yesno:'aria-hidden=false,aria-hidden=true' }}> {{ has_submitted_feedback|yesno:'aria-hidden=false,aria-hidden=true' }}>
<h3 class="message__title">{% trans "Your Feedback Has Been Submitted" %}</h3> <h5 class="message__title">{% trans "Status" %}</h5>
<div class="message__content"> <div class="message__content">
<p>{% trans "Your feedback has been submitted. Course staff will be able to see this feedback when they review course records." %}</p> <p>{% trans "Your feedback has been submitted. Course staff will be able to see this feedback when they review course records." %}</p>
</div> </div>
...@@ -135,7 +134,7 @@ ...@@ -135,7 +134,7 @@
<ol class="list list--fields submission__feedback__fields {{ has_submitted_feedback|yesno:"is--hidden," }}" <ol class="list list--fields submission__feedback__fields {{ has_submitted_feedback|yesno:"is--hidden," }}"
{{ has_submitted_feedback|yesno:'aria-hidden=true,aria-hidden=false' }}> {{ has_submitted_feedback|yesno:'aria-hidden=true,aria-hidden=false' }}>
<li class="field field-group field--radio feedback__overall"> <li class="field field-group field--radio feedback__overall">
<h4 id="feedback__overall__prompt__{{ xblock_id }}" class="field-group__label">{% trans "Select the statements below that best reflect your experience with peer assessments" %}:</h4> <h5 id="feedback__overall__prompt__{{ xblock_id }}" class="field-group__label">{% trans "Select the statements below that best reflect your experience with peer assessments." %}</h5>
<ol class="list--options"> <ol class="list--options">
<li class="option option--useful"> <li class="option option--useful">
<input type="checkbox" <input type="checkbox"
...@@ -189,7 +188,7 @@ ...@@ -189,7 +188,7 @@
<div class="submission__feedback__actions {{ has_submitted_feedback|yesno:"is--hidden," }}" <div class="submission__feedback__actions {{ has_submitted_feedback|yesno:"is--hidden," }}"
{{ has_submitted_feedback|yesno:'aria-hidden=true,aria-hidden=false' }}> {{ has_submitted_feedback|yesno:'aria-hidden=true,aria-hidden=false' }}>
<div class="message message--inline message--error message--error-server" tabindex="-1"> <div class="message message--inline message--error message--error-server" tabindex="-1">
<h3 class="message__title">{% trans "We could not submit your feedback" %}</h3> <h5 class="message__title">{% trans "We could not submit your feedback" %}</h5>
<div class="message__content"></div> <div class="message__content"></div>
</div> </div>
......
openassessment/templates/openassessmentblock/grade/oa_grade_incomplete.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% spaceless %} {% spaceless %}
<li id="openassessment__grade__{{ xblock_id }}" class="openassessment__steps__step step--grade is--unfinished is--initially--collapsed ui-slidable__container" tabindex="-1"> <li id="openassessment__grade__{{ xblock_id }}" class="openassessment__steps__step step--grade is--unfinished is--initially--collapsed ui-slidable__container" tabindex="-1">
<header class="step__header ui-slidable__control"> <header class="step__header ui-slidable__control">
<h2 class="step__title"> <h4 class="step__title">
<button class="ui-slidable" aria-expanded="false" id="oa_grade_{{ xblock_id }}" aria-controls="oa_grade_{{ xblock_id }}"> <button class="ui-slidable" aria-expanded="false" id="oa_grade_{{ xblock_id }}" aria-controls="oa_grade_{{ xblock_id }}">
<span class="wrapper--copy"> <span class="wrapper--copy">
<span class="step__label">{% trans "Your Grade" %}: </span> <span class="step__label">{% trans "Your Grade" %}: </span>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</span> </span>
</span> </span>
</button> </button>
</h2> </h4>
</header> </header>
<div class="ui-slidable__content" aria-labelledby="oa_grade_{{ xblock_id }}" id="oa_grade_{{ xblock_id }}_content"> <div class="ui-slidable__content" aria-labelledby="oa_grade_{{ xblock_id }}" id="oa_grade_{{ xblock_id }}_content">
......
openassessment/templates/openassessmentblock/grade/oa_grade_not_started.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% spaceless %} {% spaceless %}
<li id="openassessment__grade__{{ xblock_id }}" class="openassessment__steps__step step--grade is--unstarted is--initially--collapsed ui-slidable__container" tabindex="-1"> <li id="openassessment__grade__{{ xblock_id }}" class="openassessment__steps__step step--grade is--unstarted is--initially--collapsed ui-slidable__container" tabindex="-1">
<header class="step__header ui-slidable__control"> <header class="step__header ui-slidable__control">
<h2 class="step__title"> <h4 class="step__title">
<button class="ui-slidable" aria-expanded="false" id="oa_grade_{{ xblock_id }}" aria-controls="oa_grade_{{ xblock_id }}_content"> <button class="ui-slidable" aria-expanded="false" id="oa_grade_{{ xblock_id }}" aria-controls="oa_grade_{{ xblock_id }}_content">
<span class="wrapper--copy"> <span class="wrapper--copy">
<span class="step__label">{% trans "Your Grade" %}:</span> <span class="step__label">{% trans "Your Grade" %}:</span>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</span> </span>
</span> </span>
</button> </button>
</h2> </h4>
</header> </header>
<div class="ui-slidable__content" aria-labelledby="oa_grade_{{ xblock_id }}" id="oa_grade_{{ xblock_id }}_content"> <div class="ui-slidable__content" aria-labelledby="oa_grade_{{ xblock_id }}" id="oa_grade_{{ xblock_id }}_content">
......
openassessment/templates/openassessmentblock/grade/oa_grade_waiting.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% spaceless %} {% spaceless %}
<li id="openassessment__grade__{{ xblock_id }}" class="openassessment__steps__step step--grade is--showing {{ is_waiting_staff }} ui-slidable__container" tabindex="-1"> <li id="openassessment__grade__{{ xblock_id }}" class="openassessment__steps__step step--grade is--showing {{ is_waiting_staff }} ui-slidable__container" tabindex="-1">
<header class="step__header ui-slidable__control"> <header class="step__header ui-slidable__control">
<h2 class="step__title"> <h4 class="step__title">
<button class="ui-slidable" aria-expanded="true" id="oa_grade_{{ xblock_id }}" aria-controls="oa_grade_{{ xblock_id }}_content"> <button class="ui-slidable" aria-expanded="true" id="oa_grade_{{ xblock_id }}" aria-controls="oa_grade_{{ xblock_id }}_content">
<span class="wrapper--copy"> <span class="wrapper--copy">
<span class="step__label">{% trans "Your Grade" %}:</span> <span class="step__label">{% trans "Your Grade" %}:</span>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</span> </span>
</span> </span>
</button> </button>
</h2> </h4>
</header> </header>
<div class="ui-slidable__content" aria-labelledby="oa_grade_{{ xblock_id }}" id="oa_grade_{{ xblock_id }}_content"> <div class="ui-slidable__content" aria-labelledby="oa_grade_{{ xblock_id }}" id="oa_grade_{{ xblock_id }}_content">
......
openassessment/templates/openassessmentblock/leaderboard/oa_leaderboard_show.html
...@@ -2,27 +2,26 @@ ...@@ -2,27 +2,26 @@
{% spaceless %} {% spaceless %}
<li id="openassessment__leaderboard__{{ xblock_id }}" class="openassessment__steps__step step--leaderboard is--complete ui-slidable__container is--showing {% if allow_latex %} allow--latex{% endif %}" tabindex="-1"> <li id="openassessment__leaderboard__{{ xblock_id }}" class="openassessment__steps__step step--leaderboard is--complete ui-slidable__container is--showing {% if allow_latex %} allow--latex{% endif %}" tabindex="-1">
<header class="step__header ui-slidable__control"> <header class="step__header ui-slidable__control">
<h2 class="step__title"> <h4 class="step__title">
<button class="ui-slidable" aria-expanded="true" id="oa_leaderboard_{{ xblock_id }}" aria-controls="oa_leaderboard_{{ xblock_id }}_content"> <button class="ui-slidable" aria-expanded="true" id="oa_leaderboard_{{ xblock_id }}" aria-controls="oa_leaderboard_{{ xblock_id }}_content">
<span class="wrapper--copy"> <span class="wrapper--copy">
<span class="step__label">{% trans "Top Responses" %} </span> <span class="step__label">{% trans "Top Responses" %} </span>
</span> </span>
</button> </button>
</h2> </h4>
</header> </header>
<div class="wrapper--step__content ui-slidable__content" aria-labelledby="oa_leaderboard_{{ xblock_id }}" id="oa_leaderboard_{{ xblock_id }}_content"> <div class="wrapper--step__content ui-slidable__content" aria-labelledby="oa_leaderboard_{{ xblock_id }}" id="oa_leaderboard_{{ xblock_id }}_content">
<h3 class="leaderboard__title">{% trans "Top-Scoring Responses for This Assignment" %}</h3>
<ol class="list leaderboard__score__list"> <ol class="list leaderboard__score__list">
{% for topscore in topscores %} {% for topscore in topscores %}
<li class="leaderboard__score__item"> <li class="leaderboard__score__item">
<h4 class="leaderboard__list__number">{{ forloop.counter }}</h4> <div class="leaderboard__list__number">{{ forloop.counter }}</div>
{% with num_points=topscore.score %} {% with num_points=topscore.score %}
<h4 class="leaderboard__score__title"> <div class="leaderboard__score__title">
{% blocktrans %}{{ num_points }} points{% endblocktrans %} {% blocktrans %}{{ num_points }} points{% endblocktrans %}
</h4> </div>
{% endwith %} {% endwith %}
<div class="leaderboard__answer"> <div class="leaderboard__answer">
{% trans "Your peer's response to the question above:" as translated_label %} {% trans "Your peer's response to the question above" as translated_label %}
{% include "openassessmentblock/oa_submission_answer.html" with answer=topscore.submission.answer answer_text_label=translated_label %} {% include "openassessmentblock/oa_submission_answer.html" with answer=topscore.submission.answer answer_text_label=translated_label %}
{% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=topscore.file class_prefix="submission__answer"%} {% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=topscore.file class_prefix="submission__answer"%}
</div> </div>
......
openassessment/templates/openassessmentblock/leaderboard/oa_leaderboard_waiting.html
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
{% spaceless %} {% spaceless %}
<li id="openassessment__leaderboard__{{ xblock_id }}" class="openassessment__steps__step step--leaderboard is--initially--collapsed ui-slidable__container" tabindex="-1"> <li id="openassessment__leaderboard__{{ xblock_id }}" class="openassessment__steps__step step--leaderboard is--initially--collapsed ui-slidable__container" tabindex="-1">
<header class="step__header ui-slidable__control"> <header class="step__header ui-slidable__control">
<h2 class="step__title"> <h4 class="step__title">
<button class="ui-slidable" aria-expanded="false" id="oa_leaderboard_{{ xblock_id }}" aria-controls="oa_leaderboard_{{ xblock_id }}_content"> <button class="ui-slidable" aria-expanded="false" id="oa_leaderboard_{{ xblock_id }}" aria-controls="oa_leaderboard_{{ xblock_id }}_content">
<span class="wrapper--copy"> <span class="wrapper--copy">
<span class="step__label">{% trans "Top Responses" %} </span> <span class="step__label">{% trans "Top Responses" %} </span>
</span> </span>
</button> </button>
</h2> </h4>
</header> </header>
<div class="ui-slidable__content" aria-labelledby="oa_leaderboard_{{ xblock_id }}" id="oa_leaderboard_{{ xblock_id }}_content"> <div class="ui-slidable__content" aria-labelledby="oa_leaderboard_{{ xblock_id }}" id="oa_leaderboard_{{ xblock_id }}_content">
......
openassessment/templates/openassessmentblock/message/oa_message_closed.html
{% load i18n %} {% load i18n %}
{% spaceless %} {% spaceless %}
<div id="openassessment__message__{{ xblock_id }}" class="openassessment__message message"> <div id="openassessment__message__{{ xblock_id }}" class="openassessment__message message">
<h3 class="message__title"> <h4 class="message__title">{% trans "Status" %}</h4>
{% if not_yet_open %}
{% trans "This Task Is Not Yet Available" %}
{% else %}
{% trans "This Assignment Has Closed" %}
{% endif %}
</h3>
<div class="message__content"> <div class="message__content">
<p> <p>
{% if not_yet_open %} {% if not_yet_open %}
{% trans "Check back to complete the assignment once this section has opened." %} {% trans "This task is not yet available. Check back to complete the assignment once this section has opened." %}
{% else %} {% else %}
{% trans "One or more deadlines for this assignment have passed. You will receive an incomplete grade for this assignment." %} {% trans "This assignment has closed. One or more deadlines for this assignment have passed. You will receive an incomplete grade for this assignment." %}
{% endif %} {% endif %}
</p> </p>
</div> </div>
</div> </div>
{% endspaceless %} {% endspaceless %}
\ No newline at end of file
openassessment/templates/openassessmentblock/message/oa_message_complete.html
{% load i18n %} {% load i18n %}
{% spaceless %} {% spaceless %}
<div id="openassessment__message__{{ xblock_id }}" class="openassessment__message message"> <div id="openassessment__message__{{ xblock_id }}" class="openassessment__message message">
<h3 class="message__title">{% trans "You Have Completed This Assignment" %} </h3> <h4 class="message__title">{% trans "Status" %} </h4>
<div class="message__content"> <div class="message__content">
<p> <p>
{% if waiting %} {% if waiting %}
<p>{% trans "Your final grade will be available when the assessments of your response are complete." %}</p> <p>{% trans "You have completed this assignment. Your final grade will be available when the assessments of your response are complete." %}</p>
{% else %} {% else %}
<a data-behavior="ui-scroll" href="#openassessment__grade__{{ xblock_id }}">{% trans "Review your grade and your assessment details." %}</a> <a data-behavior="ui-scroll" href="#openassessment__grade__{{ xblock_id }}">{% trans "You have completed this assignment. Review your grade and your assessment details." %}</a>
{% endif %} {% endif %}
</p> </p>
</div> </div>
......
openassessment/templates/openassessmentblock/message/oa_message_incomplete.html
{% load i18n %} {% load i18n %}
{% spaceless %} {% spaceless %}
<div id="openassessment__message__{{ xblock_id }}" class="openassessment__message message"> <div id="openassessment__message__{{ xblock_id }}" class="openassessment__message message">
<h3 class="message__title"> <h4 class="message__title">{% trans "Status" %}</h4>
{% trans "Assignment in progress" %}
</h3>
<div class="message__content"> <div class="message__content">
<p> <p>
{% if training %} {% if training %}
{% if training_deadline_approaching %} {% if training_deadline_approaching %}
{% trans "Learner training will close soon. Complete the learner training step to move on." %} {% trans "This assignment is in progress. Learner training will close soon. Complete the learner training step to move on." %}
{% else %} {% else %}
{% trans "Complete the learner training step to move on." %} {% trans "This assignment is in progress. Complete the learner training step to move on." %}
{% endif %} {% endif %}
{% elif self %} {% elif self %}
{% if self_not_released %} {% if self_not_released %}
{% trans "Check back later when the assessment period has started." %} {% trans "This assignment is in progress. Check back later when the assessment period has started." %}
{% else %} {% else %}
{% with start_link='<a data-behavior="ui-scroll" href="#openassessment__self-assessment__'|add:xblock_id|add:'">'|safe %} {% with start_link='<a data-behavior="ui-scroll" href="#openassessment__self-assessment__'|add:xblock_id|add:'">'|safe %}
{% with start_strong='<strong>'|safe end_strong='</strong>'|safe end_link='</a>'|safe %} {% with start_strong='<strong>'|safe end_strong='</strong>'|safe end_link='</a>'|safe %}
{% if self_approaching %} {% if self_approaching %}
{% blocktrans %} {% blocktrans %}
{{ start_strong }}The self assessment step will close soon.{{ end_strong }} You still need to complete the {{ start_link }}self assessment{{ end_link }} step. {{ start_strong }}This assignment is in progress. The self assessment step will close soon.{{ end_strong }} You still need to complete the {{ start_link }}self assessment{{ end_link }} step.
{% endblocktrans %} {% endblocktrans %}
{% else %} {% else %}
{% blocktrans %} {% blocktrans %}
You still need to complete the {{ start_link }}self assessment{{ end_link }} step. This assignment is in progress. You still need to complete the {{ start_link }}self assessment{{ end_link }} step.
{% endblocktrans %} {% endblocktrans %}
{% endif %} {% endif %}
{% endwith %} {% endwith %}
...@@ -32,25 +30,25 @@ ...@@ -32,25 +30,25 @@
{% endif %} {% endif %}
{% elif peer %} {% elif peer %}
{% if peer_not_released %} {% if peer_not_released %}
{% trans "Check back later when the assessment period has started." %} {% trans "This assignment is in progress. Check back later when the assessment period has started." %}
{% else %} {% else %}
{% with start_link='<a data-behavior="ui-scroll" href="#openassessment__peer-assessment__'|add:xblock_id|add:'">'|safe%} {% with start_link='<a data-behavior="ui-scroll" href="#openassessment__peer-assessment__'|add:xblock_id|add:'">'|safe%}
{% with start_strong='<strong>'|safe end_strong='</strong>'|safe end_link='</a>'|safe %} {% with start_strong='<strong>'|safe end_strong='</strong>'|safe end_link='</a>'|safe %}
{% if peer_approaching and peer_not_available %} {% if peer_approaching and peer_not_available %}
{% blocktrans %} {% blocktrans %}
{{ start_strong }}The peer assessment step will close soon.{{ end_strong }} All submitted peer responses have been assessed. Check back later to see if more learners have submitted responses. You still need to complete the {{ start_link }}peer assessment{{ end_link }} step. This assignment is in progress.{{ start_strong }}The peer assessment step will close soon.{{ end_strong }} All submitted peer responses have been assessed. Check back later to see if more learners have submitted responses. You still need to complete the {{ start_link }}peer assessment{{ end_link }} step.
{% endblocktrans %} {% endblocktrans %}
{% elif not peer_approaching and peer_not_available %} {% elif not peer_approaching and peer_not_available %}
{% blocktrans %} {% blocktrans %}
All submitted peer responses have been assessed. Check back later to see if more learners have submitted responses. You still need to complete the {{ start_link }}peer assessment{{ end_link }} step. This assignment is in progress. All submitted peer responses have been assessed. Check back later to see if more learners have submitted responses. You still need to complete the {{ start_link }}peer assessment{{ end_link }} step.
{% endblocktrans %} {% endblocktrans %}
{% elif peer_approaching and not peer_not_available %} {% elif peer_approaching and not peer_not_available %}
{% blocktrans %} {% blocktrans %}
{{ start_strong }}The peer assessment step will close soon.{{ end_strong }} You still need to complete the {{ start_link }}peer assessment{{ end_link }} step. This assignment is in progress. {{ start_strong }}The peer assessment step will close soon.{{ end_strong }} You still need to complete the {{ start_link }}peer assessment{{ end_link }} step.
{% endblocktrans %} {% endblocktrans %}
{% else %} {% else %}
{% blocktrans %} {% blocktrans %}
You still need to complete the {{ start_link }}peer assessment{{ end_link }} step. This assignment is in progress. You still need to complete the {{ start_link }}peer assessment{{ end_link }} step.
{% endblocktrans %} {% endblocktrans %}
{% endif %} {% endif %}
{% endwith %} {% endwith %}
......
openassessment/templates/openassessmentblock/message/oa_message_unavailable.html
{% load i18n %} {% load i18n %}
{% spaceless %} {% spaceless %}
<div id="openassessment__message__{{ xblock_id }}" class="openassessment__message message"> <div id="openassessment__message__{{ xblock_id }}" class="openassessment__message message">
<h3 class="message__title">{% trans "Instructions Unavailable" %} </h3> <h4 class="message__title">{% trans "Instructions Unavailable" %} </h4>
<div class="message__content"> <div class="message__content">
<p> {% trans "The instructions for this step could not be loaded." %}</p> <p> {% trans "The instructions for this step could not be loaded." %}</p>
</div> </div>
</div> </div>
{% endspaceless %} {% endspaceless %}
\ No newline at end of file
openassessment/templates/openassessmentblock/oa_base.html
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="openassessment problem"> <div class="openassessment problem">
<div class="wrapper--grid"> <div class="wrapper--grid">
{% if title %} {% if title %}
<h2 class="openassessment__title problem__header">{% trans title %}</h2> <h3 class="openassessment__title problem__header">{% trans title %}</h3>
{% endif %} {% endif %}
<div class="wrapper-openassessment__message"> <div class="wrapper-openassessment__message">
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
{% for assessment in rubric_assessments %} {% for assessment in rubric_assessments %}
<li class="{{ assessment.class_id }} openassessment__steps__step is--loading"> <li class="{{ assessment.class_id }} openassessment__steps__step is--loading">
<header class="step__header ui-slidable__container"> <header class="step__header ui-slidable__container">
<h2 class="step__title"> <h4 class="step__title">
<button class="ui-slidable" aria-expanded="false" disabled> <button class="ui-slidable" aria-expanded="false" disabled>
<span class="step__counter"></span> <span class="step__counter"></span>
<span class="wrapper--copy"> <span class="wrapper--copy">
...@@ -31,13 +31,12 @@ ...@@ -31,13 +31,12 @@
</button> </button>
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status:" %}</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="icon fa fa-spinner fa-spin" aria-hidden="true"></span> <span class="icon fa fa-spinner fa-spin" aria-hidden="true"></span>
<span class="copy">{% trans "Loading" %}</span> <span class="copy">{% trans "Loading" %}</span>
</span> </span>
</span> </span>
</h2> </h4>
</header> </header>
</li> </li>
{% endfor %} {% endfor %}
......
openassessment/templates/openassessmentblock/oa_rubric.html
...@@ -6,13 +6,13 @@ ...@@ -6,13 +6,13 @@
<li <li
class="field field--radio is--required assessment__rubric__question is--showing ui-slidable__container {% if criterion.options %}has--options{% endif %} {{ rubric_type }}__assessment__rubric__question--{{ criterion.order_num }}" class="field field--radio is--required assessment__rubric__question is--showing ui-slidable__container {% if criterion.options %}has--options{% endif %} {{ rubric_type }}__assessment__rubric__question--{{ criterion.order_num }}"
> >
<h4 class="question__title ui-slidable__control"> <div class="question__title ui-slidable__control">
<button class="ui-slidable" aria-expanded="true" id="oa_rubric__{{ rubric_type }}__{{ submission.uuid }}__{{ criterion.order_num }}" aria-controls="oa_rubric__{{ rubric_type }}__{{ submission.uuid }}__{{ criterion.order_num }}__content"> <button class="ui-slidable" aria-expanded="true" id="oa_rubric__{{ rubric_type }}__{{ submission.uuid }}__{{ criterion.order_num }}" aria-controls="oa_rubric__{{ rubric_type }}__{{ submission.uuid }}__{{ criterion.order_num }}__content">
<span class="icon fa fa-caret-right" aria-hidden="true"></span> <span class="icon fa fa-caret-right" aria-hidden="true"></span>
<span id="{{ rubric_type }}__assessment__rubric__prompt--{{ criterion.order_num }}" class="ui-slidable__control__copy question__title__copy">{{ criterion.prompt }}</span> <span id="{{ rubric_type }}__assessment__rubric__prompt--{{ criterion.order_num }}" class="ui-slidable__control__copy question__title__copy">{{ criterion.prompt }}</span>
<span class="label--required sr">* ({% trans "Required" %})</span> <span class="label--required sr">* ({% trans "Required" %})</span>
</button> </button>
</h4> </div>
<div class="ui-slidable__content" aria-labelledby="oa_rubric__{{ rubric_type }}__{{ submission.uuid }}__{{ criterion.order_num }}" id="oa_rubric__{{ rubric_type }}__{{ submission.uuid }}__{{ criterion.order_num }}__content"> <div class="ui-slidable__content" aria-labelledby="oa_rubric__{{ rubric_type }}__{{ submission.uuid }}__{{ criterion.order_num }}" id="oa_rubric__{{ rubric_type }}__{{ submission.uuid }}__{{ criterion.order_num }}__content">
<div class="question__answers"> <div class="question__answers">
......
openassessment/templates/openassessmentblock/oa_submission_answer.html
...@@ -3,14 +3,16 @@ ...@@ -3,14 +3,16 @@
<ol class="submission__answer__display__content"> <ol class="submission__answer__display__content">
{% for part in answer.parts %} {% for part in answer.parts %}
<li class="submission__answer__part"> <li class="submission__answer__part">
<div class="submission__answer__part__text">
<h5 class="submission__answer__part__text__title">{% trans "The question for this section" %}</h5>
</div>
<article class="submission__answer__part__prompt"> <article class="submission__answer__part__prompt">
<h2 class="submission__answer__part__prompt__title">{% trans "The question for this section." %}</h2>
<div class="submission__answer__part__prompt__value"> <div class="submission__answer__part__prompt__value">
{{ part.prompt.description|linebreaks }} {{ part.prompt.description|linebreaks }}
</div> </div>
</article> </article>
<div class="submission__answer__part__text"> <div class="submission__answer__part__text">
<h2 class="submission__answer__part__text__title">{{ answer_text_label }}</h2> <h5 class="submission__answer__part__text__title">{{ answer_text_label }}</h5>
<div class="submission__answer__part__text__value"> <div class="submission__answer__part__text__value">
{{ part.text|linebreaks }} {{ part.text|linebreaks }}
</div> </div>
......
openassessment/templates/openassessmentblock/oa_uploaded_file.html
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
{% if file_upload_type %} {% if file_upload_type %}
{% if header %} {% if header %}
<header class="{{ class_prefix }}__display__header"> <header class="{{ class_prefix }}__display__header">
<h3 class="{{ class_prefix }}__display__title"> <h5 class="{{ class_prefix }}__display__title">
{{ header }} {{ header }}
</h3> </h5>
</header> </header>
{% endif %} {% endif %}
......
openassessment/templates/openassessmentblock/peer/oa_peer_assessment.html
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
{% spaceless %} {% spaceless %}
<header class="step__header ui-slidable__control"> <header class="step__header ui-slidable__control">
<h2 class="step__title"> <h4 class="step__title">
{% block button %} {% block button %}
<button class="ui-slidable" aria-expanded="true" id="oa_peer_{{ xblock_id }}" aria-controls="oa_peer{{ xblock_id }}_content"> <button class="ui-slidable" aria-expanded="true" id="oa_peer_{{ xblock_id }}" aria-controls="oa_peer{{ xblock_id }}_content">
{% endblock %} {% endblock %}
...@@ -34,19 +34,18 @@ ...@@ -34,19 +34,18 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="copy"> <span class="copy">
{% with graded_string=graded|stringformat:"s" must_grade_string=must_grade|stringformat:"s" %} {% with review_num_string=review_num|stringformat:"s" must_grade_string=must_grade|stringformat:"s" %}
{% blocktrans with num_graded='<span class="step__status__value--completed">'|safe|add:graded_string|add:"</span>"|safe num_must_grade='<span class="step__status__value--required">'|safe|add:must_grade_string|add:"</span>"|safe %} {% blocktrans with review_number='<span class="step__status__number--current">'|safe|add:review_num_string|add:"</span>"|safe num_must_grade='<span class="step__status__value--required">'|safe|add:must_grade_string|add:"</span>"|safe %}
In Progress ({{ num_graded }} of {{ num_must_grade }}) In Progress ({{ review_number }} of {{ num_must_grade }})
{% endblocktrans %} {% endblocktrans %}
{% endwith %} {% endwith %}
</span> </span>
</span> </span>
</span> </span>
{% endblock %} {% endblock %}
</h2> </h4>
</header> </header>
{% block body %} {% block body %}
...@@ -61,17 +60,8 @@ ...@@ -61,17 +60,8 @@
<li class="list--peer-assessments__item"> <li class="list--peer-assessments__item">
<article class="peer-assessment peer-assessment--001"> <article class="peer-assessment peer-assessment--001">
<div class="peer-assessment__display"> <div class="peer-assessment__display">
<header class="peer-assessment__display__header">
<h3 class="peer-assessment__display__title">
{% with review_num_string=review_num|stringformat:"s" must_grade_string=must_grade|stringformat:"s" %}
{% blocktrans with review_number='<span class="peer-assessment__number--current">'|safe|add:review_num_string|add:'</span>'|safe num_must_grade='<span class="peer-assessment__number--required">'|safe|add:must_grade_string|add:'</span>'|safe %}
Assessment # {{ review_number }} of {{ num_must_grade }}
{% endblocktrans %}
{% endwith %}
</h3>
</header>
{% trans "Your peer's response to the question above:" as translated_label %} {% trans "Your peer's response to the question above" as translated_label %}
{% include "openassessmentblock/oa_submission_answer.html" with answer=peer_submission.answer answer_text_label=translated_label %} {% include "openassessmentblock/oa_submission_answer.html" with answer=peer_submission.answer answer_text_label=translated_label %}
{% trans "Associated File" as translated_header %} {% trans "Associated File" as translated_header %}
...@@ -88,7 +78,7 @@ ...@@ -88,7 +78,7 @@
<div class="step__actions"> <div class="step__actions">
<div class="message message--inline message--error message--error-server" tabindex="-1"> <div class="message message--inline message--error message--error-server" tabindex="-1">
<h3 class="message__title">{% trans "We could not submit your assessment" %}</h3> <h5 class="message__title">{% trans "We could not submit your assessment" %}</h5>
<div class="message__content"></div> <div class="message__content"></div>
</div> </div>
......
openassessment/templates/openassessmentblock/peer/oa_peer_cancelled.html
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="icon fa fa-exclamation-triangle" aria-hidden="true"></span> <span class="icon fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="copy"> <span class="copy">
......
openassessment/templates/openassessmentblock/peer/oa_peer_closed.html
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="copy"> <span class="copy">
<span class="icon fa fa-exclamation-triangle" aria-hidden="true"></span> <span class="icon fa fa-exclamation-triangle" aria-hidden="true"></span>
...@@ -29,9 +28,9 @@ ...@@ -29,9 +28,9 @@
<div class="ui-slidable__content" aria-labelledby="oa_peer_{{ xblock_id }}" id="oa_peer_{{ xblock_id }}_content"> <div class="ui-slidable__content" aria-labelledby="oa_peer_{{ xblock_id }}" id="oa_peer_{{ xblock_id }}_content">
<div class="wrapper--step__content"> <div class="wrapper--step__content">
<div class="step__message message message--incomplete"> <div class="step__message message message--incomplete">
<h3 class="message__title">{% trans "The Due Date for This Step Has Passed" %}</h3> <h5 class="message__title">{% trans "Status" %}</h5>
<div class="message__content"> <div class="message__content">
<p>{% trans "This step is now closed. You can no longer complete peer assessments or continue with this assignment, and you'll receive a grade of Incomplete." %}</p> <p>{% trans "The due date for this step has passed. This step is now closed. You can no longer complete peer assessments or continue with this assignment, and you will receive a grade of Incomplete." %}</p>
</div> </div>
</div> </div>
</div> </div>
......
openassessment/templates/openassessmentblock/peer/oa_peer_complete.html
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="icon fa fa-check" aria-hidden="true"></span> <span class="icon fa fa-check" aria-hidden="true"></span>
<span class="copy"> <span class="copy">
...@@ -26,13 +25,14 @@ ...@@ -26,13 +25,14 @@
<div class="wrapper--step__content"> <div class="wrapper--step__content">
<div class="step__message message message--complete"> <div class="step__message message message--complete">
<h3 class="message__title">{% trans "Peer Assessments Complete" %}</h3> <h5 class="message__title">{% trans "Status" %}</h5>
<div class="message__content">{% trans "You have successfully completed all of the required peer assessments for this assignment. You may assess additional peer responses if you want to. Completing additional assessments will not affect your final grade." %}</div> <div class="message__content">{% trans "You have successfully completed all of the required peer assessments for this assignment. You may assess additional peer responses if you want to. Completing additional assessments will not affect your final grade." %}</div>
</div> </div>
<div class="step__actions"> <div class="step__actions">
<div class="message message--inline message--error message--error-server" tabindex="-1"> <div class="message message--inline message--error message--error-server" tabindex="-1">
<h3 class="message__title">{% trans "We could not retrieve additional submissions for assessment" %}</h3> <h5 class="message__title">{% trans "We could not retrieve additional submissions for assessment" %}</h5>
<div class="message__content"></div>
</div> </div>
<ul class="list list--actions"> <ul class="list list--actions">
......
openassessment/templates/openassessmentblock/peer/oa_peer_turbo_mode.html
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="icon fa fa-check" aria-hidden="true"></span> <span class="icon fa fa-check" aria-hidden="true"></span>
<span class="copy"> <span class="copy">
...@@ -36,7 +35,7 @@ ...@@ -36,7 +35,7 @@
<div class="wrapper--step__content"> <div class="wrapper--step__content">
<div class="step__message message message--complete"> <div class="step__message message message--complete">
<h3 class="message__title">{% trans "Peer Assessments Complete" %}</h3> <h5 class="message__title">{% trans "Status" %}</h5>
<div class="message__content">{% trans "You have successfully completed all of the required peer assessments for this assignment. You may assess additional peer responses if you want to. Completing additional assessments will not affect your final grade." %}</div> <div class="message__content">{% trans "You have successfully completed all of the required peer assessments for this assignment. You may assess additional peer responses if you want to. Completing additional assessments will not affect your final grade." %}</div>
</div> </div>
...@@ -49,14 +48,7 @@ ...@@ -49,14 +48,7 @@
<li class="list--peer-assessments__item"> <li class="list--peer-assessments__item">
<article class="peer-assessment peer-assessment--001"> <article class="peer-assessment peer-assessment--001">
<div class="peer-assessment__display"> <div class="peer-assessment__display">
<header class="peer-assessment__display__header"> {% trans "Your peer's response to the question above" as translated_label %}
<h3 class="peer-assessment__display__title">{% trans "Assessment #" %}
<span class="peer-assessment__number--current">{{ review_num }}</span> of
<span class="peer-assessment__number--required">{{ must_grade }}</span>
</h3>
</header>
{% trans "Your peer's response to the question above:" as translated_label %}
{% include "openassessmentblock/oa_submission_answer.html" with answer=peer_submission.answer answer_text_label=translated_label %} {% include "openassessmentblock/oa_submission_answer.html" with answer=peer_submission.answer answer_text_label=translated_label %}
{% trans "Associated File" as translated_header %} {% trans "Associated File" as translated_header %}
...@@ -73,7 +65,7 @@ ...@@ -73,7 +65,7 @@
<div class="step__actions"> <div class="step__actions">
<div class="message message--inline message--error message--error-server" tabindex="-1"> <div class="message message--inline message--error message--error-server" tabindex="-1">
<h3 class="message__title">{% trans "We could not submit your assessment" %}</h3> <h5 class="message__title">{% trans "We could not submit your assessment" %}</h5>
</div> </div>
<ul class="list list--actions"> <ul class="list list--actions">
......
openassessment/templates/openassessmentblock/peer/oa_peer_turbo_mode_waiting.html
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="icon fa fa-check" aria-hidden="true"></span> <span class="icon fa fa-check" aria-hidden="true"></span>
<span class="copy"> <span class="copy">
...@@ -30,11 +29,11 @@ ...@@ -30,11 +29,11 @@
<div class="wrapper--step__content"> <div class="wrapper--step__content">
<div class="step__message message message--complete"> <div class="step__message message message--complete">
<h3 class="message__title">{% trans "Peer Assessments Complete" %}</h3> <h5 class="message__title">{% trans "Status" %}</h5>
<div class="message__content"> <div class="message__content">
<p>{% trans "You have successfully completed all of the required peer assessments for this assignment. You may assess additional peer responses if you want to. Completing additional assessments will not affect your final grade." %}</p> <p>{% trans "You have successfully completed all of the required peer assessments for this assignment. You may assess additional peer responses if you want to. Completing additional assessments will not affect your final grade." %}</p>
<p><strong>{% trans "All submitted peer responses have been assessed. Check back later to see if more students have submitted responses." %}</strong></p> <p><strong>{% trans "All submitted peer responses have been assessed. Check back later to see if more learners have submitted responses." %}</strong></p>
</div> </div>
</div> </div>
</div> </div>
......
openassessment/templates/openassessmentblock/peer/oa_peer_unavailable.html
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="copy">{% trans "Not Available" %}</span> <span class="copy">{% trans "Not Available" %}</span>
</span> </span>
......
openassessment/templates/openassessmentblock/peer/oa_peer_waiting.html
...@@ -12,12 +12,11 @@ ...@@ -12,12 +12,11 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="copy"> <span class="copy">{{review_num}}
{% with graded_string=graded|stringformat:"s" must_grade_string=must_grade|stringformat:"s" %} {% with review_num_string=review_num|stringformat:"s" must_grade_string=must_grade|stringformat:"s" %}
{% blocktrans with num_graded='<span class="step__status__value--completed">'|safe|add:graded_string|add:"</span>"|safe num_must_grade='<span class="step__status__value--required">'|safe|add:must_grade_string|add:"</span>"|safe %} {% blocktrans with review_number='<span class="step__status__number--current">'|safe|add:review_num_string|add:"</span>"|safe num_must_grade='<span class="step__status__value--required">'|safe|add:must_grade_string|add:"</span>"|safe %}
In Progress ({{ num_graded }} of {{ num_must_grade }}) In Progress ({{ review_number }} of {{ num_must_grade }})
{% endblocktrans %} {% endblocktrans %}
{% endwith %} {% endwith %}
</span> </span>
...@@ -30,10 +29,10 @@ ...@@ -30,10 +29,10 @@
<div class="wrapper--step__content"> <div class="wrapper--step__content">
<div class="step__message message message--incomplete"> <div class="step__message message message--incomplete">
<h3 class="message__title">{% trans "Waiting for Peer Responses" %}</h3> <h5 class="message__title">{% trans "Status" %}</h5>
<div class="message__content"> <div class="message__content">
<p>{% trans "All submitted peer responses have been assessed. Check back later to see if more students have submitted responses. You'll receive your grade after you've completed all the steps for this problem and your peers have assessed your response." %}</p> <p>{% trans "All available peer responses have been assessed. Check back later to see if more learners have submitted responses. You will receive your grade after you've completed all the steps for this problem and your peers have assessed your response." %}</p>
</div> </div>
</div> </div>
</div> </div>
......
openassessment/templates/openassessmentblock/response/oa_response.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
{% endblock %} {% endblock %}
<header class="step__header ui-slidable__control"> <header class="step__header ui-slidable__control">
<h2 class="step__title"> <h4 class="step__title">
{% block button %} {% block button %}
<button class="ui-slidable" aria-expanded="true" id="oa_response_{{ xblock_id }}" aria-controls="oa_response_{{ xblock_id }}_content"> <button class="ui-slidable" aria-expanded="true" id="oa_response_{{ xblock_id }}" aria-controls="oa_response_{{ xblock_id }}_content">
{% endblock %} {% endblock %}
...@@ -29,13 +29,12 @@ ...@@ -29,13 +29,12 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="copy">{% trans "In Progress" %}</span> <span class="copy">{% trans "In Progress" %}</span>
</span> </span>
</span> </span>
{% endblock %} {% endblock %}
</h2> </h4>
</header> </header>
{% block body %} {% block body %}
...@@ -58,18 +57,26 @@ ...@@ -58,18 +57,26 @@
<ol class="list list--fields response__submission__content"> <ol class="list list--fields response__submission__content">
{% for part in saved_response.answer.parts %} {% for part in saved_response.answer.parts %}
<li class="submission__answer__part"> <li class="submission__answer__part">
<h5 class="submission__answer__part__text__title">{% trans "The prompt for this section" %}</h5>
<article class="submission__answer__part__prompt"> <article class="submission__answer__part__prompt">
<h2 class="submission__answer__part__prompt__title">{% trans "The prompt for this section." %}</h2>
<div class="submission__answer__part__prompt__copy"> <div class="submission__answer__part__prompt__copy">
{{ part.prompt.description|linebreaks }} {{ part.prompt.description|linebreaks }}
</div> </div>
</article> </article>
<div class="field field--textarea submission__answer__part__text"> <div class="field field--textarea submission__answer__part__text">
<label class="sr" for="submission__answer__part__text__{{ forloop.counter }}__{{ xblock_id }}">{% trans "Your response to the question above." %}</label> <div class="submission__answer__part__text">
<h5 id="submission__answer__part__text__title__{{ forloop.counter }}__{{ xblock_id }}"
class="submission__answer__part__text__title">
{% trans "Your response" %}
</h5>
</div>
<textarea <textarea
id="submission__answer__part__text__{{ forloop.counter }}__{{ xblock_id }}" id="submission__answer__part__text__{{ forloop.counter }}__{{ xblock_id }}"
class="submission__answer__part__text__value" class="submission__answer__part__text__value"
aria-labelledby="submission__answer__part__text__title__{{ forloop.counter }}__{{ xblock_id }}"
aria-describedby="submission__answer__tip__{{ xblock_id }}" aria-describedby="submission__answer__tip__{{ xblock_id }}"
placeholder="{% trans "Enter your response to the question above." %}" placeholder="{% trans "Enter your response to the question above." %}"
maxlength="100000" maxlength="100000"
...@@ -81,7 +88,7 @@ ...@@ -81,7 +88,7 @@
<li class="field"> <li class="field">
<div class="upload__error"> <div class="upload__error">
<div class="message message--inline message--error message--error-server" tabindex="-1"> <div class="message message--inline message--error message--error-server" tabindex="-1">
<h3 class="message__title">{% trans "We could not upload this file" %}</h3> <h5 class="message__title">{% trans "We could not upload this file" %}</h5>
<div class="message__content"></div> <div class="message__content"></div>
</div> </div>
</div> </div>
...@@ -98,7 +105,7 @@ ...@@ -98,7 +105,7 @@
<div class="response__submission__actions"> <div class="response__submission__actions">
<div class="message message--inline message--error message--error-server" tabindex="-1"> <div class="message message--inline message--error message--error-server" tabindex="-1">
<h3 class="message__title">{% trans "We could not save your progress" %}</h3> <h5 class="message__title">{% trans "We could not save your progress" %}</h5>
<div class="message__content"></div> <div class="message__content"></div>
</div> </div>
...@@ -125,7 +132,7 @@ ...@@ -125,7 +132,7 @@
</li> </li>
<li class="submission__preview__item list--actions__item"> <li class="submission__preview__item list--actions__item">
<article class="submission__answer__display"> <article class="submission__answer__display">
<h3 class="submission__answer__display__title">{% trans "Preview Response"%}</h3> <h5 class="submission__answer__display__title">{% trans "Preview Response"%}</h5>
<div class="submission__answer__display__content"> <div class="submission__answer__display__content">
<p class="preview_content"></p> <p class="preview_content"></p>
</div> </div>
...@@ -139,7 +146,7 @@ ...@@ -139,7 +146,7 @@
<div class="step__actions"> <div class="step__actions">
<div class="message message--inline message--error message--error-server" tabindex="-1"> <div class="message message--inline message--error message--error-server" tabindex="-1">
<h3 class="message__title">{% trans "We could not submit your response" %}</h3> <h5 class="message__title">{% trans "We could not submit your response" %}</h5>
<div class="message__content"></div> <div class="message__content"></div>
</div> </div>
......
openassessment/templates/openassessmentblock/response/oa_response_cancelled.html
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="icon fa fa-exclamation-triangle" aria-hidden="true"></span> <span class="icon fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="copy">{% trans "Cancelled" %}</span> <span class="copy">{% trans "Cancelled" %}</span>
...@@ -27,9 +26,10 @@ ...@@ -27,9 +26,10 @@
<div class="wrapper--step__content"> <div class="wrapper--step__content">
<div class="step__message message message--incomplete"> <div class="step__message message message--incomplete">
<h3 class="message__title">{% trans "Submission Cancelled" %}</h3> <h5 class="message__title">{% trans "Status" %}</h5>
<div class="message__content"> <div class="message__content">
{% trans "Your submission was cancelled. " %}
<p> <p>
{% if workflow_cancellation.cancelled_by %} {% if workflow_cancellation.cancelled_by %}
{% blocktrans with removed_datetime=workflow_cancellation.cancelled_at|utc|date:"N j, Y H:i e" removed_by_username=workflow_cancellation.cancelled_by %} {% blocktrans with removed_datetime=workflow_cancellation.cancelled_at|utc|date:"N j, Y H:i e" removed_by_username=workflow_cancellation.cancelled_by %}
......
openassessment/templates/openassessmentblock/response/oa_response_closed.html
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="icon fa fa-exclamation-triangle" aria-hidden="true"></span> <span class="icon fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="copy">{% trans "Incomplete" %}</span> <span class="copy">{% trans "Incomplete" %}</span>
...@@ -25,10 +24,10 @@ ...@@ -25,10 +24,10 @@
<div class="wrapper--step__content"> <div class="wrapper--step__content">
<div class="step__message message message--incomplete"> <div class="step__message message message--incomplete">
<h3 class="message__title">{% trans "The Due Date for This Step Has Passed" %}</h3> <h5 class="message__title">{% trans "Status" %}</h5>
<div class="message__content"> <div class="message__content">
<p>{% trans "This step is now closed. You can no longer submit a response or continue with this problem, and you'll receive a grade of Incomplete. If you saved but did not submit a response, the response appears in the course records." %}</p> <p>{% trans "The due date for this step has passed. This step is now closed. You can no longer submit a response or continue with this problem, and you will receive a grade of Incomplete. If you saved but did not submit a response, the response appears in the course records." %}</p>
</div> </div>
</div> </div>
</div> </div>
......
openassessment/templates/openassessmentblock/response/oa_response_graded.html
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="icon fa fa-check" aria-hidden="true"></span> <span class="icon fa fa-check" aria-hidden="true"></span>
<span class="copy">{% trans "Complete" %}</span> <span class="copy">{% trans "Complete" %}</span>
...@@ -26,9 +25,7 @@ ...@@ -26,9 +25,7 @@
<div class="wrapper--step__content"> <div class="wrapper--step__content">
<div class="step__content"> <div class="step__content">
<article class="submission__answer__display"> <article class="submission__answer__display">
<h3 class="submission__answer__display__title">{% trans "Your Response" %}</h3> {% trans "Your response" as translated_label %}
{% trans "Your response to the question above:" as translated_label %}
{% include "openassessmentblock/oa_submission_answer.html" with answer=student_submission.answer answer_text_label=translated_label %} {% include "openassessmentblock/oa_submission_answer.html" with answer=student_submission.answer answer_text_label=translated_label %}
{% trans "Your Uploaded File" as translated_header %} {% trans "Your Uploaded File" as translated_header %}
......
openassessment/templates/openassessmentblock/response/oa_response_submitted.html
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="icon fa fa-check" aria-hidden="true"></span> <span class="icon fa fa-check" aria-hidden="true"></span>
<span class="copy">{% trans "Complete" %}</span> <span class="copy">{% trans "Complete" %}</span>
...@@ -26,9 +25,9 @@ ...@@ -26,9 +25,9 @@
<div class="wrapper--step__content"> <div class="wrapper--step__content">
<div class="step__message message message--complete"> <div class="step__message message message--complete">
<h3 class="message__title">{% trans "Your Response Has Been Submitted" %}</h3> <h5 class="message__title">{% trans "Status" %}</h5>
<div class="message__content"> <div class="message__content">
{% trans "You will receive your grade after all steps are complete and your response is fully assessed." %} {% trans "Your response has been submitted. You will receive your grade after all steps are complete and your response is fully assessed." %}
{% if peer_incomplete and self_incomplete %} {% if peer_incomplete and self_incomplete %}
{% blocktrans with peer_start_tag='<a data-behavior="ui-scroll" href="#openassessment__peer-assessment__'|add:xblock_id|add:'">'|safe self_start_tag='<a data-behavior="ui-scroll" href="#openassessment__self-assessment__'|add:xblock_id|add:'">'|safe end_tag='</a>'|safe %} {% blocktrans with peer_start_tag='<a data-behavior="ui-scroll" href="#openassessment__peer-assessment__'|add:xblock_id|add:'">'|safe self_start_tag='<a data-behavior="ui-scroll" href="#openassessment__self-assessment__'|add:xblock_id|add:'">'|safe end_tag='</a>'|safe %}
You still need to complete the {{ peer_start_tag }}peer assessment{{ end_tag }} and {{ self_start_tag }}self assessment{{ end_tag }} steps. You still need to complete the {{ peer_start_tag }}peer assessment{{ end_tag }} and {{ self_start_tag }}self assessment{{ end_tag }} steps.
...@@ -47,9 +46,7 @@ ...@@ -47,9 +46,7 @@
<div class="step__content"> <div class="step__content">
<article class="submission__answer__display"> <article class="submission__answer__display">
<h3 class="submission__answer__display__title">{% trans "Your Response" %}</h3> {% trans "Your response" as translated_label %}
{% trans "Your response to the question above:" as translated_label %}
{% include "openassessmentblock/oa_submission_answer.html" with answer=student_submission.answer answer_text_label=translated_label %} {% include "openassessmentblock/oa_submission_answer.html" with answer=student_submission.answer answer_text_label=translated_label %}
{% trans "Your Uploaded File" as translated_header %} {% trans "Your Uploaded File" as translated_header %}
......
openassessment/templates/openassessmentblock/response/oa_response_unavailable.html
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="copy">{% trans "Not Available" %}</span> <span class="copy">{% trans "Not Available" %}</span>
</span> </span>
......
openassessment/templates/openassessmentblock/self/oa_self_assessment.html
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
{% endblock %} {% endblock %}
<header class="step__header ui-slidable__control"> <header class="step__header ui-slidable__control">
<h2 class="step__title"> <h4 class="step__title">
{% block button %} {% block button %}
<button class="ui-slidable" aria-expanded="true" id="oa_self_{{ xblock_id }}" aria-controls="oa_self_{{ xblock_id }}_content"> <button class="ui-slidable" aria-expanded="true" id="oa_self_{{ xblock_id }}" aria-controls="oa_self_{{ xblock_id }}_content">
{% endblock %} {% endblock %}
...@@ -31,13 +31,12 @@ ...@@ -31,13 +31,12 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="copy">{% trans "In Progress" %}</span> <span class="copy">{% trans "In Progress" %}</span>
</span> </span>
</span> </span>
{% endblock %} {% endblock %}
</h2> </h4>
</header> </header>
{% block body %} {% block body %}
...@@ -45,11 +44,7 @@ ...@@ -45,11 +44,7 @@
<div class="wrapper--step__content"> <div class="wrapper--step__content">
<div class="step__content"> <div class="step__content">
<article class="self-assessment__display"> <article class="self-assessment__display">
<header class="self-assessment__display__header"> {% trans "Your response" as translated_label %}
<h3 class="self-assessment__display__title">{% trans "Your Response" %}</h3>
</header>
{% trans "Your response to the question above:" as translated_label %}
{% include "openassessmentblock/oa_submission_answer.html" with answer=self_submission.answer answer_text_label=translated_label %} {% include "openassessmentblock/oa_submission_answer.html" with answer=self_submission.answer answer_text_label=translated_label %}
{% trans "Associated File" as translated_header %} {% trans "Associated File" as translated_header %}
...@@ -63,7 +58,7 @@ ...@@ -63,7 +58,7 @@
<div class="step__actions"> <div class="step__actions">
<div class="message message--inline message--error message--error-server" tabindex="-1"> <div class="message message--inline message--error message--error-server" tabindex="-1">
<h3 class="message__title">{% trans "We could not submit your assessment" %}</h3> <h5 class="message__title">{% trans "We could not submit your assessment" %}</h5>
<div class="message__content"></div> <div class="message__content"></div>
</div> </div>
......
openassessment/templates/openassessmentblock/self/oa_self_cancelled.html
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="icon fa fa-exclamation-triangle" aria-hidden="true"></span> <span class="icon fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="copy"> <span class="copy">
......
openassessment/templates/openassessmentblock/self/oa_self_closed.html
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="icon fa fa-exclamation-triangle" aria-hidden="true"></span> <span class="icon fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="copy">{% trans "Incomplete" %}</span> <span class="copy">{% trans "Incomplete" %}</span>
...@@ -26,9 +25,9 @@ ...@@ -26,9 +25,9 @@
<div class="wrapper--step__content"> <div class="wrapper--step__content">
<div class="step__message message message--incomplete"> <div class="step__message message message--incomplete">
<h3 class="message__title">{% trans "The Due Date for This Step Has Passed" %}</h3> <h5 class="message__title">{% trans "Status" %}</h5>
<div class="message__content"> <div class="message__content">
<p>{% trans "This step is now closed. You can no longer complete a self assessment or continue with this assignment, and you'll receive a grade of Incomplete." %}</p> <p>{% trans "The due date for this step has passed. This step is now closed. You can no longer complete a self assessment or continue with this assignment, and you will receive a grade of Incomplete." %}</p>
</div> </div>
</div> </div>
</div> </div>
......
openassessment/templates/openassessmentblock/self/oa_self_complete.html
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="icon fa fa-check" aria-hidden="true"></span> <span class="icon fa fa-check" aria-hidden="true"></span>
<span class="copy">{% trans "Complete" %}</span> <span class="copy">{% trans "Complete" %}</span>
......
openassessment/templates/openassessmentblock/self/oa_self_unavailable.html
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="copy">{% trans "Not Available" %}</span> <span class="copy">{% trans "Not Available" %}</span>
</span> </span>
......
openassessment/templates/openassessmentblock/staff/oa_staff_grade.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<li id="openassessment__staff-assessment__{{ xblock_id }}" class="openassessment__steps__step step--staff-assessment ui-slidable__container {{ step_classes }}" tabindex="-1"> <li id="openassessment__staff-assessment__{{ xblock_id }}" class="openassessment__steps__step step--staff-assessment ui-slidable__container {{ step_classes }}" tabindex="-1">
<header class="step__header ui-slidable__control"> <header class="step__header ui-slidable__control">
<h2 class="step__title"> <h4 class="step__title">
<button class="ui-slidable" {{ button_active }} <button class="ui-slidable" {{ button_active }}
{% if message_title %} {% if message_title %}
id="oa_staff_grade_{{ xblock_id }}" aria-controls="oa_staff_grade_{{ xblock_id }}_content" id="oa_staff_grade_{{ xblock_id }}" aria-controls="oa_staff_grade_{{ xblock_id }}_content"
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
</button> </button>
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
{% if icon_class %} {% if icon_class %}
<span class="icon fa {{ icon_class }}" aria-hidden="true"></span> <span class="icon fa {{ icon_class }}" aria-hidden="true"></span>
...@@ -23,14 +22,14 @@ ...@@ -23,14 +22,14 @@
<span class="copy">{{ status_value }}</span> <span class="copy">{{ status_value }}</span>
</span> </span>
</span> </span>
</h2> </h4>
</header> </header>
{% if message_title %} {% if message_title %}
<div class="ui-slidable__content" aria-labelledby="oa_staff_grade_{{ xblock_id }}" id="oa_staff_grade_{{ xblock_id }}_content"> <div class="ui-slidable__content" aria-labelledby="oa_staff_grade_{{ xblock_id }}" id="oa_staff_grade_{{ xblock_id }}_content">
<div class="wrapper--step__content"> <div class="wrapper--step__content">
<div class="step__message message message--incomplete"> <div class="step__message message message--incomplete">
<h3 class="message__title">{{ message_title }}</h3> <h5 class="message__title">{{ message_title }}</h5>
<div class="message__content"> <div class="message__content">
<p>{{ message_content }}</p> <p>{{ message_content }}</p>
......
openassessment/templates/openassessmentblock/staff_area/oa_staff_grade_learners_assessment.html
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</h4> </h4>
</header> </header>
{% trans "The learner's response to the question above:" as translated_label %} {% trans "The learner's response to the question above" as translated_label %}
{% include "openassessmentblock/oa_submission_answer.html" with answer=submission.answer answer_text_label=translated_label %} {% include "openassessmentblock/oa_submission_answer.html" with answer=submission.answer answer_text_label=translated_label %}
{% trans "Associated File" as translated_header %} {% trans "Associated File" as translated_header %}
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<div> <div>
<div class="message message--inline message--error message--error-server" tabindex="-1"> <div class="message message--inline message--error message--error-server" tabindex="-1">
<h4 class="message__title">{% trans "We could not submit your assessment" %}</h4> <h5 class="message__title">{% trans "We could not submit your assessment" %}</h5>
<div class="message__content"></div> <div class="message__content"></div>
</div> </div>
......
openassessment/templates/openassessmentblock/staff_area/oa_staff_override_assessment.html
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</h3> </h3>
</header> </header>
{% trans "The learner's response to the question above:" as translated_label %} {% trans "The learner's response to the question above" as translated_label %}
{% include "openassessmentblock/oa_submission_answer.html" with answer=submission.answer answer_text_label=translated_label %} {% include "openassessmentblock/oa_submission_answer.html" with answer=submission.answer answer_text_label=translated_label %}
{% trans "Associated File" as translated_header %} {% trans "Associated File" as translated_header %}
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<div class="step__actions"> <div class="step__actions">
<div class="message message--inline message--error message--error-server" tabindex="-1"> <div class="message message--inline message--error message--error-server" tabindex="-1">
<h3 class="message__title">{% trans "We could not submit your assessment" %}</h3> <h5 class="message__title">{% trans "We could not submit your assessment" %}</h5>
<div class="message__content"></div> <div class="message__content"></div>
</div> </div>
......
openassessment/templates/openassessmentblock/staff_area/oa_student_info.html
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</p> </p>
{% else %} {% else %}
<div class="wrapper--content"> <div class="wrapper--content">
{% trans "The learner's response to the question above:" as translated_label %} {% trans "The learner's response to the question above" as translated_label %}
{% include "openassessmentblock/oa_submission_answer.html" with answer=submission.answer answer_text_label=translated_label %} {% include "openassessmentblock/oa_submission_answer.html" with answer=submission.answer answer_text_label=translated_label %}
{% trans "Associated File" as translated_header %} {% trans "Associated File" as translated_header %}
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
<form data-submission-uuid="{{ submission.uuid }}"> <form data-submission-uuid="{{ submission.uuid }}">
<div class="step__message message message--warning"> <div class="step__message message message--warning">
<h3 class="message__title">{% trans "Caution: This Action Cannot Be Undone" %}</h3> <h5 class="message__title">{% trans "Caution: This Action Cannot Be Undone" %}</h5>
<div class="message__content">{% trans "Removing a learner's submission cannot be undone and should be done with caution." %}</div> <div class="message__content">{% trans "Removing a learner's submission cannot be undone and should be done with caution." %}</div>
</div> </div>
......
openassessment/templates/openassessmentblock/student_training/student_training.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
{% endblock %} {% endblock %}
<header class="step__header ui-slidable__control"> <header class="step__header ui-slidable__control">
<h2 class="step__title"> <h4 class="step__title">
{% block button %} {% block button %}
<button class="ui-slidable" aria-expanded="true" id="oa_training_{{ xblock_id }}" aria-controls="oa_training_{{ xblock_id }}_content"> <button class="ui-slidable" aria-expanded="true" id="oa_training_{{ xblock_id }}" aria-controls="oa_training_{{ xblock_id }}_content">
{% endblock %} {% endblock %}
...@@ -31,19 +31,18 @@ ...@@ -31,19 +31,18 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="copy"> <span class="copy">
{% with training_num_completed_string=training_num_completed|stringformat:"s" training_num_available_string=training_num_available|stringformat:"s" %} {% with training_num_current_string=training_num_current|stringformat:"s" training_num_available_string=training_num_available|stringformat:"s" %}
{% blocktrans with training_completed_num='<span class="step__status__value--completed">'|safe|add:training_num_completed_string|add:'</span>'|safe training_available_num='<span class="step__status__value--required">'|safe|add:training_num_available_string|add:'</span>'|safe %} {% blocktrans with current_progress_num='<span class="step__status__number--current">'|safe|add:training_num_current_string|add:'</span>'|safe training_available_num='<span class="step__status__value--required">'|safe|add:training_num_available_string|add:'</span>'|safe %}
In Progress ({{ training_completed_num }} of {{ training_available_num }}) In Progress ({{ current_progress_num }} of {{ training_available_num }})
{% endblocktrans %} {% endblocktrans %}
{% endwith %} {% endwith %}
</span> </span>
</span> </span>
</span> </span>
{% endblock %} {% endblock %}
</h2> </h4>
</header> </header>
{% block body %} {% block body %}
...@@ -51,7 +50,7 @@ ...@@ -51,7 +50,7 @@
<div class="wrapper--step__content"> <div class="wrapper--step__content">
<div class="openassessment__student-training--instructions step__message message message--correct"> <div class="openassessment__student-training--instructions step__message message message--correct">
<h3 class="message__title">{% trans "Learning to Assess Responses" %}</h3> <h5 class="message__title">{% trans "Learning to Assess Responses" %}</h5>
<div class="message__content"> <div class="message__content">
<p>{% trans "Before you begin to assess your peers' responses, you'll learn how to complete peer assessments by reviewing responses that instructors have already assessed. If you select the same options for the response that the instructor selected, you'll move to the next step. If you don't select the same options, you'll review the response and try again." %}</p> <p>{% trans "Before you begin to assess your peers' responses, you'll learn how to complete peer assessments by reviewing responses that instructors have already assessed. If you select the same options for the response that the instructor selected, you'll move to the next step. If you don't select the same options, you'll review the response and try again." %}</p>
...@@ -59,7 +58,7 @@ ...@@ -59,7 +58,7 @@
</div> </div>
<div class="openassessment__student-training--incorrect step__message message message--incorrect is--hidden"> <div class="openassessment__student-training--incorrect step__message message message--incorrect is--hidden">
<h3 class="message__title">{% trans "Learning to Assess Responses" %}</h3> <h5 class="message__title">{% trans "Learning to Assess Responses" %}</h5>
<div class="message__content"> <div class="message__content">
<p>{% trans "Your assessment differs from the instructor's assessment of this response. Review the response and consider why the instructor may have assessed it differently. Then, try the assessment again." %}</p> <p>{% trans "Your assessment differs from the instructor's assessment of this response. Review the response and consider why the instructor may have assessed it differently. Then, try the assessment again." %}</p>
...@@ -68,17 +67,6 @@ ...@@ -68,17 +67,6 @@
<div class="step__content"> <div class="step__content">
<article class="student-training__display"> <article class="student-training__display">
<header class="student-training__display__header">
{% with training_num_current=training_num_current training_num_available=training_num_available %}
<h3 class="student-training__display__title">
{% with training_num_current_string=training_num_current|stringformat:"s" training_num_available_string=training_num_available|stringformat:"s" %}
{% blocktrans with current_progress_num='<span class="student-training__number--current">'|safe|add:training_num_current_string|add:'</span>'|safe num_to_complete='<span class="student-training__number--required">'|safe|add:training_num_available_string|add:'</span>'|safe %}
Training Assessment # {{ current_progress_num }} of {{ num_to_complete }}
{% endblocktrans %}
{% endwith %}
</h3>
{% endwith %}
</header>
{% trans "The response to the question above:" as translated_label %} {% trans "The response to the question above:" as translated_label %}
{% include "openassessmentblock/oa_submission_answer.html" with answer=training_essay.answer answer_text_label=translated_label %} {% include "openassessmentblock/oa_submission_answer.html" with answer=training_essay.answer answer_text_label=translated_label %}
...@@ -93,23 +81,23 @@ ...@@ -93,23 +81,23 @@
<li <li
class="field field--radio is--required assessment__rubric__question has--options is--showing ui-slidable__container training__assessment__rubric__question--{{ criterion.order_num }}" class="field field--radio is--required assessment__rubric__question has--options is--showing ui-slidable__container training__assessment__rubric__question--{{ criterion.order_num }}"
> >
<h4 class="question__title ui-slidable__control"> <div class="question__title ui-slidable__control">
<button class="ui-slidable" aria-expanded="true" id="oa_training_{{ xblock_id }}_criterion--{{ criterion.order_num }}" aria-controls="oa_training_{{ xblock_id }}_content_criterion--{{ criterion.order_num }}"> <button class="ui-slidable" aria-expanded="true" id="oa_training_{{ xblock_id }}_criterion--{{ criterion.order_num }}" aria-controls="oa_training_{{ xblock_id }}_content_criterion--{{ criterion.order_num }}">
<span class="icon fa fa-caret-right" aria-hidden="true"></span> <span class="icon fa fa-caret-right" aria-hidden="true"></span>
<span id="training__assessment__rubric__prompt--{{ criterion.order_num }}__{{ xblock_id }}" class="question__title__copy">{{ criterion.prompt }}</span> <span id="training__assessment__rubric__prompt--{{ criterion.order_num }}__{{ xblock_id }}" class="question__title__copy">{{ criterion.prompt }}</span>
<span class="label--required sr">* ({% trans "Required" %})</span> <span class="label--required sr">* ({% trans "Required" %})</span>
</button> </button>
</h4> </div>
<div class="ui-slidable__content" aria-labelledby="oa_training_{{ xblock_id }}_criterion--{{ criterion.order_num }}" id="oa_training_{{ xblock_id }}_content_criterion--{{ criterion.order_num }}"> <div class="ui-slidable__content" aria-labelledby="oa_training_{{ xblock_id }}_criterion--{{ criterion.order_num }}" id="oa_training_{{ xblock_id }}_content_criterion--{{ criterion.order_num }}">
<div class="step__message message message--correct is--hidden"> <div class="step__message message message--correct is--hidden">
<h3 class="message__title">{% trans "Selected Options Agree" %}</h3> <h5 class="message__title">{% trans "Selected Options Agree" %}</h5>
<div class="message__content"> <div class="message__content">
<p>{% trans "The option you selected is the option that the instructor selected." %}</p> <p>{% trans "The option you selected is the option that the instructor selected." %}</p>
</div> </div>
</div> </div>
<div class="step__message message message--incorrect is--hidden"> <div class="step__message message message--incorrect is--hidden">
<h3 class="message__title">{% trans "Selected Options Differ" %}</h3> <h5 class="message__title">{% trans "Selected Options Differ" %}</h5>
<div class="message__content"> <div class="message__content">
<p>{% trans "The option you selected is not the option that the instructor selected." %}</p> <p>{% trans "The option you selected is not the option that the instructor selected." %}</p>
...@@ -148,7 +136,7 @@ ...@@ -148,7 +136,7 @@
<div class="step__actions"> <div class="step__actions">
<div class="message message--inline message--error message--error-server" tabindex="-1"> <div class="message message--inline message--error message--error-server" tabindex="-1">
<h3 class="message__title">{% trans "We could not check your assessment" %}</h3> <h5 class="message__title">{% trans "We could not check your assessment" %}</h5>
<div class="message__content"></div> <div class="message__content"></div>
</div> </div>
......
openassessment/templates/openassessmentblock/student_training/student_training_cancelled.html
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="icon fa fa-exclamation-triangle" aria-hidden="true"></span> <span class="icon fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="copy">{% trans "Cancelled" %}</span> <span class="copy">{% trans "Cancelled" %}</span>
......
openassessment/templates/openassessmentblock/student_training/student_training_closed.html
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="icon fa fa-exclamation-triangle" aria-hidden="true"></span> <span class="icon fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="copy">{% trans "Incomplete" %}</span> <span class="copy">{% trans "Incomplete" %}</span>
...@@ -25,9 +24,9 @@ ...@@ -25,9 +24,9 @@
<div class="wrapper--step__content"> <div class="wrapper--step__content">
<div class="step__message message message--incomplete"> <div class="step__message message message--incomplete">
<h3 class="message__title">{% trans "The Due Date for This Step Has Passed" %}</h3> <h5 class="message__title">{% trans "Status" %}</h5>
<div class="message__content"> <div class="message__content">
<p>{% trans "This step is now closed.You can no longer continue with this assignment, and you'll receive a grade of Incomplete." %}</p> <p>{% trans "The due date for this step has passed. This step is now closed. You can no longer continue with this assignment, and you will receive a grade of Incomplete." %}</p>
</div> </div>
</div> </div>
</div> </div>
......
openassessment/templates/openassessmentblock/student_training/student_training_complete.html
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="icon fa fa-check" aria-hidden="true"></span> <span class="icon fa fa-check" aria-hidden="true"></span>
<span class="copy">{% trans "Complete" %}</span> <span class="copy">{% trans "Complete" %}</span>
......
openassessment/templates/openassessmentblock/student_training/student_training_error.html
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<div class="wrapper--step__content"> <div class="wrapper--step__content">
<div class="step__message message message--incomplete"> <div class="step__message message message--incomplete">
<h3 class="message__title">{% trans "Error Loading Learner Training Examples" %}</h3> <h5 class="message__title">{% trans "Error Loading Learner Training Examples" %}</h5>
<div class="message__content"> <div class="message__content">
<p>{% trans "The Learner Training Step of this assignment could not be loaded." %}</p> <p>{% trans "The Learner Training Step of this assignment could not be loaded." %}</p>
......
openassessment/templates/openassessmentblock/student_training/student_training_unavailable.html
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
{% block title %} {% block title %}
<span class="step__status"> <span class="step__status">
<span class="step__status__label">{% trans "This step's status" %}:</span>
<span class="step__status__value"> <span class="step__status__value">
<span class="copy">{% trans "Not Available" %}</span> <span class="copy">{% trans "Not Available" %}</span>
</span> </span>
......
openassessment/xblock/static/css/openassessment-ltr.css
This source diff could not be displayed because it is too large. You can view the blob instead.
openassessment/xblock/static/css/openassessment-rtl.css
This source diff could not be displayed because it is too large. You can view the blob instead.
openassessment/xblock/static/sass/oa/utilities/_developer.scss
...@@ -1114,11 +1114,6 @@ ...@@ -1114,11 +1114,6 @@
@include margin-right(($baseline-h/4)); @include margin-right(($baseline-h/4));
} }
.leaderboard__title {
@extend %t-superheading;
color: $heading-color;
}
.list.leaderboard__score__list { .list.leaderboard__score__list {
list-style-type: none; list-style-type: none;
...@@ -1146,7 +1141,7 @@ ...@@ -1146,7 +1141,7 @@
.leaderboard__score__title { .leaderboard__score__title {
font-size: 15px; font-size: 15px;
color: $edx-gray-l1; color: $heading-color;
text-transform: uppercase; text-transform: uppercase;
display: inline-block; display: inline-block;
@include padding-left(15px); @include padding-left(15px);
......
openassessment/xblock/static/sass/oa/utilities/_shame.scss
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
} }
// step title/name // step title/name
h2.step__title { .step__title {
@include text-align(left); @include text-align(left);
@include float(none); @include float(none);
margin-top: 0 !important; margin-top: 0 !important;
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
// submission answer leaderboard fix (TNL-4009). 4 class selectors is more specific than // submission answer leaderboard fix (TNL-4009). 4 class selectors is more specific than
// lms/static/sass/course/courseware/_courseware.scss#L453 in edx-platform (3 class selectors) // lms/static/sass/course/courseware/_courseware.scss#L453 in edx-platform (3 class selectors)
.leaderboard__answer .submission__answer__display__content { .leaderboard__answer .submission__answer__display__content {
h2.submission__answer__part__text__title { .submission__answer__part__text__title {
@include text-align(left); @include text-align(left);
@include float(none); @include float(none);
font-size: inherit; font-size: inherit;
......
openassessment/xblock/static/sass/oa/views/_oa-base.scss
...@@ -239,10 +239,6 @@ ...@@ -239,10 +239,6 @@
} }
} }
.step__status__label {
@extend %text-sr;
}
// step content wrapper // step content wrapper
.wrapper--step__content { .wrapper--step__content {
margin-top: ($baseline-v/2); margin-top: ($baseline-v/2);
...@@ -547,10 +543,15 @@ ...@@ -547,10 +543,15 @@
@extend %t-heading; @extend %t-heading;
} }
div.submission__answer__part__text__value {
border: 1px solid $color-decorative-secondary; .submission__answer__part__text__value {
background-color: $white; margin: ($baseline-v/2) 0;
padding: $baseline-v;
&:not(textarea) {
border: 1px solid $color-decorative-secondary;
background-color: $white;
padding: $baseline-v;
}
} }
// -------------------- // --------------------
......
openassessment/xblock/test/test_peer.py
...@@ -286,7 +286,7 @@ class TestPeerAssessment(XBlockHandlerTestCase): ...@@ -286,7 +286,7 @@ class TestPeerAssessment(XBlockHandlerTestCase):
self.assertIsNotNone(peer_response) self.assertIsNotNone(peer_response)
self.assertNotIn(submission["answer"]["parts"][0]["text"].encode('utf-8'), peer_response.body) self.assertNotIn(submission["answer"]["parts"][0]["text"].encode('utf-8'), peer_response.body)
self.assertNotIn(submission["answer"]["parts"][1]["text"].encode('utf-8'), peer_response.body) self.assertNotIn(submission["answer"]["parts"][1]["text"].encode('utf-8'), peer_response.body)
self.assertIn("Peer Assessments Complete", peer_response.body) self.assertIn("You have successfully completed", peer_response.body)
@ddt.ddt @ddt.ddt
......
test/acceptance/pages.py
...@@ -416,9 +416,18 @@ class AssessmentPage(OpenAssessmentPage, AssessmentMixin): ...@@ -416,9 +416,18 @@ class AssessmentPage(OpenAssessmentPage, AssessmentMixin):
if self._assessment_type not in ['peer-assessment', 'student-training']: if self._assessment_type not in ['peer-assessment', 'student-training']:
msg = "Only peer assessment and student training steps can retrieve the number completed" msg = "Only peer assessment and student training steps can retrieve the number completed"
raise PageConfigurationError(msg) raise PageConfigurationError(msg)
status_completed_css = self._bounded_selector(".step__status__value--completed") status_completed_css = self._bounded_selector(".step__status__value--completed")
candidates = [int(x) for x in self.q(css=status_completed_css).text] complete_candidates = [int(x) for x in self.q(css=status_completed_css).text]
return candidates[0] if len(candidates) > 0 else None if len(complete_candidates) > 0:
completed = complete_candidates[0]
else:
# The number completed is no longer available on this page, but can be inferred from the
# current review number.
status_current_css = self._bounded_selector(".step__status__number--current")
current_candidates = [int(y) for y in self.q(css=status_current_css).text]
completed = current_candidates[0] - 1 if len(current_candidates) > 0 and current_candidates[0] > 0 else None
return completed
@property @property
def label(self): def label(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment