From 7a638c1bd0de8276774a6ff06e0a45080d7b41b0 Mon Sep 17 00:00:00 2001 From: Reto Bollinger Date: Mon, 13 Jan 2025 08:43:11 +0100 Subject: [PATCH 1/8] Fixed path to imprint --- lektor/lektordata/project/templates/layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lektor/lektordata/project/templates/layout.html b/lektor/lektordata/project/templates/layout.html index 8d2ea48..d370b32 100644 --- a/lektor/lektordata/project/templates/layout.html +++ b/lektor/lektordata/project/templates/layout.html @@ -54,7 +54,7 @@ 8476 Unterstammheim
- Impressum + Impressum
© Copyright 2025 by PC Stammertal. From 25d0a9bc94608ef25de61f7c5986053cee444355 Mon Sep 17 00:00:00 2001 From: Reto Bollinger Date: Tue, 14 Jan 2025 10:41:21 +0100 Subject: [PATCH 2/8] As I learnt trailing slashes on void HTML elements is considered bad practice. Trying to get rid of them. --- lektor/lektordata/project/content/contents.lr | 8 +- .../project/content/termine/contents.lr | 264 ++++++++++++++++-- .../lektordata/project/templates/layout.html | 20 +- .../scripts/calendar-fetcher-main.py | 8 +- 4 files changed, 266 insertions(+), 34 deletions(-) diff --git a/lektor/lektordata/project/content/contents.lr b/lektor/lektordata/project/content/contents.lr index 63ae877..519512b 100644 --- a/lektor/lektordata/project/content/contents.lr +++ b/lektor/lektordata/project/content/contents.lr @@ -4,12 +4,12 @@ title: Willkommen beim PC Stammertal --- html: -

Unser nächster Anlass:


+

Unser nächster Anlass:


Leider unbekannt, aber frag mal den Vorstand der müsste es wissen
-  
-  
-  
+  
+  
+  

...und auch nicht verpassen:

27. Zürcher Kantonalschützenfest 2025 diff --git a/lektor/lektordata/project/content/termine/contents.lr b/lektor/lektordata/project/content/termine/contents.lr index 137bcb0..ea25998 100644 --- a/lektor/lektordata/project/content/termine/contents.lr +++ b/lektor/lektordata/project/content/termine/contents.lr @@ -4,41 +4,273 @@ title: Termine --- body: -*
Pistolen Gangfisch Schiessen
  - *
So. 15. Dezember 2024
  +*
Generalversammlung
  + *
Do. 6. Februar 2025
  + *
19:00
  + *
Restaurant Hirschen
  +*
Bezirksmatch 10m
  + *
Do. 13. Februar 2025
  + *
18:00
  + *
Stammheim
  +*
Bezirksmatch 10m
  + *
Do. 20. Februar 2025
  + *
18:00
  + *
Stammheim
  +*
Bezirkswinterschiessen
  + *
Do. 6. März 2025
  + *
17:30
  + *
Flurlingen
  +*
Bezirkswinterschiessen
  + *
Sa. 8. März 2025
  + *
14:00
  + *
Flurlingen
  +*
Frühlingsschiessen
  + *
Sa. 15. März 2025
  + *
9:00
  + *
Bülach
  +*
Frühlingsschiessen
  + *
Sa. 15. März 2025
  + *
13:30
  + *
Bülach
  +*
Frühlingsschiessen
  + *
Sa. 22. März 2025
  + *
9:00
  + *
Bülach
  +*
freies Training
  + *
Mo. 31. März 2025
  + *
18:00
  + *
Stammheim
  +*
Eulachschiessen
  + *
Fr. 4. April 2025
  + *
16:00
  + *
Winterthur
  +*
Eulachschiessen
  + *
Sa. 5. April 2025
  + *
8:30
  + *
Winterthur
  +*
Eulachschiessen
  + *
Fr. 11. April 2025
  + *
16:00
  + *
Winterthur
  +*
Eulachschiessen
  + *
Sa. 12. April 2025
  + *
8:30
  + *
Winterthur
  +*
Kreis Winterschiessen
  + *
Mo. 14. April 2025
  + *
18:00
  + *
Stammheim
  +*
freies Training
  + *
Mo. 21. April 2025
  + *
18:00
  + *
Stammheim
  +*
Obligatorisches Programm und Kreis Winterschiessen
  + *
Mo. 28. April 2025
  + *
18:00
  + *
Stammheim
  +*
freies Training
  + *
Mo. 5. Mai 2025
  + *
18:30
  + *
Stammheim
  +*
freies Training
  + *
Mo. 12. Mai 2025
  + *
18:30
  + *
Stammheim
  +*
Schlossschiessen
  + *
Do. 15. Mai 2025
  + *
17:30
  + *
Wülflingen
  +*
Schlossschiessen
  + *
Fr. 16. Mai 2025
  + *
17:30
  + *
Wülflingen
  +*
Schlossschiessen
  + *
Sa. 17. Mai 2025
  + *
9:30
  + *
Wülflingen
  +*
Obligatorisches Programm und freies Training
  + *
Mo. 19. Mai 2025
  + *
18:30
  + *
Stammheim
  +*
Schlossschiessen
  + *
Do. 22. Mai 2025
  + *
17:30
  + *
Wülflingen
  +*
Schlossschiessen
  + *
Fr. 23. Mai 2025
  + *
17:30
  + *
Wülflingen
  +*
freies Training
  + *
Mo. 26. Mai 2025
  + *
18:30
  + *
Stammheim
  +*
Kreis Sommerschiessen
  + *
Mo. 2. Juni 2025
  + *
18:30
  + *
Stammheim
  +*
Sommer-Schüsse
  + *
Fr. 6. Juni 2025
  + *
17:00
  + *
Rafz
  +*
Sommer-Schüsse
  + *
Sa. 14. Juni 2025
  + *
9:00
  + *
Rafz
  +*
Obligatorisches Programm und freies Training
  + *
Mo. 16. Juni 2025
  + *
18:30
  + *
Stammheim
  +*
freies Training
  + *
Mo. 23. Juni 2025
  + *
18:30
  + *
Stammheim
  +*
freies Training
  + *
Mo. 30. Juni 2025
  + *
18:30
  + *
Stammheim
  +*
Bezirks Sommerschiessen
  + *
Sa. 5. Juli 2025
  + *
17:00
  + *
Flurlingen
  +*
freies Training
  + *
Mo. 7. Juli 2025
  + *
18:30
  + *
Stammheim
  +*
Terassenfest
  + *
Fr. 11. Juli 2025
  + *
19:00
  + *
Stammheim
  +*
Bezirks Sommerschiessen
  + *
Sa. 12. Juli 2025
  + *
14:00
  + *
Flurlingen
  +*
freies Training
  + *
Mo. 14. Juli 2025
  + *
18:30
  + *
Stammheim
  +*
Obligatorisches Programm und freies Training
  + *
Mo. 11. August 2025
  + *
18:30
  + *
Stammheim
  +*
ZHKSF Ausbildung Pistole
  + *
Do. 14. August 2025
  + *
18:30
  *
 
  - *
Ermatingen
  -*
40. Appenzeller Luftpistolenmeisterschaft 2025
  - *
Do. 2. Januar 2025
  +*
Zürcher Kantonalschützenfest
  + *
Fr. 15. August 2025
  *
 
  *
 
  -*
40. Appenzeller Luftpistolenmeisterschaft 2025
  - *
Do. 9. Januar 2025
  +*
Zürcher Kantonalschützenfest
  + *
Sa. 16. August 2025
  *
 
  *
 
  -*
Appenzeller Lupi Meisterschaft
  - *
So. 12. Januar 2025
  +*
Zürcher Kantonalschützenfest
  + *
So. 17. August 2025
  *
 
  *
 
  +*
KEIN Training
  + *
Mo. 18. August 2025
  + *
 
  + *
 
  +*
ZHKSF intern
  + *
Do. 21. August 2025
  + *
18:30
  + *
 
  +*
Zürcher Kantonalschützenfest
  + *
Fr. 22. August 2025
  + *
 
  + *
 
  +*
Zürcher Kantonalschützenfest
  + *
Sa. 23. August 2025
  + *
 
  + *
 
  +*
Zürcher Kantonalschützenfest
  + *
So. 24. August 2025
  + *
 
  + *
 
  +*
Zürcher Kantonalschützenfest
  + *
Mo. 25. August 2025
  + *
 
  + *
 
  +*
Zürcher Kantonalschützenfest
  + *
Fr. 29. August 2025
  + *
 
  + *
 
  +*
Zürcher Kantonalschützenfest
  + *
Sa. 30. August 2025
  + *
 
  + *
 
  +*
Zürcher Kantonalschützenfest
  + *
So. 31. August 2025
  + *
 
  + *
 
  +*
freies Training
  + *
Mo. 1. September 2025
  + *
18:30
  + *
Stammheim
  +*
Kreismatch
  + *
Mo. 8. September 2025
  + *
18:00
  + *
Stammheim
  *
Orientierungslauf Stammerberg (kein Schiessbetrieb!)
  *
Sa. 13. September 2025
  *
 
  - *
 
  + *
Unterstammheim
  +*
Kreismatch
  + *
Mo. 15. September 2025
  + *
18:00
  + *
Stammheim
  *
Schwaderlohschiessen
  *
Sa. 20. September 2025
  - *
13:00
  - *
 
  + *
13:30
  + *
Alterswilen
  +*
freies Training
  + *
Mo. 22. September 2025
  + *
18:00
  + *
Stammheim
  *
Schwaderlohschiessen (unser Schiesstag)
  *
Di. 23. September 2025
  - *
17:00
  - *
 
  + *
17:30
  + *
Alterswilen
  *
Schwaderlohschiessen
  *
Sa. 27. September 2025
  - *
 
  - *
 
  + *
8:00
  + *
Alterswilen
  *
Schwaderlohschiessen
  *
So. 28. September 2025
  + *
10:00
  + *
Alterswilen
  +*
Endschiessen
  + *
Mo. 29. September 2025
  + *
17:00
  + *
Stammheim
  +*
Endschiessen
  + *
Mo. 6. Oktober 2025
  + *
17:00
  + *
Stammheim
  +*
Niklausschiessen
  + *
Sa. 25. Oktober 2025
  + *
9:00
  + *
Diessenhofen
  +*
Niklausschiessen
  + *
So. 26. Oktober 2025
  + *
9:00
  + *
Diessenhofen
  +*
Absenden
  + *
Fr. 31. Oktober 2025
  + *
19:00
  *
 
  +*
Niklausschiessen
  + *
Sa. 1. November 2025
  + *
9:00
  + *
Diessenhofen
  +*
Appenzeller Lupi Meisterschaft
  + *
So. 11. Januar 2026
  + *
9:00
  + *
 
  +*
Generalversammlung
  + *
Do. 5. Februar 2026
  + *
19:00
  *
 
  *
Bezirkssommerschiessen
  *
Do. 23. August 2029
  diff --git a/lektor/lektordata/project/templates/layout.html b/lektor/lektordata/project/templates/layout.html index d370b32..a69ba40 100644 --- a/lektor/lektordata/project/templates/layout.html +++ b/lektor/lektordata/project/templates/layout.html @@ -1,12 +1,12 @@ - - - - - - + + + + + + {% block title %}Welcome{% endblock %} — PCS
@@ -22,7 +22,7 @@ - +
    {% for href, title in [ ['/termine', 'Termine'], @@ -49,9 +49,9 @@
    -  
    - Pistolenclub Stammertal
    - 8476 Unterstammheim
    +  
    + Pistolenclub Stammertal
    + 8476 Unterstammheim
    Impressum diff --git a/lektor/lektordata/scripts/calendar-fetcher-main.py b/lektor/lektordata/scripts/calendar-fetcher-main.py index 46bc78b..05da116 100644 --- a/lektor/lektordata/scripts/calendar-fetcher-main.py +++ b/lektor/lektordata/scripts/calendar-fetcher-main.py @@ -42,12 +42,12 @@ title: Willkommen beim PC Stammertal --- html: -

    Unser nächster Anlass:


    +

    Unser nächster Anlass:


    {self.fallback_html}
    -  
    -  
    -  
    +  
    +  
    +  

    ...und auch nicht verpassen:

    27. Zürcher Kantonalschützenfest 2025 From 73afa3a9a97577006ce36179f5e5ccac340ef03d Mon Sep 17 00:00:00 2001 From: Reto Bollinger Date: Tue, 14 Jan 2025 10:50:33 +0100 Subject: [PATCH 3/8] Should now pass HTML validation without warnings or errors! --- lektor/lektordata/project/templates/layout.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lektor/lektordata/project/templates/layout.html b/lektor/lektordata/project/templates/layout.html index a69ba40..c5712c8 100644 --- a/lektor/lektordata/project/templates/layout.html +++ b/lektor/lektordata/project/templates/layout.html @@ -1,4 +1,5 @@ + @@ -62,3 +63,4 @@
    + \ No newline at end of file From eadd2c13edde5083a6ef4488acbd63509f96fa5b Mon Sep 17 00:00:00 2001 From: Reto Bollinger Date: Tue, 14 Jan 2025 11:25:43 +0100 Subject: [PATCH 4/8] Restructuring content. Lifting heading levels, adjusted website title for home page and such. --- .../lektordata/project/assets/static/style.css | 18 +++++++++--------- lektor/lektordata/project/content/contents.lr | 4 ++-- .../lektordata/project/templates/layout.html | 5 ++++- lektor/lektordata/project/templates/page.html | 2 +- .../project/templates/termine_page.html | 2 +- .../scripts/calendar-fetcher-main.py | 4 ++-- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/lektor/lektordata/project/assets/static/style.css b/lektor/lektordata/project/assets/static/style.css index 8a46fc2..9e9d60d 100644 --- a/lektor/lektordata/project/assets/static/style.css +++ b/lektor/lektordata/project/assets/static/style.css @@ -176,7 +176,7 @@ div.page.home{ font-size:36px; } -div.page h2 { +div.page h1 { font-family: "Roboto-Black","Arial Bold",sans-serif; font-size:60px; margin: 20px 0 0 0; @@ -185,7 +185,7 @@ div.page h2 { line-height: normal; } -div.page h3 { +div.page h2 { font-family: "Roboto-Thin","Arial",sans-serif; font-size:60px; margin: 0px; @@ -195,7 +195,7 @@ div.page h3 { } -div.page h4 { +div.page h3 { font-family: "Roboto-Thin","Arial",sans-serif; font-size:40px; margin: 0; @@ -571,16 +571,16 @@ div.left_footer, div.middle_footer, div.right_footer { font-size:calc(36vw * 0.091); } - div.page h2 { + div.page h1 { font-size:calc(60vw * 0.091); margin: calc(20vw * 0.091) 0 0 0; padding: calc(22vw * 0.091) 0 1em 0; width: 100%; } - div.page h3 { + div.page h2 { font-size:calc(60vw * 0.091); } - div.page h4 { + div.page h3 { font-size:calc(40vw * 0.091); } div.page div.threecolumn{ @@ -648,15 +648,15 @@ div.left_footer, div.middle_footer, div.right_footer { div.page.home{ font-size:calc(36px * 0.7); } - div.page h2 { + div.page h1 { font-size:calc(60px * 0.7); margin: 0; padding: calc(22px * 0.7) 0 1em 0; } - div.page h3 { + div.page h2 { font-size:calc(60px * 0.7); } - div.page h4 { + div.page h3 { font-size:calc(40px * 0.7); } div.page div.threecolumn{ diff --git a/lektor/lektordata/project/content/contents.lr b/lektor/lektordata/project/content/contents.lr index 519512b..00d2a3f 100644 --- a/lektor/lektordata/project/content/contents.lr +++ b/lektor/lektordata/project/content/contents.lr @@ -4,14 +4,14 @@ title: Willkommen beim PC Stammertal --- html: -

    Unser nächster Anlass:


    +

    Unser nächster Anlass:


    Leider unbekannt, aber frag mal den Vorstand der müsste es wissen
     
     
     
    -

    ...und auch nicht verpassen:

    +

    ...und auch nicht verpassen:

    27. Zürcher Kantonalschützenfest 2025
    diff --git a/lektor/lektordata/project/templates/layout.html b/lektor/lektordata/project/templates/layout.html index c5712c8..70257bd 100644 --- a/lektor/lektordata/project/templates/layout.html +++ b/lektor/lektordata/project/templates/layout.html @@ -7,8 +7,11 @@ +{% if this._path == '/' %} + +{% endif%} -{% block title %}Welcome{% endblock %} — PCS +{% if this._path == '/' %}Home - PCS{% else %}{% block title %}Welcome{% endblock %} — PCS{% endif%}
    diff --git a/lektor/lektordata/project/templates/page.html b/lektor/lektordata/project/templates/page.html index 31bac15..20082d1 100644 --- a/lektor/lektordata/project/templates/page.html +++ b/lektor/lektordata/project/templates/page.html @@ -2,7 +2,7 @@ {% block title %}{{ this.title }}{% endblock %} {% block body %}
    -

    {{ this.title }}

    +

    {{ this.title }}

    {{ this.body }} {{ this.html }}
    diff --git a/lektor/lektordata/project/templates/termine_page.html b/lektor/lektordata/project/templates/termine_page.html index e8f6519..bcc3f18 100644 --- a/lektor/lektordata/project/templates/termine_page.html +++ b/lektor/lektordata/project/templates/termine_page.html @@ -2,7 +2,7 @@ {% block title %}{{ this.title }}{% endblock %} {% block body %}
    -

    {{ this.title }}

    +

    {{ this.title }}

    {{ this.body }} {{ this.html }}
    diff --git a/lektor/lektordata/scripts/calendar-fetcher-main.py b/lektor/lektordata/scripts/calendar-fetcher-main.py index 05da116..d259c9c 100644 --- a/lektor/lektordata/scripts/calendar-fetcher-main.py +++ b/lektor/lektordata/scripts/calendar-fetcher-main.py @@ -42,14 +42,14 @@ title: Willkommen beim PC Stammertal --- html: -

    Unser nächster Anlass:


    +

    Unser nächster Anlass:


    {self.fallback_html}
     
     
     
    -

    ...und auch nicht verpassen:

    +

    ...und auch nicht verpassen:

    27. Zürcher Kantonalschützenfest 2025
    From eeed8663072724fb6d4ed7fb55d68996bd19bd6a Mon Sep 17 00:00:00 2001 From: Reto Bollinger Date: Tue, 14 Jan 2025 11:29:45 +0100 Subject: [PATCH 5/8] Subtle change in page title for home page. --- lektor/lektordata/project/templates/layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lektor/lektordata/project/templates/layout.html b/lektor/lektordata/project/templates/layout.html index 70257bd..ab6e8c0 100644 --- a/lektor/lektordata/project/templates/layout.html +++ b/lektor/lektordata/project/templates/layout.html @@ -11,7 +11,7 @@ {% endif%} -{% if this._path == '/' %}Home - PCS{% else %}{% block title %}Welcome{% endblock %} — PCS{% endif%} +{% if this._path == '/' %}Home — PCS{% else %}{% block title %}Welcome{% endblock %} — PCS{% endif%}
    From 604f114798d1e16b81633fe9b3be5a9df5f49728 Mon Sep 17 00:00:00 2001 From: Reto Bollinger Date: Tue, 14 Jan 2025 11:40:21 +0100 Subject: [PATCH 6/8] Eliminating unneccessary empty lines --- lektor/lektordata/project/templates/layout.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lektor/lektordata/project/templates/layout.html b/lektor/lektordata/project/templates/layout.html index ab6e8c0..16de4b3 100644 --- a/lektor/lektordata/project/templates/layout.html +++ b/lektor/lektordata/project/templates/layout.html @@ -7,9 +7,7 @@ -{% if this._path == '/' %} - -{% endif%} +{% if this._path == '/' %}{% endif%} {% if this._path == '/' %}Home — PCS{% else %}{% block title %}Welcome{% endblock %} — PCS{% endif%} From 02b2094d78ef4f8f16625be156c083b1c21c7985 Mon Sep 17 00:00:00 2001 From: Reto Bollinger Date: Tue, 14 Jan 2025 13:30:33 +0100 Subject: [PATCH 7/8] Improved descripton in 160 characters --- lektor/lektordata/project/templates/layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lektor/lektordata/project/templates/layout.html b/lektor/lektordata/project/templates/layout.html index 16de4b3..3574aaf 100644 --- a/lektor/lektordata/project/templates/layout.html +++ b/lektor/lektordata/project/templates/layout.html @@ -7,7 +7,7 @@ -{% if this._path == '/' %}{% endif%} +{% if this._path == '/' %}{% endif%} {% if this._path == '/' %}Home — PCS{% else %}{% block title %}Welcome{% endblock %} — PCS{% endif%} From b42547a7787fcb7c941ce0fe751d82fa11633976 Mon Sep 17 00:00:00 2001 From: Reto Bollinger Date: Tue, 14 Jan 2025 14:02:49 +0100 Subject: [PATCH 8/8] Added viewport meta tag for SEO reasons --- lektor/lektordata/project/templates/layout.html | 1 + 1 file changed, 1 insertion(+) diff --git a/lektor/lektordata/project/templates/layout.html b/lektor/lektordata/project/templates/layout.html index 3574aaf..0f601db 100644 --- a/lektor/lektordata/project/templates/layout.html +++ b/lektor/lektordata/project/templates/layout.html @@ -8,6 +8,7 @@ {% if this._path == '/' %}{% endif%} + {% if this._path == '/' %}Home — PCS{% else %}{% block title %}Welcome{% endblock %} — PCS{% endif%}