Skip to content

Commit d0cd2d0

Browse files
redfrobrongodfrey
redfrobro
and
ngodfrey
authored
Pycon us sprints 2025 (#702)
* fixed css link * fixed js link * fixed js link added About page * updating events --------- Co-authored-by: ngodfrey <ngodfrey@protonmail.com>
1 parent 0ecd9ad commit d0cd2d0

File tree

8 files changed

+52
-25
lines changed

8 files changed

+52
-25
lines changed

‎_layouts/_includes/footer.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h3>About us</h3>
1111
<h3>Quick link</h3>
1212
<ul>
1313
<li><a href="/about.html">About Us</a></li>
14-
<li><a href="/event/">Events</a></li>
14+
<li><a href="/events/">Events</a></li>
1515
<li><a href="/community/">Community</a></li>
1616
<li><a href="/support/">Support</a></li>
1717
</ul>

‎_layouts/_includes/latest-posts.html‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
1-
{% if site.paginate %} {% assign posts = paginator.posts %} {% else %} {% assign posts = site.posts %} {% endif %} {%- if posts.size > 0 -%} {%- if page.list_title -%}
1+
{%- if page.list_title -%}
22
<h2 class="post-list-heading">{{ page.list_title }}</h2>
3-
{%- endif -%}
3+
{% endif %}
44
<article class="post-list">
5-
{%- assign date_format = site.bpdevs.date_format | default: "%b %-d, %Y" -%} {% assign count = 0 %} {% assign limit_posts = 3 %} {%- for post in posts -%} {%- if count < limit_posts -%}
65
<div>
76
<h3>
8-
<a class="" href="{{ post.url | relative_url }}"> {{ post.title | escape }} </a>
7+
<a class="" href="{{ post.url }}"> {{ post.title | escape }} </a>
98
</h3>
10-
<p>{{ post.date | date: date_format }}</p>
9+
<p>{{ post.date }}</p>
1110
{%- if site.show_excerpts -%}
1211
<p class="post-description" style="margin-bottom: 2rem">{{ post.description}}</p>
13-
{%- endif -%}
1412
</div>
15-
{%- assign count = count | plus:1 -%} {%- endif -%} {%- endfor -%}
1613
</article>
1714

18-
{% if site.paginate %}
1915
<div class="pager">
2016
<ul class="pagination">
2117
{%- if paginator.previous_page %}
@@ -31,4 +27,4 @@ <h3>
3127
{%- endif %}
3228
</ul>
3329
</div>
34-
{%- endif %} {%- endif -%}
30+
{%- endif %}

‎_layouts/default.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
<body>
2121
{%- include '_includes/header.html' -%}
2222
<main class="container" role="main" aria-label="Content">
23-
{{ content }}
23+
24+
{% block content %}
25+
{% endblock %}
2426
</main>
2527
{%- include '_includes/footer.html' -%}
2628
<script src="/assets/js/jquery.min.js"></script>

‎_layouts/event-list.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{% extends "default.html" %}
2+
{% block content %}
3+
{% for page in pages %}
4+
<a href="{{ page }}.html">{{ page }}</a>
5+
{% endfor %}
6+
{% endblock %}

‎_layouts/index.html‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,19 @@
22

33
{% block content %}
44
<div class="home">
5-
{% set t = site.data.locales[page.lang][page.lang] %}
6-
{% if page.title %}
7-
{% set header = page.title %}
5+
{% if title %}
6+
{% set header = title %}
87
{% else %}
98
{% set header = site.title %}
109
{% endif %}
11-
12-
<article class="hero">
13-
<div class="hero-text">{{ t.index.lead }}</div>
14-
</article>
10+
1511

1612
{{ content }}
1713

18-
<img src="{{ url_for('static', filename='images/dcus.jpg') }}" alt="DjangoCon US 2023"/>
1914

20-
{% include "latest-posts.html" %}
21-
{% include "join_us.html" %}
22-
{% include "partnerships.html" %}
23-
{% include "newsletter_form.html" %}
15+
{% include "_includes/latest-posts.html" %}
16+
{% include "_includes/join_us.html" %}
17+
{% include "_includes/partnerships.html" %}
18+
{% include "_includes/newsletter_form.html" %}
2419
</div>
2520
{% endblock %}

‎app.py‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from render_engine import Site, Page
1+
from render_engine import Site, Page, Collection
22

33
navigation = [
44
{"text": "Home", "url": "/index.html", "fa": "fa fa-home fa-fw"},
@@ -25,3 +25,12 @@ class Index(Page):
2525
class About(Page):
2626
content_path = "pages/about.html"
2727
template = "default.html"
28+
29+
30+
@app.collection
31+
class Events(Collection):
32+
content_path = "events"
33+
template = "default.html"
34+
routes = ["./events"]
35+
has_archive = True
36+
archive_template = "event-list.html"

leadership-summit-2024.md renamed to events/leadership-summit-2024.md

File renamed without changes.

‎output/index.html‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,24 @@ <h1 class="site-title"><a class="logo-text" href="/index.html"><img src="assets/
1616
<nav class="site-navigation" aria-label="Main navigation">
1717
<div class="site-navigation-wrap">
1818
<ul class="menu" role="menu">
19+
<li class="menu-item nav-current" role="menuitem">
20+
<a class="nav-current" href="/index.html"> <i class="fa fa-home fa-fw" aria-hidden="true"></i>&nbsp;Home </a>
21+
</li>
22+
<li class="menu-item " role="menuitem">
23+
<a class="" href="/blog.html"> <i class="fa fa-newspaper fa-fw" aria-hidden="true"></i>&nbsp;Blog </a>
24+
</li>
25+
<li class="menu-item " role="menuitem">
26+
<a class="" href="/about.html"> <i class="fa fa-info-circle fa-fw" aria-hidden="true"></i>&nbsp;About Us </a>
27+
</li>
28+
<li class="menu-item " role="menuitem">
29+
<a class="" href="/events.html"> <i class="fa fa-calendar fa-fw" aria-hidden="true"></i>&nbsp;Events </a>
30+
</li>
31+
<li class="menu-item " role="menuitem">
32+
<a class="" href="/community.html"> <i class="fa fa-users fa-fw" aria-hidden="true"></i>&nbsp;Community </a>
33+
</li>
34+
<li class="menu-item " role="menuitem">
35+
<a class="" href="/support.html"> <i class="fa-solid fa-money-check-dollar" aria-hidden="true"></i>&nbsp;Support Us </a>
36+
</li>
1937
</ul>
2038
<!-- .menu -->
2139
<button id="menu-close" class="menu-toggle">
@@ -56,6 +74,7 @@ <h3 class="pico-color-pumpkin-50">Say it loud!</h3>
5674
</div>
5775

5876
<hr />
77+
5978
</main><footer role="contentinfo">
6079
<div class="wrapper">
6180
<div class="footer-grid">
@@ -69,7 +88,7 @@ <h3>About us</h3>
6988
<h3>Quick link</h3>
7089
<ul>
7190
<li><a href="/about.html">About Us</a></li>
72-
<li><a href="/event/">Events</a></li>
91+
<li><a href="/events/">Events</a></li>
7392
<li><a href="/community/">Community</a></li>
7493
<li><a href="/support/">Support</a></li>
7594
</ul>

0 commit comments

Comments
 (0)