Skip to content

E
edx-ora2
Commit bd16973e by Usman Khalid Committed by Ahsan Ulhaq
Options

Submission 

TNL-708
parent fa3e83b0
Showing with 24 additions and 23 deletions
openassessment/templates/openassessmentblock/response/oa_response.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load i18n %} {% load i18n %}
{% spaceless %} {% spaceless %}
{% block list_item %} {% block list_item %}
<li id="openassessment__response" class="openassessment__steps__step step--response ui-toggle-visibility"> <div id="openassessment__response" aria-expanded="true" class="openassessment__steps__step step--response ui-toggle-visibility">
{% endblock %} {% endblock %}
<header class="step__header ui-toggle-visibility__control"> <header class="step__header ui-toggle-visibility__control">
...@@ -51,9 +51,9 @@ ...@@ -51,9 +51,9 @@
<div class="step__content"> <div class="step__content">
<form id="response__submission" class="response__submission"> <form id="response__submission" class="response__submission">
<ol class="list list--fields response__submission__content"> <div 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"> <div class="submission__answer__part">
<article class="submission__answer__part__prompt ui-toggle-visibility"> <article class="submission__answer__part__prompt ui-toggle-visibility">
<h2 class="submission__answer__part__prompt__title">{% trans "The prompt for this section." %}</h2> <h2 class="submission__answer__part__prompt__title">{% trans "The prompt for this section." %}</h2>
...@@ -70,10 +70,10 @@ ...@@ -70,10 +70,10 @@
maxlength="100000" maxlength="100000"
>{{ part.text }}</textarea> >{{ part.text }}</textarea>
</div> </div>
</li> </div>
{% endfor %} {% endfor %}
{% if allow_file_upload %} {% if allow_file_upload %}
<li class="field"> <div class="field">
<div id="upload__error"> <div id="upload__error">
<div class="message message--inline message--error message--error-server"> <div class="message message--inline message--error message--error-server">
<h3 class="message__title">{% trans "We could not upload this image" %}</h3> <h3 class="message__title">{% trans "We could not upload this image" %}</h3>
...@@ -83,8 +83,8 @@ ...@@ -83,8 +83,8 @@
<label class="sr" for="submission__answer__upload">{% trans "Select an image to upload for this submission." %}</label> <label class="sr" for="submission__answer__upload">{% trans "Select an image to upload for this submission." %}</label>
<input type="file" id="submission__answer__upload" class="file--upload"> <input type="file" id="submission__answer__upload" class="file--upload">
<button type="submit" id="file__upload" class="action action--upload is--disabled">{% trans "Upload your image" %}</button> <button type="submit" id="file__upload" class="action action--upload is--disabled">{% trans "Upload your image" %}</button>
</li> </div>
<li> <div>
<div class="submission__answer__display__image is--hidden"> <div class="submission__answer__display__image is--hidden">
<img id="submission__answer__image" <img id="submission__answer__image"
class="submission--image" class="submission--image"
...@@ -93,9 +93,9 @@ ...@@ -93,9 +93,9 @@
{% endif %} {% endif %}
src="{{ file_url }}"/> src="{{ file_url }}"/>
</div> </div>
</li> </div>
{% endif %} {% endif %}
</ol> </div>
<span class="tip">{% trans "You may continue to work on your response until you submit it." %}</span> <span class="tip">{% trans "You may continue to work on your response until you submit it." %}</span>
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
<div class="message__content"></div> <div class="message__content"></div>
</div> </div>
<ul class="list list--actions"> <div class="list list--actions">
<li class="list--actions__item"> <div class="list--actions__item">
<button type="submit" id="submission__save" class="action action--save submission__save is--disabled">{% trans "Save Your Progress" %}</button> <button type="submit" id="submission__save" class="action action--save submission__save is--disabled">{% trans "Save Your Progress" %}</button>
<div id="response__save_status" class="response__submission__status"> <div id="response__save_status" class="response__submission__status">
...@@ -115,26 +115,26 @@ ...@@ -115,26 +115,26 @@
{{ save_status }} {{ save_status }}
</h3> </h3>
</div> </div>
</li> </div>
{% if allow_latex %} {% if allow_latex %}
<li class="list--actions__item"> <div class="list--actions__item">
<button type="submit" id="submission__preview" class="action action--save submission__save is--disabled">{% trans "Preview in Latex"%}</button> <button type="submit" id="submission__preview" class="action action--save submission__save is--disabled">{% trans "Preview in Latex"%}</button>
<div id="response__preview_explanation" class="response__submission__status"> <div id="response__preview_explanation" class="response__submission__status">
<h3 class="response__submission__status__title"> <h3 class="response__submission__status__title">
{% trans "Click to preview your submission in Latex"%} {% trans "Click to preview your submission in Latex"%}
</h3> </h3>
</div> </div>
</li> </div>
<li id = "submission__preview__item" class="list--actions__item"> <div id = "submission__preview__item" class="list--actions__item">
<article class="submission__answer__display"> <article class="submission__answer__display">
<h3 class="submission__answer__display__title">Preview Response</h3> <h3 class="submission__answer__display__title">Preview Response</h3>
<div class="submission__answer__display__content"> <div class="submission__answer__display__content">
<p id="preview_content"></p> <p id="preview_content"></p>
</div> </div>
</article> </article>
</li> </div>
{% endif %} {% endif %}
</ul> </div>
</div> </div>
</form> </form>
</div> </div>
...@@ -145,18 +145,18 @@ ...@@ -145,18 +145,18 @@
<div class="message__content"></div> <div class="message__content"></div>
</div> </div>
<ul class="list list--actions"> <div class="list list--actions">
<li class="list--actions__item"> <div class="list--actions__item">
<a aria-role="button" href="#" id="step--response__submit" <a aria-role="button" href="#" id="step--response__submit"
class="action action--submit step--response__submit {{ submit_enabled|yesno:",is--disabled" }}"> class="action action--submit step--response__submit {{ submit_enabled|yesno:",is--disabled" }}">
<span class="copy">{% trans "Submit your response and move to the next step" %}</span> <span class="copy">{% trans "Submit your response and move to the next step" %}</span>
<i class="ico icon-caret-right"></i> <i class="ico icon-caret-right"></i>
</a> </a>
</li> </div>
</ul> </div>
</div> </div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
</li> </div>
{% endspaceless %} {% endspaceless %}
openassessment/templates/openassessmentblock/response/oa_response_submitted.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load i18n %} {% load i18n %}
{% block list_item %} {% 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" aria-expanded="false" class="openassessment__steps__step step--response is--complete ui-toggle-visibility is--collapsed {% if allow_latex %}allow--latex{%endif%}">
{% endblock %} {% endblock %}
{% block title %} {% block title %}
......
openassessment/xblock/static/js/src/lms/oa_response.js
...@@ -270,6 +270,7 @@ OpenAssessment.ResponseView.prototype = { ...@@ -270,6 +270,7 @@ OpenAssessment.ResponseView.prototype = {
response: function(texts) { response: function(texts) {
var sel = $('.submission__answer__part__text__value', this.element); var sel = $('.submission__answer__part__text__value', this.element);
if (typeof texts === 'undefined') { if (typeof texts === 'undefined') {
return sel.map(function() { return sel.map(function() {
return $.trim($(this).val()); return $.trim($(this).val());
}).get(); }).get();
......
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