Merge branch 'website-updates'

Schrittweise Vereinheitlichung der Darstellung. Kleine Vereinfachungen des Website-Codes.
author: Valentin <valentin@fricklerhandwerk.de> 2025-11-04 16:31:23 +0100
committer: Valentin <valentin@fricklerhandwerk.de> 2025-11-06 16:46:28 +0100
commit: defc2a4ecbc28feabb88d28cf18aedd121697988 (patch)
tree: 57e6d8887611af39b9a8090a271a13f2140b735b /www
parent: 9212d8028bb0410c81d72b34c013b38d5e3f563b (diff)
parent: 90607c6604b1f46dabe1a68b4289f25d3d689453 (diff)
4 files changed, 53 insertions, 44 deletions
diff --git a/www/caddy.nix b/www/caddy.nix
index 805291e..a1463ca 100644
--- a/www/caddy.nix
+++ b/www/caddy.nix
@@ -72,6 +72,7 @@ in
   perSystem =
     {
       pkgs,
+      lib,
       system,
       self',
       ...
@@ -92,7 +93,7 @@ in
       '';
       packages.preview = pkgs.devmode.override {
         buildArgs = ''
-          -A packages.${system}.html -vv
+          "$(${lib.getExe pkgs.git} rev-parse --show-toplevel)" -A packages.${system}.html -vv
         '';
       };
     };
diff --git a/www/html/datenschutz.html b/www/html/datenschutz.html
index a83613e..18fda6c 100644
--- a/www/html/datenschutz.html
+++ b/www/html/datenschutz.html
@@ -6,9 +6,7 @@
     <meta name="viewport" content="width=device-width">
     <title>Datenschutz</title>
 
-    <link rel="shortcut icon" type="image/x-icon"
-      href="/img/Kraniche-dreh-klein.gif">
-    <!-- > icons/favicon.ico"> < -->
+    <link rel="shortcut icon" type="image/x-icon" href="/img/Kraniche-dreh-klein.gif">
   </head>
   <body>
     <a href="index.html">Zurück</a><br>
diff --git a/www/html/impressum.html b/www/html/impressum.html
index 9e93d29..e6872db 100644
--- a/www/html/impressum.html
+++ b/www/html/impressum.html
@@ -6,9 +6,7 @@
     <meta name="viewport" content="width=device-width">
     <title>Impressum</title>
 
-    <link rel="shortcut icon" type="image/x-icon"
-      href="/img/Kraniche-dreh-klein.gif">
-    <!-- > icons/favicon.ico"> < -->
+    <link rel="shortcut icon" type="image/x-icon" href="/img/Kraniche-dreh-klein.gif">
   </head>
   <body>
     <a href="index.html">Zurück</a><br>
diff --git a/www/html/index.html b/www/html/index.html
index 2332c1e..a3d4043 100644
--- a/www/html/index.html
+++ b/www/html/index.html
@@ -6,22 +6,31 @@
     <meta name="viewport" content="width=device-width">
     <meta name="description" content="Informationen zum Stadtteil Heimfeld und seinem Stadtteilbeirat">
     <meta name="keywords" content="Heimfeld, Stadtteil, Stadtteilbeirat, Beirat, Stadtteilfest, Treffpunkthaus">
-    <title>Herzlich Willkommen</title>
-    <link rel="shortcut icon" type="image/x-icon"
-      href="/img/Kraniche-dreh-klein.gif">
-    <!-- > icons/favicon.ico"> < -->
+    <title>Stadtteilbeirat Heimfeld</title>
+    <link rel="shortcut icon" type="image/x-icon" href="/img/Kraniche-dreh-klein.gif">
     <style>
-body {
-        background: url("img/Kraniche-oval-4a.png");
-        background-position: center center;
-        background-repeat: no-repeat  ;
-        background-blend-mode: multiply;
-        background-size: auto, auto 125px ;
-        background-color: #77cc77;
-        text-align: center;
-        color: #ff0000;
+    body {
+      font-family: sans-serif;
+      background-color: #77cc77;
+      text-align: center;
+      color: #ff0000;
     }
-</style>
+    body::before {
+      content: '';
+      position: fixed;
+      background-image: url("img/Kraniche-oval-4a.png");
+      top: calc(615px/2 + 2em);
+      left: 50%;
+      transform: translate(-50%, -50%);
+      width: 465px;
+      height: 615px;
+      background-size: contain;
+      background-repeat: no-repeat;
+      mix-blend-mode: multiply;
+      pointer-events: none;
+      z-index: -1;
+    }
+    </style>
   </head>
   <body>
     <p>
@@ -33,10 +42,12 @@ body {
                 cellpadding="6" border="1" height="100%">
                 <tbody>
                   <tr>
-                    <td bgcolor="99ee99" valign="top" height="25%"><font
-                        size="+2"><b><font color="#ffffff">Stadtteilbeirat
-                            Heimfeld<br>
-                          </font></b></font>
+                    <th bgcolor="#ffcc00" align="center" valign="top" height="25">
+                      <font size="+2">Stadtteilbeirat Heimfeld</font>
+                    </th>
+                  </tr>
+                  <tr>
+                    <td bgcolor="99ee99" valign="top" height="25%">
                       <div align="center"><font color="#330033">Tel:
                           (040) 300 924 94</font><br>
                         <font color="#330033">Di 10 - 12h &amp; Do 14 -
@@ -46,7 +57,8 @@ body {
                           <br>
                           Nächste Sitzung<br>
                           <b><font size="+2" color="#ff0000">19. November 2025 18:30Uhr</font></b></font><br>
-                          Treffpunkthaus Heimfeld
+                          Treffpunkthaus Heimfeld<br>
+                          <a href="https://www.openstreetmap.org/node/6549438363" target="_blank">Friedrich-Naumann-Straße 9, 21075 Hamburg</a>
                         </font>
                       </div>
                     </td>
@@ -71,17 +83,16 @@ body {
               <br>
             </td>
             <td align="center" width="50%" valign="middle">
-              <p> <font color="#ff9900"><b><font size="6" face="Arial,
-                      Helvetica, Sans Serif">H<font size="5">ERZLICH</font>
-                      W<font size="5">ILLKOMMEN</font></font></b></font>
+              <p>
+                <font size="6" style="color: #ff9900; font-weight: bold; font-variant-caps: small-caps;">Herzlich Willkommen</font>
                 <br>
                 <br>
-                <font size="4" face="Arial, Helvetica, Sans Serif"><font
-                    color="#ffff00">Dies ist die Website<br>
-                    für den Hamburger Stadtteil</font> <font size="6"
-                    color="white">Heimfeld</font> <font color="#ffff00">und
-                    angrenzende Bereiche
-                    </font></font>
+                <font size="4" color="#ffff00">
+                  Dies ist die Website<br>
+                  für den Hamburger Stadtteil</font>
+                  <font size="6" color="white">Heimfeld</font>
+                  <font color="#ffff00">und angrenzende Bereiche
+                </font>
               </p>
             </td>
             <td width="25%" valign="top">
@@ -89,8 +100,8 @@ body {
                 border="1" height="100%">
                 <tbody>
                   <tr>
-                    <th bgcolor="#ffcc00" align="center" valign="top"
-                      height="25"><font size="+2">Aktuelles / Termine</font><br>
+                    <th bgcolor="#ffcc00" align="center" valign="top" height="25">
+                      <font size="+2">Aktuelles / Termine</font>
                     </th>
                   </tr>
                   <tr>
@@ -114,7 +125,8 @@ body {
                             <font color="#6600cc">
                               <a href="https://www.cafe-rennkoppel.de">Café Rennkoppel</a><br>
                               Wir sind da!<br>
-                              Wir haben Mo. - Fr. 9:30 - 18:00 Uhr geöffnet.
+                              Wir haben Mo. - Fr. 9:30 - 18:00 Uhr geöffnet.<br>
+                              <a href="https://www.openstreetmap.org/node/6374378143" target="_blank">An der Rennkoppel 3, 21075 Hamburg</a>
                             </font>
                           </td>
                         </tr>
@@ -145,14 +157,14 @@ body {
             </td>
             <td align="center" width="11%" valign="middle"><br>
             </td>
-            <td <font="" face="Arial, Helvetica, Sans Serif" size="3"
-              align="center" width="11%" valign="middle"><a
-                href="impressum.html">Impressum</a></td>
+            <td <font size="3" align="center" width="11%" valign="middle">
+                <a href="impressum.html">Impressum</a>
+            </td>
             <td align="center" width="11%" valign="middle"><br>
             </td>
-            <td align="center" width="11%" valign="middle"><font
-                size="3" face="Arial, Helvetica, Sans Serif"><a
-                  href="datenschutz.html">Datenschutz</a></font></td>
+            <td align="center" width="11%" valign="middle">
+              <font size="3"><a href="datenschutz.html">Datenschutz</a></font>
+            </td>
             <td align="center" width="11%" valign="middle"><br>
             </td>
             <td align="center" width="11%" valign="middle"><br>
author	Valentin <valentin@fricklerhandwerk.de>	2025-11-04 16:31:23 +0100
committer	Valentin <valentin@fricklerhandwerk.de>	2025-11-06 16:46:28 +0100
commit	defc2a4ecbc28feabb88d28cf18aedd121697988 (patch)
tree	57e6d8887611af39b9a8090a271a13f2140b735b /www
parent	9212d8028bb0410c81d72b34c013b38d5e3f563b (diff)
parent	90607c6604b1f46dabe1a68b4289f25d3d689453 (diff)