Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/brian/pearson-exam' of github.com:MITx/mitx into feature/brian/pearson-exam

Browse Source
This commit is contained in:
Brian Wilson
2013-02-07 15:58:12 -05:00
parent cc11dc2aa3 6d4cb558d3
commit 2974b9eec3
6 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/lib/capa/capa/tests/test_files/js/test_problem_display.js
View File

@@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.3.3
// Generated by CoffeeScript 1.4.0
(function() {
var MinimaxProblemDisplay, root,
__hasProp = {}.hasOwnProperty,

2
common/lib/capa/capa/tests/test_files/js/test_problem_generator.js
View File

@@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.3.3
// Generated by CoffeeScript 1.4.0
(function() {
var TestProblemGenerator, root,
__hasProp = {}.hasOwnProperty,

2
common/lib/capa/capa/tests/test_files/js/test_problem_grader.js
View File

@@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.3.3
// Generated by CoffeeScript 1.4.0
(function() {
var TestProblemGrader, root,
__hasProp = {}.hasOwnProperty,

2
common/lib/capa/capa/tests/test_files/js/xproblem.js
View File

@@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.3.3
// Generated by CoffeeScript 1.4.0
(function() {
var XProblemDisplay, XProblemGenerator, XProblemGrader, root;

21
lms/static/sass/course/layout/_timer.scss
View File

@@ -1,27 +1,38 @@
div.timer-main {
position: fixed;
z-index: 99;
top: 0;
right: 0;
width: 100%;
border-top: 2px solid #000;
div#timer_wrapper {
position: relative;
position: absolute;
top: -3px;
float: right;
margin-right: 10px;
right: 10px;
background: #000;
color: #fff;
padding: 10px 20px;
border-radius: 3px;
}
.timer_label {
color: #ccc;
.timer_return_url {
display: block;
margin-bottom: 5px;
border-bottom: 1px solid tint(#000, 20%);
padding-bottom: 5px;
font-size: 13px;
}
.timer_label {
color: #b0b0b0;
font-size: 13px;
margin-bottom: 3px;
}
#exam_timer {
font-weight: bold;
font-size: 15px;
letter-spacing: 1px;
}
}

4
lms/templates/courseware/courseware.html
View File

@@ -112,10 +112,10 @@
% if timer_expiration_datetime:
<div class="timer-main">
<div id="timer_wrapper">
<div class="timer_label">Time Remaining:</div> <div id="exam_timer" class="timer_value">&nbsp;</div>
% if timer_navigation_return_url:
<a href="${timer_navigation_return_url}" class="timer_return_url">Return...</a>
<a href="${timer_navigation_return_url}" class="timer_return_url">Return to Exam</a>
% endif
<div class="timer_label">Time Remaining:</div> <div id="exam_timer" class="timer_value">&nbsp;</div>
</div>
</div>
% endif