Skip to content

Commit

Permalink
simplify timetable, add chairs
Browse files Browse the repository at this point in the history
  • Loading branch information
mscroggs committed Jul 12, 2023
1 parent 90eb708 commit 8953e8a
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 10 deletions.
18 changes: 10 additions & 8 deletions builder/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -261,14 +261,14 @@ def minutes_after_one(time):
dcontent += session['platform']
dcontent += ")</h3>"
col = 2 * di + 2
row = 2 + minutes_after_one(session['start'])
rowend = 2 + minutes_after_one(session['end'])
row = [3, 15, 23][si]
rowend = [13, 21, 23][si]
if di == 0:
tt_content += "<div class='gridcell timetableheading rotated' style='"
if session["platform"] == "Gather Town":
tt_content += f"grid-column: {col - 1} / span 1; grid-row: {row + 1} / span 1"
tt_content += f"grid-column: {col - 1} / span 1; grid-row: {row} / span 1"
else:
tt_content += f"grid-column: {col - 1} / span 1; grid-row: {row} / span {rowend - row}"
tt_content += f"grid-column: {col - 1} / span 1; grid-row: {row - 1} / span {rowend - row + 1}"
tt_content += "'>"
tt_content += markup(f"Session {si + 1} (<time {day} {session['start']}>&ndash;<time {day} {session['end']}><tzone>, "
f"{session['platform']})", paragraphs=False)
Expand All @@ -278,6 +278,8 @@ def minutes_after_one(time):
if "chair" in session:
dcontent += (f"<div class='authors' style='margin-top:-10px;margin-bottom:10px'>"
f"Chair: {person(session['chair'])}</div>")
tt_content += (f"<div style='grid-column: {col} / span 1; grid-row: {row - 1} / span 1;margin:10px;font-size:80%;text-align:center'>"
f"Chair: {session['chair']['name']}</div>")
if "talks" in session:
talklen = (rowend - row) / sum(3 if is_long(t) else 1 for t in session["talks"])
start = 0
Expand All @@ -288,7 +290,7 @@ def minutes_after_one(time):
dcontent += talk(t, day, si + 1, session_time, next_and_prev[t]["prev"], next_and_prev[t]["next"])
title, speaker = get_title_and_speaker(t)
length = 70 if is_long(t) else 20
rows = 30 if is_long(t) else 10
rows = 3 if is_long(t) else 1
if t == "intro":
tt_content += "<div"
else:
Expand All @@ -312,7 +314,7 @@ def minutes_after_one(time):
start += rows
else:
tt_content += (f"<a class='gridcell timetabletalk' href='/gather-town.html' style='"
f"grid-column: {col} / span 1; grid-row: {row + 1} / span 1'>"
f"grid-column: {col} / span 1; grid-row: {row} / span 1'>"
"<div class='timetabletalktitle'>Discussions</div>")
if "description" in session:
tt_content += f"<div class='timetabletalkspeaker'>{session['description']}</div>"
Expand All @@ -321,8 +323,8 @@ def minutes_after_one(time):
row0 = 2 + minutes_after_one(timetable[day][si - 1]['end'])
row1 = 2 + minutes_after_one(session['start'])
tt_content += ("<div class='gridcell timetableheading' style='"
f"grid-column: 2 / span 3; "
f"grid-row: {row0} / span {row1 - row0}; "
"grid-column: 2 / span 3; "
"grid-row: 13 / span 1; "
"display: flex; justify-content: center; align-items: center;'>")
tt_content += " &nbsp; &nbsp; &nbsp; ".join("BREAK")
tt_content += "</div>"
Expand Down
2 changes: 1 addition & 1 deletion files/sty.css
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ td.heading {font-weight:bold;font-size:80%}
.timetablegrid {
display:grid;
grid-template-columns: auto 3fr 0.1fr 3fr;
grid-template-rows: auto repeat(180, 1fr) 2fr auto;
grid-template-rows: auto auto repeat(10, 1fr) 2fr auto repeat(6, 1fr) 10px auto;
}
.timetableheading {font-weight:bold;font-size:80%}
.timetablegrid .gridcell {
Expand Down
20 changes: 20 additions & 0 deletions talks/_timetable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ Thursday:
start: "13:00"
end: "14:40"
platform: Zoom
chair:
name: Matthew Scroggs
github: mscroggs
twitter: mscroggs
mastodon: mscroggs@mathstodon.xyz
website: https://mscroggs.co.uk
email: matthew.scroggs.14@ucl.ac.uk
zulip: Matthew Scroggs
- talks:
- salib
- sky
Expand All @@ -19,6 +27,9 @@ Thursday:
start: "15:00"
end: "16:00"
platform: Zoom
chair:
name: Luna Arthur
twitter: LunaAArthur
- start: "16:00"
end: "17:00"
platform: Gather Town
Expand All @@ -36,6 +47,8 @@ Friday:
start: "13:00"
end: "14:40"
platform: Zoom
chair:
name: Ignacia Fierro-Piccardo
- talks:
- brown
- eaves
Expand All @@ -46,6 +59,13 @@ Friday:
start: "15:00"
end: "16:00"
platform: Zoom
chair:
name: Andreas Longva
email: longva@cs.rwth-aachen.de
affiliation: RWTH Aachen University
github: Andlon
twitter: andreas_longva
zulip: Andreas Longva
- start: "16:00"
end: "17:00"
platform: Gather Town
Expand Down
2 changes: 1 addition & 1 deletion template/intro.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<title>{{pagetitle}}</title>
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Prompt&display=swap" rel="stylesheet">
<link rel='stylesheet' type='text/css' href='/sty.css?v=2023-07-12'>
<link rel='stylesheet' type='text/css' href='/sty.css?v=2023-07-12.1'>
<script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
<link rel="apple-touch-icon" sizes="57x57" href="/icons/apple-icon-57x57.png">
Expand Down

0 comments on commit 8953e8a

Please sign in to comment.