WIP: more hoster independencie (but more strict resource placing

2024-12-28 10:35:01 +01:00
parent b4f70df7c8
commit 20367dffcc
3 changed files with 127 additions and 105 deletions
--- a/homepage/cwsvJudo/pandocTemplate/materialize.pandocTemplate
+++ b/homepage/cwsvJudo/pandocTemplate/materialize.pandocTemplate
@@ -12,43 +12,39 @@
    // @todo remove galleries
 	galleryRedirector();
 ?>
-
 <!DOCTYPE html>
 <html $if(lang)$lang="$lang$"$endif$ $if(dir)$dir="$dir$"$endif$>
-
    <head>
        <meta charset="utf-8">
        <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
-        $for(author-meta)$
-            <meta name="author" content="$author-meta$">
-        $endfor$
-        $if(date-meta)$
-            <meta name="dcterms.date" content="$date-meta$">
-        $endif$
-        $if(keywords)$
-            <meta 
-                name="keywords"
-                content="$for(keywords)$$keywords$$sep$, $endfor$"
-            >
-        $endif$
-        $if(canonicalPath)$
-            <link rel="canonical" href="<?php echo($$canonicalBaseUrl);?>/$canonicalPath$">
-        $endif$
-        $if(ampVersionLink)$
-            <link rel="amphtml" href="$ampVersionLink$">
-        $endif$
-        $if(phpTitleString)$
-            <title><?php echo( $phpTitleString$ );?>
-        </title>
-        $else$$if(title)$
-            <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
-        $endif$
-        $endif$
-        $if(phpDescriptionString)$
-            <meta name="description" content="<?php echo( $phpDescriptionString$ );?>">
-        $else$$if(description)$
-            <meta name="description" content="$description$">
-        $endif$$endif$
+$for(author-meta)$
+        <meta name="author" content="$author-meta$">
+$endfor$
+$if(date-meta)$
+        <meta name="dcterms.date" content="$date-meta$">
+$endif$
+$if(keywords)$
+        <meta 
+            name="keywords"
+            content="$for(keywords)$$keywords$$sep$, $endfor$"
+        >
+$endif$
+$if(canonicalPath)$
+        <link rel="canonical" href="<?php echo($$canonicalBaseUrl);?>/$canonicalPath$">
+$endif$
+$if(ampVersionLink)$
+        <link rel="amphtml" href="$ampVersionLink$">
+$endif$
+$if(phpTitleString)$
+        <title><?php echo( $phpTitleString$ );?></title>
+$else$$if(title)$
+        <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
+$endif$$endif$
+$if(phpDescriptionString)$
+        <meta name="description" content="<?php echo( $phpDescriptionString$ );?>">
+$else$$if(description)$
+        <meta name="description" content="$description$">
+$endif$$endif$

        <style>
        @font-face {
@@ -57,37 +53,36 @@
            src: url(/ressourcen/fonts/Orbitron-Medium.otf);
        }
        </style>
-
-        $if(css)$
+$if(css)$
        <style>
-            $for(css)$
-                <?php include_once($$basePath."/$css$");?>
-            $endfor$
+    $for(css)$
+            <?php include_once($$basePath."/$css$");?>
+    $endfor$
        </style>
-        $endif$
+$endif$
        <style>
            code {
                white-space: pre;
            }
        </style>
-        $if(quotes)$
+$if(quotes)$
        <style>
            q {
                quotes: "“" "”" "‘" "’";
            }
        </style>
-        $endif$
-        $if(highlighting-css)$
+$endif$
+$if(highlighting-css)$
        <style type="text/css">
            $highlighting-css$
        </style>
-        $endif$
-        $for(extraCss)$
+$endif$
+$for(extraCss)$
            <link rel="stylesheet" href="$extraCss$">
-        $endfor$
-        $if(math)$
-            $math$
-        $endif$
+$endfor$
+$if(math)$
+        $math$
+$endif$
        <script type='application/ld+json'>
 			{
 			  "@context": "http://www.schema.org",
@@ -106,30 +101,29 @@ $endif$
 			  "image": <?php echo($$canonicalBaseUrl);?>/ressourcen/graphiken/logos/cwsvJudoLogoWappen.256w.png"
 			}
 		</script>
-        $if(jsonSdFiles)$
-        $for(jsonSdFiles)$
+$if(jsonSdFiles)$
+    $for(jsonSdFiles)$
        <script type='application/ld+json'>
-			<?php include($$basePath."/ressourcen/structuredData/json/$jsonSdFiles$");?>
+           <?php include($$basePath."/ressourcen/structuredData/json/$jsonSdFiles$");?>
 		</script>
-        $endfor$
-        $endif$
-        $if(jsLibs)$
-        $for(jsLibs)$
+    $endfor$
+$endif$
+$if(jsLibs)$$for(jsLibs)$
        <script src="$jsLibs$" type="text/javascript"></script>
-        $endfor$
-        $endif$
+$endfor$
+$endif$
        <link rel="alternate" type="application/rss+xml" href="/rss">
-        <?php // @todo reactivate require_once($$basePath."/pages/shared/favicon.html.inc");?>
-        $for(header-includes)$
-        $header-includes$
-        $endfor$
+        <?php require_once($$basePath."/pages/shared/favicon.html.inc");?>
+$for(header-includes)$
+    $header-includes$
+$endfor$
    </head>

    <body>
        <!-- Kopfzeile mit Titel, Promobildern und Breadcrumbs -->
        <header class="cwsvHeader">
            <img width="200" height="140" title="Judo im Chemnitzer WSV" alt="Judo im Chemnitzer WSV - Promo"
-                src="<?php echo($$canonicalBaseUrl);?>/ressourcen/graphiken/banner/bannerlogo.1.jpg">
+                src="/ressourcen/graphiken/banner/bannerlogo.1.jpg">
            <span>
                <span>Judo</span>
                <span>
@@ -137,29 +131,53 @@ $endif$
                </span>
            </span>
            <img width="128" height="104" title="Judo im Chemnitzer WSV" alt="Judo im Chemnitzer WSV - Logo"
-                src="<?php echo($$canonicalBaseUrl);?>/ressourcen/graphiken/logos/cwsvJudoLogoWappen.128w.png"
-                srcset="<?php echo($$canonicalBaseUrl);?>/ressourcen/graphiken/logos/cwsvJudoLogoWappen.256w.png 2x">
+                src="/ressourcen/graphiken/logos/cwsvJudoLogoWappen.128w.png"
+                srcset="/ressourcen/graphiken/logos/cwsvJudoLogoWappen.256w.png 2x">
        </header>

-        $if(mainNav)$
+$if(mainNav)$
        <nav id="mainNav">
-            $for(mainNav)$
-            <a href="$mainNav.url$" $if(mainNav.caption)$title="$mainNav.caption$" $endif$
-                $if(mainNav.active)$class="activeNav" $endif$>
-                $if(mainNav.icon)$
-                <span><img src="$if(mainNav.icon.src)$$mainNav.icon.src$$else$$mainNav.icon$$endif$"
-                        $if(mainNav.caption)$ alt="$mainNav.caption$" $else$ $if(mainNav.icon.alt)$
-                        alt="$mainNav.icon.alt$" $endif$ $endif$ $if(mainNav.icon.width)$ width="$mainNav.icon.width$"
-                        $endif$ $if(mainNav.icon.height)$ height="$mainNav.icon.height$" $endif$
-                        $if(mainNav.icon.title)$ title="$mainNav.icon.title$" $endif$ $if(mainNav.icon.srcset)$
-                        srcset="$mainNav.icon.srcset$" $endif$>
-                </span>
-                $endif$
-                $if(mainNav.caption)$<span>$mainNav.caption$</span>$endif$
-            </a>
-            $endfor$
-        </nav>
+    $for(mainNav)$
+            <a 
+                href="$mainNav.url$"
+        $if(mainNav.caption)$
+                title="$mainNav.caption$"
        $endif$
+        $if(mainNav.active)$
+                class="activeNav"
+        $endif$
+            >
+        $if(mainNav.icon)$
+            <span>
+                <img 
+                    src="$if(mainNav.icon.src)$$mainNav.icon.src$$else$$mainNav.icon$$endif$"
+            $if(mainNav.caption)$
+                    alt="$mainNav.caption$"
+            $else$$if(mainNav.icon.alt)$
+                    alt="$mainNav.icon.alt$"
+            $endif$$endif$
+            $if(mainNav.icon.width)$
+                    width="$mainNav.icon.width$"
+            $endif$
+            $if(mainNav.icon.height)$
+                    height="$mainNav.icon.height$"
+            $endif$
+            $if(mainNav.icon.title)$
+                    title="$mainNav.icon.title$"
+            $endif$
+            $if(mainNav.icon.srcset)$
+                    srcset="$mainNav.icon.srcset$"
+            $endif$
+                >
+            </span>
+        $endif$
+        $if(mainNav.caption)$
+            <span>$mainNav.caption$</span>
+        $endif$
+        </a>
+    $endfor$
+    </nav>
+$endif$

        $if(subNav)$
        <nav class="subNav">
@@ -177,7 +195,7 @@ $endif$
            </a>
            $endfor$
            <a href="#mainNav" title="Hauptnavigation">
-                <img src="<?php echo($$canonicalBaseUrl);?>/ressourcen/graphiken/icons/arrowRightDown.svg" alt="Menü">
+                <img src="/ressourcen/graphiken/icons/arrowRightDown.svg" alt="Menü">
                <span>zur Hauptnavigation</span>
            </a>
        </nav>
@@ -211,7 +229,7 @@ $endif$
                href="/kontakt">Kontakt</a>
            <a class="touchLink" title="Impressum" href="<?php echo($$baseUrl);?>/impressum">Impressum</a>
            <a class="touchLink" title="Datenschutz" href="<?php echo($$baseUrl);?>/datenschutz">Datenschutz</a>
-            <a class="touchLink" title="News-Feed Abonnieren" href="<?php echo($$canonicalBaseUrl);?>/rss"><img
+            <a class="touchLink" title="News-Feed Abonnieren" href="/rss"><img
                    src="/ressourcen/graphiken/icons/newsFeedIcon.svg" alt="Newsfeed" title="News Feed Icon"
                    class="charImg">
            </a>
--- a/homepage/cwsvJudo/readMe.md
+++ b/homepage/cwsvJudo/readMe.md
@@ -1,10 +1,14 @@
-# Homepage der Judoka des CWSV
+HelioHost build pipeline redesign:

-## Verzeichnisstruktur
-
-`src`
-: (Handgeschriebene) Quellen (Quellcodes)
-
-`res`
-: nicht selber erzeugte Quellen (z.B. Graphiken)
+- install dependencies:
+  - `make -j -f Makefile.heliohost installDependencies`
+- make a distributable package:
+  - `make -j -f Makefile.heliohost dist`
+  
+## Directory structure

+- `build/dist/heliohost` - (dist root)
+  - `httpdocs` - http root (root for the files served via http)
+    - `pages` - pages to be reachable, requests to `/page` get redirected to `pages/page` (@todo: currently there is still a responsive directory in the between)
+    - `ressourcen` - directory with static ressources (i.e. graphics)
+  - `.local` - local specific files, e.g., configuration files
--- a/homepage/cwsvJudo/src/yaml/images.yaml
+++ b/homepage/cwsvJudo/src/yaml/images.yaml
@@ -4,68 +4,68 @@ cwsvJudoLogoWappen: &cwsvJudoLogoWappen
 	height: "52"
 	alt: "cwsvJudo"
 	title: "Judo im Chemnitzer WSV - Logo"
-	src: "<?php echo($canonicalBaseUrl); ?>/ressourcen/graphiken/logos/cwsvJudoLogoWappen.64w.png"
-	srcset: "<?php echo($canonicalBaseUrl); ?>/ressourcen/graphiken/logos/cwsvJudoLogoWappen.128w.png 2x, <?php echo($canonicalBaseUrl); ?>/ressourcen/graphiken/logos/cwsvJudoLogoWappen.256w.png 4x"
+	src: "/ressourcen/graphiken/logos/cwsvJudoLogoWappen.64w.png"
+	srcset: "/ressourcen/graphiken/logos/cwsvJudoLogoWappen.128w.png 2x, /ressourcen/graphiken/logos/cwsvJudoLogoWappen.256w.png 4x"
 cwsvLogoWappen: &cwsvLogoWappen
 	width: "64"
 	height: "77"
 	alt: "CWSV"
 	title: "Chemnitzer WSV - Logo"
-	src: "<?php echo($canonicalBaseUrl); ?>/ressourcen/graphiken/logos/cwsvLogoWappen.64w.png"
-	srcset: "<?php echo($canonicalBaseUrl); ?>/ressourcen/graphiken/logos/cwsvLogoWappen.128w.png 2x, <?php echo($canonicalBaseUrl); ?>/ressourcen/graphiken/logos/cwsvLogoWappen.256w.png 4x"
+	src: "/ressourcen/graphiken/logos/cwsvLogoWappen.64w.png"
+	srcset: "/ressourcen/graphiken/logos/cwsvLogoWappen.128w.png 2x, /ressourcen/graphiken/logos/cwsvLogoWappen.256w.png 4x"
 iconClockFriendly: &iconClockFriendly
 	width: "112"
 	height: "112"
 	alt: "Uhr"
-	src: "<?php echo($canonicalBaseUrl); ?>/ressourcen/graphiken/icons/clockIconFriendly.svg"
+	src: "/ressourcen/graphiken/icons/clockIconFriendly.svg"
 iconCalendar: &iconCalendar
 	width: "782"
 	height: "800"
 	alt: "Kalender"
-	src: "<?php echo($canonicalBaseUrl); ?>/ressourcen/graphiken/icons/calendarIcon.svg"
+	src: "/ressourcen/graphiken/icons/calendarIcon.svg"
 iconPlanner: &iconPlanner
 	width: "60"
 	height: "60"
 	alt: "Planer"
-	src: "<?php echo($canonicalBaseUrl); ?>/ressourcen/graphiken/icons/terminKalender.svg"
+	src: "/ressourcen/graphiken/icons/terminKalender.svg"
 iconGallery: &iconGallery
 	width: "500"
 	height: "500"
 	alt: "Galerien"
-	src: "<?php echo($canonicalBaseUrl); ?>/ressourcen/graphiken/icons/gallery.svg"
+	src: "/ressourcen/graphiken/icons/gallery.svg"
 iconContact: &iconContact
 	width: "953"
 	height: "943"
 	alt: "Kontakt"
-	src: "<?php echo($canonicalBaseUrl); ?>/ressourcen/graphiken/icons/contact4Ways.svg"
+	src: "/ressourcen/graphiken/icons/contact4Ways.svg"
 iconWikipediaW: &iconWikipediaW
 	width: "1700"
 	height: "1700"
 	alt: "Kontakt"
-	src: "<?php echo($canonicalBaseUrl); ?>/ressourcen/graphiken/icons/wikipediaW.svg"
+	src: "/ressourcen/graphiken/icons/wikipediaW.svg"
 iconQuizLampe: &iconQuizLampe
 	width: "135"
 	height: "137.01"
 	alt: "Quiz"
-	src: "<?php echo($canonicalBaseUrl); ?>/ressourcen/graphiken/icons/quizLampe.svg"
+	src: "/ressourcen/graphiken/icons/quizLampe.svg"
 iconWerkzeug: &iconWerkzeug
 	width: "240"
 	height: "240"
 	alt: "Tools"
-	src: "<?php echo($canonicalBaseUrl); ?>/ressourcen/graphiken/icons/werkzeugIcon.svg"
+	src: "/ressourcen/graphiken/icons/werkzeugIcon.svg"
 iconLinks: &iconLinks
 	width: "500"
 	height: "500"
 	alt: "Links"
-	src: "<?php echo($canonicalBaseUrl); ?>/ressourcen/graphiken/icons/linksIcon.svg"
+	src: "/ressourcen/graphiken/icons/linksIcon.svg"
 iconDownloads: &iconDownloads
 	width: "200"
 	height: "200"
 	alt: "Links"
-	src: "<?php echo($canonicalBaseUrl); ?>/ressourcen/graphiken/icons/downloadIcon.svg"
+	src: "/ressourcen/graphiken/icons/downloadIcon.svg"
 iconExtrasStern: &iconExtrasStern
 	width: "100"
 	height: "100"
 	alt: "Extras"
-	src: "<?php echo($canonicalBaseUrl); ?>/ressourcen/graphiken/icons/star.svg"
+	src: "/ressourcen/graphiken/icons/star.svg"
 ...