bleh

pgbovine · mmmicedcoffee · commit 85e04142074f · 2014-01-31T13:15:20.000-05:00
diff --git a/v3/css/matrixtutor.css b/v3/css/matrixtutor.css
@@ -8,3 +8,14 @@
   font-size: 12pt;
   border: 1px solid #ddd;
 }
+
+#gradingPane {
+  margin-top: 20px;
+  margin-bottom: 20px;
+
+  max-width: 700px;
+  /* center align */
+  margin-left: auto;
+  margin-right: auto;
+}
+
diff --git a/v3/js/matrixtutor.js b/v3/js/matrixtutor.js
@@ -43,6 +43,8 @@ var preseededCurInstr = null; // if you passed in a 'curInstr=<number>' in the U
 
 var myVisualizer = null; // singleton ExecutionVisualizer instance
 
+var VIZ_LABEL = "Run and Visualize Code";
+
 
 function enterEditMode() {
   $.bbq.pushState({ mode: 'edit' }, 2 /* completely override other hash strings to keep URL clean */);
@@ -58,7 +60,7 @@ var pyTestInputCodeMirror; // CodeMirror object that contains the test code
 
 $(document).ready(function() {
 
-  $("#embedLinkDiv").hide();
+  $("#embedLinkDiv,#gradingPane,#pyOutputPane").hide();
 
   pyInputCodeMirror = CodeMirror(document.getElementById('codeInputPane'), {
     mode: 'python',
@@ -88,7 +90,7 @@ $(document).ready(function() {
 
     if (appMode === undefined || appMode == 'edit') {
       $("#pyInputPane").show();
-      $("#pyOutputPane").hide();
+      $("#pyOutputPane,#gradingPane").hide();
       $("#embedLinkDiv").hide();
 
       // destroy all annotation bubbles (NB: kludgy)
@@ -98,11 +100,10 @@ $(document).ready(function() {
     }
     else if (appMode == 'display') {
       $("#pyInputPane").hide();
-      $("#pyOutputPane").show();
-
+      $("#pyOutputPane,#gradingPane").show();
       $("#embedLinkDiv").show();
 
-      $('#executeBtn').html("Visualize Execution");
+      $('#executeBtn').html(VIZ_LABEL);
       $('#executeBtn').attr('disabled', false);
 
 
@@ -118,7 +119,7 @@ $(document).ready(function() {
     }
     else if (appMode == 'display_no_frills') {
       $("#pyInputPane").hide();
-      $("#pyOutputPane").show();
+      $("#pyOutputPane,#gradingPane").show();
       $("#embedLinkDiv").show();
     }
     else {
@@ -138,7 +139,7 @@ $(document).ready(function() {
 
       $('#executeBtn').html("Please wait ... processing your code");
       $('#executeBtn').attr('disabled', true);
-      $("#pyOutputPane").hide();
+      $("#pyOutputPane,#gradingPane").hide();
       $("#embedLinkDiv").hide();
 
       var backendOptionsObj = {cumulative_mode: ($('#cumulativeModeSelector').val() == 'true'),
@@ -176,7 +177,6 @@ $(document).ready(function() {
               });
             }
             else {
-              console.log('wtf?', errorLineNo, nCodeLines);
               // instead highlight the faulting line in pyTestInputCodeMirror
               errorLineNo -= nCodeLines;
 
@@ -191,7 +191,7 @@ $(document).ready(function() {
             }
           }
 
-          $('#executeBtn').html("Visualize Execution");
+          $('#executeBtn').html(VIZ_LABEL);
           $('#executeBtn').attr('disabled', false);
         }
       }
@@ -251,7 +251,7 @@ $(document).ready(function() {
           "Report a bug to philip@pgbovine.net\n\n" +
           "(Click the 'Generate URL' button to include a unique URL in your email bug report.)");
 
-    $('#executeBtn').html("Visualize Execution");
+    $('#executeBtn').html(VIZ_LABEL);
     $('#executeBtn').attr('disabled', false);
   });
 
diff --git a/v3/matrix-demo/python_comprehension-1.py b/v3/matrix-demo/python_comprehension-1.py
@@ -6,6 +6,6 @@ def increments(L):
 	  - a list where the elements in L were incremented by 1
 	Example:
 	>>> increments([1,4,6])
-	[2,5,7]
+	[2, 5, 7]
 	'''
 	pass
diff --git a/v3/matrixtutor.html b/v3/matrixtutor.html
@@ -30,7 +30,7 @@
  -->
 
 <head>
-  <title>Online Python Tutor - Visualize program execution</title>
+  <title>Python Visualizer - Coding The Matrix</title>
 
   <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
 
@@ -69,6 +69,8 @@
 
 <div id="pyInputPane">
 
+<h1 style="margin-bottom: 25px; font-size: 16pt;">Problem: python_comprehension-1</h1>
+
 Write your solution code here (will be submitted for grading):
 <br/>
 <div id="codeInputPane"></div> <!-- populate with a CodeMirror instance -->
@@ -78,7 +80,7 @@
 <div id="testInputPane"></div> <!-- populate with a CodeMirror instance -->
 
 <p>
-<button id="executeBtn" class="bigBtn" type="button">Visualize Execution</button>
+<button id="executeBtn" class="bigBtn" type="button">Run and Visualize Code</button>
 </p>
 
 </div>
@@ -87,6 +89,20 @@
 <div id="pyOutputPane">
 </div>
 
+<div id="gradingPane">
+
+
+<h1 style="margin-bottom: 15px; font-size: 14pt;">Problem: python_comprehension-1</h1>
+
+<p>
+<button id="submitGradeBtn" class="bigBtn" type="button">Submit for Grading</button>
+</p>
+
+<pre id="gradeResultsPane">
+</pre>
+
+</div>
+
 <div id="footer">
 
 This version of <a href="http://pythontutor.com/">Online Python Tutor</a> supports
