Compare commits

..

No commits in common. "ae351c9685ee8491d471e9ad3bc907ac6d999ae5" and "6225b664a76b71f01f15d8e4a93c8c2ef0e6e1fe" have entirely different histories.

3 changed files with 17 additions and 46 deletions

View File

@ -38,10 +38,6 @@ section .description {
list-style-position: inside; list-style-position: inside;
} }
section.years-index {
text-align: center;
}
footer { footer {
text-align: center; text-align: center;
} }

View File

@ -53,40 +53,10 @@ def main(ics_url, out_path):
(out_path / "chaosevents.ics").write_text(r.text) (out_path / "chaosevents.ics").write_text(r.text)
events_by_year = {}
for event in t:
if event.begin.year not in events_by_year:
events_by_year[event.begin.year] = []
events_by_year[event.begin.year].append(event)
years_index = sorted(events_by_year.keys())
# Index page
sections = {}
if any(t.now()):
sections["Current"] = t.now()
sections["Upcoming"] = t.start_after(arrow.utcnow())
(out_path / "index.html").write_text( (out_path / "index.html").write_text(
env.get_template("index.html").render( env.get_template("index.html").render(
sections=sections, currentevents=t.now() if any(t.now()) else None,
years_index=years_index, upcomingevents=t.start_after(arrow.utcnow())
)
)
# Year pages
for year, year_events in events_by_year.items():
year_directory = out_path / "year" / str(year)
year_directory.mkdir(exist_ok=True, parents=True)
(year_directory / "index.html").write_text(
env.get_template("index.html").render(
title=f"Year {year}",
sections={f"Year {year}": year_events},
years_index=years_index,
) )
) )

View File

@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{% if title %}{{ title }} | {% endif %}Upcoming Chaos Events</title> <title>Upcoming Chaos Events</title>
<link rel="stylesheet" href="/style.css"> <link rel="stylesheet" href="/style.css">
</head> </head>
<body> <body>
@ -13,11 +13,11 @@
<a href="/chaosevents.ics">Add to calendar</a> | <a href="mailto:chaosevents@clerie.de"> Event missing?</a> <a href="/chaosevents.ics">Add to calendar</a> | <a href="mailto:chaosevents@clerie.de"> Event missing?</a>
</div> </div>
</header> </header>
{% for section_title, section_events in sections.items() %} {% if currentevents %}
<section> <section>
<h2>{{ section_title }}</h2> <h2>Current</h2>
</section> </section>
{% for event in section_events %} {% for event in currentevents %}
<section> <section>
<h3>{{ event.name }} <span class="date">{{ event.begin.format("YYYY-MM-DD") }} - {{ event.end.shift(seconds=-1).format("YYYY-MM-DD") }}</span></h3> <h3>{{ event.name }} <span class="date">{{ event.begin.format("YYYY-MM-DD") }} - {{ event.end.shift(seconds=-1).format("YYYY-MM-DD") }}</span></h3>
<div class="description"> <div class="description">
@ -25,13 +25,18 @@
</div> </div>
</section> </section>
{% endfor %} {% endfor %}
{% endfor %} {% endif %}
<section class="years-index"> <section>
<a href="/">Upcoming</a> <h2>Upcoming</h2>
{% for year in years_index %}
| <a href="/year/{{ year }}/">{{ year }}</a>
{% endfor %}
</section> </section>
{% for event in upcomingevents %}
<section>
<h3>{{ event.name }} <span class="date">{{ event.begin.format("YYYY-MM-DD") }} - {{ event.end.shift(seconds=-1).format("YYYY-MM-DD") }}</span></h3>
<div class="description">
{{ event.description_rendered|safe }}
</div>
</section>
{% endfor %}
<footer> <footer>
<a href="https://legal.clerie.de/impressum">Imprint</a> | <a href="https://legal.clerie.de/datenschutz">Privacy</a> | <a href="https://git.clerie.de/clerie/chaosevents">Source Code</a> <a href="https://legal.clerie.de/impressum">Imprint</a> | <a href="https://legal.clerie.de/datenschutz">Privacy</a> | <a href="https://git.clerie.de/clerie/chaosevents">Source Code</a>
</footer> </footer>