Skip to content

E
edx-ora2
Commit e21ea2aa by Ahsan Ulhaq
Options

List structure unnecessary. 

List structure was used to structure the pages of ora2 which
results lot of unnecessary verbosity

TNL-68
parent e70b63e3
Showing with 86 additions and 86 deletions
openassessment/templates/openassessmentblock/grade/oa_grade_cancelled.html
{% load i18n %}
{% spaceless %}
<li id="openassessment__grade" class="openassessment__steps__step step--grade has--error">
<div id="openassessment__grade" class="openassessment__steps__step step--grade has--error">
<header class="step__header ui-toggle-visibility__control">
<h2 class="step__title">
<span class="wrapper--copy">
......@@ -32,5 +32,5 @@
</div>
</div>
</div>
</li>
</div>
{% endspaceless %}
openassessment/templates/openassessmentblock/grade/oa_grade_closed.html
{% load i18n %}
{% spaceless %}
<li id="openassessment__grade" class="openassessment__steps__step step--grade is--complete">
<div id="openassessment__grade" class="openassessment__steps__step step--grade is--complete">
<header class="step__header ui-toggle-visibility__control">
<h2 class="step__title">
<span class="wrapper--copy">
......@@ -12,5 +12,5 @@
</span>
</h2>
</header>
</li>
</div>
{% endspaceless %}
openassessment/templates/openassessmentblock/grade/oa_grade_incomplete.html
{% load i18n %}
{% spaceless %}
<li id="openassessment__grade" class="openassessment__steps__step step--grade">
<div id="openassessment__grade" class="openassessment__steps__step step--grade">
<header class="step__header ui-toggle-visibility__control">
<h2 class="step__title">
<span class="wrapper--copy">
......@@ -21,5 +21,5 @@
</div>
</div>
</div>
</li>
</div>
{% endspaceless %}
openassessment/templates/openassessmentblock/grade/oa_grade_not_started.html
{% load i18n %}
{% spaceless %}
<li id="openassessment__grade" class="openassessment__steps__step step--grade is--unstarted">
<div id="openassessment__grade" class="openassessment__steps__step step--grade is--unstarted">
<header class="step__header ui-toggle-visibility__control">
<h2 class="step__title">
<span class="wrapper--copy">
......@@ -21,5 +21,5 @@
</div>
</div>
</div>
</li>
</div>
{% endspaceless %}
openassessment/templates/openassessmentblock/grade/oa_grade_waiting.html
{% load i18n %}
{% spaceless %}
<li id="openassessment__grade" class="openassessment__steps__step step--grade">
<div id="openassessment__grade" class="openassessment__steps__step step--grade">
<header class="step__header ui-toggle-visibility__control">
<h2 class="step__title">
<span class="wrapper--copy">
......@@ -27,5 +27,5 @@
</div>
</div>
</div>
</li>
</div>
{% endspaceless %}
openassessment/templates/openassessmentblock/oa_base.html
......@@ -15,9 +15,9 @@
{% endblock %}
</div>
<ol class="openassessment__steps" id="openassessment__steps">
<div class="openassessment__steps" id="openassessment__steps">
{% for assessment in rubric_assessments %}
<li id="{{ assessment.class_id }}" class="openassessment__steps__step is--loading">
<div id="{{ assessment.class_id }}" class="openassessment__steps__step is--loading">
<header class="step__header">
<h2 class="step__title">
<span class="step__counter"></span>
......@@ -35,9 +35,9 @@
</span>
</span>
</header>
</li>
</div>
{% endfor %}
</ol>
</div>
{% if show_staff_debug_info %}
<div id="openassessment__staff-info"></div>
......
openassessment/templates/openassessmentblock/peer/oa_peer_assessment.html
{% load tz %}
{% load i18n %}
{% block list_item %}
<li
<div
id="openassessment__peer-assessment"
class="openassessment__steps__step step--peer-assessment ui-toggle-visibility {% if allow_latex %} allow--latex {%endif%}"
data-submission-uuid="{{ peer_submission.uuid }}"
......@@ -52,8 +52,8 @@
</div>
<div class="step__content">
<ul class="list--peer-assessments">
<li class="list--peer-assessments__item">
<div class="list--peer-assessments">
<div class="list--peer-assessments__item">
<article class="peer-assessment" id="peer-assessment--001">
<div class="peer-assessment__display">
<header class="peer-assessment__display__header">
......@@ -85,8 +85,8 @@
{% include "openassessmentblock/oa_rubric.html" %}
</form>
</article>
</li>
</ul>
</div>
</div>
</div>
<div class="step__actions">
......@@ -95,17 +95,17 @@
<div class="message__content"></div>
</div>
<ul class="list list--actions">
<li class="list--actions__item">
<div class="list list--actions">
<div class="list--actions__item">
<button type="submit" id="peer-assessment--001__assessment__submit" class="action action--submit is--disabled">
<span class="copy">{{ submit_button_text }}</span>
<i class="ico icon-caret-right"></i>
</button>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
{% endblock %}
{% endspaceless %}
</li>
</div>
openassessment/templates/openassessmentblock/peer/oa_peer_cancelled.html
......@@ -4,7 +4,7 @@
{% block list_item %}
<li id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment">
<div id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment">
{% endblock %}
{% block title %}
......
openassessment/templates/openassessmentblock/peer/oa_peer_closed.html
......@@ -2,7 +2,7 @@
{% load i18n %}
{% block list_item %}
<li id="openassessment__peer-assessment"class="openassessment__steps__step step--peer-assessment is--incomplete ui-toggle-visibility">
<div id="openassessment__peer-assessment"class="openassessment__steps__step step--peer-assessment is--incomplete ui-toggle-visibility">
{% endblock %}
{% block title %}
......
openassessment/templates/openassessmentblock/peer/oa_peer_complete.html
......@@ -2,7 +2,7 @@
{% load i18n %}
{% block list_item %}
<li id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment ui-toggle-visibility is--empty is--complete is--collapsed">
<div id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment ui-toggle-visibility is--empty is--complete is--collapsed">
{% endblock %}
{% block title %}
......@@ -31,14 +31,14 @@
<h3 class="message__title">{% trans "We could not retrieve additional submissions for assessment" %}</h3>
</div>
<ul class="list list--actions">
<li class="list--actions__item">
<div class="list list--actions">
<div class="list--actions__item">
<button type="submit" id="peer-assessment__continue__grading" class="action action--continue--grading">
<span class="copy">{% trans "Continue Assessing Peers" %}</span>
<i class="ico icon-caret-right"></i>
</button>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
......
openassessment/templates/openassessmentblock/peer/oa_peer_turbo_mode.html
......@@ -2,7 +2,7 @@
{% load i18n %}
{% block list_item %}
<li
<div
id="openassessment__peer-assessment"
class="openassessment__steps__step step--peer-assessment ui-toggle-visibility is--complete"
data-submission-uuid="{{ peer_submission.uuid }}"
......@@ -40,7 +40,7 @@
<div class="step__content">
<ul class="list--peer-assessments">
<li class="list--peer-assessments__item">
<div class="list--peer-assessments__item">
<article class="peer-assessment" id="peer-assessment--001">
<div class="peer-assessment__display">
<header class="peer-assessment__display__header">
......@@ -67,10 +67,10 @@
<form id="peer-assessment--001__assessment" class="peer-assessment__assessment" method="post">
<fieldset class="assessment__fields">
<ol class="list list--fields assessment__rubric">
<div class="list list--fields assessment__rubric">
{% for criterion in rubric_criteria %}
<li
<div
class="field field--radio is--required assessment__rubric__question ui-toggle-visibility {% if criterion.options %}has--options{% endif %}"
id="assessment__rubric__question--{{ criterion.order_num }}"
>
......@@ -81,9 +81,9 @@
</h4>
<div class="ui-toggle-visibility__content">
<ol class="question__answers">
<div class="question__answers">
{% for option in criterion.options %}
<li class="answer">
<div class="answer">
<div class="wrapper--input">
<input type="radio"
name="{{ criterion.name }}"
......@@ -98,11 +98,11 @@
<span class="answer__tip">{{ option.explanation }}</span>
<span class="answer__points">{{option.points}} <span class="answer__points__label">{% trans "points" %}</span></span>
</div>
</li>
</div>
{% endfor %}
{% if criterion.feedback == 'optional' or criterion.feedback == 'required' %}
<li class="answer--feedback">
<div class="answer--feedback">
<div class="wrapper--input">
<label for="assessment__rubric__question--{{ criterion.order_num }}__feedback" class="answer__label">{% trans "Comments" %}</label>
<textarea
......@@ -115,14 +115,14 @@
>
</textarea>
</div>
</li>
</div>
{% endif %}
</ol>
</div>
</li>
</div>
</div>
{% endfor %}
<li class="wrapper--input field field--textarea assessment__rubric__question assessment__rubric__question--feedback" id="assessment__rubric__question--feedback">
<div class="wrapper--input field field--textarea assessment__rubric__question assessment__rubric__question--feedback" id="assessment__rubric__question--feedback">
<label class="question__title" for="assessment__rubric__question--feedback__value">
<span class="question__title__copy">{{ rubric_feedback_prompt }}</span>
</label>
......@@ -134,13 +134,13 @@
>
</textarea>
</div>
</li>
</ol>
</div>
</div>
</fieldset>
</form>
</article>
</li>
</ul>
</div>
</div>
</div>
<div class="step__actions">
......@@ -148,14 +148,14 @@
<h3 class="message__title">{% trans "We could not submit your assessment" %}</h3>
</div>
<ul class="list list--actions">
<li class="list--actions__item">
<div class="list list--actions">
<div class="list--actions__item">
<button type="submit" id="peer-assessment--001__assessment__submit" class="action action--submit is--disabled">
<span class="copy">{{ submit_button_text }}</span>
<i class="ico icon-caret-right"></i>
</button>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
......
openassessment/templates/openassessmentblock/peer/oa_peer_turbo_mode_waiting.html
......@@ -2,7 +2,7 @@
{% load i18n %}
{% block list_item %}
<li id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment ui-toggle-visibility is--complete">
<div id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment ui-toggle-visibility is--complete">
{% endblock %}
{% block title %}
......
openassessment/templates/openassessmentblock/peer/oa_peer_unavailable.html
......@@ -2,7 +2,7 @@
{% load i18n %}
{% block list_item %}
<li id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment is--unavailable is--empty is--collapsed">
<div id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment is--unavailable is--empty is--collapsed">
{% endblock %}
{% block title %}
......
openassessment/templates/openassessmentblock/peer/oa_peer_waiting.html
......@@ -2,7 +2,7 @@
{% load i18n %}
{% block list_item %}
<li id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment">
<div id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment">
{% endblock %}
{% block title %}
......
openassessment/templates/openassessmentblock/response/oa_response_cancelled.html
......@@ -3,7 +3,7 @@
{% load tz %}
{% block list_item %}
<li id="openassessment__response" class="openassessment__steps__step step--response ui-toggle-visibility has--error">
<div id="openassessment__response" class="openassessment__steps__step step--response ui-toggle-visibility has--error">
{% endblock %}
{% block title %}
......
openassessment/templates/openassessmentblock/response/oa_response_closed.html
{% extends "openassessmentblock/response/oa_response.html" %}
{% load i18n %}
{% block list_item %}
<li id="openassessment__response" class="openassessment__steps__step step--response is--incomplete ui-toggle-visibility">
<div id="openassessment__response" class="openassessment__steps__step step--response is--incomplete ui-toggle-visibility">
{% endblock %}
{% block title %}
......
openassessment/templates/openassessmentblock/response/oa_response_graded.html
......@@ -2,7 +2,7 @@
{% load i18n %}
{% block list_item %}
<li id="openassessment__response" class="openassessment__steps__step step--response is--complete ui-toggle-visibility is--collapsed {% if allow_latex %}allow--latex{%endif%}">
<div id="openassessment__response" class="openassessment__steps__step step--response is--complete ui-toggle-visibility is--collapsed {% if allow_latex %}allow--latex{%endif%}">
{% endblock %}
{% block title %}
......
openassessment/templates/openassessmentblock/response/oa_response_unavailable.html
......@@ -2,7 +2,7 @@
{% load i18n %}
{% block list_item %}
<li id="openassessment__response" class="openassessment__steps__step step--response is--empty is--unavailable is--collapsed">
<div id="openassessment__response" class="openassessment__steps__step step--response is--empty is--unavailable is--collapsed">
{% endblock %}
{% block title %}
......
openassessment/templates/openassessmentblock/self/oa_self_assessment.html
......@@ -2,7 +2,7 @@
{% load tz %}
{% spaceless %}
{% block list_item %}
<li id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment ui-toggle-visibility {% if allow_latex %}allow--latex{%endif%}">
<div id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment ui-toggle-visibility {% if allow_latex %}allow--latex{%endif%}">
{% endblock %}
<header class="step__header ui-toggle-visibility__control">
......@@ -69,17 +69,17 @@
<div class="message__content"></div>
</div>
<ul class="list list--actions">
<li class="list--actions__item">
<div class="list list--actions">
<div class="list--actions__item">
<button type="submit" id="self-assessment--001__assessment__submit" class="action action--submit is--disabled">
<span class="copy">{% trans "Submit Your Assessment" %}</span>
<i class="ico icon-caret-right"></i>
</button>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
{% endblock %}
</li>
</div>
{% endspaceless %}
openassessment/templates/openassessmentblock/self/oa_self_cancelled.html
......@@ -4,7 +4,7 @@
{% block list_item %}
<li id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment">
<div id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment">
{% endblock %}
{% block title %}
......
openassessment/templates/openassessmentblock/self/oa_self_closed.html
......@@ -2,7 +2,7 @@
{% load i18n %}
{% block list_item %}
<li id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment is--incomplete ui-toggle-visibility">
<div id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment is--incomplete ui-toggle-visibility">
{% endblock %}
{% block title %}
......
openassessment/templates/openassessmentblock/self/oa_self_complete.html
......@@ -2,7 +2,7 @@
{% load i18n %}
{% block list_item %}
<li id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment is--complete is--empty is--collapsed">
<div id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment is--complete is--empty is--collapsed">
{% endblock %}
{% block title %}
......
openassessment/templates/openassessmentblock/self/oa_self_unavailable.html
......@@ -2,7 +2,7 @@
{% load i18n %}
{% block list_item %}
<li id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment is--empty is--unavailable is--collapsed">
<div id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment is--empty is--unavailable is--collapsed">
{% endblock %}
{% block title %}
......
openassessment/templates/openassessmentblock/student_training/student_training.html
......@@ -2,7 +2,7 @@
{% load tz %}
{% spaceless %}
{% block list_item %}
<li id="openassessment__student-training" class="openassessment__steps__step step--student-training ui-toggle-visibility {% if allow_latex %}allow--latex{%endif%}">
<div id="openassessment__student-training" class="openassessment__steps__step step--student-training ui-toggle-visibility {% if allow_latex %}allow--latex{%endif%}">
{% endblock %}
<header class="step__header ui-toggle-visibility__control">
......@@ -78,10 +78,10 @@
<form id="student-training--001__assessment" class="student-training__assessment" method="post">
<fieldset class="assessment__fields">
<ol class="list list--fields assessment__rubric">
<div class="list list--fields assessment__rubric">
{% for criterion in training_rubric.criteria %}
{% if criterion.options %}
<li
<div
class="field field--radio is--required assessment__rubric__question ui-toggle-visibility has--options"
id="assessment__rubric__question--{{ criterion.order_num }}"
>
......@@ -105,9 +105,9 @@
<p>{% trans "The option you selected is not the option that the instructor selected." %}</p>
</div>
</div>
<ol class="question__answers">
<div class="question__answers">
{% for option in criterion.options %}
<li class="answer">
<div class="answer">
<div class="wrapper--input">
<input type="radio"
name="{{ criterion.name }}"
......@@ -121,14 +121,14 @@
<span class="answer__tip">{{ option.explanation }}</span>
<span class="answer__points">{{option.points}} <span class="answer__points__label">{% trans "points" %}</span></span>
</div>
</li>
</div>
{% endfor %}
</ol>
</div>
</div>
</li>
</div>
{% endif %}
{% endfor %}
</ol>
</div>
</fieldset>
</form>
</div>
......@@ -139,17 +139,17 @@
<div class="message__content"></div>
</div>
<ul class="list list--actions">
<li class="list--actions__item">
<div class="list list--actions">
<div class="list--actions__item">
<button type="submit" id="student-training--001__assessment__submit" class="action action--submit is--disabled">
<span class="copy">{% trans "Compare your selections with the instructor's selections" %}</span>
<i class="ico icon-caret-right"></i>
</button>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
{% endblock %}
</li>
</div>
{% endspaceless %}
openassessment/templates/openassessmentblock/student_training/student_training_cancelled.html
......@@ -3,7 +3,7 @@
{% load tz %}
{% block list_item %}
<li id="openassessment__student-training" class="openassessment__steps__step step--student-training">
<div id="openassessment__student-training" class="openassessment__steps__step step--student-training">
{% endblock %}
{% block title %}
......
openassessment/templates/openassessmentblock/student_training/student_training_closed.html
......@@ -2,7 +2,7 @@
{% load i18n %}
{% block list_item %}
<li id="openassessment__student-training" class="openassessment__steps__step step--student-training is--incomplete ui-toggle-visibility">
<div id="openassessment__student-training" class="openassessment__steps__step step--student-training is--incomplete ui-toggle-visibility">
{% endblock %}
{% block title %}
......
openassessment/templates/openassessmentblock/student_training/student_training_complete.html
......@@ -2,7 +2,7 @@
{% load i18n %}
{% block list_item %}
<li id="openassessment__student-training" class="openassessment__steps__step step--student-training is--complete is--empty is--collapsed">
<div id="openassessment__student-training" class="openassessment__steps__step step--student-training is--complete is--empty is--collapsed">
{% endblock %}
{% block title %}
......
openassessment/templates/openassessmentblock/student_training/student_training_unavailable.html
......@@ -2,7 +2,7 @@
{% load i18n %}
{% block list_item %}
<li id="openassessment__student-training" class="openassessment__steps__step step--student-training is--empty is--unavailable is--collapsed">
<div id="openassessment__student-training" class="openassessment__steps__step step--student-training is--empty is--unavailable is--collapsed">
{% endblock %}
{% block title %}
......
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