[fa24] Updated 61A and 88C Staff Pages (#7017)

* added staff_61a.py file * added staff_88c.py file * Added GUEST_LECTURER role in Role class * Updated staff roles for 61a * added staff info * Changed shm to INSTRUCTOR for 61a * fixed styling and minor issues * changed base_config to use staff_61 * added staff_61a.py file * Added GUEST_LECTURER role in Role class * added staff_88c.py file * added staff info * Updated staff roles for 61a * fixed styling and minor issues * Changed shm to INSTRUCTOR for 61a * changed base_config to use staff_61 * changed info.py to include staff on website * created seperate html for c88c and 61a * test commit to fix module not found error * changed init.py to fix module not found error * added test variable to debug no module found error * Updated instructor pronouns & emails, updated DSA and SPA for tas * attempt tp debug module not found error * try fixing module not found error * combined all staff data into 1 file to fix module not found error * fixed init.py * changed index and base to use 61a staff files, NOT correct wayt to do this since not considering c88c * changed lab assitent and academic interns, NOT correct way to do this as it is only using 61a, work in progress * seperating 61a and c88c staff * trying to fix modulenotfound error * fixing import error * fixing module not found error * removed whitespace * fixed white space error * Changed image path from jpg to jpeg according to their photos * Changed image path from jpg to png accordingly * Updated SPA access for hans and albert * Fixed image paths * Fixed file paths * Updated instructor images for both classes * Added swetha * Added Khadija and Lia * Remove trailing whitespace * removed debugging file, removed empty website links * Changed instructor and staff link to start with semester abbreviation (fa24) --------- Co-authored-by: Celine Tan <[email protected]> Co-authored-by: Benji Xu <[email protected]> Co-authored-by: Huanzhi (Hans) Mao <[email protected]>
cs88-website · Sep 3, 2024 · d85cd15 · d85cd15
1 parent c572624
commit d85cd15
Show file tree

Hide file tree

Showing 7 changed files with 531 additions and 41 deletions.
diff --git a/src/main/templates/index.html b/src/main/templates/index.html
@@ -7,13 +7,15 @@
   <h1>{{ course_info.name }}: {{ course_info.title }}</h1>
   <p>
     {{ semester }}
-    <!-- ,
+    ,
     {% if 1 == staff.get('instructors', [])|list|length %}
+    <!-- CHANGED CAREFUL -->
       Instructor:
     {% else %}
       Instructors:
     {% endif %}
-    {{ staff.get('instructors', [])|join(", ", attribute="name") }} -->
+    {{ staff.get('instructors', [])|join(", ", attribute="name") }}
+    <!-- CHANGED CAREFUL -->
     {{ course_info.lecture_times }}
   </p>
 </header>

diff --git a/src/web/data/__init__.py b/src/web/data/__init__.py
@@ -7,6 +7,7 @@
 from web.data.staff import (
     staff_members
 )
+
 from web.data.calendar import (
     main_calendar,
     extra_calendar,

diff --git a/src/web/data/info.py b/src/web/data/info.py
@@ -57,10 +57,10 @@ def slide_file_format(slide_format):
                 'Campus Resources': '/articles/campus-res/',
                 'Advice from Students': '/articles/advice/',
             },
-            # 'Staff': {
-            #     'Instructors': '/instructors',
-            #     'TAs & Tutors': '/staff',
-            # },
+            'Staff': {
+                'Instructors': '/instructor',
+                'TAs & Tutors': '/staff',
+            },
         },
         },
     'c88c': {
@@ -94,10 +94,10 @@ def slide_file_format(slide_format):
                 'Composition Guide': f'/{semester_abbrev}/articles/composition/',
                 'Campus Resources': f'/{semester_abbrev}/articles/campus-res/',
             },
-            # 'Staff': {
-            #     'Instructors': '/instructors',
-            #     'TAs & Tutors': '/staff',
-            # },
+            'Staff': {
+                'Instructors': f'/{semester_abbrev}/instructor',
+                'TAs & Tutors': f'/{semester_abbrev}/staff',
+            },
         },
         }
 }[course]