From 2ddc599ce1ac57bd370b6f52f488f8d5de99c612 Mon Sep 17 00:00:00 2001
From: Laurens <wisdomchicken@pm.me>
Date: Wed, 8 May 2024 15:44:32 +0200
Subject: [PATCH] contactpage update

---
 assets/scss/custom.scss   |  7 +++
 hugo_stats.json           |  1 +
 layouts/contact/list.html | 90 +++++++++------------------------------
 layouts/events/list.html  |  9 ++--
 public/contact/index.html | 61 ++++++++++++++++++++++----
 public/css/style.css      |  6 +++
 public/events/index.html  | 13 +++---
 7 files changed, 101 insertions(+), 86 deletions(-)

diff --git a/assets/scss/custom.scss b/assets/scss/custom.scss
index 45785653..fe704eb2 100755
--- a/assets/scss/custom.scss
+++ b/assets/scss/custom.scss
@@ -102,4 +102,11 @@
     justify-content: center;
 
     
+  }
+
+  .hr-list2 {
+    border: 20;
+    border-top: 1px solid #FF6E00;
+    margin-top: 5px;
+    margin-bottom: 5px;
   }
\ No newline at end of file
diff --git a/hugo_stats.json b/hugo_stats.json
index 0eacc3e8..fe539ee0 100644
--- a/hugo_stats.json
+++ b/hugo_stats.json
@@ -101,6 +101,7 @@
       "header-with-image",
       "hidden",
       "hr-list",
+      "hr-list2",
       "img",
       "inlin-block",
       "inline-block",
diff --git a/layouts/contact/list.html b/layouts/contact/list.html
index 6973cc6c..f7c67ea3 100755
--- a/layouts/contact/list.html
+++ b/layouts/contact/list.html
@@ -1,5 +1,18 @@
 {{ define "main" }} {{ partial "page-header" . }}
 
+
+<section class="section-sm">
+  <div class="container">
+    <div class="row justify-center">
+      <div class="lg:col-10">
+        <div class="content">{{ .Content }}</div>
+      </div>
+    </div>
+  </div>
+</section>
+
+
+
 <section class="section-sm">
   <div class="container">
     <div class="row">
@@ -7,37 +20,37 @@
         <form action="{{ site.Params.contact_form_action }}" method="POST">
           <div class="mb-6">
             <label for="name" class="form-label">
-              Full Name <span class="text-red-500">*</span>
+              Name <span class="text-red-500">*</span>
             </label>
             <input
               id="name"
               name="name"
               class="form-input"
-              placeholder="John Doe"
+              placeholder=""
               type="text"
             />
           </div>
           <div class="mb-6">
             <label for="email" class="form-label">
-              Working Mail <span class="text-red-500">*</span>
+              Email address <span class="text-red-500">*</span>
             </label>
             <input
               id="email"
               name="email"
               class="form-input"
-              placeholder="john.doe@email.com"
+              placeholder=""
               type="email"
             />
           </div>
           <div class="mb-6">
             <label for="message" class="form-label">
-              Anything else? <span class="text-red-500">*</span>
+              Send us a message! <span class="text-red-500">*</span>
             </label>
             <textarea
               id="message"
               name="message"
               class="form-input"
-              placeholder="Message goes here..."
+              placeholder=""
               rows="8"
             ></textarea>
           </div>
@@ -48,67 +61,4 @@
   </div>
 </section>
 
-<!-- google map -->
-{{ with site.Params.google_map }} {{ if .enable }}
-<div
-  id="map"
-  style="height: 400px"
-  data-latitude="{{ .map_latitude }}"
-  data-longitude="{{ .map_longitude }}"
-  data-marker="{{ .map_marker | relURL }}"
-  data-marker-name="{{ site.Title }}"
-></div>
-{{ end }} {{ end }} {{ with site.Params.subscription }} {{ if .enable }}
-<!-- subscription form -->
-<form
-  action="{{ .mailchimp_form_action | safeURL }}"
-  method="post"
-  id="mc-embedded-subscribe-form"
-  novalidate="novalidate"
->
-  <div class="input-group w-75 mx-auto mb-3">
-    <input
-      type="email"
-      name="EMAIL"
-      placeholder="Email"
-      class="form-control required email mce_inline_error"
-      id="mce-EMAIL"
-      aria-required="true"
-      autocomplete="off"
-      required
-    />
-    <button
-      class="input-group-text"
-      name="subscribe"
-      id="mc-embedded-subscribe"
-    >
-      {{ .button_label }}
-    </button>
-  </div>
-  <input type="hidden" name="EMAILTYPE" id="mce-EMAILTYPE-0" value="html" />
-  <div style="position: absolute; left: -5000px" aria-hidden="true">
-    <input type="text" name="{{ .name }}" tabindex="-1" />
-  </div>
-</form>
-<div id="mce-responses" class="clear">
-  <div
-    class="response text-white"
-    id="mce-error-response"
-    style="display: none"
-  ></div>
-  <div
-    class="response text-white"
-    id="mce-success-response"
-    style="display: none"
-  ></div>
-</div>
-<script
-  type="text/javascript"
-  src="//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js"
-></script>
-<!-- /subscription form -->
-{{ end }} {{ end }} {{ if site.Params.google_map.enable }} {{ $gmap:=
-resources.Get "plugins/maps/google-map.js" }}
-<script defer src="{{ $gmap.RelPermalink }}"></script>
-<script src="https://maps.googleapis.com/maps/api/js?key={{ site.Params.google_map.map_api_key }}&libraries=places"></script>
-{{ end }} {{ end }}
+{{ end }} 
\ No newline at end of file
diff --git a/layouts/events/list.html b/layouts/events/list.html
index 960c619d..fa290ad9 100644
--- a/layouts/events/list.html
+++ b/layouts/events/list.html
@@ -3,16 +3,19 @@
 <ul class="list">
   {{ if gt (len (where .Site.RegularPages "Section" "events")) 0 }}
   <section>
-    <h2>Upcoming Events</h2>
+    <div class="header-with-image">
+      <img src="/images/users.png" alt="Image">
+      <h4 class="mb-4">Events</h4>
+    </div>
     <ul class="list">
       {{ range (first 5 (where .Site.RegularPages "Section" "events").ByDate.Reverse) }}
       <li class="list-item">
         <div class="content">
-          <a class="link" href="{{ .RelPermalink }}">{{ .Title }}</a>
+          <a class="link" href="{{ .RelPermalink }}" style="color: #FF6E00">{{ .Title }}</a>
         </div>
         <hr class="hr-list">
         <time class="g time" datetime="{{ dateFormat "2006-01-02" .Date }}">{{ dateFormat "02-01-2006" .Date }}</time>
-
+        <hr class="hr-list2">
       </li>
       {{ end }}
     </ul>
diff --git a/public/contact/index.html b/public/contact/index.html
index b20f81a1..dae6517d 100644
--- a/public/contact/index.html
+++ b/public/contact/index.html
@@ -682,6 +682,52 @@
 </section>
 
 
+
+<section class="section-sm">
+  <div class="container">
+    <div class="row justify-center">
+      <div class="lg:col-10">
+        <div class="content"><p>Please feel free to reach out to us via email at the following addresses for any inquiries or assistance. We’re here to help and eager to hear from you!</p>
+<p>For generic questions about the Fediversity project:</p>
+<p><a href="mailto:contact@fediversity.eu"
+
+
+
+ 
+
+
+>contact@fediversity.eu</a>
+
+For questions about the administrative side of the Fediversity Project:</p>
+<p><a href="mailto:fediversity@nlnet.nl"
+
+
+
+ 
+
+
+>fediversity@nlnet.nl</a>
+
+If you have questions about the funding rounds that are part of the Fediversity project, you can find out more information on the NLnet website:</p>
+<p><a href="https://nlnet.nl/fediversity/guideforapplicants/"
+
+
+
+
+ target="_blank"
+ 
+
+
+>https://nlnet.nl/fediversity/guideforapplicants/</a>
+</p>
+</div>
+      </div>
+    </div>
+  </div>
+</section>
+
+
+
 <section class="section-sm">
   <div class="container">
     <div class="row">
@@ -689,37 +735,37 @@
         <form action="#" method="POST">
           <div class="mb-6">
             <label for="name" class="form-label">
-              Full Name <span class="text-red-500">*</span>
+              Name <span class="text-red-500">*</span>
             </label>
             <input
               id="name"
               name="name"
               class="form-input"
-              placeholder="John Doe"
+              placeholder=""
               type="text"
             />
           </div>
           <div class="mb-6">
             <label for="email" class="form-label">
-              Working Mail <span class="text-red-500">*</span>
+              Email address <span class="text-red-500">*</span>
             </label>
             <input
               id="email"
               name="email"
               class="form-input"
-              placeholder="john.doe@email.com"
+              placeholder=""
               type="email"
             />
           </div>
           <div class="mb-6">
             <label for="message" class="form-label">
-              Anything else? <span class="text-red-500">*</span>
+              Send us a message! <span class="text-red-500">*</span>
             </label>
             <textarea
               id="message"
               name="message"
               class="form-input"
-              placeholder="Message goes here..."
+              placeholder=""
               rows="8"
             ></textarea>
           </div>
@@ -730,8 +776,7 @@
   </div>
 </section>
 
-
-       </main>
+</main>
 
     
     <footer class="bg-theme-light">
diff --git a/public/css/style.css b/public/css/style.css
index 298a9f7c..1bd67e14 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -3023,6 +3023,12 @@ input#nav-toggle:checked ~ #nav-menu {
   display: flex;
   justify-content: center; }
 
+.hr-list2 {
+  border: 20;
+  border-top: 1px solid #FF6E00;
+  margin-top: 5px;
+  margin-bottom: 5px; }
+
 @media (min-width: 540px) {
 
   .sm\:col-10 {
diff --git a/public/events/index.html b/public/events/index.html
index fd845447..27f50f64 100644
--- a/public/events/index.html
+++ b/public/events/index.html
@@ -686,25 +686,28 @@
 <ul class="list">
   
   <section>
-    <h2>Upcoming Events</h2>
+    <div class="header-with-image">
+      <img src="/images/users.png" alt="Image">
+      <h4 class="mb-4">Events</h4>
+    </div>
     <ul class="list">
       
       <li class="list-item">
         <div class="content">
-          <a class="link" href="/events/waag-state-internet-2024/">State of the Internet 2024</a>
+          <a class="link" href="/events/waag-state-internet-2024/" style="color: #FF6E00">State of the Internet 2024</a>
         </div>
         <hr class="hr-list">
         <time class="g time" datetime="2024-04-02">02-04-2024</time>
-
+        <hr class="hr-list2">
       </li>
       
       <li class="list-item">
         <div class="content">
-          <a class="link" href="/events/waag-state-internet-2024-copy/">State of the Internet 2024</a>
+          <a class="link" href="/events/waag-state-internet-2024-copy/" style="color: #FF6E00">State of the Internet 2024</a>
         </div>
         <hr class="hr-list">
         <time class="g time" datetime="2024-04-02">02-04-2024</time>
-
+        <hr class="hr-list2">
       </li>
       
     </ul>