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

common/lib/capa/capa/tests/test_files/js/test_problem_display.js

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

common/lib/capa/capa/tests/test_files/js/test_problem_generator.js

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

common/lib/capa/capa/tests/test_files/js/test_problem_grader.js

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

common/lib/capa/capa/tests/test_files/js/xproblem.js

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

lms/static/sass/course/layout/_timer.scss

 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_return_url {
+    display: block;
+    margin-bottom: 5px;
+    border-bottom: 1px solid tint(#000, 20%);
+    padding-bottom: 5px;
+    font-size: 13px;
+  }
+
   .timer_label {
-    color: #ccc;
+    color: #b0b0b0;
     font-size: 13px;
+    margin-bottom: 3px;
   }
 
   #exam_timer {
     font-weight: bold;
     font-size: 15px;
+    letter-spacing: 1px;
   }
 }

lms/templates/courseware/courseware.html

@@ -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