Skip to content

Commit

Permalink
Merge pull request #538 from edx/matthugs/onboarding-error-copy
Browse files Browse the repository at this point in the history
Update onboarding blocking error messages
  • Loading branch information
matthugs authored Feb 15, 2019
2 parents 7ea5285 + 85c9b5b commit 5f3a797
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 25 deletions.
2 changes: 1 addition & 1 deletion edx_proctoring/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
from __future__ import absolute_import

# Be sure to update the version number in edx_proctoring/package.json
__version__ = '1.5.13'
__version__ = '1.5.14'

default_app_config = 'edx_proctoring.apps.EdxProctoringConfig' # pylint: disable=invalid-name
3 changes: 2 additions & 1 deletion edx_proctoring/templates/proctored_exam/instructions.html
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ <h3>
}
);

function check_exam_started() {
function check_exam_started(e) {
e.preventDefault();
var url = $('.instructions').data('exam-started-poll-url') + '?sourceid=instructions';
$.ajax(url).success(function(data){
if (data.status === 'ready_to_start') {
Expand Down
46 changes: 24 additions & 22 deletions edx_proctoring/templates/proctored_exam/onboarding_error.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,38 @@ <h3>
</h3>
<p>
{% if onboarding_status == 'onboarding_missing' or onboarding_status == 'onboarding_expired' %}
{% if onboarding_link %}
{% blocktrans %}
Please complete the <a href="{{onboarding_link}}">onboarding exam</a> before attempting this exam.
{% endblocktrans %}
{% else %}
{% blocktrans %}
<p>
{% blocktrans %}
Please complete an onboarding exam before attempting this exam.
{% endblocktrans %}
{% endif %}
{% endblocktrans %}
</p>
{% if onboarding_link %}
<a href="{{onboarding_link}}" class="btn-secondary">
{% trans "Navigate to onboarding exam" %}
</a>
{% endif %}
{% elif onboarding_status == 'onboarding_pending' %}
{% blocktrans %}
Your onboarding exam is being reviewed. Before attempting this exam, please allow 2+ business days for your onboarding exam to be reviewed.
{% endblocktrans %}
{% elif onboarding_status == 'onboarding_failed' %}
<p>
{% blocktrans %}
Your onboarding exam is being reviewed. Before attempting this exam, please allow 1-2 days for your onboarding exam to be reviewed.
Your onboarding exam failed to pass all requirements.
{% endblocktrans %}
{% elif onboarding_status == 'onboarding_failed' %}
{% if onboarding_link %}
{% blocktrans %}
Your onboarding exam failed to pass all requirements. You can retake the <a href="{{onboarding_link}}">Onboarding Exam</a>.
{% endblocktrans %}
{% else %}
{% blocktrans %}
Your onboarding exam failed to pass all requirements.
{% endblocktrans %}
{% endif %}
</p>
{% if onboarding_link %}
<a href="{{onboarding_link}}" class="btn-secondary">
{% trans "Navigate to onboarding exam" %}
</a>
{% endif %}
{% endif %}
</p>
<p>
{% blocktrans %}
If you have questions about the status of your onboarding exam, contact {{ platform_name }}
support at
<a href="mailto:{{ tech_support_email }}?Subject={{ support_email_subject }}">{{ tech_support_email }}</a>.
Proctoring for your exam is provided via {{ provider_name }}.
If you have questions about the status of your onboarding exam, contact
<a href="mailto:{{ integration_specific_email }}">{{ integration_specific_email }}</a>.
{% endblocktrans %}
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@edx/edx-proctoring",
"//": "Be sure to update the version number in edx_proctoring/__init__.py",
"//": "Note that the version format is slightly different than that of the Python version when using prereleases.",
"version": "1.5.13",
"version": "1.5.14",
"main": "edx_proctoring/static/index.js",
"repository": {
"type": "git",
Expand Down

0 comments on commit 5f3a797

Please sign in to comment.