From 85c9b5b81b297d3e26c271039bf9d3b628aed92a Mon Sep 17 00:00:00 2001
From: Matt Hughes <mhughes@edx.org>
Date: Fri, 15 Feb 2019 10:29:24 -0500
Subject: [PATCH] Update onboarding blocking error messages

and change links into button-styled CTAs
Also fix poorly behaved link on instructions page

JIRA:EDUCATOR-4048
---
 edx_proctoring/__init__.py                    |  2 +-
 .../proctored_exam/instructions.html          |  3 +-
 .../proctored_exam/onboarding_error.html      | 46 ++++++++++---------
 package.json                                  |  2 +-
 4 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/edx_proctoring/__init__.py b/edx_proctoring/__init__.py
index 32c5bbdd2e4..abf81acba70 100644
--- a/edx_proctoring/__init__.py
+++ b/edx_proctoring/__init__.py
@@ -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
diff --git a/edx_proctoring/templates/proctored_exam/instructions.html b/edx_proctoring/templates/proctored_exam/instructions.html
index 2973923dd46..9df8a86a917 100644
--- a/edx_proctoring/templates/proctored_exam/instructions.html
+++ b/edx_proctoring/templates/proctored_exam/instructions.html
@@ -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') {
diff --git a/edx_proctoring/templates/proctored_exam/onboarding_error.html b/edx_proctoring/templates/proctored_exam/onboarding_error.html
index 58d19c73239..5a519f1441b 100644
--- a/edx_proctoring/templates/proctored_exam/onboarding_error.html
+++ b/edx_proctoring/templates/proctored_exam/onboarding_error.html
@@ -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>
diff --git a/package.json b/package.json
index 8723d446c6a..55936cf4c56 100644
--- a/package.json
+++ b/package.json
@@ -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",