aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pydis_site/templates/events/index.html64
-rw-r--r--pydis_site/templates/events/sidebar/events-list.html10
2 files changed, 26 insertions, 48 deletions
diff --git a/pydis_site/templates/events/index.html b/pydis_site/templates/events/index.html
index 352a3aa9..b5c556e5 100644
--- a/pydis_site/templates/events/index.html
+++ b/pydis_site/templates/events/index.html
@@ -16,48 +16,27 @@
</div>
<div class="box">
- <h2 class="title is-4">Game Jam</h2>
+ <h2 class="title is-4">PyWeek</h2>
<div class="columns is-3" style="--columnGap: 0.75rem;">
<div class="column">
<p>
- The Game Jam is similar to our Code Jams, but smaller in scope. Instead of having to complete a qualifier
- and being teamed up with random strangers, members of our community can just sign-up individually or pair up
- with whoever they like.
- </p>
- <p>
- The participants will have ten days to create a game using the technology we've selected, and drawing
- inspiration from a provided theme. After the event, a panel of judges will play all the games and select a
- winner. The top 5 will featured in a special video on our <a href="https://www.youtube.com/channel/UCQsrA4xo6jvdgsJZhKaBL6w">YouTube channel</a>.
- </p>
- <p>
- The <a class="has-text-link" href="{% url "events:page" path="game-jams/2020" %}">first edition of the Game Jam</a> ran from
- <strong>April 17, 2020 to April 26, 2020</strong>.
+ For the past 15 years, <a href="https://pyweek.org">PyWeek</a> has been running a bi-annual game jam for the
+ Python language. As of 2020, we are excited to say we are officially partnered with PyWeek to co-run these
+ events.
</p>
- </div>
- <div class="column is-3">
- <img src="https://user-images.githubusercontent.com/33516116/77593036-5fb09780-6eeb-11ea-9feb-336b2e5e23de.png" style="border-radius: 10px;" alt="">
- </div>
- </div>
- </div>
-
- <div class="box">
- <h2 class="title is-4">Hacktoberfest</h2>
- <div class="columns is-3" style="--columnGap: 0.75rem;">
- <div class="column">
<p>
- This event revolves around the annual <a href="https://hacktoberfest.digitalocean.com/">Hacktoberfest
- event</a> organized by Digital Ocean. In addition to promoting Hacktoberfest in our community and supporting
- those who choose to take their first steps into the world of open source, we will also ease our members into
- contributing to open source by starting a low-entry, beginner-friendly open source project where we will
- guide our members through the open source process in a safe environment.
+ During each PyWeek event, we open a special discussion channel in which our members can discuss their
+ submissions, meet other participants, and talk to PyWeek staff. The PyWeek organizer,
+ Daniel Pope (<a href="https://twitter.com/lordmauve">@lordmauve</a>) will be present during the entire event to answer
+ questions and post announcements and information in our community.
</p>
<p>
- The exact form this event will take has not been decided yet, but we'll make sure to keep you updated in
- our community announcements!
+ Unlike our other events, the <strong>community</strong> will select the winner from all the submissions
+ during PyWeek. We may release YouTube content showcasing the best submissions after the events are finished.
</p>
</div>
<div class="column is-3">
- <img src="https://raw.githubusercontent.com/python-discord/branding/master/seasonal/halloween/hacktoberfest/2020/animated_server_icon.gif" style="border-radius: 10px;" alt="">
+ <img src="https://pyweek.readthedocs.io/en/latest/_static/pyweek.svg" style="border-radius: 10px;" alt="">
</div>
</div>
</div>
@@ -91,27 +70,26 @@
</div>
<div class="box">
- <h2 class="title is-4">PyWeek</h2>
+ <h2 class="title is-4">Game Jam</h2>
<div class="columns is-3" style="--columnGap: 0.75rem;">
<div class="column">
<p>
- For the past 15 years, <a href="https://pyweek.org">PyWeek</a> has been running a bi-annual game jam for the
- Python language. As of 2020, we are excited to say we are officially partnered with PyWeek to co-run these
- events.
+ The Game Jam is similar to our Code Jams, but smaller in scope. Instead of having to complete a qualifier
+ and being teamed up with random strangers, members of our community can just sign-up individually or pair up
+ with whoever they like.
</p>
<p>
- During each PyWeek event, we open a special discussion channel in which our members can discuss their
- submissions, meet other participants, and talk to PyWeek staff. The PyWeek organizer,
- Daniel Pope (<a href="https://twitter.com/lordmauve">@lordmauve</a>) will be present during the entire event to answer
- questions and post announcements and information in our community.
+ The participants will have ten days to create a game using the technology we've selected, and drawing
+ inspiration from a provided theme. After the event, a panel of judges will play all the games and select a
+ winner. The top 5 will featured in a special video on our <a href="https://www.youtube.com/channel/UCQsrA4xo6jvdgsJZhKaBL6w">YouTube channel</a>.
</p>
<p>
- Unlike our other events, the <strong>community</strong> will select the winner from all the submissions
- during PyWeek. We may release YouTube content showcasing the best submissions after the events are finished.
+ The <a class="has-text-link" href="{% url "events:page" path="game-jams/2020" %}">first edition of the Game Jam</a> ran from
+ <strong>April 17, 2020 to April 26, 2020</strong>.
</p>
</div>
<div class="column is-3">
- <img src="https://pyweek.readthedocs.io/en/latest/_static/pyweek.svg" style="border-radius: 10px;" alt="">
+ <img src="https://user-images.githubusercontent.com/33516116/77593036-5fb09780-6eeb-11ea-9feb-336b2e5e23de.png" style="border-radius: 10px;" alt="">
</div>
</div>
</div>
diff --git a/pydis_site/templates/events/sidebar/events-list.html b/pydis_site/templates/events/sidebar/events-list.html
index 327b0e77..6029ae74 100644
--- a/pydis_site/templates/events/sidebar/events-list.html
+++ b/pydis_site/templates/events/sidebar/events-list.html
@@ -1,10 +1,10 @@
<div class="box">
- <p class="menu-label">Event Calendar 2020</p>
+ <p class="menu-label">Event Calendar 2021</p>
<ul class="menu-list">
- <li><a class="has-text-link" href="{% url "events:page" path="code-jams/6" %}">January 17-January 26: Winter Code Jam</a></li>
- <li><a class="has-text-link" href="{% url "events:page" path="game-jams/2020" %}">April 17-April 26: Game Jam</a></li>
- <li><a class="has-text-link" href="{% url "events:page" path="code-jams/7" %}">July 31-August 9: Summer Code Jam</a></li>
- <li><a class="has-text-black" style="cursor: default;">October: Hacktoberfest</a></li>
+ <li><a class="has-text-link" href="https://pyweek.org/31/">March: PyWeek 31</a></li>
+ <li><a class="has-text-black" style="cursor: default;">May: Pixels</a></li>
+ <li><a class="has-text-link" href="{% url "events:page" path="code-jams/8" %}">July: Summer Code Jam</a></li>
+ <li><a class="has-text-link" href="https://pyweek.org/32/">September: PyWeek 32</a></li>
<li><a class="has-text-black" style="cursor: default;">December: Advent of Code</a></li>
</ul>
</div>