From 88ec9a5d68d53655fccf946a1a3a6788220dec0d Mon Sep 17 00:00:00 2001 From: "max.mehl" Date: Mon, 11 Sep 2017 20:28:49 +0200 Subject: [PATCH] increase visibility of open letter link by separating it from demand and some CSS markup --- site/languages/strings.XY.toml.sample | 7 ++++--- site/languages/strings.de.toml | 7 ++++--- site/languages/strings.en.toml | 7 ++++--- site/languages/strings.nl.toml | 12 +++++++----- site/layouts/partials/action.html | 3 ++- site/static/css/custom.css | 4 ++++ 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/site/languages/strings.XY.toml.sample b/site/languages/strings.XY.toml.sample index 81974d3..e22988d 100644 --- a/site/languages/strings.XY.toml.sample +++ b/site/languages/strings.XY.toml.sample @@ -57,9 +57,10 @@ # Action section [Languages.en.action] headline = "Tell Your Representatives!" - # In "subheadline", please use curly quotation marks for the demand. Otherwise the build might fail: https://en.wikipedia.org/wiki/Quotation_mark - subheadline = "This is our demand: **“Implement legislation requiring that publicly financed software developed for the public sector be made publicly available under a [Free and Open Source Software](https://fsfe.org/freesoftware/basics/summary.html 'Free Software gives everybody the right to use, study, share and improve software. This right helps support other fundamental freedoms like freedom of speech, press and privacy.') licence.”**" - description = "**$ORGS organisations** and **$INDS individuals** already support this call for action by signing our [open letter](openletter/). You can help us make a much bigger impact by signing it, too! We will hand over all signatures to representatives all over Europe that are debating software freedom in public administration." + intro = "In our [**open letter**](openletter/) we demand:" + # In "demand", please use curly quotation marks for the demand. Otherwise the build might fail: https://en.wikipedia.org/wiki/Quotation_mark + demand = "“Implement legislation requiring that publicly financed software developed for the public sector be made publicly available under a [Free and Open Source Software](https://fsfe.org/freesoftware/basics/summary.html 'Free Software gives everybody the right to use, study, share and improve software. This right helps support other fundamental freedoms like freedom of speech, press and privacy.') licence.”" + description = "**$ORGS** organisations and **$INDS** individuals already support this call for action by signing our [open letter](openletter/). You can help us make a much bigger impact by signing it, too! We will hand over all signatures to representatives all over Europe that are debating software freedom in public administration." [Languages.en.action.box] text = "Already **$INDS SIGNATURES** – sign the open letter now!" diff --git a/site/languages/strings.de.toml b/site/languages/strings.de.toml index b7a2073..876f7c2 100644 --- a/site/languages/strings.de.toml +++ b/site/languages/strings.de.toml @@ -57,9 +57,10 @@ # Action section [Languages.de.action] headline = "Sag es deinen Abgeordneten!" - # In "subheadline", please use curly quotation marks for the demand. Otherwise the build might fail: https://en.wikipedia.org/wiki/Quotation_mark - subheadline = "Wir fordern: **„Erlasst Gesetze, die es erfordern, dass mit öffentlichen Gelden für öffentliche Verwaltungen entwickelte Software unter einer [Freie-Software- und Open-Source Lizenz](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.') veröffentlicht wird.“**" - description = "**$ORGS Organisationen** und **$INDS Personen** unterstützen bereits diesen Aufruf, indem sie unseren [Offenen Brief](openletter/) unterzeichnet haben. Hilf uns, eine Wirkung zu erzielen, indem auch du ihn unterzeichnest! Wir werden alle Unterschriften an Abgeordnete in ganz Europa, die den Einsatz Freier Software in öffentlichen Verwaltungen diskutieren, überreichen." + intro = "In unserem [**Offenen Brief**](openletter/) fordern wir:" + # In "demand", please use curly quotation marks for the demand. Otherwise the build might fail: https://en.wikipedia.org/wiki/Quotation_mark + demand = "„Erlasst Gesetze, die es erfordern, dass mit öffentlichen Gelden für öffentliche Verwaltungen entwickelte Software unter einer [Freie-Software- und Open-Source Lizenz](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.') veröffentlicht wird.“" + description = "**$ORGS** Organisationen und **$INDS** Personen unterstützen bereits diesen Aufruf, indem sie unseren [Offenen Brief](openletter/) unterzeichnet haben. Hilf uns, eine Wirkung zu erzielen, indem auch du ihn unterzeichnest! Wir werden alle Unterschriften an Abgeordnete in ganz Europa, die den Einsatz Freier Software in öffentlichen Verwaltungen diskutieren, überreichen." [Languages.de.action.box] text = "Schon **$INDS UNTERSCHRIFTEN** – jetzt den offenen Brief unterzeichnen!" diff --git a/site/languages/strings.en.toml b/site/languages/strings.en.toml index 6de70de..e170650 100644 --- a/site/languages/strings.en.toml +++ b/site/languages/strings.en.toml @@ -57,9 +57,10 @@ # Action section [Languages.en.action] headline = "Tell Your Representatives!" - # In "subheadline", please use curly quotation marks for the demand. Otherwise the build might fail: https://en.wikipedia.org/wiki/Quotation_mark - subheadline = "This is our demand: **“Implement legislation requiring that publicly financed software developed for the public sector be made publicly available under a [Free and Open Source Software](https://fsfe.org/freesoftware/basics/summary.html 'Free Software gives everybody the right to use, study, share and improve software. This right helps support other fundamental freedoms like freedom of speech, press and privacy.') licence.”**" - description = "**$ORGS organisations** and **$INDS individuals** already support this call for action by signing our [open letter](openletter/). You can help us make a much bigger impact by signing it, too! We will hand over all signatures to representatives all over Europe that are debating software freedom in public administration." + intro = "In our [**open letter**](openletter/) we demand:" + # In "demand", please use curly quotation marks for the demand. Otherwise the build might fail: https://en.wikipedia.org/wiki/Quotation_mark + demand = "“Implement legislation requiring that publicly financed software developed for the public sector be made publicly available under a [Free and Open Source Software](https://fsfe.org/freesoftware/basics/summary.html 'Free Software gives everybody the right to use, study, share and improve software. This right helps support other fundamental freedoms like freedom of speech, press and privacy.') licence.”" + description = "**$ORGS** organisations and **$INDS** individuals already support this call for action by signing our [open letter](openletter/). You can help us make a much bigger impact by signing it, too! We will hand over all signatures to representatives all over Europe that are debating software freedom in public administration." [Languages.en.action.box] text = "Already **$INDS SIGNATURES** – sign the open letter now!" diff --git a/site/languages/strings.nl.toml b/site/languages/strings.nl.toml index 80764df..ea9a13f 100644 --- a/site/languages/strings.nl.toml +++ b/site/languages/strings.nl.toml @@ -86,12 +86,14 @@ # Action section [Languages.nl.action] # headline = "Tell Your Representatives!" - # subheadline = "This is our demand: **“Implement legislation requiring that publicly financed software developed for the public sector be made publicly available under a [Free and Open Source Software](https://fsfe.org/about/mission.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 = "**$ORGS organisations** and **$INDS individuals** already support this call for action by signing our [open letter](openletter/). You can help us make a much bigger impact by signing it, too! We will hand over all signatures to representatives all over Europe that are debating software freedom in public administration." + # intro = "In our [**open letter**](openletter/) we demand:" + # demand = "“Implement legislation requiring that publicly financed software developed for the public sector be made publicly available under a [Free and Open Source Software](https://fsfe.org/about/mission.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 = "**$ORGS** organisations and **$INDS** individuals already support this call for action by signing our [open letter](openletter/). You can help us make a much bigger impact by signing it, too! We will hand over all signatures to representatives all over Europe that are debating software freedom in public administration." headline = "Vertel uw vertegenwoordigers!" - # In "subheadline", please use curly quotation marks for the demand. Otherwise the build might fail: https://en.wikipedia.org/wiki/Quotation_mark - subheadline = "We demand: **„Implement legislation requiring that publicly financed software developed for public sector must be made publicly available under a [Free and Open Source 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.“**" # TODO: Copy from open letter - description = "**$ORGS organisaties** en **$INDS individuen** hebben onze oproep al gesteund door de [Open Brief](openletter/) te ondertekenen. Help ons om een verschil te maken door het ook te ondertekenen! Wij zullen alle handtekeningen overhandigen aan vertegenwoordigers in heel Europa die debatteren over softwarevrijheid in openbare besturen." + intro = "In our [**open letter**](openletter/) we demand:" + # In "demand", please use curly quotation marks for the demand. Otherwise the build might fail: https://en.wikipedia.org/wiki/Quotation_mark + demand = "„Implement legislation requiring that publicly financed software developed for public sector must be made publicly available under a [Free and Open Source 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.“" # TODO: Copy from open letter + description = "**$ORGS** organisaties en **$INDS** individuen hebben onze oproep al gesteund door de [Open Brief](openletter/) te ondertekenen. Help ons om een verschil te maken door het ook te ondertekenen! Wij zullen alle handtekeningen overhandigen aan vertegenwoordigers in heel Europa die debatteren over softwarevrijheid in openbare besturen." [Languages.nl.action.box] # text = "Already **$INDS SIGNATURES** – sign the open letter now!" diff --git a/site/layouts/partials/action.html b/site/layouts/partials/action.html index 0b87951..196b7cf 100644 --- a/site/layouts/partials/action.html +++ b/site/layouts/partials/action.html @@ -5,7 +5,8 @@

{{ .Site.Params.action.headline }}

-

{{ .Site.Params.action.subheadline | markdownify }}

+

{{ .Site.Params.action.intro | markdownify }}

+

{{ .Site.Params.action.demand | markdownify }}

{{ (replace (replace .Site.Params.action.description "$ORGS" (partial "functions/count_organisations.html" .) ) "$INDS" (partial "functions/count_signatures.html" .)) | markdownify }}

diff --git a/site/static/css/custom.css b/site/static/css/custom.css index c1dd1f9..d8e9243 100644 --- a/site/static/css/custom.css +++ b/site/static/css/custom.css @@ -114,6 +114,10 @@ blockquote p { #action a:hover { color: #EEE; } +#actionintro strong { + text-transform: uppercase; + letter-spacing: 1px; +} #action form { color: #fff; font-size: 18px;