convert signature subpage to a .md-based page

lektura
max.mehl 2017-08-29 16:04:12 +02:00
parent 8d9b43e5c8
commit 6d8b4e48bb
11 changed files with 68 additions and 86 deletions

View File

@ -84,15 +84,15 @@ DefaultContentLanguage = "en"
# Action section
[params.action]
headline = "Tell Your Representatives!"
subheadline = "Public Money? Public Code!"
description = "More than XY organisations support this call for action. Help us to make an impact by signing our open letter. We will hand over all signatures to representatives all over Europe that are debating software freedom in public administration."
subheadline = "We demand: **„Implement legislation requiring that, as a default setting, publicly financed software must be made publicly available under a Free Software licence.“**"
description = "More than XY organisations support this call for action by signing our [open letter](/openletter). Help us to make an impact by signing it, too! We will hand over all signatures to representatives all over Europe that are debating software freedom in public administration."
formName = "Name (required)"
formEmail = "Email (required)"
formCountry = "Country"
formZip = "ZIP Code"
formPermissionPriv = "I have read and accepted the [privacy statement](/privacy)"
formPermissionNews = "I want to stay informed about the future of this campaign"
formPermissionPub = "I want my signature to appear in the [list of signatures](/signatures)"
formPermissionPub = "I want my signature to appear in the [list of signatures](/openletter#signatures)"
formSubmit = "Sign"
# Spread the word section
@ -115,14 +115,6 @@ DefaultContentLanguage = "en"
# Subpages
[params.subpage]
# Signatures Subpage
[params.subpage.signatures]
headline = "Signatures"
id = "ID"
name = "Name"
country = "Country"
zip = "ZIP Code"
# 404 Error Page
[params.error]

View File

@ -0,0 +1,35 @@
---
title: Open Letter
type: page
layout: subpage
sigtable: true
tableZip: Zip Code
tableName: Name
tableCountry: Country
---
Publicly funded software has to be Free Software. While there are plenty of good reasons for that, many politicians don't know about the importance of software yet.
That's where you can help! Sign the open letter to give our message more weight. We will hand over the letter and signatures to your representatives and make sure that they understand: Public Money? Public Code!
> ## Public Money? Public Code!
>
> Digital services offered and used by our public administrations are the critical infrastructure of 21st century democratic nations. In order to establish trustworthy systems, public bodies must ensure they have full control over the software and the computer systems at the core of our state digital infrastructure. However, right now, this is rarely the case due to restrictive software licences that:
>
> * Forbid sharing and exchanging publicly funded code. This prevents cooperation between public administrations and hinders further development.
> * Support monopolies by hindering competition. As a result, many administrations become dependent on a handful of companies.
> * Pose a threat to the security of our digital infrastructure by forbidding access to the source code. This makes fixing backdoors and security holes extremely difficult, if not completely impossible.
>
> We need software that fosters the sharing of good ideas and solutions. Like this we will be able to improve IT services for people all over Europe. We need software that guarantees freedom of choice, access, and competition. We need software that helps public administrations regain full control of their critical digital infrastructure, allowing them to become and remain independent from a handful of companies. That is why we call our representatives to support Free and Open Source Software in public administrations, because:
>
> * Free and Open Source Software is a modern public good that allows everybody to freely use, study, share and improve applications we use on a daily basis.
> * Free and Open Source Software licences provide safeguards against being locked down to services from specific companies that use restrictive licences to hinder competition.
> * Free and Open Source Software ensures that the source code is accessible so that backdoors and security holes can be fixed without depending on one service provider.
>
> Public bodies are financed through taxes. They must make sure they spend funds in the most efficient way possible. If it is public money, it should be public code as well!
>
> That is why we, the undersigned, call our representatives to:
>
> **"Implement legislation requiring that publicly financed software developed for public sector must be made publicly available under a Free and Open Source Software licence."**
Following people have signed the letter already and agreed to have their signature be public. Will you be the next?

View File

@ -1,19 +0,0 @@
<!DOCTYPE html>
<html lang="{{ with .Site.LanguageCode }}{{ . }}{{ else }}en-US{{ end }}">
<head>
{{ partial "head.html" . }}
</head>
<body id="page-top">
{{ partial "page-nav.html" . }}
{{ partial "page-signatures.html" . }}
{{ partial "language.html" . }}
{{ partial "legal.html" . }}
{{ partial "sharecolumn.html" . }}
{{ partial "js.html" . }}
</body>
</html>

View File

@ -1,19 +0,0 @@
<!DOCTYPE html>
<html lang="{{ with .Site.LanguageCode }}{{ . }}{{ else }}en-US{{ end }}">
<head>
{{ partial "head.html" . }}
</head>
<body id="page-top">
{{ partial "page-nav.html" . }}
{{ partial "page-signatures.html" . }}
{{ partial "language.html" . }}
{{ partial "legal.html" . }}
{{ partial "sharecolumn.html" . }}
{{ partial "js.html" . }}
</body>
</html>

View File

@ -4,7 +4,7 @@
{{ partial "head.html" . }}
</head>
<body id="page-top">
{{ partial "page-nav.html" . }}
{{ partial "subpage_navbar.html" . }}
{{ partial "page-template.html" . }}

View File

@ -4,7 +4,7 @@
{{ partial "head.html" . }}
</head>
<body id="page-top">
{{ partial "page-nav.html" . }}
{{ partial "subpage_navbar.html" . }}
{{ partial "subpage_before.html" . }}
@ -14,6 +14,10 @@
{{ .Content }}
{{ if eq .Params.sigtable true }}
{{ partial "subpage_sigtable.html" . }}
{{ end }}
{{ partial "subpage_after.html" . }}
{{ partial "language.html" . }}

View File

@ -5,8 +5,8 @@
<div class="col-lg-8 col-lg-offset-2 text-center">
<h2 class="section-heading">{{ .Site.Params.action.headline }}</h2>
<hr class="light">
<p><strong>{{ .Site.Params.action.subheadline}}</strong> <br />
{{ .Site.Params.action.description | markdownify }}</p>
<p>{{ .Site.Params.action.subheadline | markdownify }}</p>
<p>{{ .Site.Params.action.description | markdownify }}</p>
<form action="/sign" method="post">
<label class="sign-input form-na">

View File

@ -1,31 +0,0 @@
{{ "<!-- SUBPAGE SIGNATURES -->" | safeHTML }}
<header>
<div class="header-content">
<div class="header-content-inner">
<div class="col-lg-8 col-lg-offset-2 text-center">
<h1>{{ .Site.Params.Subpage.Signatures.Headline }}</h1>
<hr />
<table class="signatures">
<tbody>
<tr>
<th>{{ .Site.Params.Subpage.Signatures.name }}</th>
<th>{{ .Site.Params.Subpage.Signatures.country }}</th>
<th>{{ .Site.Params.Subpage.Signatures.zip }}</th>
</tr>
{{ range .Site.Data.signatures.data }}
{{ range sort . "id" "desc" }}
{{ if (eq .confirmed "yes") | and (eq .permPub "yes") }}
<tr>
<td>{{ .name }}</td>
<td>{{ .country }}</td>
<td>{{ .zip }}</td>
</tr>
{{ end }}
{{ end }}
{{ end }}
</tbody>
</table>
</div>
</div>
</div>
</header>

View File

@ -0,0 +1,20 @@
<table id="signatures">
<tbody>
<tr>
<th>{{ .Params.tableName }}</th>
<th>{{ .Params.tableCountry }}</th>
<th>{{ .Params.tableZip }}</th>
</tr>
{{ range .Site.Data.signatures.data }}
{{ range sort . "id" "desc" }}
{{ if (eq .confirmed "yes") | and (eq .permPub "yes") }}
<tr>
<td>{{ .name }}</td>
<td>{{ .country }}</td>
<td>{{ .zip }}</td>
</tr>
{{ end }}
{{ end }}
{{ end }}
</tbody>
</table>

View File

@ -108,10 +108,10 @@ p.form-pe a {
}
/* SIGNATURE TABLE */
table.signatures {
table#signatures {
margin: 0 auto;
}
table.signatures th, table.signatures td {
table#signatures th, table#signatures td {
border: 1px solid darkgrey;
border-collapse: collapse;
text-align: left;