diff --git a/lms/static/sass/course/layout/_courseware_preview.scss b/lms/static/sass/course/layout/_courseware_preview.scss index 82447d5421..b53628e14f 100644 --- a/lms/static/sass/course/layout/_courseware_preview.scss +++ b/lms/static/sass/course/layout/_courseware_preview.scss @@ -1,3 +1,4 @@ +$proctoring-banner-text-size: 14px; .wrapper-preview-menu { @include clearfix(); @@ -67,7 +68,7 @@ } .exam-timer { - font-size: 14px; + font-size: $proctoring-banner-text-size; background-color: rgb(229, 234, 236); padding: $baseline ($baseline*2); border-left: 4px solid theme-color("primary"); @@ -190,6 +191,10 @@ border-top-left-radius: 0; margin-right: 0; } + h3 { + display: inline; + font-size: $proctoring-banner-text-size; + } b { padding-right: ($baseline/5); diff --git a/lms/templates/courseware/proctored-exam-status.underscore b/lms/templates/courseware/proctored-exam-status.underscore index 5c47a58b6e..6f223b3c7f 100644 --- a/lms/templates/courseware/proctored-exam-status.underscore +++ b/lms/templates/courseware/proctored-exam-status.underscore @@ -6,12 +6,18 @@ .replace(/>/g, '>') } %> -
+
<% // xss-lint: disable=underscore-not-escaped %> - <%= interpolate_text('You are taking "{exam_link}" as a {exam_type} exam. The timer on the right shows the time remaining in the exam.', {exam_link: ""+gtLtEscape(exam_display_name)+"", exam_type: (!_.isUndefined(arguments[0].exam_type)) ? exam_type : gettext('timed')}) %> - <%- gettext('To receive credit for problems, you must select "Submit" for each problem before you select "End My Exam".') %> + <%= interpolate_text('You are taking "{exam_link}" as a {exam_type} exam. ', {exam_link: ""+gtLtEscape(exam_display_name)+"", exam_type: (!_.isUndefined(arguments[0].exam_type)) ? exam_type : gettext('timed')}) %> + + <%- gettext('The timer on the right shows the time remaining in the exam.') %> + <%- gettext('To receive credit for problems, you must select "Submit" for each problem before you select "End My Exam".') %> + +
-
+
<% if(attempt_status !== 'ready_to_submit') {%> diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 4d16e6bc76..1473f75dab 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -124,7 +124,7 @@ edx-oauth2-provider==1.2.2 edx-opaque-keys[django]==0.4.4 edx-organizations==1.0.0 edx-proctoring-proctortrack==1.0.1 -edx-proctoring==1.5.7 +edx-proctoring==1.5.8 edx-rest-api-client==1.9.2 edx-search==1.2.1 edx-submissions==2.1.1 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 91a2a9cf2c..9a5b9685db 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -143,7 +143,7 @@ edx-oauth2-provider==1.2.2 edx-opaque-keys[django]==0.4.4 edx-organizations==1.0.0 edx-proctoring-proctortrack==1.0.1 -edx-proctoring==1.5.7 +edx-proctoring==1.5.8 edx-rest-api-client==1.9.2 edx-search==1.2.1 edx-sphinx-theme==1.4.0 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index d9869b0604..c012ba16a1 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -138,7 +138,7 @@ edx-oauth2-provider==1.2.2 edx-opaque-keys[django]==0.4.4 edx-organizations==1.0.0 edx-proctoring-proctortrack==1.0.1 -edx-proctoring==1.5.7 +edx-proctoring==1.5.8 edx-rest-api-client==1.9.2 edx-search==1.2.1 edx-submissions==2.1.1