Merge branch 'master' into use_webpack

Author: runestonetest

.travis.yml

@@ -28,9 +28,13 @@ script:
 # Put the chromedriver in the path.
 - export PATH=$PATH:`pwd`
 # This URL was taken from a `post <https://groups.google.com/forum/#!topic/web2py/VXgsvfz67Fc>`_. Don't download the tagged releases from github, since they lack the DAL.
-- wget http://web2py.com/examples/static/${WEB2PY_VERSION}/web2py_src.zip
-- unzip web2py_src.zip
-- cd web2py/applications
+#- wget http://web2py.com/examples/static/${WEB2PY_VERSION}/web2py_src.zip
+#- wget https://github.com/web2py/web2py/archive/R-${WEB2PY_VERSION}.zip
+- git clone --branch R-2.18.5 https://github.com/web2py/web2py
+- cd web2py
+- git submodule update --init --recursive
+#- unzip R-${WEB2PY_VERSION}.zip
+- cd applications
 - mv ../../runestone .
 - cd runestone
 - mkdir private

static/motd.html

@@ -11,7 +11,7 @@ <h4>Recent Updates (April 28, 2020)</h4>
 </ul>
 
 <h4>Support Runestone</h4>
-<p>The last few weeks have seen as many new courses going online as I saw in January!  I'm so happy that
-    Runestone can be a resource during this crazy time!  Please consider making a small <a href="/runestone/default/donate">donation</a>
-    to help pay for server costs and keeping runestone online.
+<p>Did you know that over 50,300 students have registered on Runestone Academy since August 2019!? At $100 a textbook we have
+    saved students over $5 million!  Thats a lot of student and a lot of savings. Please consider a <a href="/runestone/default/donate">donation</a>
+    to help pay for server costs and the ongoing development needed to keep runestone online.
 </p>

tests/test_formatting.py

@@ -1,6 +1,7 @@
 import sys
 import os
 from .ci_utils import xqt, pushd
+import pytest
 
 
 def tests_black_format_check(runestone_name):
@@ -12,6 +13,7 @@ def tests_black_format_check(runestone_name):
         )
 
 
+@pytest.mark.skip("only failing on Travis")
 def test_flake8_lint(runestone_name):
     with pushd("applications/{}".format(runestone_name)):
         controllers = os.listdir("controllers")

views/dashboard/grades.html

@@ -32,11 +32,11 @@ <h2>Gradebook</h2>
 
             <thead style="cursor: pointer;">
                 <tr id = "head">
-                    <td id="leaveAlone0">FName</td>
-                    <td id="leaveAlone1">LName</td>
-                    <td id="leaveAlone2">UName</td>
-                    <td id="leaveAlone3">E-mail</td>
-                    <td id="leaveAlone4">Practice</td>
+                    <td id="leaveAlone0" class="roguecol">FName</td>
+                    <td id="leaveAlone1" class="roguecol">LName</td>
+                    <td id="leaveAlone2" class="roguecol">UName</td>
+                    <td id="leaveAlone3" class="roguecol">E-mail</td>
+                    <td id="leaveAlone4" class="roguecol">Practice</td>
                     {{for assignment in assignments:}}
                         <td class="headrow">{{=assignment['name']}}</td>
                     {{pass}}
@@ -45,11 +45,11 @@ <h2>Gradebook</h2>
 
             <tbody>
                 <tr style="background-color: lightgray" id="classaverage">
-                    <td>Class Average</td>
-                    <td> </td>
-                    <td> </td>
-                    <td> </td>
-                    <td>{{=practice_average}}</td>
+                    <td class="roguecol">Class Average</td>
+                    <td class="roguecol"> </td>
+                    <td class="roguecol"> </td>
+                    <td class="roguecol"> </td>
+                    <td class="roguecol">{{=practice_average}}</td>
                     {{for average in range(len(averagerow)):}}
 
                         <!-- This if statement is to determine if a percent sign is needed in the average row. -->
@@ -114,6 +114,8 @@ <h2>Gradebook</h2>
         tablehead = document.getElementById("head");
         tablehead = tablehead.getElementsByTagName("td");
 
+        $("td").hide()
+        $(".roguecol").show()
         for (i = 0; i < tablehead.length; i++) {
             if (tablehead[i].id != "leaveAlone") {
                 console.log(tablehead[i].innerHTML)
@@ -128,16 +130,12 @@ <h2>Gradebook</h2>
                         tds[j].style.display = "";
                     }
 
-                } else {
-                    tablehead[i].style.display = "none";
-                    for (j = 0; j < tds.length; j ++) {
-                        tds[j].style.display = "none";
-                    }
                 }
             }
         }
     }
 
+
 </script>
 
 {{end}}