Skip to content

Commit 5152f59

Browse files
MagicLikeMagicLike
committed
Merge remote-tracking branch 'origin/page-updates' into docs-update
2 parents 10b0065 + 5e1be51 commit 5152f59

17 files changed

+441
-241
lines changed

‎build.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"imprint.html",
1818
"privacy.html",
1919
"feedback.html",
20+
"404.html",
2021
]
2122

2223
# Load template files and write the rendered HTML

‎public/.htaccess‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
##START HTTP Security Header##
2+
3+
#Content Security Policy - CSP-HEADER
4+
Header set Content-Security-Policy "frame-ancestors 'self'; default-src 'none'; script-src 'self' plausible.io peertube.tv opencollective.com liberapay.com; script-src-attr 'none'; script-src-elem 'self'; object-src 'self' img.shields.io; img-src 'self' opencollective.com liberapay.com; media-src 'self'; connect-src 'self'; frame-src 'self' img.shields.io peertube.tv; form-action 'self'; base-uri 'self'; font-src 'self'; style-src 'self'; style-src-elem 'self'; style-src-attr 'self';"
5+
6+
#HTTP Content-Types
7+
AddCharset UTF-8 .html
8+
9+
#Public Key Pins
10+
Header set Public-Key-Pins "pin-sha256=\"base64+primary==\"; pin-sha256=\"base64+backup==\"; max-age=5184000; includeSubDomains"
11+
12+
#Strict-Transport-Security
13+
Header set Strict-Transport-Security "max-age=31536000; includeSubDomains"
14+
15+
#X-Content-Type-Options
16+
Header always set X-Content-Type-Options "nosniff"
17+
18+
#X-Frame-Options
19+
Header always set X-Frame-Options "SAMEORIGIN"
20+
21+
#X-Xss-Protection
22+
Header always set X-Xss-Protection "1; mode=block"
23+
24+
#Referrer-Policy
25+
Header set Referrer-Policy "no-referrer, same-origin"
26+
27+
##END HTTP Security Header##
28+
29+
#HTTP Cache
30+
Header set Cache-Control "max-age=604800"
31+
# "max-age=604800" -> 1 Week
32+
# "max-age=2592000" -> 30 Days
33+
# "max-age=31536000" -> 1 Year
34+
35+
Error pages
36+
ErrorDocument 404 404.html
37+
38+
##START File Extensions##
39+
40+
RewriteEngine on
41+
42+
# Remove .html
43+
RewriteCond %{REQUEST_FILENAME} !-d
44+
RewriteCond %{REQUEST_FILENAME}\.html -f
45+
RewriteRule ^(.*)$ $1.html
46+
47+
##END File Extensions##

‎public/static/BMBF_gefoerdert_2017_en.jpg‎

-70.5 KB
Binary file not shown.

‎public/static/Screenshot-requirements-page.png‎

-131 KB
Binary file not shown.

‎public/static/Screenshot-select-page.png‎

-112 KB
Binary file not shown.

‎public/static/Screenshot-start-page.png‎

-132 KB
Binary file not shown.

‎public/static/custom.css‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,61 @@ html {
22
scroll-behavior: smooth;
33
}
44

5+
.px-6 ul {
6+
list-style: unset;
7+
}
8+
9+
.round {
10+
border-radius: 4px;
11+
}
12+
13+
.hover-transition {
14+
transition: ease-in 250ms;
15+
}
16+
17+
.hover-transition:hover {
18+
transition: ease-in 250ms;
19+
}
20+
21+
#pf-funding-logos {
22+
width: 333px;
23+
}
24+
25+
.pt-5 {
26+
border-top: 1px solid #dee2e6;
27+
}
28+
29+
#user {
30+
display: block;
31+
}
32+
33+
/*Donation options*/
34+
35+
#donate-widgets {
36+
margin: auto;
37+
margin-top: 10px;
38+
}
39+
40+
.opencollective,
41+
#gh-sponsors {
42+
display: flex !important;
43+
margin: auto !important;
44+
}
45+
46+
.liberapay {
47+
display: flex !important;
48+
width: 50% !important;
49+
margin-bottom: 10px;
50+
margin-left: 46.05px !important;
51+
}
52+
53+
.liberapay-nojs {
54+
display: flex;
55+
margin: auto;
56+
margin-top: -20px;
57+
margin-bottom: 10px;
58+
}
59+
560
/* Style the tab content */
661
.tabcontent {
762
display: none;

‎public/static/openandroidinstaller-demo-preview.png‎

-74.8 KB
Binary file not shown.

‎templates/404.html‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{% extends "base.html" %}
2+
{% block title %}404 | OpenAndroidInstaller{% endblock %}
3+
{% block robot %}
4+
<meta name="robots" content="noindex,nofollow">
5+
<meta name="googlebot" content="noindex,nofollow">
6+
{% endblock %}
7+
{% block content %}
8+
<head>
9+
<link rel="stylesheet" href="/public/static/style.css">
10+
<link rel="stylesheet" href="/public/static/custom.css">
11+
</head>
12+
<!-- Header -->
13+
<section class="hero is-small">
14+
<div class="hero-body">
15+
<div class="container has-text-centered">
16+
<h1 class="is-size-1 is-size-3-mobile has-text-weight-bold">Error 404</h1>
17+
<p class="subtitle is-4">Oops! - The requested page does not exist or was not found.</p>
18+
</div>
19+
</div>
20+
</section>
21+
<!-- Header End -->
22+
23+
<section class="section">
24+
<div class="container is-max-desktop">
25+
<!-- Content -->
26+
<div class="content">
27+
<!-- Content End -->
28+
</div>
29+
</section>
30+
31+
<!-- Contribution Banner -->
32+
<section class="section has-background-primary">
33+
<div class="container">
34+
<div class="is-vcentered columns is-multiline">
35+
<div class="column is-6 is-5-desktop mb-4">
36+
<h2 class="has-text-white mt-2 mb-3 is-size-1 is-size-3-mobile has-text-weight-bold">You think something is wrong?
37+
</h2>
38+
</div>
39+
<div class="column is-5 ml-auto">
40+
<div class="mx-auto box p-6 has-background-light has-text-centered">
41+
<a class="button is-link is-fullwidth hover-transition" id="contribute-button"
42+
href="mailto:[email protected]">Write an e-mail</a>
43+
</div>
44+
</div>
45+
</div>
46+
</div>
47+
</section>
48+
<!-- Contribution Banner End -->
49+
{% endblock %}

‎templates/base.html‎

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33

44
<head>
5-
<!-- META -->
5+
<!-- Meta -->
66
<meta charset="UTF-8">
77
<title>{% block title %}{% endblock %}</title>
88
<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -26,6 +26,7 @@
2626
<link rel="stylesheet" href="static/custom.css">
2727
<link rel="icon" href="static/favicon.ico">
2828
<meta name="msvalidate.01" content="BADB1605403452D1F9CB0E93E71BCEA6">
29+
<!-- Meta End -->
2930
<script defer data-domain="openandroidinstaller.org"
3031
src="https://plausible.io/js/script.outbound-links.file-downloads.js"></script>
3132
<script>window.plausible = window.plausible || function () { (window.plausible.q = window.plausible.q || []).push(arguments) }</script>
@@ -56,53 +57,54 @@
5657

5758
<body>
5859
<div>
59-
<!-- NAV -->
60+
<!-- Nav -->
6061
<nav class="navbar py-4">
6162
<div class="container is-fluid">
6263
<div class="navbar-brand">
6364
<a class="navbar-item" href="https://openandroidinstaller.org">
6465
<img class="image" src="static/oai-logo.jpg" alt="OpenAndroidInstaller Logo" width="30" height="30">
6566
</a>
66-
<a class="navbar-burger" role="button" aria-label="menu" aria-expanded="false" data-target="navMenu">
67+
<a class="navbar-burger round hover-transition" role="button" aria-label="menu" aria-expanded="false"
68+
data-target="navMenu">
6769
<span aria-hidden="true"></span>
6870
<span aria-hidden="true"></span>
6971
<span aria-hidden="true"></span>
7072
</a>
7173
</div>
72-
<div class="navbar-menu" id="navMenu">
74+
<div class="navbar-menu round" id="navMenu">
7375
<div class="navbar-end">
74-
<a class="navbar-item" href="https://openandroidinstaller.org#getting-started">
76+
<a class="navbar-item round hover-transition" href="#getting-started">
7577
<span class="icon"><i class="fa fa-play"></i></span><span>Getting started</span>
7678
</a>
77-
<a class="navbar-item" href="https://openandroidinstaller.org/supported-devices.html">
79+
<a class="navbar-item round hover-transition" href="supported-devices.html">
7880
<span class="icon"><i class="fa fa-mobile"></i></span><span>Supported Devices</span>
7981
</a>
80-
<a class="navbar-item" href="https://openandroidinstaller.org/download.html">
82+
<a class="navbar-item round hover-transition" href="download.html">
8183
<span class="icon"><i class="fa fa-download"></i></span><span>Download</span>
8284
</a>
83-
<a class="navbar-item" href="https://openandroidinstaller.org/#contribute">
85+
<a class="navbar-item round hover-transition" href="#contribute">
8486
<span class="icon"><i class="fa fa-heart"></i></span><span>Contribute</span>
8587
</a>
86-
<a class="navbar-item" href="https://openandroidinstaller.org/faq.html">
88+
<a class="navbar-item round hover-transition" href="faq.html">
8789
<span class="icon"><i class="fa fa-question"></i></span><span>FAQ</span>
8890
</a>
89-
<a class="navbar-item" href="https://github.com/openandroidinstaller-dev/openandroidinstaller"
90-
target="_blank">
91+
<a class="navbar-item round hover-transition"
92+
href="https://github.com/openandroidinstaller-dev/openandroidinstaller" rel="noopener" target="_blank">
9193
<span class="icon"><i class="fab fa-github"></i></span><span>GitHub</span>
9294
</a>
93-
<a class="navbar-item" href="mailto:[email protected]">
95+
<a class="navbar-item round hover-transition" href="mailto:[email protected]">
9496
<span class="icon"><i class="fa fa-envelope"></i></span><span>Get Help</span>
9597
</a>
9698
</div>
9799
</div>
98100
</div>
99101
</nav>
100-
<!-- NAV END -->
102+
<!-- Nav End -->
101103

102104
<!-- Main -->
103105
{% block content %}
104106
{% endblock %}
105-
<!-- Main END -->
107+
<!-- Main End -->
106108

107109
<!-- Footer -->
108110
<footer class="section">
@@ -111,49 +113,50 @@
111113
<div class="mr-auto mb-2">
112114
<div class="is-inline-block">
113115
<a href="https://openandroidinstaller.org">
114-
<img class="image is-96x96" src="static/oai-logo.jpg" alt="OpenAndroidInstaller Logo">
116+
<img class="image is-96x96 round" src="static/oai-logo.jpg" alt="OpenAndroidInstaller Logo">
115117
</a>
116118
</div>
117-
<div class="is-inline-block" style="width: 333px;">
119+
<div class="is-inline-block" id="pf-funding-logos">
118120
<figure class="image">
119121
<img src="static/pf_funding_logos.svg" alt="BMBF logo">
120122
</figure>
121123
</div>
122124
</div>
123125
<div>
124126
<ul class="is-flex is-flex-wrap-wrap is-align-items-center is-justify-content-center">
125-
<li class="mr-4"><a class="button is-white"
127+
<li class="mr-4"><a class="button is-white hover-transition"
126128
href="https://github.com/openandroidinstaller-dev/openandroidinstaller-dev.github.io/files/10787205/press-kit-openandroidinstaller.zip"
127-
target="_blank">Download press kit</a></li>
128-
<li class="mr-4"><a class="button is-white"
129+
rel="noopener" target="_blank">Download press kit</a></li>
130+
<li class="mr-4"><a class="button is-white hover-transition"
129131
href="https://github.com/openandroidinstaller-dev/openandroidinstaller#acknowledgements"
130-
target="_blank">Funding</a></li>
131-
<li class="mr-4"><a class="button is-white"
132+
rel="noopener" target="_blank">Funding</a></li>
133+
<li class="mr-4"><a class="button is-white hover-transition"
132134
href="https://github.com/openandroidinstaller-dev/openandroidinstaller/blob/main/LICENSE"
133-
target="_blank">License</a></li>
134-
<li class="mr-4"><a class="button is-white"
135-
href="https://openandroidinstaller.org/imprint.html">Impressum</a></li>
136-
<li class="mr-4"><a class="button is-white" href="https://openandroidinstaller.org/privacy.html">Privacy
137-
Statement</a></li>
135+
rel="noopener" target="_blank">License</a></li>
136+
<li class="mr-4"><a class="button is-white hover-transition" href="imprint.html">Impressum</a></li>
137+
<li class="mr-4"><a class="button is-white hover-transition" href="privacy.html">Privacy Statement</a>
138+
</li>
138139
</ul>
139140
</div>
140141
</div>
141142
</div>
142-
<div class="pt-5" style="border-top: 1px solid #dee2e6;"></div>
143+
<div class="pt-5"></div>
143144
<div class="container">
144145
<div class="is-flex-tablet is-justify-content-between is-align-items-center">
145-
<p>Made with &#x1F49A;, Python and <a href="https://bulma.io/" target="_blank">Bulma</a> by Tobias Sterbak.
146-
All rights reserved © OpenAndroidInstaller 2022-2023</p>
146+
<p>Made with &#x1F49A;, Python and <a href="https://bulma.io" rel="noopener" target="_blank">Bulma</a> by
147+
Tobias Sterbak. All rights reserved © OpenAndroidInstaller 2022-2023</p>
147148
<div class="py-2 is-hidden-tablet"></div>
148149
<div class="ml-auto">
149-
<a class="mr-4 is-inline-block" href="https://github.com/openandroidinstaller-dev/openandroidinstaller"
150-
target="_blank">
150+
<a class="mr-4 is-inline-block hover-transition"
151+
href="https://github.com/openandroidinstaller-dev/openandroidinstaller" rel="noopener" target="_blank">
151152
<span class="icon"><i class="fab fa-github"></i></span><span>GitHub</span>
152153
</a>
153-
<a class="mr-4 is-inline-block" href="https://twitter.com/OAInstaller" target="_blank">
154+
<a class="mr-4 is-inline-block hover-transition" href="https://twitter.com/OAInstaller" rel="noopener"
155+
target="_blank">
154156
<span class="icon"><i class="fab fa-twitter"></i></span><span>Twitter</span>
155157
</a>
156-
<a rel="me" class="mr-4 is-inline-block" href="https://fosstodon.org/@openandroidinstaller" target="_blank">
158+
<a class="mr-4 is-inline-block hover-transition" href="https://fosstodon.org/@openandroidinstaller"
159+
rel="me noopener" target="_blank">
157160
<span class="icon"><i class="fab fa-mastodon"></i></span><span>Mastodon</span>
158161
</a>
159162
</div>
@@ -163,16 +166,16 @@
163166
<!-- Footer End -->
164167
</div>
165168
</body>
166-
<link rel="stylesheet" href="static/all.min.css" >
167-
<!-- Track button clicks-->
169+
<link rel="stylesheet" href="static/all.min.css">
170+
<!-- Track button clicks -->
168171
<script>
169172
document.getElementById('download-header').addEventListener("click", function () { plausible('download-header'); });
170173
document.getElementById('download-banner').addEventListener("click", function () { plausible('download-banner'); });
171174
document.getElementById('demo-video').addEventListener("click", function () { plausible('demo-video-started'); });
172175
document.getElementById('contribute-button').addEventListener("click", function () { plausible('contribute-button'); });
173176
document.getElementById('getting-started-button').addEventListener("click", function () { plausible('getting-started'); });
174177
</script>
175-
<!--Automatically close all the other <details> tags after opening a specific <details> tag-->
178+
<!--Automatically close all the other <details> tags after opening a specific <details> tag -->
176179
<script>
177180
// Fetch all the details element.
178181
const details = document.querySelectorAll("details");
@@ -189,7 +192,7 @@
189192
});
190193
});
191194
</script>
192-
<!--Script for vertical tabs-->
195+
<!--Script for vertical tabs -->
193196
<script>
194197
function openTab(event, tabName) {
195198
// Declare all variables
@@ -213,4 +216,4 @@
213216
}
214217
</script>
215218

216-
</html>
219+
</html>

0 commit comments

Comments
 (0)