Merge branch 'feature/count-signatures' of pmpc/website into master

lektura
Max Mehl 2017-08-31 16:15:03 +02:00 committed by Gogs
commit c3b24b99e2
6 changed files with 12 additions and 3 deletions

View File

@ -76,7 +76,7 @@ DefaultContentLanguage = "en"
[params.action]
headline = "Tell Your Representatives!"
subheadline = "We demand: **„Implement legislation requiring that, as a default setting, publicly financed software must be made publicly available under a [Free Software](https://fsfe.org/freesoftware/basics/summary.html 'Free Software gives everybody the rights to use, study, share and improve software. These rights help support other fundamental freedoms like freedom of speech, press and privacy.') 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."
description = "**$ORGS organisations** and **$INDS individuals** 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 = "Your Country"

View File

@ -12,7 +12,7 @@ Publicly funded software has to be [Free Software][fs]. While there are plenty o
{{< fsdefinition type="box">}}
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!
That's where you can help! Sign the open letter to give our message more weight, like **{{< count type="signatures" >}} people** and **{{< count type="organisations" >}} organisations** before you did. 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!
>

View File

@ -6,7 +6,7 @@
<h2 class="section-heading">{{ .Site.Params.action.headline }}</h2>
<hr class="light">
<p>{{ .Site.Params.action.subheadline | markdownify }}</p>
<p>{{ .Site.Params.action.description | markdownify }}</p>
<p>{{ (replace (replace .Site.Params.action.description "$ORGS" (partial "functions/count_organisations.html" .) ) "$INDS" (partial "functions/count_signatures.html" .)) | markdownify }}</p>
<form action="/sign" method="post">
<label class="sign-input form-na">

View File

@ -0,0 +1,2 @@
{{ $json := getJSON "data/signees/signees.json" }}
{{- len $json -}}

View File

@ -0,0 +1,2 @@
{{ $json := getJSON "data/signatures/data/signatures_clean.json" }}
{{- len $json -}}

View File

@ -0,0 +1,5 @@
{{ if eq (.Get "type") "organisations" }}
{{ partial "functions/count_organisations.html" . }}
{{ else if eq (.Get "type") "signatures" }}
{{ partial "functions/count_signatures.html" . }}
{{ end }}