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

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

lektura
Max Mehl 2017-09-04 17:39:12 +02:00 committed by Gogs
parent e5e990249c 0047eb6b0b
commit 8fd6ba038d
11 changed files with 76 additions and 46 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" 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 === # === TRANSLATIONS ===
[Languages] [Languages]
[Languages.en] [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."** > **"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." [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."

2
site/content/template.html
View File

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

2
site/layouts/404.html
View File

@ -4,7 +4,7 @@
{{ partial "head.html" . }} {{ partial "head.html" . }}
</head> </head>
<body id="page-top"> <body id="page-top">
{{ partial "subpage_navbar.html" . }} {{ partial "sub-pages/navbar.html" . }}
{{ partial "404.html" . }} {{ partial "404.html" . }}

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

@ -4,9 +4,9 @@
{{ partial "head.html" . }} {{ partial "head.html" . }}
</head> </head>
<body id="page-top"> <body id="page-top">
{{ partial "subpage_navbar.html" . }} {{ partial "sub-pages/navbar.html" . }}
{{ partial "subpage_before.html" . }} {{ partial "sub-pages/section_begin.html" . }}
<h1>{{ .Params.Title }}</h1> <h1>{{ .Params.Title }}</h1>
@ -14,16 +14,16 @@
{{ .Content }} {{ .Content }}
{{ if eq .Params.sigtable true }} {{ partial "sub-pages/section_end.html" . }}
{{ partial "subpage_sigtable.html" . }}
{{ end }}
{{ partial "subpage_after.html" . }}
{{ if eq .Params.sigtable true }} {{ if eq .Params.sigtable true }}
{{ partial "organisations.html" . }} {{ partial "organisations.html" . }}
{{ end }} {{ end }}
{{ if eq .Params.sigtable true }}
{{ partial "sub-pages/sigtable.html" . }}
{{ end }}
{{ partial "language.html" . }} {{ partial "language.html" . }}
{{ partial "legal.html" . }} {{ partial "legal.html" . }}

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

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

0
site/layouts/partials/subpage_before.html → site/layouts/partials/sub-pages/section_begin.html
View File

0
site/layouts/partials/subpage_after.html → site/layouts/partials/sub-pages/section_end.html
View File

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

@ -0,0 +1,42 @@
{{ "<!-- 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>

22
site/layouts/partials/subpage_sigtable.html
View File

@ -1,22 +0,0 @@
<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>

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

@ -1,3 +1,8 @@
/* GENERAL STYLING */
.bg-primary a {
color: #fff;
}
/* SUBPAGES */ /* SUBPAGES */
.subpage { .subpage {
background-image: url(../img/header.jpg); background-image: url(../img/header.jpg);
@ -161,47 +166,47 @@ p.form-pe a {
} }
/* SIGNATURE TABLE */ /* SIGNATURE TABLE */
table#signatures { table#sigtable {
display: table; display: table;
width: 100%; width: 100%;
} }
table#signatures thead, table#signatures tbody { table#sigtable thead, table#sigtable tbody {
width: 100%; 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%; 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%; 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%; width: 50%;
} }
table#signatures thead { table#sigtable thead {
overflow-y: scroll; overflow-y: scroll;
display: table; display: table;
width: calc(100% - 16px); width: calc(100% - 16px);
background-color: rgba(230, 230, 230, 0.2); background-color: rgba(230, 230, 230, 0.2);
} }
table#signatures tbody { table#sigtable tbody {
overflow: auto; overflow: auto;
height: 250px; max-height: 250px;
display: block; display: block;
} }
table#signatures tr { table#sigtable tr {
width: 100%; width: 100%;
display: table; display: table;
text-align: left; text-align: left;
} }
table#signatures th, table#signatures td { table#sigtable th, table#sigtable td {
border-bottom: 1px solid darkgrey; border-bottom: 1px solid darkgrey;
text-align: left; text-align: left;
padding: 5px; padding: 5px;
} }
table#signatures tr:nth-child(even) { table#sigtable tr:nth-child(even) {
background-color: rgba(230, 230, 230, 0.05); background-color: rgba(230, 230, 230, 0.05);
} }
table#signatures tr:hover { table#sigtable tr:hover {
background-color: rgba(230, 230, 230, 0.1); background-color: rgba(230, 230, 230, 0.1);
} }