Merge branch 'main' into main

Author: milescalabresi

.github/workflows/tests.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   build:
     name: ${{ matrix.travis_job }} (Python ${{ matrix.python-version }})
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     services:
       postgres:
         image: postgres:10.8
@@ -34,7 +34,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: niden/actions-memcached@v7
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: deadsnakes/[email protected]
       with:
         python-version: ${{ matrix.python-version }}
     - name: Prepare for Installing Dependencies

esp/esp/program/modules/handlers/programprintables.py

@@ -1646,63 +1646,6 @@ def classchecklists(self, request, tl, one, two, module, extra, prog):
 
         return render_to_response(self.baseDir()+'classchecklists.html', request, context)
 
-    @aux_call
-    @needs_admin
-    def adminbinder(self, request, tl, one, two, module, extra, prog):
-
-        if extra not in ['teacher', 'classid', 'timeblock']:
-            return self.goToCore(tl)
-        context = {'module': self}
-
-        scheditems = []
-
-
-        if extra == 'teacher':
-            teachers = sorted(self.program.teachers())
-            list(map(ESPUser, teachers))
-
-            scheditems = []
-
-            for teacher in teachers:
-                classes = [ cls for cls in teacher.getTaughtClasses()
-                            if cls.isAccepted() and
-                               cls.parent_program == self.program     ]
-                for cls in classes:
-                    scheditems.append({'teacher': teacher,
-                                       'class'  : cls})
-
-            context['scheditems'] = scheditems
-            return render_to_response(self.baseDir()+'adminteachers.html', request, context)
-
-
-
-        if extra == 'classid':
-            classes = [cls for cls in self.program.classes()
-                       if cls.isAccepted()                   ]
-
-            classes.sort(key=ClassSubject.idcmp)
-
-            for cls in classes:
-                for teacher in cls.get_teachers():
-                    scheditems.append({'teacher': teacher,
-                                      'class'  : cls})
-            context['scheditems'] = scheditems
-            return render_to_response(self.baseDir()+'adminclassid.html', request, context)
-
-
-        if extra == 'timeblock':
-            classes = sorted([cls for cls in self.program.classes()
-                       if cls.isAccepted()                   ])
-
-
-            for cls in classes:
-                for teacher in cls.get_teachers():
-                    scheditems.append({'teacher': teacher,
-                                      'cls'  : cls})
-
-            context['scheditems'] = scheditems
-            return render_to_response(self.baseDir()+'adminclasstime.html', request, context)
-
     @aux_call
     @needs_admin
     def certificate(self, request, tl, one, two, module, extra, prog):

esp/esp/utils/widgets.py

@@ -324,7 +324,7 @@ class NavStructureWidget(forms.Widget):
     var delete_button = $j("<button class='btn btn-mini btn-danger'>Delete link</button>");
     delete_button.on("click", {{ name }}_delete_link);
     entry.append(delete_button);
-    $j("#{{ name }}_entries input").on("change", {{ name }}_save);
+    $j("#{{ name }}_entries input, #{{ name }}_entries select").on("change", {{ name }}_save);
 }
 
 function {{ name }}_add_tab(obj, data)
@@ -785,8 +785,9 @@ def compress(self, value):
 class NavStructureWidgetWithIcons(NavStructureWidget):
     add_link_body = """
         entry.append($j("<span>Icon: </span>"));
-        var select = $j("<select class='data_icon nav_secondary_field input-medium glyphicon' />");
-        select.append($j("<option value=''" +
+        var select = $j("<select style='font-family: Glyphicons Halflings'" +
+                        "class='data_icon nav_secondary_field input-medium glyphicon' />");
+        select.append($j("<option style='font-family: Glyphicons Halflings' value=''" +
                          (data.icon ? "" : " selected") +
                          ">(none)</option>"));
         %(entries)s
@@ -795,7 +796,7 @@ class NavStructureWidgetWithIcons(NavStructureWidget):
     """ % {
         'super_add_link_body': NavStructureWidget.add_link_body,
         'entries': '\n'.join('''
-            select.append($j("<option value='%(icon)s'" +
+            select.append($j("<option style='font-family: Glyphicons Halflings' value='%(icon)s'" +
                              (data.icon === "%(icon)s" ? " selected" : "") +
                              ">%(unicode)s (%(icon)s)</option>"));'''
             % {'icon': icon, 'unicode': text_unicode}

…s/programprintables/studentreceipts.html …/public/media/default_styles/rosters.cssesp/templates/program/modules/programprintables/studentreceipts.html renamed to esp/public/media/default_styles/rosters.css esp/templates/program/modules/programprintables/studentreceipts.html renamed to esp/public/media/default_styles/rosters.css

@@ -1,15 +1,8 @@
-<html>
-<head>
-<title>Student Receipts</title>
-<style type="text/css" media="print,screen">
 body { font-family: georgia; }
 .classtitle { text-align: center; font-size: 15pt; font-weight: bold; font-family: georgia; padding: .3in;}
 
 .classroster { text-align: center; }
-.title span { font-weight:bolder; text-decoration: underline;
-              font-size:16pt; }
-
-.blocks { padding: 4px; font-size: 10pt; font-weight: bold; }
+.blocks { padding: 8px; font-size: 10pt; font-weight: bold; }
 .classroom { padding: 8px; font-size: 10pt; font-weight: bold; }
 .pretty {border: 1px solid black; }
 .pretty td { border: 1px solid black; }
@@ -19,17 +12,11 @@
 .teachername span { border: 1px solid black; padding: 3px;
                width: auto; }
 .classroom { vertical-align: top; }
-.blokcs { vertical-align: top; }
+.blocks { vertical-align: top; }
 #pagebreak {page-break-after: always; }
-</style>
-</head>
-<body>
-{% for receipt in receipts %}
-{% if not forloop.first %}
-<div style="page-break-after: always;">&nbsp;</div>
-{% endif %}
-{% include "program/modules/programprintables/studentreceipt.html" %}
-{% endfor %}
-
-</body>
-</html>
+table.sortable thead {
+    background-color:#eee;
+    color:#666666;
+    font-weight: bold;
+    cursor: default;
+}

esp/templates/program/modules/commmodule/userlist.html

@@ -1,30 +1,7 @@
 <html>
 <head>
 <title>User List</title>
-<style type="text/css" media="print,screen">
-body { font-family: georgia; }
-.classtitle { text-align: center; font-size: 15pt; font-weight: bold; font-family: georgia; padding: .3in;}
-
-.classroster { text-align: center; }
-.title span { font-weight:bolder; text-decoration: underline;
-              font-size:16pt; }
-
-.blocks { padding: 4px; font-size: 10pt; font-weight: bold; }
-.classroom { padding: 8px; font-size: 10pt; font-weight: bold; }
-.pretty {border: 1px solid black; }
-.pretty td { border: 1px solid black; }
-.pretty th { border: 1px solid black; }
-.pretty td { vertical-align: top; }
-.teachername { font-size: 9pt; }
-.teachername span { border: 1px solid black; padding: 3px;
-               width: auto; }
-.classroom { vertical-align: top; }
-.blokcs { vertical-align: top; }
-.pretty td.oldnew { border-bottom: 0; border-top: 2px; }
-.pretty td.old { border-bottom: 0;
-                      border-top: 0;}
-#pagebreak {page-break-after: always; }
-</style>
+<link rel="stylesheet" type="text/css" href="/media/styles/rosters.css" media="print,screen">
 <script src="/media/scripts/sorttable.js"></script>
 </head>
 <body>

esp/templates/program/modules/listgenmodule/list_html.html

@@ -1,27 +1,8 @@
 <html>
 <head>
 <title>Class Rosters</title>
-<style type="text/css" media="print,screen">
-body { font-family: georgia; }
-.classtitle { text-align: center; font-size: 15pt; font-weight: bold; font-family: georgia; padding: .3in;}
+<link rel="stylesheet" type="text/css" href="/media/styles/rosters.css" media="print,screen">
 
-.classroster { text-align: center; }
-.title span { font-weight:bolder; text-decoration: underline;
-              font-size:16pt; }
-
-.blocks { padding: 4px; font-size: 10pt; font-weight: bold; }
-.classroom { padding: 8px; font-size: 10pt; font-weight: bold; }
-.pretty {border: 1px solid black; }
-.pretty td { border: 1px solid black; }
-.pretty th { border: 1px solid black; }
-.pretty td { vertical-align: top; }
-.teachername { font-size: 9pt; }
-.teachername span { border: 1px solid black; padding: 3px;
-               width: auto; }
-.classroom { vertical-align: top; }
-.blokcs { vertical-align: top; }
-#pagebreak {page-break-after: always; }
-</style>
 </head>
 <body>
 {% for item in scheditems %}

esp/templates/program/modules/programprintables/adminclasstime.html

@@ -1,26 +1,9 @@
 <html>
 <head>
 <title>Class Check-in Checklists</title>
+<link rel="stylesheet" type="text/css" href="/media/styles/rosters.css" media="print,screen">
 <style type="text/css" media="print,screen">
-body { font-family: georgia; }
-.classtitle { text-align: center; font-size: 15pt; font-weight: bold; font-family: georgia; padding: .3in;}
-
-.classroster { text-align: center; }
-.title span { font-weight:bolder; text-decoration: underline;
-              font-size:16pt; }
-
 .blocks { padding: 4px; font-size: 10pt; font-weight: bold; }
-.classroom { padding: 8px; font-size: 10pt; font-weight: bold; }
-.pretty {border: 1px solid black; }
-.pretty td { border: 1px solid black; }
-.pretty th { border: 1px solid black; }
-.pretty td { vertical-align: top; }
-.teachername { font-size: 9pt; }
-.teachername span { border: 1px solid black; padding: 3px;
-               width: auto; }
-.classroom { vertical-align: top; }
-.blokcs { vertical-align: top; }
-#pagebreak {page-break-after: always; }
 </style>
 </head>
 <body>

esp/templates/program/modules/programprintables/classattendance.html

@@ -1,27 +1,7 @@
 <html>
 <head>
 <title>Class Rosters</title>
-<style type="text/css" media="print,screen">
-body { font-family: georgia; }
-.classtitle { text-align: center; font-size: 15pt; font-weight: bold; font-family: georgia; padding: .3in;}
-
-.classroster { text-align: center; }
-.title span { font-weight:bolder; text-decoration: underline;
-              font-size:16pt; }
-
-.blocks { padding: 4px; font-size: 10pt; font-weight: bold; }
-.classroom { padding: 8px; font-size: 10pt; font-weight: bold; }
-.pretty {border: 1px solid black; }
-.pretty td { border: 1px solid black; }
-.pretty th { border: 1px solid black; }
-.pretty td { vertical-align: top; }
-.teachername { font-size: 9pt; }
-.teachername span { border: 1px solid black; padding: 3px;
-               width: auto; }
-.classroom { vertical-align: top; }
-.blokcs { vertical-align: top; }
-#pagebreak {page-break-after: always; }
-</style>
+<link rel="stylesheet" type="text/css" href="/media/styles/rosters.css" media="print,screen">
 </head>
 <body>
 {% for item in scheditems %}