merge master into branch

lektura
max.mehl 2017-03-23 19:23:50 +01:00
commit b9cb820553
12 changed files with 195 additions and 4 deletions

View File

@ -16,6 +16,7 @@ DefaultContentLanguage = "en"
brand = "Public Money, Public Code"
[params.navigation.links]
start = "Start"
about = "About"
reasons = "Reasons"
resources = "Resources"
@ -101,6 +102,12 @@ DefaultContentLanguage = "en"
privacy = "Privacy"
transparency = "Transparency"
license = "Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved."
# 404 Error Page
[params.error]
headline = "Error 404 - Page not found"
description = "The page you're looking for does not exist."
button = "Back to start page"
# === TRANSLATIONS ===
@ -116,6 +123,7 @@ DefaultContentLanguage = "en"
[Languages.de.navigation]
brand = "Public Money, Public Code"
[Languages.de.navigation.links]
start = "Start"
about = "Über"
reasons = "Gründe"
resources = "Ressourcen"

View File

@ -0,0 +1,19 @@
<!DOCTYPE html>
<html lang="{{ with .Site.LanguageCode }}{{ . }}{{ else }}en-US{{ end }}">
<head>
{{ partial "head.html" . }}
</head>
<body id="page-top">
{{ partial "navpage.html" . }}
{{ partial "page-signatures.html" . }}
{{ partial "language.html" . }}
{{ partial "legal.html" . }}
{{ partial "sharecolumn.html" . }}
{{ partial "js.html" . }}
</body>
</html>

View File

@ -0,0 +1,19 @@
<!DOCTYPE html>
<html lang="{{ with .Site.LanguageCode }}{{ . }}{{ else }}en-US{{ end }}">
<head>
{{ partial "head.html" . }}
</head>
<body id="page-top">
{{ partial "navpage.html" . }}
{{ partial "page-signatures.html" . }}
{{ partial "language.html" . }}
{{ partial "legal.html" . }}
{{ partial "sharecolumn.html" . }}
{{ partial "js.html" . }}
</body>
</html>

View File

@ -0,0 +1,42 @@
[
{
"id": 0,
"name": "Max",
"email": "mail@example.com",
"country": "Deutschland",
"zip": "86367",
"perm": "yes",
"code": "630691407558d1cc36a6abb",
"confirmed": "yes"
},
{
"id": 1,
"name": "Cooler Name",
"email": "tech@web.de",
"country": "Schweiz",
"zip": "4404",
"perm": "yes",
"code": "759321396558d1cc8bb57fe",
"confirmed": "yes"
},
{
"id": 2,
"name": "Hengst",
"email": "test@test.com",
"country": "",
"zip": "",
"perm": "yes",
"code": "691034870458d1cd0fdfb2f",
"confirmed": "yes"
},
{
"id": 3,
"name": "Richard Bruce Kopp",
"email": "kopp@test.de",
"country": "Germany ",
"zip": "71522",
"perm": "yes",
"code": "557271457758d1ff356910f",
"confirmed": "no"
}
]

17
layouts/404.html 100644
View File

@ -0,0 +1,17 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
{{ partial "head.html" . }}
</head>
<body id="page-top">
<!--{{ partial "nav.html" . }}-->
{{ partial "404.html" . }}
{{ partial "legal.html" . }}
{{ partial "sharecolumn.html" . }}
{{ partial "js.html" . }}
</body>
</html>

View File

@ -0,0 +1,11 @@
{{ "<!-- 404 HEADER -->" | safeHTML }}
<header>
<div class="header-content">
<div class="header-content-inner">
<h1>{{ .Site.Params.error.headline }}</h1>
<hr>
<p>{{ .Site.Params.error.description }}</p>
<a href="/" class="btn btn-primary btn-xl page-scroll">{{ .Site.Params.error.button }}</a>
</div>
</div>
</header>

View File

@ -6,9 +6,9 @@
{{ .Hugo.Generator }}
<title>{{ .Site.Title }}</title>
{{ "<!-- Translations -->" | safeHTML }}
<link type="text/html" rel="alternate" hreflang="{{ .Lang }}" lang="{{ .Lang }}" href="{{ if eq .Lang "en" }}/{{else}}/{{ .Lang }}/{{end}}" title="{{ .Site.Params.languageName }}">
<link type="text/html" rel="alternate" hreflang="{{ .Lang }}" lang="{{ .Lang }}" href="{{ .RelPermalink }}" title="{{ .Site.Params.languageName }}">
{{ range .Translations }}
<link type="text/html" rel="alternate" hreflang="{{ .Lang }}" lang="{{ .Lang }}" href="{{ if eq .Lang "en" }}/{{else}}/{{ .Lang }}/{{end}}" title="{{ .Site.Params.languageName }}">
<link type="text/html" rel="alternate" hreflang="{{ .Lang }}" lang="{{ .Lang }}" href="{{ .RelPermalink }}" title="{{ .Site.Params.languageName }}">
{{end}}
{{ "<!-- Favicon -->" | safeHTML }}
<link rel="shortcut icon" href="{{ .Site.Params.favicon | absURL }}">

View File

@ -8,9 +8,9 @@
<p style="font-size:25px;"><i class="fa fa-globe" aria-hidden="true" style="font-size:1.5em;vertical-align:top;"></i></p>
<ul>
{{ range .Translations }}
<li><a href="{{ if eq .Lang "en" }}/{{else}}/{{ .Lang }}/{{end}}">{{ .Site.Params.languageName }}</a></li>
<li><a href="{{ .RelPermalink }}">{{ .Site.Params.languageName }}</a></li>
{{end}}
<li><a href="{{ if eq .Lang "en" }}/{{else}}/{{ .Lang }}/{{end}}">{{ .Site.Params.languageName }}</a></li>
<li><a href="{{ .RelPermalink }}">{{ .Site.Params.languageName }}</a></li>
</ul>
</div>
</div>

View File

@ -0,0 +1,30 @@
{{ "<!-- NAVIGATION ON PAGES -->" | safeHTML }}
<nav id="mainNav" class="navbar navbar-default navbar-fixed-top">
<div class="container-fluid">
{{ "<!-- Brand and toggle get grouped for better mobile display -->" | safeHTML }}
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
{{ with .Site.Params.navigation.brand }}
<a class="navbar-brand page-scroll" href="#page-top">{{ . | markdownify }}</a>
{{ end }}
</div>
{{ "<!-- Collect the nav links, forms, and other content for toggling -->" | safeHTML }}
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li>
<a href="{{ "/" | relLangURL }}">{{ .Site.Params.navigation.links.start }}</a>
</li>
<li>
<a class="page-scroll" href="#language" title="Change Language"><i class="fa fa-globe" aria-hidden="true" style="font-size:1.5em;vertical-align:top;"></i> {{ .Site.Params.navigation.links.language }}</a>
</li>
</ul>
</div>
{{ "<!-- /.navbar-collapse -->" | safeHTML }}
</div>
{{ "<!-- /.container-fluid -->" | safeHTML }}
</nav>

View File

@ -0,0 +1,33 @@
{{ "<!-- SUBPAGE SIGNATURES -->" | safeHTML }}
<header>
<div class="header-content">
<div class="header-content-inner">
<div class="col-lg-8 col-lg-offset-2 text-center">
<h1>Signatures</h1>
<hr />
<table class="signatures">
<tbody>
<tr>
<th>ID</th>
<th>Name</th>
<th>Country</th>
<th>Zip Code</th>
</tr>
{{ range $.Site.Data.signatures }}
{{ range . }}
{{ if eq .confirmed "yes" }}
<tr>
<td>{{ .id }}</td>
<td>{{ .name }}</td>
<td>{{ .country }}</td>
<td>{{ .zip }}</td>
</tr>
{{ end }}
{{ end }}
{{ end }}
</tbody>
</table>
</div>
</div>
</div>
</header>

1
static/.htaccess 100644
View File

@ -0,0 +1 @@
ErrorDocument 404 /404.html

View File

@ -75,6 +75,17 @@ input#honey {
display: none;
}
/* SIGNATURE TABLE */
table.signatures {
margin: 0 auto;
}
table.signatures th, table.signatures td {
border: 1px solid darkgrey;
border-collapse: collapse;
text-align: left;
padding: 2px;
}
/* SHARE BUTTONS IN "SPREAD THE WORD" SECTION */
.share-buttons a {
background-position: left 5px center;