Commit 21d5a06b by Afzal Wali Committed by Chris Dodge

Suggestions for master.

parent ab60d148
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<th class="attempt-started-at"><%- gettext("Started At") %></th> <th class="attempt-started-at"><%- gettext("Started At") %></th>
<th class="attempt-completed-at"><%- gettext("Completed At") %> </th> <th class="attempt-completed-at"><%- gettext("Completed At") %> </th>
<th class="attempt-status"><%- gettext("Status") %> </th> <th class="attempt-status"><%- gettext("Status") %> </th>
<th class="c_action"><%- gettext("Action") %> </th> <th class="c_action"><%- gettext("Actions") %> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="sequence proctored-exam entrance" data-exam-id="{{exam_id}}"> <div class="sequence proctored-exam entrance" data-exam-id="{{exam_id}}">
<h3> <h3>
{% blocktrans %} {% blocktrans %}
Would you like to take {{ display_name }} as a Proctored Exam? Would you like to take {{ display_name }} as a proctored exam?
{% endblocktrans %} {% endblocktrans %}
</h3> </h3>
<p> <p>
...@@ -14,38 +14,36 @@ ...@@ -14,38 +14,36 @@
<div class="gated-sequence"> <div class="gated-sequence">
<span><i class="fa fa-lock"></i></span> <span><i class="fa fa-lock"></i></span>
<a class="start-timed-exam" data-ajax-url="{{enter_exam_endpoint}}" data-exam-id="{{exam_id}}" data-attempt-proctored=true data-start-immediately=false> <a class="start-timed-exam" data-ajax-url="{{enter_exam_endpoint}}" data-exam-id="{{exam_id}}" data-attempt-proctored=true data-start-immediately=false>
{% trans "Yes, take this as a proctored exam (and be eligible for credit)" %} {% trans "Yes, I want to take this exam with online proctoring (and be eligible for credit)" %}
</a> </a>
<p> <p>
{% blocktrans %} {% blocktrans %}
You will need to <strong>download and install {{platform_name}} approved software </strong>for the online proctoring of You will be guided through installing edX-approved online proctoring software and
your exam. After successful installation, you will be <strong>guided through setting up your performing various checks to set up your proctored exam session. Have your photo ID
proctored session and begin the exam immediately </strong>afterwards.</p> ready for the photo ID verification step.<br />
Immediately after you complete the set up, you will begin your timed and proctored exam.<br />
Before you set up your proctoring session, you might want to <a href="#">read this</a>
to learn more about taking a proctored exam.<br />
{% endblocktrans %} {% endblocktrans %}
</p>
<i class="fa fa-arrow-circle-right start-timed-exam" data-ajax-url="{{enter_exam_endpoint}}" data-exam-id="{{exam_id}}" data-attempt-proctored=true data-start-immediately=false></i> <i class="fa fa-arrow-circle-right start-timed-exam" data-ajax-url="{{enter_exam_endpoint}}" data-exam-id="{{exam_id}}" data-attempt-proctored=true data-start-immediately=false></i>
</div> </div>
<div class="gated-sequence"> <div class="gated-sequence">
<span><i class="fa fa-unlock"></i></span> <span><i class="fa fa-unlock"></i></span>
<a class="start-timed-exam" data-ajax-url="{{enter_exam_endpoint}}" data-exam-id="{{exam_id}}" data-attempt-proctored=false data-start-immediately=true> <a class="start-timed-exam" data-ajax-url="{{enter_exam_endpoint}}" data-exam-id="{{exam_id}}" data-attempt-proctored=false data-start-immediately=true>
{% trans "No, take this as an open exam (and not be eligible for credit)" %} {% trans "No, I want to take this exam without proctoring (and not be eligible for credit)" %}
</a> </a>
<p> <p>
{% blocktrans %} {% blocktrans %}
You may proceed and begin the exam at your leisure, but <strong>you will not be able to apply for By not taking the exam as a proctored exam, you will not earn credit for completing
college credit </strong>upon completing the exam or this course in general. the exam or this course. You are taking this exam as an open exam and can begin when
you are ready.
{% endblocktrans %} {% endblocktrans %}
</p> </p>
<i class="fa fa-arrow-circle-right start-timed-exam" data-ajax-url="{{enter_exam_endpoint}}" data-exam-id="{{exam_id}}" data-attempt-proctored=false data-start-immediately=true></i> <i class="fa fa-arrow-circle-right start-timed-exam" data-ajax-url="{{enter_exam_endpoint}}" data-exam-id="{{exam_id}}" data-attempt-proctored=false data-start-immediately=true></i>
</div> </div>
</div> </div>
<div class="footer-sequence">
<h4> {% trans "Why i am seeing these options?" %} </h4>
<p>
{% blocktrans %}
Text to be added here.
{% endblocktrans %}
</p>
</div>
{% include 'proctoring/seq_proctored_exam_footer.html' %} {% include 'proctoring/seq_proctored_exam_footer.html' %}
<script type="text/javascript"> <script type="text/javascript">
......
...@@ -2,39 +2,41 @@ ...@@ -2,39 +2,41 @@
<div class="sequence proctored-exam instructions" data-exam-id="{{exam_id}}" data-exam-started-poll-url="{{exam_started_poll_url}}"> <div class="sequence proctored-exam instructions" data-exam-id="{{exam_id}}" data-exam-started-poll-url="{{exam_started_poll_url}}">
<h3> <h3>
{% blocktrans %} {% blocktrans %}
Awaiting Proctoring Installation & Set Up Awaiting Proctoring Software Installation and Setup
{% endblocktrans %} {% endblocktrans %}
</h3> </h3>
<p> <p>
{% blocktrans %} {% blocktrans %}
You've chosen to take {{display_name}} as a proctored exam. You should be directed to a new window You have chosen to take {{display_name}} as a proctored exam. You should be directed to a new window
with installation and setup instructions. You can also <a href="{{software_download_url}}" target="_blank">open the installation window directly.</a> with installation and setup instructions. You can also <a href="{{software_download_url}}" target="_blank">open the installation window directly.</a>
{% endblocktrans %} {% endblocktrans %}
</p> </p>
<div class="proctored-exam-message"> <div class="proctored-exam-message">
<h3> <h3>
{% blocktrans %} {% blocktrans %}
Here is your unique exam code. You'll be asked for it during the setup. Here is your unique exam code. You will be asked for it during the setup.
{% endblocktrans %} {% endblocktrans %}
</h3> </h3>
<h2> {{exam_code}}<span class='copy-to-clipboard'></span></h2> <h2> {{exam_code}}<span class='copy-to-clipboard'></span></h2>
<p> <p>
{% blocktrans %} {% blocktrans %}
Please do not share this code. It can only be used once and it tied to your {{platform_name}} account. Do not share this code. It is linked to your {{platform_name}} account and can be used only once.
{% endblocktrans %} {% endblocktrans %}
</p> </p>
</div> </div>
</div> </div>
<div class="footer-sequence border-b-0 padding-b-0"> <div class="footer-sequence border-b-0 padding-b-0">
<span> {% trans "Note: Once you complete installation and set up, your timed exam will begin." %} </span> <span> {% trans "Note: As soon as you finish installing and setting up the proctoring software,
you will be prompted to start your timed exam." %} </span>
<p> <p>
{% blocktrans %} {% blocktrans %}
Please be prepared to start the exam and follow all of the guidelines of an {{platform_name}} proctored exam. Be prepared to start your exam and to complete it while adhering to the {{platform_name}}
rules for online proctoring.
{% endblocktrans %} {% endblocktrans %}
</p> </p>
<p class="proctored-exam-option"> <p class="proctored-exam-option">
{% blocktrans %} {% blocktrans %}
Don't want to take this as a proctored exam? <a href="#">Take this as an open exam instead.</a> Don't want to take this exam with online proctoring? <a href="#">Take this exam as an open exam instead.</a>
{% endblocktrans %} {% endblocktrans %}
</p> </p>
</div> </div>
......
...@@ -72,10 +72,10 @@ class ProctoredExamApiTests(LoggedInTestCase): ...@@ -72,10 +72,10 @@ class ProctoredExamApiTests(LoggedInTestCase):
self.disabled_exam_id = self._create_disabled_exam() self.disabled_exam_id = self._create_disabled_exam()
# Messages for get_student_view # Messages for get_student_view
self.start_an_exam_msg = 'Would you like to take %s as a Proctored Exam?' self.start_an_exam_msg = 'Would you like to take %s as a proctored exam?'
self.timed_exam_msg = '%s is a Timed Exam' self.timed_exam_msg = '%s is a Timed Exam'
self.exam_time_expired_msg = 'you did not submit your exam before the time allotted expired' self.exam_time_expired_msg = 'You did not complete the exam in the allotted time'
self.chose_proctored_exam_msg = 'You\'ve chosen to take %s as a proctored exam' self.chose_proctored_exam_msg = 'You have chosen to take %s as a proctored exam'
def _create_proctored_exam(self): def _create_proctored_exam(self):
""" """
......
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