more links and hover-texts to Free Software definition. also reusable definition boxes in arguments section and under /openletter. Fixes #62

lektura
max.mehl 2017-08-30 12:58:16 +02:00
parent 0c345ab00c
commit 3013c47f46
5 changed files with 51 additions and 13 deletions

View File

@ -6,6 +6,8 @@ DefaultContentLanguage = "en"
[params]
author = "Free Software Foundation Europe (FSFE)"
description = "Public Money, Public Code - A campaign for releasing publicly financed software as Free Software"
# For translation fsdefinition, https://fsfe.org/about/mission.html may help you
fsdefinition = "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."
languageCode = "en-us"
languageName = "English"
url = "https://publiccode.eu"
@ -36,7 +38,7 @@ DefaultContentLanguage = "en"
slogan_2 = "Public Code"
alt = "Public Money, Public Code"
subtitle1 = "Why is software that is programmed with taxpayers' money not released as Free Software?"
subtitle2 = "We want legislation requiring that publicly financed software developed for public sector must be made publicly available under a Free and Open Source Software licence. If it is public money, it should be public code as well."
subtitle2 = "We want 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. If it is public money, it should be public code as well."
subtitle3 = "**Code paid by all people should be available to all people!**"
@ -49,7 +51,7 @@ DefaultContentLanguage = "en"
# Arguments section
[params.arguments]
headline = "Only 4 of many reasons for public code"
headline = "Reasons for Public Code"
followup = "Do you believe that Free Software must be the default option for publicly financed software? **Then let's convince your political representatives!**"
buttonText = "Sign the Open Letter"
[[params.arguments.list]]
@ -73,8 +75,8 @@ DefaultContentLanguage = "en"
# Action section
[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 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."
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."
formName = "Name (required)"
formEmail = "Email (required)"
formCountry = "Country"

View File

@ -8,7 +8,9 @@ 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.
Publicly funded software has to be [Free Software][fs]. While there are plenty of good reasons for that, many politicians don't know about the importance of software yet.
{{< 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!
@ -33,3 +35,5 @@ That's where you can help! Sign the open letter to give our message more weight.
> **"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?
[fs]: 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."

View File

@ -1,15 +1,13 @@
{{ "<!-- ARGUMENTS -->" | safeHTML }}
<section id="arguments">
{{ with .Site.Params.arguments.headline }}
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="section-heading">{{ . }}</h2>
<hr class="primary">
</div>
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="section-heading">{{ .Site.Params.arguments.headline }}</h2>
<hr class="primary">
</div>
</div>
{{ end }}
</div>
<div class="container">
<div class="row">
{{ range .Site.Params.arguments.list }}
@ -24,6 +22,7 @@
</div>
{{ end }}
</div>
<div class="definition blue"><p>{{ .Site.Params.fsdefinition }}</p></div>
<div class="col-lg-8 col-lg-offset-2 text-center" id="arguments-followup">
<p>{{ .Site.Params.arguments.followup | markdownify }}</p>
<a href="#action" class="btn btn-primary btn-xl page-scroll">{{ .Site.Params.arguments.buttonText }}</a>

View File

@ -0,0 +1,7 @@
{{ if eq (.Get "type") "box" }}
<div class="definition"><p>{{ .Site.Params.fsdefinition }}</p></div>
{{ else if eq (.Get "type") "paragraph" }}
<p>{{ .Site.Params.fsdefinition }}</p>
{{ else }}
{{ .Site.Params.fsdefinition }}
{{ end }}

View File

@ -238,3 +238,29 @@ a:not(.btn):not(.hiddenlink):hover::before, a:not(.btn):not(.hiddenlink):focus::
top: 13px;
font-size: 19px;
}
/* DEFINITION BOX */
.definition {
margin: 20px 10px;
padding: 0px;
background-image: linear-gradient(white, white),
linear-gradient(white, white),
linear-gradient(white, white),
linear-gradient(white, white),
linear-gradient(rgba(288, 288, 288, 0.3), rgba(288, 288, 288, 0.3));
background-repeat: no-repeat;
background-size: 4px 30px, 30px 4px, 4px 30px, 30px 4px, calc(100% - 8px) calc(100% - 8px);
background-position: left top, left top, right bottom, right bottom, 4px 4px;
}
.definition.blue {
background-image: linear-gradient(#2093C4, #2093C4),
linear-gradient(#2093C4, #2093C4),
linear-gradient(#2093C4, #2093C4),
linear-gradient(#2093C4, #2093C4),
linear-gradient(rgba(32, 147, 196, 0.2), rgba(32, 147, 196, 0.2));
}
.definition p {
margin: 0;
padding: 20px 30px;
font-style: italic;
}