Merge pull request #446 from ossf/lab_format_fixup3

Lab format fixup3

Author: david-a-wheeler

docs/labs/README.md

@@ -15,7 +15,7 @@ Here are the labs available:
 
 * [hello](hello.html) - simple "Hello, world!" demo
 * [input1](input1.html) - input validation (simple types)
-* [regex](regex1.html) - regular expressions (regexes)
+* [regex1](regex1.html) - regular expressions (regexes)
 * [input2](input2.html) - input validation (more complex situations)
 * [csp1](csp1.html) - Content Security Policy (CSP)
 
@@ -46,7 +46,7 @@ mappings to existing labs or people who have agreed to work on one:
     * Input Validation: A Few Simple Data Types - [input1](input1.html)
     * Sidequest: Text, Unicode, and Locales
     * Validating Text
-    * Introduction to Regular Expressions - [regex](regex1.html)
+    * Introduction to Regular Expressions - [regex1](regex1.html)
     * Using Regular Expressions for Text Input Validation - [input2](input2.html)
     * Countering ReDoS Attacks on Regular Expressions - NEED
   * Input Validation: Beyond Numbers and Text

docs/labs/csp1.html

@@ -410,7 +410,7 @@ <h2>Interactive Lab (<span id="grade"></span>)</h2>
 <button type="button" class="giveUpButton">Give up</button>
 <br><br>
 <p id="correctStamp" class="small">
-<textarea id="debugData" class="displayNone" rows="20" cols="70" readonly>
+<textarea id="debugData" class="displayNone" rows="20" cols="65" readonly>
 </textarea>
 </form>
 </div><!-- End GitHub pages formatting -->

docs/labs/hello.html

@@ -159,19 +159,19 @@ <h2>Interactive Lab (<span id="grade"></span>)</h2>
 <!--
 You can use this an example for new labs.
 For multi-line inputs, instead of <input id="attempt0" type="text" ...>, use
-<textarea id="attempt" rows="2" cols="70">...</textarea>
+<textarea id="attempt" rows="2" cols="65">...</textarea>
 -->
 <form id="lab">
 <pre><code>
-<input id="attempt0" type="text" size="70" spellcheck="false"
+<input id="attempt0" type="text" size="65" spellcheck="false"
        value='console.log("Goodbye.");'>
 </code></pre>
 <button type="button" class="hintButton">Hint</button>
 <button type="button" class="resetButton">Reset</button>
 <button type="button" class="giveUpButton">Give up</button>
 <br><br>
 <p id="correctStamp" class="small">
-<textarea id="debugData" class="displayNone" rows="20" cols="70" readonly>
+<textarea id="debugData" class="displayNone" rows="20" cols="65" readonly>
 </textarea>
 </form>
 

docs/labs/input1.html

@@ -200,18 +200,19 @@ <h2>Interactive Lab (<span id="grade"></span>)</h2>
 <!--
 You can use this an example for new labs.
 For multi-line inputs, instead of <input id="attempt0" type="text" ...>, use
-<textarea id="attempt" rows="2" cols="70">...</textarea>
+<textarea id="attempt" rows="2" cols="65">...</textarea>
 -->
 <form id="lab">
 <pre></code>
 // Set up Express framework and express-validator library
 const express = require("express");
 const app = express();
-const { query, matchedData, validationResult } = require('express-validator');
+const { query, matchedData, validationResult } =
+    require('express-validator');
 
-// Implement requests such as http://localhost:3000/invoices?id=1
+// Implement requests, e.g., http://localhost:3000/invoices?id=1
 app.get('/invoices',
-<input id="attempt0" type="text" size="70" spellcheck="false"
+<input id="attempt0" type="text" size="65" spellcheck="false"
  value="  query('id'),">
   (req, res) =&gt; { // Execute this code if /invoices seen
     const result = validationResult(req); // Retrieve errors
@@ -227,7 +228,7 @@ <h2>Interactive Lab (<span id="grade"></span>)</h2>
 <button type="button" class="giveUpButton">Give up</button>
 <br><br><!-- These go in the last form if there's more than one: -->
 <p id="correctStamp" class="small">
-<textarea id="debugData" class="displayNone" rows="20" cols="70" readonly>
+<textarea id="debugData" class="displayNone" rows="20" cols="65" readonly>
 </textarea>
 </form>
 

docs/labs/input2.html

@@ -191,18 +191,19 @@ <h2>Interactive Lab (<span id="grade"></span>)</h2>
 <!--
 You can use this an example for new labs.
 For multi-line inputs, instead of <input id="attempt" type="text" ...>, use
-<textarea id="attempt" rows="2" cols="70">...</textarea>
+<textarea id="attempt" rows="2" cols="65">...</textarea>
 -->
 <form id="lab">
 <pre><code>
 // Set up Express framework and express-validator library
 const express = require("express");
 const app = express();
-const { query, matchedData, validationResult } = require('express-validator');
+const { query, matchedData, validationResult } =
+    require('express-validator');
 
-// Implement requests such as http://localhost:3000/parts?id=1
+// Implement requests, e.g., http://localhost:3000/parts?id=1
 app.get('/parts',
-<input id="attempt0" type="text" size="70" spellcheck="false"
+<input id="attempt0" type="text" size="65" spellcheck="false"
  value="  ,">
   (req, res) =&gt; { // Execute this code if /invoices seen
     const result = validationResult(req); // Retrieve errors
@@ -218,7 +219,7 @@ <h2>Interactive Lab (<span id="grade"></span>)</h2>
 <button type="button" class="giveUpButton">Give up</button>
 <br><br>
 <p id="correctStamp" class="small">
-<textarea id="debugData" class="displayNone" rows="20" cols="70" readonly>
+<textarea id="debugData" class="displayNone" rows="20" cols="65" readonly>
 </textarea>
 </form>
 

docs/labs/regex1.html

@@ -351,7 +351,7 @@ <h3>Part 1</h2>
 <!--
 You can use this an example for new labs.
 For multi-line inputs, instead of <input id="attempt0" type="text" ...>, use
-<textarea id="attempt" rows="2" cols="70">...</textarea>
+<textarea id="attempt" rows="2" cols="65">...</textarea>
 -->
 <form id="lab1">
 <pre></code>
@@ -369,7 +369,7 @@ <h3>Part 2</h2>
 <!--
 You can use this an example for new labs.
 For multi-line inputs, instead of <input id="attempt0" type="text" ...>, use
-<textarea id="attempt" rows="2" cols="70">...</textarea>
+<textarea id="attempt" rows="2" cols="65">...</textarea>
 -->
 <form id="lab2">
 <pre></code>
@@ -387,7 +387,7 @@ <h3>Part 3</h2>
 <!--
 You can use this an example for new labs.
 For multi-line inputs, instead of <input id="attempt0" type="text" ...>, use
-<textarea id="attempt" rows="2" cols="70">...</textarea>
+<textarea id="attempt" rows="2" cols="65">...</textarea>
 -->
 <form id="lab3">
 <pre></code>
@@ -406,7 +406,7 @@ <h3>Part 4</h2>
 <!--
 You can use this an example for new labs.
 For multi-line inputs, instead of <input id="attempt0" type="text" ...>, use
-<textarea id="attempt" rows="2" cols="70">...</textarea>
+<textarea id="attempt" rows="2" cols="65">...</textarea>
 -->
 <form id="lab4">
 <pre></code>
@@ -426,7 +426,7 @@ <h3>Part 5</h2>
 <!--
 You can use this an example for new labs.
 For multi-line inputs, instead of <input id="attempt0" type="text" ...>, use
-<textarea id="attempt" rows="2" cols="70">...</textarea>
+<textarea id="attempt" rows="2" cols="65">...</textarea>
 -->
 <form id="lab5">
 <pre></code>
@@ -440,7 +440,7 @@ <h3>Part 5</h2>
 
 <br><br><!-- These go in the last form if there's more than one: -->
 <p id="correctStamp" class="small">
-<textarea id="debugData" class="displayNone" rows="20" cols="70" readonly>
+<textarea id="debugData" class="displayNone" rows="20" cols="65" readonly>
 </textarea>
 
 </div><!-- End GitHub pages formatting -->