Skip to content

Commit 62bd4ff

Browse files
mxmehlmxmehl
committed
prettify HTML with an extendable base template
1 parent b469ea8 commit 62bd4ff

13 files changed

+120
-12
lines changed

‎LICENSES/LicenseRef-FSFE-Logo.txt

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Terms of usage
2+
3+
You may use the FSFE logo as part of the logo of your local FSFE group or FSFE
4+
team and to promote activities your group or team organizes. For example, if
5+
your local FSFE group runs a booth, you may use the logo.
6+
7+
Furthermore, at events not organized by the FSFE directly or a local FSFE group,
8+
speakers representing the FSFE may use the logo to clearly show the affiliation
9+
of the speaker. That does not mean you can use the logo in a way that makes it
10+
seem as if the FSFE is endorsing the event.
11+
12+
Generally, the logo of the FSFE must never be used in a way that could be
13+
understood as endorsing certain activities, home pages, products or entities not
14+
organized by an FSFE team or local group, unless you get prior consent from the
15+
FSFE. If in doubt, please contact <[email protected]> if you wish to know whether
16+
your intended usage is suitable and whether you can use it in a certain context.
17+
18+
Also see: https://fsfe.org/about/graphics/

‎LICENSES/MIT.txt

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2019-2021 Pico
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎fsfe_forms/static/css/custom.css

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
* SPDX-License-Identifier: CC0-1.0
3+
* SPDX-FileCopyrightText: 2022 Free Software Foundation Europe <https://fsfe.org>
4+
*/
5+
6+
img.logo {
7+
padding-bottom: 1em;
8+
}
9+
h1 {
10+
margin-bottom: 0.5em;
11+
}

‎fsfe_forms/static/css/pico.min.css

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎fsfe_forms/static/img/fsfe.ico

3.19 KB
Binary file not shown.

‎fsfe_forms/static/img/fsfe.ico.license

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
SPDX-License-Identifier: LicenseRef-FSFE-Logo
2+
SPDX-FileCopyrightText: Free Software Foundation Europe e.V. <https://fsfe.org>

‎fsfe_forms/static/img/fsfe_logo.png

4.93 KB
Loading

‎fsfe_forms/static/img/fsfe_logo.png.license

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
SPDX-License-Identifier: LicenseRef-FSFE-Logo
2+
SPDX-FileCopyrightText: Free Software Foundation Europe e.V. <https://fsfe.org>

‎fsfe_forms/templates/confirm.html

-7
This file was deleted.

‎fsfe_forms/templates/pages/base.html

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<!DOCTYPE html SYSTEM "about:legacy-compat">
2+
<html lang="en">
3+
<head>
4+
<meta http-equiv="Content-Type" content=
5+
"text/html; charset=utf-8">
6+
<link rel="stylesheet" href="/static/css/pico.min.css" />
7+
<link rel="stylesheet" href="/static/css/custom.css" />
8+
<link rel="icon" href="/static/img/fsfe.ico" type="image/x-icon" />
9+
<title>{% block title %}FSFE{% endblock %}</title>
10+
</head>
11+
<body>
12+
<main class="container">
13+
<div id="header">
14+
<div id="logo"><img alt="FSFE Logo" src="/static/img/fsfe_logo.png" class="logo" /></div>
15+
<p id="statement">
16+
The Free Software Foundation Europe is a non-profit organisation
17+
dedicated to promoting <a href=
18+
"https://fsfe.org/freesoftware/">Free Software</a>,
19+
working to build a free digital society. <a
20+
href="https://fsfe.org/about/">Learn more</a> and <a
21+
href="https://my.fsfe.org/donate?referrer=forms">support us</a>.
22+
</p>
23+
</div>
24+
<div id="content">
25+
{% block content %}
26+
{% endblock %}
27+
</div>
28+
<footer>
29+
<hr />
30+
<small>
31+
<p>
32+
A service of the Free Software Foundation Europe. The code of this
33+
service is Free Software (<a
34+
href="https://git.fsfe.org/fsfe-system-hackers/forms">Code</a>). <a href="https://fsfe.org/about/legal/imprint.html">Imprint and privacy policy</a>.
35+
</p>
36+
</small>
37+
</footer>
38+
</main>
39+
</body>
40+
</html>

‎fsfe_forms/templates/pages/confirm.html

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{% extends "pages/base.html" %}
2+
3+
{% block title %}Confirm your request - FSFE{% endblock %}
4+
5+
{% block content %}
6+
<h1>Confirm your request</h1>
7+
<p>
8+
<a href="/redeem?id={{ id }}" role="button">Click to confirm</a>
9+
</p>
10+
{% endblock %}

‎fsfe_forms/templates/index.html ‎fsfe_forms/templates/pages/index.html

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
<!DOCTYPE html>
2-
<title>FSFE Form Server</title>
3-
<h1>FSFE Form Server</h1>
1+
{% extends "pages/base.html" %}
2+
3+
{% block title %}FSFE Forms API - FSFE{% endblock %}
4+
5+
{% block content %}
6+
<h1>FSFE Forms API</h1>
47
<p>
58
This is an API service to send emails and other information. It supports
69
double opt-ins. Please refer to the
710
<a href="https://git.fsfe.org/fsfe-system-hackers/forms">Git repository</a>
811
for further information.
912
</p>
13+
14+
{% endblock %}

‎fsfe_forms/views.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def _process(config, params, id=None, store=None):
138138

139139

140140
def index():
141-
return render_template("index.html")
141+
return render_template("pages/index.html")
142142

143143

144144
# =============================================================================
@@ -182,7 +182,7 @@ def email():
182182
@use_kwargs(confirm_parameters, location="query")
183183
def confirm(id):
184184
"""A landing page to confirm the ID via a click. Hands over to redeem()"""
185-
return render_template("confirm.html", id=id)
185+
return render_template("pages/confirm.html", id=id)
186186

187187

188188
@use_kwargs(confirm_parameters, location="query")

0 commit comments

Comments
 (0)