redesign website #1

Merged
l3d merged 80 commits from ui into main 2022-05-18 00:35:38 +02:00
5 changed files with 156 additions and 47 deletions
Showing only changes of commit 0a2fc20948 - Show all commits

View file

@ -4,10 +4,11 @@
{%- endif %}>
<head>
<meta charset="utf-8" />
<link rel="preload" as="image" href="/waffle_apfelmus-medium.webp"/>
<link rel="preload" as="image" href="/sweet_waffle-medium.webp"/>
{%- if this.path == '/' -%}
{{- '\n ' -}} <link rel="preload" as="image" href="/waffle_apfelmus-medium.webp"/>
{{- '\n ' -}} <link rel="preload" as="image" href="/sweet_waffle-medium.webp"/>
{%- endif -%}
{{- '\n' -}}
<!-- __ _____ _
/ \__..-""" ;-.",'/
( / \_ `.' / `.
@ -34,8 +35,6 @@
`::|| | | | | | \ |
`-._| | \ | \ `.___/
\_______) \_______) C3WOC -->
{# remove next line and robots.txt if LIVE not preview #}
<!-- peta name="robots" content="noindex" -->
{#-
Namensschema der CSS-Klassen nach BEM (Block Element Modifier,
@ -55,7 +54,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>{% block title %}C3 Waffel Operation Center{% endblock %} | C3WOC</title>
<meta name="description" content="{% block meta_description %}C3WOC, die führenden Experten für Waffeln in der Chaos Community{% endblock %}">
<meta name="description" content="{% block meta_description %}vielfältige Waffelrezepte. knusprige Ideen. kreativer Waffelbelag. Das C3WOC sind die führenden Experten für Waffeln in der Chaos Community{% endblock %}">
{#- OG Values
https://ogp.me/ #}
<meta property="og:title" content="{{ self.title() }}">
@ -63,8 +62,8 @@
<meta property="og:url" content="{{ this | url(external=true) }}">
{% if '/images/waffel.jpg'|asseturl is defined -%}
<meta property="og:image" content="{% block meta_image %}{{ '/images/waffel.jpg'|asseturl }}{% endblock %}">
{%- endif %}
{# JSON-LD SEO Optimisation Stuff... -#}
{%- endif -%}
{#- JSON-LD SEO Optimisation Stuff... -#}
{%- block json_ld %}
<script type='application/ld+json'>
{
@ -72,46 +71,46 @@
"name": "C3WOC",
"url": "https://c3woc.de",
"logo": "https://c3woc.de/images/logo.svg",
"description": "Die führenden Experten für Waffeln in der chaos Community."
"description": "vielfältige Waffelrezepte. knusprige Ideen. kreativer Waffelbelag. Das C3WOC sind die führenden Experten für Waffeln in der Chaos Community."
}
</script>
{% endblock %}
{%- endblock %}
{% if '/css/reset.css'|asseturl is defined -%}
<link rel="stylesheet" href="{{ '/css/reset.css'|asseturl }}">
{%- endif %}
{% if '/css/fonts.css'|asseturl is defined -%}
<link rel="stylesheet" href="{{ '/css/fonts.css'|asseturl }}">
{%- endif %}
{% if '/css/main.min.css'|asseturl is defined -%}
<link rel="stylesheet" href="{{ '/css/main.min.css'|asseturl }}">
{% endif %}
{% if '/images/icons/manifest.json'|asseturl is defined -%}
<link rel="manifest" href="{{ '/images/icons/manifest.json'|asseturl }}">
{%- endif %}
{% if '/images/icons/apple-touch-icon.png'|asseturl is defined -%}
<link rel="apple-touch-icon" sizes="180x180" href="{{ '/images/icons/apple-touch-icon.png'|asseturl }}">
{%- endif %}
{% if '/images/icons/favicon-32x32.png'|asseturl is defined -%}
<link rel="icon" type="image/png" sizes="32x32" href="{{ '/images/icons/favicon-32x32.png'|asseturl }}">
{%- endif %}
{% if '/images/icons/favicon-16x16.png'|asseturl is defined -%}
<link rel="icon" type="image/png" sizes="16x16" href="{{ '/images/icons/favicon-16x16.png'|asseturl }}">
{%- endif %}
{% if '/images/icons/site.webmanifest'|asseturl is defined -%}
<link rel="manifest" href="{{ '/images/icons/site.webmanifest'|asseturl }}">
{%- endif %}
{% if '/images/icons/safari-pinned-tab.svg'|asseturl is defined -%}
<link rel="mask-icon" href="{{ '/images/icons/safari-pinned-tab.svg'|asseturl }}" color="#ffda1d">
{%- endif %}
{% if '/images/icons/favicon.ico'|asseturl is defined -%}
<link rel="shortcut icon" href="{{ '/images/icons/favicon.ico'|asseturl }}">
{%- endif %}
<meta name="msapplication-TileColor" content="#ffac33">
{%- if '/css/reset.css'|asseturl is defined -%}
{{- '\n ' -}} <link rel="stylesheet" href="{{ '/css/reset.css'|asseturl }}">
{%- endif -%}
{%- if '/css/fonts.css'|asseturl is defined -%}
{{- '\n ' -}} <link rel="stylesheet" href="{{ '/css/fonts.css'|asseturl }}">
{%- endif -%}
{%- if '/css/main.min.css'|asseturl is defined -%}
{{- '\n ' -}} <link rel="stylesheet" href="{{ '/css/main.min.css'|asseturl }}">
{%- endif -%}
{%- if '/images/icons/manifest.json'|asseturl is defined -%}
{{- '\n ' -}} <link rel="manifest" href="{{ '/images/icons/manifest.json'|asseturl }}">
{%- endif -%}
{%- if '/images/icons/apple-touch-icon.png'|asseturl is defined -%}
{{- '\n ' -}} <link rel="apple-touch-icon" sizes="180x180" href="{{ '/images/icons/apple-touch-icon.png'|asseturl }}">
{%- endif -%}
{%- if '/images/icons/favicon-32x32.png'|asseturl is defined -%}
{{- '\n ' -}} <link rel="icon" type="image/png" sizes="32x32" href="{{ '/images/icons/favicon-32x32.png'|asseturl }}">
{%- endif -%}
{%- if '/images/icons/favicon-16x16.png'|asseturl is defined -%}
{{- '\n ' -}} <link rel="icon" type="image/png" sizes="16x16" href="{{ '/images/icons/favicon-16x16.png'|asseturl }}">
{%- endif -%}
{%- if '/images/icons/site.webmanifest'|asseturl is defined -%}
{{- '\n ' -}} <link rel="manifest" href="{{ '/images/icons/site.webmanifest'|asseturl }}">
{%- endif -%}
{%- if '/images/icons/safari-pinned-tab.svg'|asseturl is defined -%}
{{- '\n ' -}} <link rel="mask-icon" href="{{ '/images/icons/safari-pinned-tab.svg'|asseturl }}" color="#ffda1d">
{%- endif -%}
{%- if '/images/icons/favicon.ico'|asseturl is defined -%}
{{- '\n ' -}} <link rel="shortcut icon" href="{{ '/images/icons/favicon.ico'|asseturl }}">
{%- endif -%}
{% if '/images/icons/browserconfig.xml'|asseturl is defined -%}
<meta name="msapplication-config" content="{{ '/images/icons/browserconfig.xml'|asseturl }}">
{%- endif %}
<meta name="theme-color" content="#631409">
{{- '\n ' -}} <meta name="msapplication-config" content="{{ '/images/icons/browserconfig.xml'|asseturl }}">
{%- endif -%}
{{- '\n ' -}} <meta name="msapplication-TileColor" content="#ffac33">
{{- '\n ' -}} <meta name="theme-color" content="#631409">
</head>
<body>

View file

@ -8,6 +8,20 @@
C3WOC
{%- endif -%}
{%- endblock -%}
{# https://schema.org/Recipe #}
{%- block json_ld -%}
<script type='application/ld+json'>
{
{%- for child in this.children -%}
{%- if child._template == 'zutaten.yaml' -%}
{%- if not from_index -%}
{%- include "zutaten/rezept_ld.json.j2" -%}
{%- endif -%}
{%- endif -%}
{%- endfor -%}
}
</script>
{%- endblock -%}
{%- block body -%}
{{- render_rezept_post(this) -}}
{%- endblock -%}

View file

@ -0,0 +1,96 @@
{#-
LD+JSON Rendering des Rezept aus dem zutaten.yaml template für die Detailseite des Rezepts.
based on https://schema.org/Recipe
-#}
{#-
"@context": "https://schema.org",
"@type": "Recipe",
"author": "John Smith",
"cookTime": "PT1H",
"datePublished": "2009-05-08",
"description": "This classic banana bread recipe comes from my mom -- the walnuts add a nice texture and flavor to the banana bread.",
"image": "bananabread.jpg",
"recipeIngredient": [
"3 or 4 ripe bananas, smashed",
"1 egg",
"3/4 cup of sugar"
],
"interactionStatistic": {
"@type": "InteractionCounter",
"interactionType": "https://schema.org/Comment",
"userInteractionCount": "140"
},
"name": "Mom's World Famous Banana Bread",
"nutrition": {
"@type": "NutritionInformation",
"calories": "240 calories",
"fatContent": "9 grams fat"
},
"prepTime": "PT15M",
"recipeInstructions": "Preheat the oven to 350 degrees. Mix in the ingredients in a bowl. Add the flour last. Pour the mixture into a loaf pan and bake for one hour.",
"recipeYield": "1 loaf",
"suitableForDiet": "https://schema.org/LowFatDiet"
-#}
{{- '\n "@context": "https://schema.org",' -}}
{{- '\n "@type": "Recipe",' -}}
{{- '\n "author": ' -}}
{%- if this.author is defined -%}
"{{- this.author -}}"
{%- else -%}
"C3WOC"
{%- endif -%}
{#- for child in this.children -%}
{%- if child._template == 'zutaten.yaml' -%}
{ #-
Zunächst werden die Zutaten des Rezept definiert...
-# }
{{- '\n ' -}} <div class="content__box">
{{- '\n ' -}} <div class="content__inner_box">
{{- '\n ' -}}
<h1 id="{{- child.parent._gid[:8] -}}-{{- child.parent._gid[-6:-2] -}}-{{- child._gid[-8:-4] }}-{{- child._gid[-4:] -}}-{{- child._gid[:12] -}}">
{%- if child.recipe_name and child.recipe_name != "" -%}
{{ child.recipe_name }}</h1>
{%- else -%}
{{ child.title }}</h1>
{%- endif -%}
{%- if child.servings is defined and child.servings != "" -%}
{%- if child.servings.blocks != [] -%}
{%- include "zutaten/zutaten.html" -%}
{%- else -%}
<p>ungültige Rezeptangaben</p>
{%- endif -%}
{%- endif -%}
{{- '\n ' -}} </div>
{{- '\n ' -}} </div>
{ #-
Nachdem die Zutaten des Rezept nun angegeben sind,
folgt die Zubereitung der waffelfähigen Teigprodukte...
-# }
{%- if child.steps is defined and child.steps.blocks is defined and child.steps != "" -%}
{%- if child.steps.blocks is defined and child.steps.blocks != "" and child.steps.blocks != [] -%}
{%- include "zutaten/zubereitung.html" -%}
{%- endif -%}
{%- endif -%}
{%- include "zutaten/hinweise.html" -%}
{ #-
Render die Notizen und Angaben zur Verarbeitung der einzelnen Zutaten
-# }
{%- if child.ingredients is defined and child.ingredients != "" %}
{%- if child.ingredients.blocks != [] -%}
{%- include "zutaten/zutat_notes.html" -%}
{%- endif -%}
{%- endif -%}
{%- endif -%}
{%- endfor -#}

View file

@ -31,7 +31,7 @@
<i>({{ prc.process }})</i>
{%- else -%}
{{- ' ' -}}
<i>(<a href="#processing_{{- ing.ingredient | string -}}"_ class="processing">Angaben zur Verarbeitung von {{ ing.ingredient }} beachten</a>)</i>
<i>(<a href="#processing_{{- ing.ingredient | string -}}" class="processing">Angaben zur Verarbeitung von {{ ing.ingredient }} beachten</a>)</i>
{%- endif -%}
{%- endif -%}
{%- endfor -%}

View file

@ -23,7 +23,7 @@
<i>({{ prc.process }})</i>
{%- else -%}
{{- ' ' -}}
<i>(<a href="#processing_{{- ing.ingredient | string -}}"_ class="processing">Angaben zur Verarbeitung von {{ ing.ingredient }} beachten</a>)</i>
<i>(<a href="#processing_{{- ing.ingredient | string -}}" class="processing">Angaben zur Verarbeitung von {{ ing.ingredient }} beachten</a>)</i>
{%- endif -%}
{%- endif -%}
{%- endfor -%}