From b3357176078e9da58b25eb710c9352362cdabf58 Mon Sep 17 00:00:00 2001 From: cahrens Date: Sat, 13 May 2017 21:17:27 -0400 Subject: [PATCH] Remove credit and progress page references. EDUCATOR-396 --- AUTHORS | 2 ++ edx_proctoring/__init__.py | 2 +- .../proctoring_attempt_satisfactory_email.html | 3 +-- .../templates/practice_exam/submitted.html | 2 +- .../templates/proctored_exam/confirm-decline.html | 2 +- .../templates/proctored_exam/entrance.html | 2 +- edx_proctoring/templates/proctored_exam/error.html | 6 ------ edx_proctoring/templates/proctored_exam/expired.html | 6 ------ .../proctored_exam/failed-prerequisites.html | 4 ++-- .../templates/proctored_exam/instructions.html | 4 +--- .../proctored_exam/pending-prerequisites.html | 4 ++-- .../proctored_exam/proctoring_opt_out_button.html | 5 ----- .../templates/proctored_exam/ready_to_submit.html | 2 -- .../templates/proctored_exam/rejected.html | 8 -------- .../templates/proctored_exam/submitted.html | 6 ------ .../templates/proctored_exam/verified.html | 12 ------------ .../templates/proctored_exam/visit_exam_content.html | 6 ------ edx_proctoring/templates/timed_exam/submitted.html | 3 --- 18 files changed, 12 insertions(+), 67 deletions(-) diff --git a/AUTHORS b/AUTHORS index 7926c1aae82..2b6ca325ece 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,3 +2,5 @@ Chris Dodge Muhammad Shoaib Afzal Wali Mushtaq Ali +Christina Roberts + diff --git a/edx_proctoring/__init__.py b/edx_proctoring/__init__.py index ed5bf1da20b..f2a35070d33 100644 --- a/edx_proctoring/__init__.py +++ b/edx_proctoring/__init__.py @@ -4,6 +4,6 @@ from __future__ import absolute_import -__version__ = '0.18.0' +__version__ = '0.18.1' default_app_config = 'edx_proctoring.apps.EdxProctoringConfig' # pylint: disable=invalid-name diff --git a/edx_proctoring/templates/emails/proctoring_attempt_satisfactory_email.html b/edx_proctoring/templates/emails/proctoring_attempt_satisfactory_email.html index bd00e3ca917..bcdf627143d 100644 --- a/edx_proctoring/templates/emails/proctoring_attempt_satisfactory_email.html +++ b/edx_proctoring/templates/emails/proctoring_attempt_satisfactory_email.html @@ -9,8 +9,7 @@ {% blocktrans %} Your proctored exam "{{ exam_name }}" in {{ course_name }} was reviewed and you - met all exam requirements. You can view your grade on the course - progress page. + met all exam requirements. {% endblocktrans %}

diff --git a/edx_proctoring/templates/practice_exam/submitted.html b/edx_proctoring/templates/practice_exam/submitted.html index bf38174deba..e52478b10ce 100644 --- a/edx_proctoring/templates/practice_exam/submitted.html +++ b/edx_proctoring/templates/practice_exam/submitted.html @@ -8,7 +8,7 @@

{% blocktrans %} - Practice exams do not affect your grade or your credit eligibility. + Practice exams do not affect your grade. You have completed this practice exam and can continue with your course work. {% endblocktrans %}

diff --git a/edx_proctoring/templates/proctored_exam/confirm-decline.html b/edx_proctoring/templates/proctored_exam/confirm-decline.html index c517a2f051f..a7cf90910d2 100644 --- a/edx_proctoring/templates/proctored_exam/confirm-decline.html +++ b/edx_proctoring/templates/proctored_exam/confirm-decline.html @@ -8,7 +8,7 @@
{% blocktrans %} - If you take this exam without proctoring, you will no longer be eligible for academic credit. + If you take this exam without proctoring, you will not be eligible for course credit or the MicroMasters credential if either applies to this course. {% endblocktrans %}
diff --git a/edx_proctoring/templates/proctored_exam/entrance.html b/edx_proctoring/templates/proctored_exam/entrance.html index 7a502e08c27..20bc69e0c9c 100644 --- a/edx_proctoring/templates/proctored_exam/entrance.html +++ b/edx_proctoring/templates/proctored_exam/entrance.html @@ -11,7 +11,7 @@

{% endblocktrans %}

diff --git a/edx_proctoring/templates/proctored_exam/expired.html b/edx_proctoring/templates/proctored_exam/expired.html index 6db49c5de5a..8b2f414d556 100644 --- a/edx_proctoring/templates/proctored_exam/expired.html +++ b/edx_proctoring/templates/proctored_exam/expired.html @@ -10,10 +10,4 @@

Because the due date has passed, you are no longer able to take this exam. {% endblocktrans %}

-
-

- {% blocktrans %} - View your credit eligibility status on your Progress page. - {% endblocktrans %} -

diff --git a/edx_proctoring/templates/proctored_exam/failed-prerequisites.html b/edx_proctoring/templates/proctored_exam/failed-prerequisites.html index d0a1e51f189..5ed58326b72 100644 --- a/edx_proctoring/templates/proctored_exam/failed-prerequisites.html +++ b/edx_proctoring/templates/proctored_exam/failed-prerequisites.html @@ -7,7 +7,7 @@

{% blocktrans %} - You did not satisfy the requirements for taking this exam with proctoring, and are not eligible for credit. See your Progress page for a list of requirements and your status for each. + You did not satisfy the requirements for taking this exam with proctoring. {% endblocktrans %}

@@ -38,7 +38,7 @@

{% endif %}

{% blocktrans %} - If you have questions about the status of your requirements for course credit, contact {{ platform_name }} Support. + If you have questions about the status of your requirements, contact {{ platform_name }} Support. {% endblocktrans %}

diff --git a/edx_proctoring/templates/proctored_exam/instructions.html b/edx_proctoring/templates/proctored_exam/instructions.html index ada0e197890..c3586305249 100644 --- a/edx_proctoring/templates/proctored_exam/instructions.html +++ b/edx_proctoring/templates/proctored_exam/instructions.html @@ -84,7 +84,6 @@

{% trans "Cannot Start Proctored Exam" %}

{% trans "Take this exam without proctoring." %} - {% trans "Doing so means that you are no longer eligible for academic credit." %}

{% endif %} @@ -111,8 +110,7 @@

{% trans "Cannot Start Proctored Exam" %}

var action = $(this).data('action'); var msg = gettext( - "Are you sure you want to take this exam without proctoring? " + - "You will no longer be eligible to use this course for academic credit." + "Are you sure you want to take this exam without proctoring?" ); if (!confirm(msg)) { return; diff --git a/edx_proctoring/templates/proctored_exam/pending-prerequisites.html b/edx_proctoring/templates/proctored_exam/pending-prerequisites.html index 70aa1ac7995..dda7e94b27e 100644 --- a/edx_proctoring/templates/proctored_exam/pending-prerequisites.html +++ b/edx_proctoring/templates/proctored_exam/pending-prerequisites.html @@ -7,7 +7,7 @@

{% blocktrans %} - You have not completed the prerequisites for this exam. All requirements must be satisfied before you can take this proctored exam and be eligible for credit. See your Progress page for a list of requirements in the order that they must be completed. + You have not completed the prerequisites for this exam. All requirements must be satisfied before you can take this proctored exam. {% endblocktrans %}

@@ -28,7 +28,7 @@

{% blocktrans %} - You can take this exam with proctoring only when all prerequisites have been successfully completed. Check your Progress page to see if prerequisite results have been updated. You can also take this exam now without proctoring, but you will not be eligible for credit. + You can take this exam with proctoring only when all prerequisites have been successfully completed. {% endblocktrans %}

diff --git a/edx_proctoring/templates/proctored_exam/proctoring_opt_out_button.html b/edx_proctoring/templates/proctored_exam/proctoring_opt_out_button.html index fd92eaceb3f..47e06e87de6 100644 --- a/edx_proctoring/templates/proctored_exam/proctoring_opt_out_button.html +++ b/edx_proctoring/templates/proctored_exam/proctoring_opt_out_button.html @@ -4,10 +4,5 @@ {% endif %} diff --git a/edx_proctoring/templates/proctored_exam/ready_to_submit.html b/edx_proctoring/templates/proctored_exam/ready_to_submit.html index 28502718ef6..6128b2d39b4 100644 --- a/edx_proctoring/templates/proctored_exam/ready_to_submit.html +++ b/edx_proctoring/templates/proctored_exam/ready_to_submit.html @@ -13,8 +13,6 @@

{% blocktrans %} After you submit your exam, your responses are graded and your proctoring session is reviewed. - You might be eligible to earn academic credit for this course if you complete all required exams - as well as achieve a final grade that meets credit requirements for the course. {% endblocktrans %}