Merge pull request 'Kontaktformular angepasst' (#22) from devel into master

Reviewed-on: #22

.woodpecker.yml

@@ -1,34 +1,31 @@
 ---
 platform: linux/arm64
 
-kind: pipeline
-name: website build
+pipeline:
+  docker:
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      platforms: linux/amd64
+      registry: git.freifunk-rhein-sieg.net
+      repo: git.freifunk-rhein-sieg.net/freifunk-rhein-sieg/freifunk-rhein-sieg.net
+      username:
+        from_secret: gitea_user
+      password:
+        from_secret: gitea_token
+      tags: latest
+    when:
+      - branch: master
 
-steps:
-- name: docker  
-  image: woodpeckerci/plugin-docker-buildx
-  settings:
-    platforms: linux/amd64
-    registry: git.freifunk-rhein-sieg.net
-    repo: git.freifunk-rhein-sieg.net/freifunk-rhein-sieg/freifunk-rhein-sieg.net
-    username:
-      from_secret: gitea_user
-    password:
-      from_secret: gitea_token
-    tags: latest
-  when:
-    - branch: master
-
-- name: docker-devel  
-  image: woodpeckerci/plugin-docker-buildx
-  settings:
-    platforms: linux/amd64
-    registry: git.freifunk-rhein-sieg.net
-    repo: git.freifunk-rhein-sieg.net/freifunk-rhein-sieg/freifunk-rhein-sieg.net
-    username:
-      from_secret: gitea_user
-    password:
-      from_secret: gitea_token
-    tags: devel
-  when:
-    - branch: devel
+  docker-devel:
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      platforms: linux/amd64
+      registry: git.freifunk-rhein-sieg.net
+      repo: git.freifunk-rhein-sieg.net/freifunk-rhein-sieg/freifunk-rhein-sieg.net
+      username:
+        from_secret: gitea_user
+      password:
+        from_secret: gitea_token
+      tags: devel
+    when:
+      - branch: devel

content/kontakt.md

@@ -8,7 +8,20 @@ draft: false
 
 ## per E-Mail im Ticket Sytem
 
-E-Mail/Ticket: [Ticket System](https://tickets.freifunk-rhein-sieg.net/open.php)
+<button id="zammad-feedback-form">Feedback</button>
+
+<script id="zammad_form_script" src="https://support.freifunk-rhein-sieg.net/assets/form/form.js"></script>
+
+<script>
+$(function() {
+  $('#zammad-feedback-form').ZammadForm({
+    messageTitle: 'Feedback-Formular',
+    messageSubmit: 'Übermitteln',
+    messageThankYou: 'Vielen Dank für Ihre Anfrage (#%s). Wir melden uns umgehend.',
+    modal: true
+  });
+});
+</script>
 
 ## Community Treffen
 

content/ueber_uns.md

@@ -2,6 +2,7 @@
 title: "Über uns"
 date: 2019-03-09T20:16:47+01:00
 url: /
+permalink: "/ueber_uns/"
 draft: false
 ---
 

themes/hugo_ff_theme/layouts/index.html

@@ -1,5 +1,8 @@
-{{ define "main" }}
-
-
-
+{{ range .Site.RegularPages }}
+    {{ if eq .RelPermalink "/ueber_uns/" }}
+        <h1>{{ .Title }}</h1>
+        <div>
+            {{ .Content }}
+        </div>
+    {{ end }}
 {{ end }}

themes/hugo_ff_theme/layouts/partials/footer.html

@@ -1,5 +1,5 @@
 
-<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
+<script src="https://code.jquery.com/jquery-3.6.0.min.js" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
 <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>