Merge pull request #5 from AKVorrat/updates-for-release

Updated website for opne source release
AKVorrat · Dec 17, 2024 · bf9e0be · bf9e0be
2 parents 499621c + 38b8de4
commit bf9e0be
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 43 deletions.
diff --git a/assets/scss/layouts/_footer.scss b/assets/scss/layouts/_footer.scss
@@ -24,3 +24,10 @@
     font-size: $font-size-base;
   }
 }
+
+.github-button {
+  position: sticky;
+  bottom: 1.5rem;
+  left: 0;
+  right: 0;
+}
diff --git a/assets/scss/layouts/_header.scss b/assets/scss/layouts/_header.scss
@@ -2,6 +2,11 @@
   @extend .nav-item;
 }
 
+.nav li {
+  margin-top: 0.5rem;
+  margin-bottom: 0.5rem;
+}
+
 .banner .nav a {
   @extend .nav-link;
 }

diff --git a/config/_default/menus.toml b/config/_default/menus.toml
@@ -4,6 +4,12 @@ pre = '<i class="fas fa-fw fa-at"></i>'
 url = "mailto:[email protected]"
 weight = 10
 
+[[main]]
+name = "Documentation"
+url = "https://github.com/AKVorrat/dearmep?tab=readme-ov-file#-documentation"
+target = "_blank"
+weight = 60
+
 
 [[footer]]
 name = "Legal notice"

diff --git a/config/_default/params.toml b/config/_default/params.toml
@@ -53,6 +53,8 @@ footer = "Copyright (c) epicenter.works <a href=\"https://creativecommons.org/li
 # Feed
 copyRight = "Copyright (c) epicenter.works <a href=\"https://creativecommons.org/licenses/by/4.0/\">CC-by 4.0</a>"
 
+githubURL = "https://github.com/AKVorrat/dearmep"
+
 # Edit Page
 # repoHost [Github | Gitea | GitLab | Bitbucket | BitbucketServer ] is used for building the edit link based on git hoster
 

diff --git a/content/_index.md b/content/_index.md
@@ -30,7 +30,7 @@ Many important decisions are taken in Europe. Yet, Brussels and Strasbourg often
       {{< img src="screen-1.png" >}}
     {{< /bs-col >}}
     {{% bs-col %}}
-Citizens can call once or schedule daily or weekly calls. E-mail or social media communication is also an option to reach out directly to politicians. When a campaign uses DearMEP, it provides information about every politician and their respective position on the issue. We suggest to base the politician’s position on previous voting behavior. For every user, our tool selects the corresponding politician from the country where the user lives and who has the highest likelihood to be convinced at this moment. In any debate, we always focus on the movable middle and do not connect citizens to politicians who have already made up their mind. The system also learns from user feedback how the position of politicians might have changed due to the interactions with citizens. This helps maximize the success and impact of subsequent contact attempts from citizens.
+Citizens can call once or schedule daily or weekly calls. E-mail or social media communication is also an option to reach out directly to politicians. When a campaign uses DearMEP, it provides information about every politician and their respective position on the issue. We suggest basing the politician’s position on previous voting behavior. For every user, our tool selects the corresponding politician from the country where the user lives and who has the highest likelihood to be convinced at this moment. In any debate, we always focus on the movable middle and do not connect citizens to politicians who have already made up their mind. The system also learns from user feedback how the position of politicians might have changed due to the interactions with citizens. This helps maximize the success and impact of subsequent contact attempts from citizens.
 
 <div align="center">{{< btn href="/team" color="primary" >}}Learn more about us{{< /btn >}}</div>
     {{% /bs-col %}}
@@ -43,7 +43,8 @@ Citizens can call once or schedule daily or weekly calls. E-mail or social media
       {{< img src="screen-2.png" >}}
     {{< /bs-col >}}
     {{% bs-col order="md-1" %}}
-The DearMEP tool is reusable for other campaigns in the European Parliament. After Chat Control (Regulation to prevent and combat child sexual abuse online 2022/0155 (COD)) will have been concluded, this tool will be released as free software. NGOs can use it with minimum effort to run their own campaigns. We believe access to the Parliament and to decision makers should be equally available to all people in a democracy. The tools are therefore designed and built to also allow for reuse in other contexts (national parliaments, governments, other assemblies, etc.) with only slight adaptions. The cost of phone calls have to be covered by whoever operates the tool, but these costs are scalable, since they are proportionate to the amount of users actively engaging in the campaign. As this is free software, we do not charge for operating this tool. There is no license fee and we haven’t received any grant or corporate money for developing it either.
+
+The DearMEP tool is available as free software on GitHub and can be reused for other campaigns in the European Parliament. NGOs and other organizations can adopt the tool with minimum effort to run their own campaigns. We believe access to the Parliament and to decision makers should be equally available to all people in a democracy. Therefore, the tool is designed to be reusable in various contexts, such as national parliaments, governments, and other assemblies, with only slight adaptations. While the cost of phone calls must be covered by the operator of the tool, these costs are scalable and directly proportionate to the number of users actively participating. As free software, there are no license fees, and we have not received any grants or corporate funding for its development.
 
 <!-- <div align="center">{{< btn href="/imprint" color="primary" >}}You can use this tool now for stopping the EU from scanning your private messages{{< /btn >}}</div> -->
     {{% /bs-col %}}
@@ -58,7 +59,7 @@ The DearMEP tool is reusable for other campaigns in the European Parliament. Aft
     {{% bs-col %}}
 As a European data protection NGO we take privacy very seriously. We tried to reduce the processing of personal information to a minimum and therefore follow privacy-by-design and privacy-by-default wherever possible.
 
-We adhere to EU law and have built DearMEP fully GDPR-compliant. You can learn more about how we handle personal information in the privacy policy in any of the tool’s instances and in this policy template which describes abstractly how we’ve built the software<link to privacy policy>. The phone calls are operated by the European company [46Elks](https://46elks.com/). Their data protection policy applies to how they handle the calls. We don’t receive any information about the users’ phone calls with the politicians.
+We adhere to EU law and have built DearMEP fully GDPR-compliant. You can learn more about how we handle personal information in the [relevant docs](https://github.com/AKVorrat/dearmep/blob/main/doc/data-protection.md), the privacy policy in any of the tool’s instances and in this [policy template](https://github.com/AKVorrat/dearmep/tree/main/server/example-markdown/docs/privacy) which describes abstractly how we’ve built the software. The phone calls are operated by the European company [46Elks](https://46elks.com/). Their data protection policy applies to how they handle the calls. We don’t receive any information about the users’ phone calls with the politicians.
 
 <!-- <div align="center">{{< btn href="/privacy" color="primary" >}}Privacy Policy{{< /btn >}}</div> -->
     {{< /bs-col >}}

diff --git a/content/showcase/chatcontrol/index.md b/content/showcase/chatcontrol/index.md
@@ -44,7 +44,7 @@ Integrate the campaign in your Website
   host="https://chatcontrol.dearmep.eu/"
   default-country="DE"
 ></dear-mep>
-<script src="https://chatcontrol.dearmep.eu/static/dear-mep.js"></script>
+<script src="https://chatcontrol.dearmep.eu/static/dear-mep.js" async></script>
 ```
 
 <link rel="stylesheet" href="https://chatcontrol.dearmep.eu/static/dear-mep.css" type="text/css"/>

diff --git a/content/team/index.md b/content/team/index.md
@@ -8,7 +8,7 @@ menu:
 This is a project of the digital rights NGO epicenter.works. We have a [history](https://en.epicenter.works/history) of novel campaigning tools. In 2013 we launched [www.savetheinternet.eu](https://www.savetheinternet.eu) and sent faxes to the printers of Members of the European Parliament in order to convince the EU to adopt [strong Net Neutrality legsilation](https://www.wsj.com/articles/eu-takes-strict-stance-on-net-neutrality-1472577087). In 2019, we launched the [www.pledge2019.eu](https://www.pledge2019.eu) campaign against uploadfilters in the EU Copyright Directive which connected citizens via telephone to their elected representatives. In 2022 the Chat Control proposal prompted us to reactivate this idea and rewrite the tool from scatch. This "Chat Control" proposal <a href="https://www.euractiv.com/section/law-enforcement/news/eu-parliament-study-slams-online-child-abuse-material-proposal/">undermines privacy, encryption and does irreparable harm to our online world</a>.
 
 A huge thanks goes out to our team:
-- Backend developer: [Tim Weber](https://scy.name/) (team management), [Eru (Jan Cullmann)](https://i3o.eu), [Philipp](https://github.com/phaabe) and Jörn Bethune 
+- Backend developer: [Tim Weber](https://scy.name/) (team management), [Eru (Jan Cullmann)](https://i3o.eu), [Philipp](https://github.com/phaabe) and Jörn Bethune
 - UI/UX design: [Isabella Horn](https://isabellahorn.com/)
 - Frontend developer: [Tobias Mühlberger](https://muehlberger.dev)
 - Administration and DevOps, [Dominik Polakovics](https://cloonar.com)
@@ -17,6 +17,6 @@ A huge thanks goes out to our team:
 - Policy Advice on the "Chat Control" proposal, Elina "Khaleesi" Eickstädt
 - Guy with the crazy idea aka. Product Owner & Advice on EU policymaking, [Thomas Lohninger](epicenter.works/team)
 
-Those developers might be available to help other NGOs to implement DearMEP for their own campaign, but any developer should be able to do so with the free and open source code we will make available on Github once the Chat Control proposal is decided.
+Those developers might be available to help other NGOs to implement DearMEP for their own campaign, but any developer should be able to do so with the free and open source code made available on [GitHub](https://github.com/AKVorrat/dearmep).
 
 The DearMEP project was funded out of epicenter.works’ core. We didn’t ask anyone for permission to develop this tool. We trust the community will determine its value and allow us to continue what we do. As a non-profit we live of [donations](https://spenden.epicenter.works) and our [supporting members](https://support.epicenter.works).
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -1,31 +1,31 @@
 <!doctype html>
-<html lang="{{ .Site.Params.LanguageIso | default "en" }}">
-  {{ partial "head/head.html" . }}
-  {{ if eq .Kind "home" -}}
-    {{ .Scratch.Set "class" "home" -}}
-  {{ else if eq .Kind "404" -}}
-    {{ .Scratch.Set "class" "error404" -}}
-  {{ else if eq .Kind "page" -}}
-    {{ .Scratch.Set "class" .Type -}}
-    {{ .Scratch.Add "class" " single" -}}
-  {{ else -}}
-    {{ .Scratch.Set "class" .Type -}}
-    {{ .Scratch.Add "class" " list" -}}
-  {{ end -}}
-  <body class="{{ .Scratch.Get "class" }}">
-    {{ partial "header/header.html" . }}
-    <div
-      class="container-{{ if or (.Site.Params.options.fullWidth) (.Params.fullWidth) (.Params.options.fullWidth) }}fluid wrap{{ else }}xxl{{ end }}"
-      {{ if (default false $.Page.Params.transparentHeader) }}style="margin-top: -69px;"{{ end }}
-      role="document"
-    >
-      <div class="content">
-        {{- block "main" . -}}{{- end -}}
-      </div>
+<html lang="{{ .Site.Params.LanguageIso | default " en" }}">
+{{ partial "head/head.html" . }}
+{{ if eq .Kind "home" -}}
+{{ .Scratch.Set "class" "home" -}}
+{{ else if eq .Kind "404" -}}
+{{ .Scratch.Set "class" "error404" -}}
+{{ else if eq .Kind "page" -}}
+{{ .Scratch.Set "class" .Type -}}
+{{ .Scratch.Add "class" " single" -}}
+{{ else -}}
+{{ .Scratch.Set "class" .Type -}}
+{{ .Scratch.Add "class" " list" -}}
+{{ end -}}
+
+<body class="{{ .Scratch.Get " class" }}">
+  {{ partial "header/header.html" . }}
+  <div
+    class="container-{{ if or (.Site.Params.options.fullWidth) (.Params.fullWidth) (.Params.options.fullWidth) }}fluid wrap{{ else }}xxl{{ end }}"
+    {{ if (default false $.Page.Params.transparentHeader) }}style="margin-top: -69px;" {{ end }} role="document">
+    <div class="content pb-4">
+      {{- block "main" . -}}{{- end -}}
     </div>
-    {{ block "sidebar-prefooter" . }}{{ end }}
-    {{ block "sidebar-footer" . }}{{ end }}
-    {{ partial "footer/footer.html" . }}
-    {{ partial "footer/script-footer.html" . }}
-  </body>
-</html>
+  </div>
+  {{ block "sidebar-prefooter" . }}{{ end }}
+  {{ block "sidebar-footer" . }}{{ end }}
+  {{ partial "footer/footer.html" . }}
+  {{ partial "footer/script-footer.html" . }}
+</body>
+
+</html>
diff --git a/layouts/partials/footer/footer.html b/layouts/partials/footer/footer.html
@@ -1,3 +1,5 @@
+{{ partial "footer/github-button.html" . }}
+
 <footer class="footer text-muted">
   <div class="container-{{ if .Site.Params.options.fullWidth }}fluid{{ else }}xxl{{ end }}">
     <div class="row">
@@ -9,14 +11,14 @@
       <div class="col-lg-6 order-first order-lg-last text-lg-end">
         <ul class="list-inline">
           {{ range .Site.Menus.footer -}}
-              {{ if eq (hasPrefix .URL "http") true }}
-                <li class="list-inline-item"><a href="{{ .URL | relURL }}" target="_blank">{{ .Name }}</a></li>
-              {{ else }}
-                <li class="list-inline-item"><a href="{{ .URL | relURL }}">{{ .Name }}</a></li>
-              {{ end }}
+          {{ if eq (hasPrefix .URL "http") true }}
+          <li class="list-inline-item"><a href="{{ .URL | relURL }}" target="_blank">{{ .Name }}</a></li>
+          {{ else }}
+          <li class="list-inline-item"><a href="{{ .URL | relURL }}">{{ .Name }}</a></li>
+          {{ end }}
           {{ end -}}
         </ul>
       </div>
     </div>
   </div>
-</footer>
+</footer>
diff --git a/layouts/partials/footer/github-button.html b/layouts/partials/footer/github-button.html
@@ -0,0 +1,4 @@
+<a href="{{ .Site.Params.githubURL | safeURL }}" target="_blank" class="btn btn-primary mb-4 mx-4 btn-lg github-button">
+  <i class="fa-brands fa-github"></i>
+  GitHub
+</a>
diff --git a/layouts/sitemapindex.xml b/layouts/sitemapindex.xml
@@ -3,8 +3,8 @@
 {{ range . }}
   <sitemap>
     <loc>{{ .SitemapAbsURL }}</loc>
-    {{ if not .LastChange.IsZero }}
-      <lastmod>{{ .LastChange.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</lastmod>
+    {{ if not .Lastmod.IsZero }}
+      <lastmod>{{ .Lastmod.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</lastmod>
     {{ end }}
   </sitemap>
 {{ end }}