kompot
/
publiccode.si
5
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move individual signatures to a separate sub-page-section below organisation signatures

lektura
max.mehl 2017-09-04 17:20:33 +02:00
parent 0c73cb579a
commit 207675d204
6 changed files with 66 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
site/config.toml
View File

@ -145,6 +145,13 @@ DefaultContentLanguage = "en"
button = "Back to start page"
# Specific sub-pages
[params.subpage]
[params.subpage.signatures]
headline = "Individual Open Letter Signatures"
description = "Following people have signed the letter already and agreed to have their signature be public. Will you be the next?"
# === TRANSLATIONS ===
[Languages]
[Languages.en]

2
site/content/openletter.en.md
View File

@ -34,6 +34,4 @@ 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."

8
site/layouts/page/subpage.html
View File

@ -14,15 +14,15 @@
{{ .Content }}
{{ if eq .Params.sigtable true }}
{{ partial "sub-pages/sigtable.html" . }}
{{ end }}
{{ partial "sub-pages/section_end.html" . }}
{{ if eq .Params.sigtable true }}
{{ partial "organisations.html" . }}
{{ end }}
{{ if eq .Params.sigtable true }}
{{ partial "sub-pages/sigtable.html" . }}
{{ end }}
{{ partial "language.html" . }}

2
site/layouts/partials/sub-pages/navbar.html
View File

@ -9,7 +9,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="hiddenlink" href="/{{ .Lang }}">
<a class="hiddenlink" href="{{ "/#action" | relLangURL }}">
<div class="logo">
<img src="/img/logo.svg" alt="Logo of the campaign" />
<span class="logo-blue">Public Money</span>

64
site/layouts/partials/sub-pages/sigtable.html
View File

@ -1,22 +1,42 @@
<table id="signatures">
<thead>
<tr>
<th>{{ .Params.tableName }}</th>
<th>{{ .Params.tableCountry }}</th>
<th>{{ .Params.tableComment }}</th>
</tr>
</thead>
<tbody>
{{ range .Site.Data.signatures }}
{{ range sort . "timestamp" "desc" }}
{{ if (eq .include_vars.permissionPub "yes") | and (eq .include_vars.permissionPriv "yes") }}
<tr>
<td>{{ .include_vars.name }}</td>
<td>{{ .include_vars.country }}</td>
<td>{{ .include_vars.comment }}</td>
</tr>
{{ end }}
{{ end }}
{{ end }}
</tbody>
</table>
{{ "<!-- SIGNATURES -->" | safeHTML }}
<section class="bg-primary" id="signatures">
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 text-center">
{{ with .Site.Params.subpage.signatures.headline }}
<h2 class="section-heading">{{ . }}</h2>
{{ end }}
{{ if and .Site.Params.subpage.signatures.headline .Site.Params.subpage.signatures.description }}
<hr class="light">
{{ end }}
<p class="text-faded">{{ .Site.Params.subpage.signatures.description | markdownify }}
<a href="/{{ .Lang }}/#action"><strong>{{ .Site.Params.action.formSubmit }}</strong></a></p>
<table id="sigtable">
<thead>
<tr>
<th>{{ .Params.tableName }}</th>
<th>{{ .Params.tableCountry }}</th>
<th>{{ .Params.tableComment }}</th>
</tr>
</thead>
<tbody>
{{ range .Site.Data.signatures }}
{{ range sort . "timestamp" "desc" }}
{{ if (eq .include_vars.permissionPub "yes") | and (eq .include_vars.permissionPriv "yes") }}
<tr>
<td>{{ .include_vars.name }}</td>
<td>{{ .include_vars.country }}</td>
<td>{{ .include_vars.comment }}</td>
</tr>
{{ end }}
{{ end }}
{{ end }}
</tbody>
</table>
</div>
</div>
</div>
</section>

24
site/static/css/custom.css
View File

@ -161,47 +161,47 @@ p.form-pe a {
}
/* SIGNATURE TABLE */
table#signatures {
table#sigtable {
display: table;
width: 100%;
}
table#signatures thead, table#signatures tbody {
table#sigtable thead, table#sigtable tbody {
width: 100%;
}
table#signatures td:nth-child(1), table#signatures th:nth-child(1) {
table#sigtable td:nth-child(1), table#sigtable th:nth-child(1) {
width: 25%;
}
table#signatures td:nth-child(2), table#signatures th:nth-child(2) {
table#sigtable td:nth-child(2), table#sigtable th:nth-child(2) {
width: 25%;
}
table#signatures td:nth-child(3), table#signatures th:nth-child(3) {
table#sigtable td:nth-child(3), table#sigtable th:nth-child(3) {
width: 50%;
}
table#signatures thead {
table#sigtable thead {
overflow-y: scroll;
display: table;
width: calc(100% - 16px);
background-color: rgba(230, 230, 230, 0.2);
}
table#signatures tbody {
table#sigtable tbody {
overflow: auto;
height: 250px;
max-height: 250px;
display: block;
}
table#signatures tr {
table#sigtable tr {
width: 100%;
display: table;
text-align: left;
}
table#signatures th, table#signatures td {
table#sigtable th, table#sigtable td {
border-bottom: 1px solid darkgrey;
text-align: left;
padding: 5px;
}
table#signatures tr:nth-child(even) {
table#sigtable tr:nth-child(even) {
background-color: rgba(230, 230, 230, 0.05);
}
table#signatures tr:hover {
table#sigtable tr:hover {
background-color: rgba(230, 230, 230, 0.1);
}