diff options
author | 2021-07-09 16:56:39 +0100 | |
---|---|---|
committer | 2021-07-09 16:56:39 +0100 | |
commit | 7d9fff844e136d6ded6023cacec8ae5e9438cfdd (patch) | |
tree | d315b8e0e6151d59ba5914665207b05976730063 | |
parent | Merge pull request #550 from python-discord/the-code-style-guide (diff) | |
parent | Code jam: use case name in code style (diff) |
Merge pull request #552 from python-discord/cj/minor-adjustments
Minor Code Jam Adjustments
-rw-r--r-- | pydis_site/templates/events/index.html | 2 | ||||
-rw-r--r-- | pydis_site/templates/events/pages/code-jams/_index.html | 2 | ||||
-rw-r--r-- | pydis_site/templates/events/pages/code-jams/code-style-guide.html | 4 | ||||
-rw-r--r-- | pydis_site/templates/events/sidebar/code-jams/ongoing-code-jam.html (renamed from pydis_site/templates/events/sidebar/code-jams/upcoming-code-jam.html) | 2 | ||||
-rw-r--r-- | pydis_site/templates/events/sidebar/ongoing-event.html (renamed from pydis_site/templates/events/sidebar/upcoming-event.html) | 2 | ||||
-rw-r--r-- | pydis_site/templates/home/index.html | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/pydis_site/templates/events/index.html b/pydis_site/templates/events/index.html index 64bf2c25..daad1c9c 100644 --- a/pydis_site/templates/events/index.html +++ b/pydis_site/templates/events/index.html @@ -121,6 +121,6 @@ {% endblock %} {% block sidebar %} - {% include "events/sidebar/upcoming-event.html" %} + {% include "events/sidebar/ongoing-event.html" %} {% include "events/sidebar/events-list.html" %} {% endblock %} diff --git a/pydis_site/templates/events/pages/code-jams/_index.html b/pydis_site/templates/events/pages/code-jams/_index.html index fcbfa4d9..22a86db3 100644 --- a/pydis_site/templates/events/pages/code-jams/_index.html +++ b/pydis_site/templates/events/pages/code-jams/_index.html @@ -66,7 +66,7 @@ {% endblock %} {% block sidebar %} - {% include "events/sidebar/code-jams/upcoming-code-jam.html" %} + {% include "events/sidebar/code-jams/ongoing-code-jam.html" %} {% include "events/sidebar/code-jams/previous-code-jams.html" %} {% include "events/sidebar/code-jams/useful-information.html" %} {% endblock %} diff --git a/pydis_site/templates/events/pages/code-jams/code-style-guide.html b/pydis_site/templates/events/pages/code-jams/code-style-guide.html index 31156da2..4ff5baaf 100644 --- a/pydis_site/templates/events/pages/code-jams/code-style-guide.html +++ b/pydis_site/templates/events/pages/code-jams/code-style-guide.html @@ -91,7 +91,7 @@ result = [ def my_function(): my_variable = "value"</code></pre> - <p>Class and type variable names should use the camel case style.</p> + <p>Class and type variable names should use the PascalCase style.</p> <pre><code class="language-python">from typing import List @@ -99,7 +99,7 @@ class MyClass: pass ListOfMyClass = List[MyClass]</code></pre> - <p>Constant names should be all uppercase, and words should be separated with underscores.</p> + <p>Constant names should use the SCREAMING_SNAKE_CASE style.</p> <pre><code class="language-python">MY_CONSTANT = 1</code></pre> <p> You should avoid single-character names, as these might be confusing. diff --git a/pydis_site/templates/events/sidebar/code-jams/upcoming-code-jam.html b/pydis_site/templates/events/sidebar/code-jams/ongoing-code-jam.html index 19806b4e..f4fa3a37 100644 --- a/pydis_site/templates/events/sidebar/code-jams/upcoming-code-jam.html +++ b/pydis_site/templates/events/sidebar/code-jams/ongoing-code-jam.html @@ -1,7 +1,7 @@ {% load static %} <div class="box"> - <h4 class="menu-label">Upcoming Code Jam</h4> + <h4 class="menu-label">Ongoing Code Jam</h4> <a href="{% url "events:page" path="code-jams/8" %}"> <img src="{% static "images/events/summer_code_jam_2021/banner.png" %}" alt="Summer Code Jam 2021"> </a> diff --git a/pydis_site/templates/events/sidebar/upcoming-event.html b/pydis_site/templates/events/sidebar/ongoing-event.html index cfa4cf88..37dfdf77 100644 --- a/pydis_site/templates/events/sidebar/upcoming-event.html +++ b/pydis_site/templates/events/sidebar/ongoing-event.html @@ -1,7 +1,7 @@ {% load static %} <div class="box"> - <p class="menu-label">Upcoming Event</p> + <p class="menu-label">Ongoing Event</p> <a href="{% url "events:page" path="code-jams/8" %}"> <img src="{% static "images/events/summer_code_jam_2021/banner.png" %}" alt="Summer Code Jam 2021"> </a> diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html index 2efa5b49..072e3817 100644 --- a/pydis_site/templates/home/index.html +++ b/pydis_site/templates/home/index.html @@ -12,7 +12,7 @@ <!-- Mobile-only Notice --> <section id="mobile-notice" class="message is-primary is-hidden-tablet"> <a href="/events/code-jams/8/"> - <img src="{% static "images/events/summer_code_jam_2021/front_page_banners/sign_up_now.png" %}" alt="Summer Code Jam 2021"> + <img src="{% static "images/events/summer_code_jam_2021/front_page_banners/currently_live.png" %}" alt="Summer Code Jam 2021"> </a> </section> @@ -48,7 +48,7 @@ {# Code Jam banner #} <div id="wave-hero-right" class="column is-half"> <a href="/events/code-jams/8/"> - <img src="{% static "images/events/summer_code_jam_2021/front_page_banners/sign_up_now.png" %}" alt="Summer Code Jam 2021"> + <img src="{% static "images/events/summer_code_jam_2021/front_page_banners/currently_live.png" %}" alt="Summer Code Jam 2021"> </a> </div> </div> |