beta #4

Merged
doug713705 merged 203 commits from beta into master 2023-04-21 00:11:59 +11:00
2 changed files with 18 additions and 18 deletions
Showing only changes of commit 4435f33e0b - Show all commits

View File

@ -27,7 +27,7 @@ pretalx:
apiprefix: api apiprefix: api
apikey: bb770a53b15467dfb67c03d178004aca9e4819d6 apikey: bb770a53b15467dfb67c03d178004aca9e4819d6
event: thsf-2023 event: thsf-2023
schedule: 0.10 schedule: wip
navbar: navbar:
items: items:
- name: Home - name: Home

View File

@ -117,12 +117,12 @@ def index():
@app.route('/planning', methods=['GET']) @app.route('/planning', methods=['GET'])
def planning(): def planning():
slots = get_slots() slots = get_slots()
for slot in slots["slots"]: for slot in slots.get("slots"):
for speaker in slot["speakers"]: for speaker in slot.get("speakers"):
speaker["biography"] = get_speaker_biography(speaker["name"]) speaker["biography"] = get_speaker_biography(speaker.get("name"))
return render_template("planning.html", return render_template("planning.html",
slots=sorted(slots["slots"], slots=sorted(slots.get("slots"),
key=lambda slot: slot["slot"]["start"]), key=lambda slot: slot.get("slot").get("start")),
navbar=navbar.get_from_page(page="/planning")) navbar=navbar.get_from_page(page="/planning"))
@app.route('/place', methods=['GET']) @app.route('/place', methods=['GET'])
@ -144,8 +144,8 @@ def goodies():
def concerts(): def concerts():
slots = get_slots() slots = get_slots()
return render_template("planning.html", return render_template("planning.html",
slots=sorted(slots["slots"], slots=sorted(slots.get("slots"),
key=lambda slot: slot["slot"]["start"]), key=lambda slot: slot.get("slot").get("start")),
navbar=navbar.get_from_page(page="/concerts"), navbar=navbar.get_from_page(page="/concerts"),
filter=["concert", "dj set"]) filter=["concert", "dj set"])
@ -153,8 +153,8 @@ def concerts():
def workshops(): def workshops():
slots = get_slots() slots = get_slots()
return render_template("planning.html", return render_template("planning.html",
slots=sorted(slots["slots"], slots=sorted(slots.get("slots"),
key=lambda slot: slot["slot"]["start"]), key=lambda slot: slot.get("slot").get("start")),
navbar=navbar.get_from_page(page="/workshops"), navbar=navbar.get_from_page(page="/workshops"),
filter=["workshop"]) filter=["workshop"])
@ -162,8 +162,8 @@ def workshops():
def screenings(): def screenings():
slots = get_slots() slots = get_slots()
return render_template("planning.html", return render_template("planning.html",
slots=sorted(slots["slots"], slots=sorted(slots.get("slots"),
key=lambda slot: slot["slot"]["start"]), key=lambda slot: slot.get("slot").get("start")),
navbar=navbar.get_from_page(page="/screenings"), navbar=navbar.get_from_page(page="/screenings"),
filter=["screening"]) filter=["screening"])
@ -171,8 +171,8 @@ def screenings():
def discussions(): def discussions():
slots = get_slots() slots = get_slots()
return render_template("planning.html", return render_template("planning.html",
slots=sorted(slots["slots"], slots=sorted(slots.get("slots"),
key=lambda slot: slot["slot"]["start"]), key=lambda slot: slot.get("slot").get("start")),
navbar=navbar.get_from_page(page="/discussions"), navbar=navbar.get_from_page(page="/discussions"),
filter=["panel discussion"]) filter=["panel discussion"])
@ -180,8 +180,8 @@ def discussions():
def exhibitions(): def exhibitions():
slots = get_slots() slots = get_slots()
return render_template("planning.html", return render_template("planning.html",
slots=sorted(slots["slots"], slots=sorted(slots.get("slots"),
key=lambda slot: slot["slot"]["start"]), key=lambda slot: slot.get("slot").get("start")),
navbar=navbar.get_from_page(page="/exhibitions"), navbar=navbar.get_from_page(page="/exhibitions"),
filter=["exhibition"]) filter=["exhibition"])
@ -189,8 +189,8 @@ def exhibitions():
def talks(): def talks():
slots = get_slots() slots = get_slots()
return render_template("planning.html", return render_template("planning.html",
slots=sorted(slots["slots"], slots=sorted(slots.get("slots"),
key=lambda slot: slot["slot"]["start"]), key=lambda slot: slot.get("slot").get("start")),
navbar=navbar.get_from_page(page="/talks"), navbar=navbar.get_from_page(page="/talks"),
filter=["talk", "light talk"]) filter=["talk", "light talk"])