Commit 2c0bcc34 by chrisndodge

Merge pull request #76 from edx/muhhshoaib/text-changes

Muhhshoaib/text changes
parents 00de4d12 cd0adbd5
...@@ -1005,6 +1005,7 @@ def get_student_view(user_id, course_id, content_id, ...@@ -1005,6 +1005,7 @@ def get_student_view(user_id, course_id, content_id,
'edx_proctoring.proctored_exam.attempt', 'edx_proctoring.proctored_exam.attempt',
args=[attempt['id']] args=[attempt['id']]
) if attempt else '', ) if attempt else '',
'link_urls': settings.PROCTORING_SETTINGS.get('LINK_URLS', {}),
}) })
return template.render(django_context) return template.render(django_context)
......
...@@ -4,6 +4,7 @@ Various callback paths that support callbacks from SoftwareSecure ...@@ -4,6 +4,7 @@ Various callback paths that support callbacks from SoftwareSecure
import logging import logging
from django.template import Context, loader from django.template import Context, loader
from django.conf import settings
from django.http import HttpResponse from django.http import HttpResponse
import pytz import pytz
from datetime import datetime from datetime import datetime
...@@ -60,6 +61,8 @@ def start_exam_callback(request, attempt_code): # pylint: disable=unused-argume ...@@ -60,6 +61,8 @@ def start_exam_callback(request, attempt_code): # pylint: disable=unused-argume
template.render( template.render(
Context({ Context({
'exam_attempt_status_url': poll_url, 'exam_attempt_status_url': poll_url,
'platform_name': settings.PLATFORM_NAME,
'link_urls': settings.PROCTORING_SETTINGS.get('LINK_URLS', {})
}) })
) )
) )
......
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
<div class="steps-container"> <div class="steps-container">
<div class="body-container"> <div class="body-container">
<h3>{% blocktrans %} Your Proctoring Session Has Started {% endblocktrans %}</h3> <h3>{% blocktrans %} Your Proctoring Session Has Started {% endblocktrans %}</h3>
<p>{% blocktrans %} From this point in time, you must follow the <a href="http://edx.readthedocs.org/projects/edx-guide-for-students/en/latest/sfd_proctoredexams/SFD_OnlineProctoringPolicy.html">online proctoring rules</a> to pass the proctoring review for your exam. {% endblocktrans %}</p> <p>{% blocktrans %} From this point in time, you must follow the <a href="{{link_urls.online_proctoring_rules}}">online proctoring rules</a> to pass the proctoring review for your exam. {% endblocktrans %}</p>
<div class="alert"> <div class="alert">
{% blocktrans %} {% blocktrans %}
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
</div> </div>
<h5> <h5>
{% blocktrans %} {% blocktrans %}
Return to the edX course window to start your exam. When you have finished your exam and Return to the {{platform_name}} course window to start your exam. When you have finished your exam and
have marked it as complete, you can close this window to end the proctoring session have marked it as complete, you can close this window to end the proctoring session
and upload your proctoring session data for review." and upload your proctoring session data for review."
{% endblocktrans %} {% endblocktrans %}
......
...@@ -2,16 +2,20 @@ ...@@ -2,16 +2,20 @@
<div class="faq-proctoring-exam"> <div class="faq-proctoring-exam">
<h4> {% trans "See Also" %} </h4> <h4> {% trans "See Also" %} </h4>
<p> <p>
{% blocktrans %} <a class="footer-link" href="{{link_urls.faq}}">
<a class="footer-link" href="http://edx.readthedocs.org/projects/edx-guide-for-students/en/latest/sfd_proctoredexams/SFD_ProctoredExams.html"> {% blocktrans %}
Frequently asked questions about proctoring and earning college credit. Frequently asked questions about proctoring and earning college credit.
{% endblocktrans %}
</a> </a>
<a class="footer-link" href="http://edx.readthedocs.org/projects/edx-guide-for-students/en/latest/sfd_proctoredexams/SFD_OnlineProctoringPolicy.html"> <a class="footer-link" href="{{link_urls.online_proctoring_rules}}">
{% blocktrans %}
Online proctoring rules Online proctoring rules
{% endblocktrans %}
</a> </a>
<a class="footer-link" href="http://clientportal.softwaresecure.com/support/index.php?/Knowledgebase/Article/View/252/0/system-requirements-remote-proctor-now"> <a class="footer-link" href="{{link_urls.tech_requirements}}">
{% blocktrans %}
Technical Requirements for taking a proctored exam Technical Requirements for taking a proctored exam
{% endblocktrans %}
</a> </a>
{% endblocktrans %}
</p> </p>
</div> </div>
\ No newline at end of file
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
{% blocktrans %} {% blocktrans %}
Proctoring session results are usually available 24-48 hours after you submit your exam. Proctoring session results are usually available 24-48 hours after you submit your exam.
If you have questions about the status of your session review If you have questions about the status of your session review
after that time, contact <a href="https://www.edx.org/contact-us">edX</a> Support. after that time, contact <a href="{{link_urls.contact_us}}">{{platform_name}}</a> Support.
{% endblocktrans %} {% endblocktrans %}
</p> </p>
<hr> <hr>
......
...@@ -82,4 +82,10 @@ PROCTORING_BACKEND_PROVIDER = { ...@@ -82,4 +82,10 @@ PROCTORING_BACKEND_PROVIDER = {
PROCTORING_SETTINGS = { PROCTORING_SETTINGS = {
'MUST_BE_VERIFIED_TRACK': True, 'MUST_BE_VERIFIED_TRACK': True,
'MUST_COMPLETE_ICRV': True, 'MUST_COMPLETE_ICRV': True,
'LINK_URLS': {
'online_proctoring_rules': '',
'faq': '',
'contact_us': '',
'tech_requirements': '',
}
} }
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