aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-02-20 21:03:55 +0000
committerng0 <ng0@n0.is>2019-02-20 21:03:55 +0000
commitfc31f8ade896224a3806b04b6e7267757b39b487 (patch)
tree3339b470cd6adcdac1e6874845f982252df8d3c1
parent8eacefe8ddcee23d3a1c4187fce62a2d60327aee (diff)
downloadwww-fc31f8ade896224a3806b04b6e7267757b39b487.tar.gz
www-fc31f8ade896224a3806b04b6e7267757b39b487.zip
introduce structure
-rw-r--r--.gitignore3
-rw-r--r--Makefile15
-rw-r--r--common/header.j2.inc11
-rw-r--r--common/navigation.j2.inc6
l---------favicon.ico1
-rw-r--r--static/images/ccby.png (renamed from images/ccby.png)bin4739 -> 4739 bytes
-rw-r--r--static/images/dfg_logo.gif (renamed from images/dfg_logo.gif)bin1426 -> 1426 bytes
-rw-r--r--static/images/fp7_logo.jpg (renamed from images/fp7_logo.jpg)bin11558 -> 11558 bytes
-rw-r--r--static/images/gnunet-anonymous-logo-red.png (renamed from images/gnunet-anonymous-logo-red.png)bin25070 -> 25070 bytes
-rw-r--r--static/images/gnunet-anonymous-logo.png (renamed from images/gnunet-anonymous-logo.png)bin30620 -> 30620 bytes
-rw-r--r--static/images/gnunet-anonymous-schriftzug.png (renamed from images/gnunet-anonymous-schriftzug.png)bin9641 -> 9641 bytes
-rw-r--r--static/images/gnunet-arch-full.svg (renamed from images/gnunet-arch-full.svg)0
-rw-r--r--static/images/gnunet-cyan-icon.png (renamed from images/gnunet-cyan-icon.png)bin1467 -> 1467 bytes
-rw-r--r--static/images/gnunet-historic-logo.svg (renamed from images/gnunet-historic-logo.svg)0
-rw-r--r--static/images/gnunet-icon.png (renamed from images/gnunet-icon.png)bin1529 -> 1529 bytes
-rw-r--r--static/images/gnunet-logo-dark-only-text.svg (renamed from images/gnunet-logo-dark-only-text.svg)0
-rw-r--r--static/images/gnunet-logo.png (renamed from images/gnunet-logo.png)bin95823 -> 95823 bytes
-rw-r--r--static/images/gnunet-logo.svg (renamed from images/gnunet-logo.svg)0
-rw-r--r--static/images/gnunet-red-icon.png (renamed from images/gnunet-red-icon.png)bin1170 -> 1170 bytes
-rw-r--r--static/images/gnunet-small-logo.png (renamed from images/gnunet-small-logo.png)bin18346 -> 18346 bytes
-rw-r--r--static/images/gnunet-smaller-logo.png (renamed from images/gnunet-smaller-logo.png)bin18109 -> 18109 bytes
-rw-r--r--static/images/languageicon.svg (renamed from images/languageicon.svg)0
-rw-r--r--static/images/nlnet_logo.gif (renamed from images/nlnet_logo.gif)bin5433 -> 5433 bytes
-rw-r--r--static/images/pdf.svg (renamed from images/pdf.svg)0
-rw-r--r--static/images/rff_logo.png (renamed from images/rff_logo.png)bin7254 -> 7254 bytes
-rw-r--r--static/images/u-n-icon.png (renamed from images/u-n-icon.png)bin804 -> 804 bytes
-rw-r--r--static/navbar.css (renamed from navbar.css)0
-rw-r--r--static/pdf/copyright.pdf (renamed from pdf/copyright.pdf)bin77869 -> 77869 bytes
-rw-r--r--static/pdf/flyer2017.pdf (renamed from pdf/flyer2017.pdf)bin941424 -> 941424 bytes
-rw-r--r--static/robots.txt (renamed from robots.txt)0
-rw-r--r--static/styles.css (renamed from styles.css)0
-rw-r--r--static/team-images/christian-grothoff.jpg (renamed from team-images/christian-grothoff.jpg)bin47385 -> 47385 bytes
-rw-r--r--static/team-images/default.png (renamed from team-images/default.png)bin1467 -> 1467 bytes
-rw-r--r--static/team-images/florian-dold.jpg (renamed from team-images/florian-dold.jpg)bin565895 -> 565895 bytes
-rw-r--r--static/team-images/jeff-burdges.jpg (renamed from team-images/jeff-burdges.jpg)bin78753 -> 78753 bytes
-rw-r--r--static/team-images/marcello-stanisci.jpg (renamed from team-images/marcello-stanisci.jpg)bin58439 -> 58439 bytes
-rw-r--r--static/team-images/martin-schanzenbach.jpg (renamed from team-images/martin-schanzenbach.jpg)bin1735 -> 1735 bytes
-rw-r--r--static/team-images/nana-karlstetter.jpg (renamed from team-images/nana-karlstetter.jpg)bin656628 -> 656628 bytes
-rw-r--r--static/team-images/ng0.jpg (renamed from team-images/ng0.jpg)bin9653 -> 9653 bytes
-rw-r--r--static/team-images/schanzenbach.jpg (renamed from team-images/schanzenbach.jpg)bin35628 -> 35628 bytes
-rw-r--r--static/team-images/sree-harsha-totakura.jpg (renamed from team-images/sree-harsha-totakura.jpg)bin15430 -> 15430 bytes
-rw-r--r--static/team-images/t3sserakt.jpg (renamed from team-images/t3sserakt.jpg)bin11878 -> 11878 bytes
-rwxr-xr-xtemplate.py6
-rw-r--r--template/about.html.j2 (renamed from about.html.j2)8
-rw-r--r--template/architecture.html.j2 (renamed from architecture.html.j2)2
-rw-r--r--template/contact.html.j2 (renamed from contact.html.j2)0
-rw-r--r--template/copyright.html.j2 (renamed from copyright.html.j2)2
-rw-r--r--template/developers.html.j2 (renamed from developers.html.j2)0
-rw-r--r--template/engage.html.j2 (renamed from engage.html.j2)0
-rw-r--r--template/ev.html.j2 (renamed from ev.html.j2)0
-rw-r--r--template/faq.html.j2 (renamed from faq.html.j2)0
-rw-r--r--template/glossary.html.j2 (renamed from glossary.html.j2)0
-rw-r--r--template/gnurl.html.j2 (renamed from gnurl.html.j2)0
-rw-r--r--template/index.html.j2 (renamed from index.html.j2)4
-rw-r--r--template/news.html.j2.inc (renamed from news.html.j2.inc)0
-rw-r--r--template/old-news.html.j2 (renamed from old-news.html.j2)0
-rw-r--r--template/team.html.j2 (renamed from team.html.j2)34
-rw-r--r--template/tutorial-archpi.html.j2 (renamed from tutorial-archpi.html.j2)0
-rw-r--r--template/tutorial-debian9.html.j2 (renamed from tutorial-debian9.html.j2)0
-rw-r--r--template/tutorial-macos.html.j2 (renamed from tutorial-macos.html.j2)0
-rw-r--r--template/tutorial-ubuntu1804.html.j2 (renamed from tutorial-ubuntu1804.html.j2)0
-rw-r--r--template/tutorial.html.j2 (renamed from tutorial.html.j2)0
-rw-r--r--template/video.html.j2 (renamed from video.html.j2)0
63 files changed, 54 insertions, 38 deletions
diff --git a/.gitignore b/.gitignore
index 4aa5633b..4fd59661 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ locale/messages.pot
8videos/grothoff2014fossa.webm 8videos/grothoff2014fossa.webm
9videos/grothoff2014fossa.ogv 9videos/grothoff2014fossa.ogv
10 10
11rendered/
11en/ 12en/
12de/ 13de/
13fr/ 14fr/
@@ -20,4 +21,4 @@ __pycache__
20 21
21*~ 22*~
22\#*\# 23\#*\#
23futility_engine_loader.sh \ No newline at end of file 24futility_engine_loader.sh
diff --git a/Makefile b/Makefile
index b7408f1b..236d7348 100644
--- a/Makefile
+++ b/Makefile
@@ -12,11 +12,21 @@
12include config.mk 12include config.mk
13 13
14all: locale template 14all: locale template
15 # Consider using pax instead of cp.
16 cp -R dist rendered/
17 cp -R static rendered/
18 cp rendered/static/robots.txt rendered/robots.txt
19 cp rendered/static/robots.txt rendered/dist/robots.txt
20 cp rendered/static/robots.txt rendered/en/robots.txt
21 cp rendered/static/robots.txt rendered/de/robots.txt
22 cp rendered/static/robots.txt rendered/es/robots.txt
23 cp rendered/static/robots.txt rendered/fr/robots.txt
24 cp rendered/static/robots.txt rendered/it/robots.txt
15 25
16# Extract translateable strings from jinja2 templates. 26# Extract translateable strings from jinja2 templates.
17# Because of the local i18nfix extractor module we need 27# Because of the local i18nfix extractor module we need
18# to set the pythonpath before invoking pybabel. 28# to set the pythonpath before invoking pybabel.
19locale/messages.pot: *.j2 common/*.j2.inc 29locale/messages.pot: *.j2 common/*.j2.inc template/*.j2
20 PYTHONPATH=. $(BABEL) -v extract -F locale/babel.map -o locale/messages.pot . 30 PYTHONPATH=. $(BABEL) -v extract -F locale/babel.map -o locale/messages.pot .
21 31
22# Update translation (.po) files with new strings. 32# Update translation (.po) files with new strings.
@@ -51,7 +61,7 @@ current_dir = $(shell pwd)
51 61
52run: all 62run: all
53 @[ "$(BROWSER)" ] || ( echo "You need to export the environment variable 'BROWSER' to run this."; exit 1 ) 63 @[ "$(BROWSER)" ] || ( echo "You need to export the environment variable 'BROWSER' to run this."; exit 1 )
54 $(RUN_BROWSER) $(current_dir)/en/index.html 64 $(RUN_BROWSER) $(current_dir)/rendered/en/index.html
55 65
56 66
57# docker-all: Build using a docker image which contains all the needed packages. 67# docker-all: Build using a docker image which contains all the needed packages.
@@ -68,4 +78,5 @@ docker-all:
68clean: 78clean:
69 rm -rf __pycache__ 79 rm -rf __pycache__
70 rm -rf en/ de/ fr/ it/ es/ ru/ 80 rm -rf en/ de/ fr/ it/ es/ ru/
81 rm -rf rendered/
71 rm -rf *.pyc *~ \.*~ \#*\# 82 rm -rf *.pyc *~ \.*~ \#*\#
diff --git a/common/header.j2.inc b/common/header.j2.inc
index 3e7a7274..c7cd0e5d 100644
--- a/common/header.j2.inc
+++ b/common/header.j2.inc
@@ -38,11 +38,11 @@
38 <!-- Bootstrap core CSS --> 38 <!-- Bootstrap core CSS -->
39 <link href="{{ url('dist/css/bootstrap.min.css') }}" rel="stylesheet"> 39 <link href="{{ url('dist/css/bootstrap.min.css') }}" rel="stylesheet">
40 <!-- Custom styles for this template --> 40 <!-- Custom styles for this template -->
41 <link href="{{ url('styles.css') }}" rel="stylesheet"> 41 <link href="{{ url('static/styles.css') }}" rel="stylesheet">
42 42
43 <script src="{{ url('dist/js/jquery-1.11.1.min.js') }}"></script> 43 <script src="{{ url('dist/js/jquery-1.11.1.min.js') }}"></script>
44 <script src="{{ url('dist/js/bootstrap.min.js') }}"></script> 44 <script src="{{ url('dist/js/bootstrap.min.js') }}"></script>
45 <link href="{{ url('navbar.css') }}" rel="stylesheet"> 45 <link href="{{ url('static/navbar.css') }}" rel="stylesheet">
46 46
47 <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> 47 <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
48 <!--[if lt IE 9]> 48 <!--[if lt IE 9]>
@@ -50,4 +50,9 @@
50 <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> 50 <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
51 <![endif]--> 51 <![endif]-->
52 <!-- font awesome, for team page --> 52 <!-- font awesome, for team page -->
53 <link href="{{ url('dist/font-awesome/css/all.css') }}" rel="stylesheet"> \ No newline at end of file 53 <link href="{{ url('dist/font-awesome/css/all.css') }}" rel="stylesheet">
54
55 <!-- rss and atom, WIP
56 <link rel="alternate" type="application/rss+xml" href="{{ url('feed.rss') }} title="RSS feed for gnunet.org">
57 <link rel="alternate" type="application/atom+xml" href="{{ url('feed.atom') }} title="Atom feed for gnunet.org">
58 -->
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index fe496667..a109714a 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -13,8 +13,8 @@
13 TODO: imo this is bad in the navbar. a readable "gnunet" font-logo would 13 TODO: imo this is bad in the navbar. a readable "gnunet" font-logo would
14 be better for orientation. 14 be better for orientation.
15 --> 15 -->
16 <img src="../images/gnunet-icon.png" alt="" /> 16 <img src="{{ url('static/images/gnunet-icon.png') }}" alt="" />
17 <!-- <img width="70%" height="70%" src="../images/gnunet-logo-dark-only-text.svg" alt="" /> --> 17 <!-- <img width="70%" height="70%" src="../static/images/gnunet-logo-dark-only-text.svg" alt="" /> -->
18 </a> 18 </a>
19 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarMain" aria-controls="navbarMain" aria-expanded="false" aria-label="Toggle navigation"> 19 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarMain" aria-controls="navbarMain" aria-expanded="false" aria-label="Toggle navigation">
20 <span class="navbar-toggler-icon"></span> 20 <span class="navbar-toggler-icon"></span>
@@ -55,7 +55,7 @@
55 <ul class="navbar-nav navbar-right"> 55 <ul class="navbar-nav navbar-right">
56 <li class="nav-item dropdown"> 56 <li class="nav-item dropdown">
57 <!--<button class="btn btn-dark dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> 57 <!--<button class="btn btn-dark dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
58 <img src="{{ url('images/languageicon.svg') }}" height="15" alt="[{{lang}}]" /> {{ lang_full }} [{{ lang }}] 58 <img src="{{ url('static/images/languageicon.svg') }}" height="15" alt="[{{lang}}]" /> {{ lang_full }} [{{ lang }}]
59 </button> --> 59 </button> -->
60 <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ lang_full }} [{{ lang }}]</a> 60 <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ lang_full }} [{{ lang }}]</a>
61 <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarMain"> 61 <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarMain">
diff --git a/favicon.ico b/favicon.ico
deleted file mode 120000
index 050b53bc..00000000
--- a/favicon.ico
+++ /dev/null
@@ -1 +0,0 @@
1images/gnunet-cyan-icon.png \ No newline at end of file
diff --git a/images/ccby.png b/static/images/ccby.png
index 822491ed..822491ed 100644
--- a/images/ccby.png
+++ b/static/images/ccby.png
Binary files differ
diff --git a/images/dfg_logo.gif b/static/images/dfg_logo.gif
index c566a73e..c566a73e 100644
--- a/images/dfg_logo.gif
+++ b/static/images/dfg_logo.gif
Binary files differ
diff --git a/images/fp7_logo.jpg b/static/images/fp7_logo.jpg
index c179c7f1..c179c7f1 100644
--- a/images/fp7_logo.jpg
+++ b/static/images/fp7_logo.jpg
Binary files differ
diff --git a/images/gnunet-anonymous-logo-red.png b/static/images/gnunet-anonymous-logo-red.png
index 870a34f3..870a34f3 100644
--- a/images/gnunet-anonymous-logo-red.png
+++ b/static/images/gnunet-anonymous-logo-red.png
Binary files differ
diff --git a/images/gnunet-anonymous-logo.png b/static/images/gnunet-anonymous-logo.png
index 26fcf3b2..26fcf3b2 100644
--- a/images/gnunet-anonymous-logo.png
+++ b/static/images/gnunet-anonymous-logo.png
Binary files differ
diff --git a/images/gnunet-anonymous-schriftzug.png b/static/images/gnunet-anonymous-schriftzug.png
index 23ea535b..23ea535b 100644
--- a/images/gnunet-anonymous-schriftzug.png
+++ b/static/images/gnunet-anonymous-schriftzug.png
Binary files differ
diff --git a/images/gnunet-arch-full.svg b/static/images/gnunet-arch-full.svg
index 766f2b85..766f2b85 100644
--- a/images/gnunet-arch-full.svg
+++ b/static/images/gnunet-arch-full.svg
diff --git a/images/gnunet-cyan-icon.png b/static/images/gnunet-cyan-icon.png
index b2147927..b2147927 100644
--- a/images/gnunet-cyan-icon.png
+++ b/static/images/gnunet-cyan-icon.png
Binary files differ
diff --git a/images/gnunet-historic-logo.svg b/static/images/gnunet-historic-logo.svg
index e61f023a..e61f023a 100644
--- a/images/gnunet-historic-logo.svg
+++ b/static/images/gnunet-historic-logo.svg
diff --git a/images/gnunet-icon.png b/static/images/gnunet-icon.png
index e13014d2..e13014d2 100644
--- a/images/gnunet-icon.png
+++ b/static/images/gnunet-icon.png
Binary files differ
diff --git a/images/gnunet-logo-dark-only-text.svg b/static/images/gnunet-logo-dark-only-text.svg
index f4ca0f9d..f4ca0f9d 100644
--- a/images/gnunet-logo-dark-only-text.svg
+++ b/static/images/gnunet-logo-dark-only-text.svg
diff --git a/images/gnunet-logo.png b/static/images/gnunet-logo.png
index badde17e..badde17e 100644
--- a/images/gnunet-logo.png
+++ b/static/images/gnunet-logo.png
Binary files differ
diff --git a/images/gnunet-logo.svg b/static/images/gnunet-logo.svg
index 8fdfefa3..8fdfefa3 100644
--- a/images/gnunet-logo.svg
+++ b/static/images/gnunet-logo.svg
diff --git a/images/gnunet-red-icon.png b/static/images/gnunet-red-icon.png
index 7f2714f6..7f2714f6 100644
--- a/images/gnunet-red-icon.png
+++ b/static/images/gnunet-red-icon.png
Binary files differ
diff --git a/images/gnunet-small-logo.png b/static/images/gnunet-small-logo.png
index 4d14a7c4..4d14a7c4 100644
--- a/images/gnunet-small-logo.png
+++ b/static/images/gnunet-small-logo.png
Binary files differ
diff --git a/images/gnunet-smaller-logo.png b/static/images/gnunet-smaller-logo.png
index 9929d424..9929d424 100644
--- a/images/gnunet-smaller-logo.png
+++ b/static/images/gnunet-smaller-logo.png
Binary files differ
diff --git a/images/languageicon.svg b/static/images/languageicon.svg
index 22d58da6..22d58da6 100644
--- a/images/languageicon.svg
+++ b/static/images/languageicon.svg
diff --git a/images/nlnet_logo.gif b/static/images/nlnet_logo.gif
index 3e904d2c..3e904d2c 100644
--- a/images/nlnet_logo.gif
+++ b/static/images/nlnet_logo.gif
Binary files differ
diff --git a/images/pdf.svg b/static/images/pdf.svg
index 8a782457..8a782457 100644
--- a/images/pdf.svg
+++ b/static/images/pdf.svg
diff --git a/images/rff_logo.png b/static/images/rff_logo.png
index e663c38a..e663c38a 100644
--- a/images/rff_logo.png
+++ b/static/images/rff_logo.png
Binary files differ
diff --git a/images/u-n-icon.png b/static/images/u-n-icon.png
index 8c647aa5..8c647aa5 100644
--- a/images/u-n-icon.png
+++ b/static/images/u-n-icon.png
Binary files differ
diff --git a/navbar.css b/static/navbar.css
index 9b60f816..9b60f816 100644
--- a/navbar.css
+++ b/static/navbar.css
diff --git a/pdf/copyright.pdf b/static/pdf/copyright.pdf
index 5e3644d9..5e3644d9 100644
--- a/pdf/copyright.pdf
+++ b/static/pdf/copyright.pdf
Binary files differ
diff --git a/pdf/flyer2017.pdf b/static/pdf/flyer2017.pdf
index 5776895e..5776895e 100644
--- a/pdf/flyer2017.pdf
+++ b/static/pdf/flyer2017.pdf
Binary files differ
diff --git a/robots.txt b/static/robots.txt
index 0a639917..0a639917 100644
--- a/robots.txt
+++ b/static/robots.txt
diff --git a/styles.css b/static/styles.css
index deb97a80..deb97a80 100644
--- a/styles.css
+++ b/static/styles.css
diff --git a/team-images/christian-grothoff.jpg b/static/team-images/christian-grothoff.jpg
index e67e7e1a..e67e7e1a 100644
--- a/team-images/christian-grothoff.jpg
+++ b/static/team-images/christian-grothoff.jpg
Binary files differ
diff --git a/team-images/default.png b/static/team-images/default.png
index b2147927..b2147927 100644
--- a/team-images/default.png
+++ b/static/team-images/default.png
Binary files differ
diff --git a/team-images/florian-dold.jpg b/static/team-images/florian-dold.jpg
index b88e6a18..b88e6a18 100644
--- a/team-images/florian-dold.jpg
+++ b/static/team-images/florian-dold.jpg
Binary files differ
diff --git a/team-images/jeff-burdges.jpg b/static/team-images/jeff-burdges.jpg
index a7b77e9b..a7b77e9b 100644
--- a/team-images/jeff-burdges.jpg
+++ b/static/team-images/jeff-burdges.jpg
Binary files differ
diff --git a/team-images/marcello-stanisci.jpg b/static/team-images/marcello-stanisci.jpg
index 65ae7559..65ae7559 100644
--- a/team-images/marcello-stanisci.jpg
+++ b/static/team-images/marcello-stanisci.jpg
Binary files differ
diff --git a/team-images/martin-schanzenbach.jpg b/static/team-images/martin-schanzenbach.jpg
index 78b37db1..78b37db1 100644
--- a/team-images/martin-schanzenbach.jpg
+++ b/static/team-images/martin-schanzenbach.jpg
Binary files differ
diff --git a/team-images/nana-karlstetter.jpg b/static/team-images/nana-karlstetter.jpg
index 38b60596..38b60596 100644
--- a/team-images/nana-karlstetter.jpg
+++ b/static/team-images/nana-karlstetter.jpg
Binary files differ
diff --git a/team-images/ng0.jpg b/static/team-images/ng0.jpg
index 1ca8faef..1ca8faef 100644
--- a/team-images/ng0.jpg
+++ b/static/team-images/ng0.jpg
Binary files differ
diff --git a/team-images/schanzenbach.jpg b/static/team-images/schanzenbach.jpg
index b2ffb1d7..b2ffb1d7 100644
--- a/team-images/schanzenbach.jpg
+++ b/static/team-images/schanzenbach.jpg
Binary files differ
diff --git a/team-images/sree-harsha-totakura.jpg b/static/team-images/sree-harsha-totakura.jpg
index 081c3bc7..081c3bc7 100644
--- a/team-images/sree-harsha-totakura.jpg
+++ b/static/team-images/sree-harsha-totakura.jpg
Binary files differ
diff --git a/team-images/t3sserakt.jpg b/static/team-images/t3sserakt.jpg
index e4782e6a..e4782e6a 100644
--- a/team-images/t3sserakt.jpg
+++ b/static/team-images/t3sserakt.jpg
Binary files differ
diff --git a/template.py b/template.py
index 90e10ffc..91ee0a8e 100755
--- a/template.py
+++ b/template.py
@@ -34,7 +34,7 @@ if (os.getenv("DEBUG")):
34 34
35langs_full = {"en": "English", "fr": "Français", "it": "Italiano", "es": "Español", "de": "Deutsch"} 35langs_full = {"en": "English", "fr": "Français", "it": "Italiano", "es": "Español", "de": "Deutsch"}
36 36
37for in_file in glob.glob("*.j2"): 37for in_file in glob.glob("template/*.j2"):
38 name, ext = re.match(r"(.*)\.([^.]+)$", in_file.rstrip(".j2")).groups() 38 name, ext = re.match(r"(.*)\.([^.]+)$", in_file.rstrip(".j2")).groups()
39 tmpl = env.get_template(in_file) 39 tmpl = env.get_template(in_file)
40 40
@@ -77,7 +77,7 @@ for in_file in glob.glob("*.j2"):
77 url_localized=url_localized, 77 url_localized=url_localized,
78 svg_localized=svg_localized, 78 svg_localized=svg_localized,
79 filename=name + "." + ext) 79 filename=name + "." + ext)
80 out_name = "./" + locale + "/" + in_file.rstrip(".j2") 80 out_name = "./rendered/" + locale + "/" + in_file.replace('template/', '').rstrip(".j2")
81 os.makedirs("./" + locale, exist_ok=True) 81 os.makedirs("./rendered/" + locale, exist_ok=True)
82 with codecs.open(out_name, "w", encoding='utf-8') as f: 82 with codecs.open(out_name, "w", encoding='utf-8') as f:
83 f.write(content) 83 f.write(content)
diff --git a/about.html.j2 b/template/about.html.j2
index ef0e54e4..55c9f605 100644
--- a/about.html.j2
+++ b/template/about.html.j2
@@ -24,25 +24,25 @@
24 <li> 24 <li>
25 <p> 25 <p>
26 <a href="https://renewablefreedom.org/">Renewable Freedom Foundation</a><br> 26 <a href="https://renewablefreedom.org/">Renewable Freedom Foundation</a><br>
27 <img src="{{ url('images/rff_logo.png') }}" alt="RFF logo"> 27 <img src="{{ url('static/images/rff_logo.png') }}" alt="RFF logo">
28 </p> 28 </p>
29 </li> 29 </li>
30 <li> 30 <li>
31 <p> 31 <p>
32 <a href="https://cordis.europa.eu/fp7/">European Commission (FP7)</a><br> 32 <a href="https://cordis.europa.eu/fp7/">European Commission (FP7)</a><br>
33 <img src="{{ url('images/fp7_logo.jpg') }}" alt="FP7 logo"> 33 <img src="{{ url('static/images/fp7_logo.jpg') }}" alt="FP7 logo">
34 </p> 34 </p>
35 </li> 35 </li>
36 <li> 36 <li>
37 <p> 37 <p>
38 <a href="http://www.dfg.de/">Deutsche Forschungsgemeinschaft</a><br> 38 <a href="http://www.dfg.de/">Deutsche Forschungsgemeinschaft</a><br>
39 <img src="{{ url('images/dfg_logo.gif') }}" alt="DFG logo"> 39 <img src="{{ url('static/images/dfg_logo.gif') }}" alt="DFG logo">
40 </p> 40 </p>
41 </li> 41 </li>
42 <li> 42 <li>
43 <p> 43 <p>
44 <a href="https://nlnet.nl/">NLnet Foundation</a><br> 44 <a href="https://nlnet.nl/">NLnet Foundation</a><br>
45 <img src="{{ url('images/nlnet_logo.gif') }}" alt="NLnet logo"> 45 <img src="{{ url('static/images/nlnet_logo.gif') }}" alt="NLnet logo">
46 </p> 46 </p>
47 </li> 47 </li>
48 </ul> 48 </ul>
diff --git a/architecture.html.j2 b/template/architecture.html.j2
index b94394d3..7b69572f 100644
--- a/architecture.html.j2
+++ b/template/architecture.html.j2
@@ -11,7 +11,7 @@
11<!-- TODO: This image is too big, it should scale dynamically --> 11<!-- TODO: This image is too big, it should scale dynamically -->
12<div class="container-wide"> 12<div class="container-wide">
13 <div class="text-center"> 13 <div class="text-center">
14 <img class="img-fluid" style="width:auto" style="border:1px solid #222" src="../images/gnunet-arch-full.svg"> 14 <img class="img-fluid" style="width:auto" style="border:1px solid #222" src="../static/images/gnunet-arch-full.svg">
15 </div> 15 </div>
16</div> 16</div>
17<div class="container"> 17<div class="container">
diff --git a/contact.html.j2 b/template/contact.html.j2
index aa74fcc5..aa74fcc5 100644
--- a/contact.html.j2
+++ b/template/contact.html.j2
diff --git a/copyright.html.j2 b/template/copyright.html.j2
index 0994ef33..37dd9f66 100644
--- a/copyright.html.j2
+++ b/template/copyright.html.j2
@@ -8,7 +8,7 @@
8 {% trans %} 8 {% trans %}
9 <p> 9 <p>
10 Contributors to GNUnet with Git access must sign the 10 Contributors to GNUnet with Git access must sign the
11 <a href="/pdf/copyright.pdf">copyright assignment</a> to 11 <a href="/static/pdf/copyright.pdf">copyright assignment</a> to
12 ensure that the <a href="https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex">GNUnet e.V. --- Taler Systems SA agreement 12 ensure that the <a href="https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex">GNUnet e.V. --- Taler Systems SA agreement
13 on licensing and collaborative development</a> of the GNUnet and 13 on licensing and collaborative development</a> of the GNUnet and
14 GNU Taler projects is satisfied. 14 GNU Taler projects is satisfied.
diff --git a/developers.html.j2 b/template/developers.html.j2
index 22283277..22283277 100644
--- a/developers.html.j2
+++ b/template/developers.html.j2
diff --git a/engage.html.j2 b/template/engage.html.j2
index 592643a7..592643a7 100644
--- a/engage.html.j2
+++ b/template/engage.html.j2
diff --git a/ev.html.j2 b/template/ev.html.j2
index 90b46ef0..90b46ef0 100644
--- a/ev.html.j2
+++ b/template/ev.html.j2
diff --git a/faq.html.j2 b/template/faq.html.j2
index 05feb4f8..05feb4f8 100644
--- a/faq.html.j2
+++ b/template/faq.html.j2
diff --git a/glossary.html.j2 b/template/glossary.html.j2
index f394bb77..f394bb77 100644
--- a/glossary.html.j2
+++ b/template/glossary.html.j2
diff --git a/gnurl.html.j2 b/template/gnurl.html.j2
index dbfbe757..dbfbe757 100644
--- a/gnurl.html.j2
+++ b/template/gnurl.html.j2
diff --git a/index.html.j2 b/template/index.html.j2
index 304b2685..48e41248 100644
--- a/index.html.j2
+++ b/template/index.html.j2
@@ -2,7 +2,7 @@
2{% block body_content %} 2{% block body_content %}
3<!-- Jumbotron --> 3<!-- Jumbotron -->
4<div class="container-logo banner dark text-center"> 4<div class="container-logo banner dark text-center">
5 <img src="../images/gnunet-anonymous-logo.png" /> 5 <img src="{{ url('static/images/gnunet-anonymous-logo.png') }}" />
6</div> 6</div>
7<div class="jumbotron"> 7<div class="jumbotron">
8 <div class="container text-center"> 8 <div class="container text-center">
@@ -286,7 +286,7 @@
286 </div> 286 </div>
287 <div class="row"> 287 <div class="row">
288 <div class="col-lg-12"> 288 <div class="col-lg-12">
289 {% include "news.html.j2.inc" %} 289 {% include "template/news.html.j2.inc" %}
290 </div> 290 </div>
291 </div> 291 </div>
292</div> <!-- /container --> 292</div> <!-- /container -->
diff --git a/news.html.j2.inc b/template/news.html.j2.inc
index d4a422ba..d4a422ba 100644
--- a/news.html.j2.inc
+++ b/template/news.html.j2.inc
diff --git a/old-news.html.j2 b/template/old-news.html.j2
index 671af1c1..671af1c1 100644
--- a/old-news.html.j2
+++ b/template/old-news.html.j2
diff --git a/team.html.j2 b/template/team.html.j2
index 99614364..7e437478 100644
--- a/team.html.j2
+++ b/template/team.html.j2
@@ -12,7 +12,7 @@
12 <!-- <div class="col-6 col-md-4 profile"> --> 12 <!-- <div class="col-6 col-md-4 profile"> -->
13 <div class="img-box"> 13 <div class="img-box">
14 <!-- was: height="240" --> 14 <!-- was: height="240" -->
15 <img src="{{ url('team-images/christian-grothoff.jpg') }}" alt="Christian Grothoff" class="img-fluid"> 15 <img src="{{ url('static/team-images/christian-grothoff.jpg') }}" alt="Christian Grothoff" class="img-fluid">
16 <ul class="text-center"> 16 <ul class="text-center">
17 <li><a href="https://grothoff.org/christian"><i class="fas fa-home"></i></a></li> 17 <li><a href="https://grothoff.org/christian"><i class="fas fa-home"></i></a></li>
18 </ul> 18 </ul>
@@ -25,7 +25,7 @@
25 <!-- <div class="col-6 col-md-4 profile"> --> 25 <!-- <div class="col-6 col-md-4 profile"> -->
26 <div class="img-box"> 26 <div class="img-box">
27 <!-- was: height="240" --> 27 <!-- was: height="240" -->
28 <img src="{{ url('team-images/default.png') }}" alt="dvn" class="img-fluid"> 28 <img src="{{ url('static/team-images/default.png') }}" alt="dvn" class="img-fluid">
29 <ul class="text-center"> 29 <ul class="text-center">
30 </ul> 30 </ul>
31 </div> 31 </div>
@@ -37,7 +37,7 @@
37 <!-- <div class="col-6 col-md-4 profile"> --> 37 <!-- <div class="col-6 col-md-4 profile"> -->
38 <div class="img-box"> 38 <div class="img-box">
39 <!-- was: height="240" --> 39 <!-- was: height="240" -->
40 <img src="{{ url('team-images/florian-dold.jpg') }}" alt="Florian Dold" class="img-fluid"> 40 <img src="{{ url('static/team-images/florian-dold.jpg') }}" alt="Florian Dold" class="img-fluid">
41 <ul class="text-center"> 41 <ul class="text-center">
42 <a href="https://fdold.eu"><li><i class="fas fa-home"></i></li></a> 42 <a href="https://fdold.eu"><li><i class="fas fa-home"></i></li></a>
43 </ul> 43 </ul>
@@ -50,7 +50,7 @@
50 <!-- <div class="col-6 col-md-4 profile"> --> 50 <!-- <div class="col-6 col-md-4 profile"> -->
51 <div class="img-box"> 51 <div class="img-box">
52 <!-- was: height="240" --> 52 <!-- was: height="240" -->
53 <img src="{{ url('team-images/jeff-burdges.jpg') }}" alt="Jeffrey Burdges" class="img-fluid"> 53 <img src="{{ url('static/team-images/jeff-burdges.jpg') }}" alt="Jeffrey Burdges" class="img-fluid">
54 <ul class="text-center"> 54 <ul class="text-center">
55 </ul> 55 </ul>
56 </div> 56 </div>
@@ -61,7 +61,7 @@
61 <div class="col-lg-3 col-md-3 col-sm-4 col-12 profile"> 61 <div class="col-lg-3 col-md-3 col-sm-4 col-12 profile">
62 <div class="img-box"> 62 <div class="img-box">
63 <!-- was: height="240" --> 63 <!-- was: height="240" -->
64 <img src="{{ url('team-images/default.png') }}" alt="Julius B&uuml;nger" class="img-fluid"> 64 <img src="{{ url('static/team-images/default.png') }}" alt="Julius B&uuml;nger" class="img-fluid">
65 <ul class="text-center"> 65 <ul class="text-center">
66 </ul> 66 </ul>
67 </div> 67 </div>
@@ -72,7 +72,7 @@
72 <div class="col-lg-3 col-md-3 col-sm-4 col-12 profile"> 72 <div class="col-lg-3 col-md-3 col-sm-4 col-12 profile">
73 <div class="img-box"> 73 <div class="img-box">
74 <!-- was: height="240" --> 74 <!-- was: height="240" -->
75 <img src="{{ url('team-images/default.png') }}" alt="lurchi" class="img-fluid"> 75 <img src="{{ url('static/team-images/default.png') }}" alt="lurchi" class="img-fluid">
76 <ul class="text-center"> 76 <ul class="text-center">
77 </ul> 77 </ul>
78 </div> 78 </div>
@@ -83,7 +83,7 @@
83 <div class="col-lg-3 col-md-3 col-sm-4 col-12 profile"> 83 <div class="col-lg-3 col-md-3 col-sm-4 col-12 profile">
84 <div class="img-box"> 84 <div class="img-box">
85 <!-- was: height="240" --> 85 <!-- was: height="240" -->
86 <img src="{{ url('team-images/schanzenbach.jpg') }}" alt="Martin Schanzenbach" class="img-fluid"> 86 <img src="{{ url('static/team-images/schanzenbach.jpg') }}" alt="Martin Schanzenbach" class="img-fluid">
87 <ul class="text-center"> 87 <ul class="text-center">
88 <a href="https://schanzen.eu"><li><i class="fas fa-home"></i></li></a> 88 <a href="https://schanzen.eu"><li><i class="fas fa-home"></i></li></a>
89 </ul> 89 </ul>
@@ -95,7 +95,7 @@
95 <div class="col-lg-3 col-md-3 col-sm-4 col-12 profile"> 95 <div class="col-lg-3 col-md-3 col-sm-4 col-12 profile">
96 <div class="img-box"> 96 <div class="img-box">
97 <!-- was: height="240" --> 97 <!-- was: height="240" -->
98 <img src="{{ url('team-images/sree-harsha-totakura.jpg') }}" alt="Sree Harsha Totakura" class="img-fluid"> 98 <img src="{{ url('static/team-images/sree-harsha-totakura.jpg') }}" alt="Sree Harsha Totakura" class="img-fluid">
99 <ul class="text-center"> 99 <ul class="text-center">
100 <a href="http://sreeharsha.totakura.in/"><li><i class="fas fa-home"></i></li></a> 100 <a href="http://sreeharsha.totakura.in/"><li><i class="fas fa-home"></i></li></a>
101 </ul> 101 </ul>
@@ -107,7 +107,7 @@
107 <div class="col-lg-3 col-md-3 col-sm-4 col-12 profile"> 107 <div class="col-lg-3 col-md-3 col-sm-4 col-12 profile">
108 <div class="img-box"> 108 <div class="img-box">
109 <!-- was: height="240" --> 109 <!-- was: height="240" -->
110 <img src="{{ url('team-images/t3sserakt.jpg') }}" alt="t3sserakt" class="img-fluid"> 110 <img src="{{ url('static/team-images/t3sserakt.jpg') }}" alt="t3sserakt" class="img-fluid">
111 <ul class="text-center"> 111 <ul class="text-center">
112 </ul> 112 </ul>
113 </div> 113 </div>
@@ -118,7 +118,7 @@
118 <div class="col-lg-3 col-md-3 col-sm-4 col-12 profile"> 118 <div class="col-lg-3 col-md-3 col-sm-4 col-12 profile">
119 <div class="img-box"> 119 <div class="img-box">
120 <!-- was: height="240" --> 120 <!-- was: height="240" -->
121 <img src="{{ url('team-images/default.png') }}" alt="wldhx" class="img-fluid"> 121 <img src="{{ url('static/team-images/default.png') }}" alt="wldhx" class="img-fluid">
122 <ul class="text-center"> 122 <ul class="text-center">
123 </ul> 123 </ul>
124 </div> 124 </div>
@@ -129,7 +129,7 @@
129 <div class="col-lg-3 col-md-3 col-sm-4 col-12 profile"> 129 <div class="col-lg-3 col-md-3 col-sm-4 col-12 profile">
130 <div class="img-box"> 130 <div class="img-box">
131 <!-- was: height="240" --> 131 <!-- was: height="240" -->
132 <img src="{{ url('team-images/default.png') }}" alt="lynX" class="img-fluid"> 132 <img src="{{ url('static/team-images/default.png') }}" alt="lynX" class="img-fluid">
133 <ul class="text-center"> 133 <ul class="text-center">
134 <a href="http://my.pages.de"><li><i class="fas fa-home"></i></li></a> 134 <a href="http://my.pages.de"><li><i class="fas fa-home"></i></li></a>
135 </ul> 135 </ul>
@@ -141,7 +141,7 @@
141 <div class="col-lg-3 col-md-3 col-sm-4 col-12 profile"> 141 <div class="col-lg-3 col-md-3 col-sm-4 col-12 profile">
142 <div class="img-box"> 142 <div class="img-box">
143 <!-- was: height="240" --> 143 <!-- was: height="240" -->
144 <img src="{{ url('team-images/default.png') }}" alt="Christian K&uuml;hne" class="img-fluid"> 144 <img src="{{ url('static/team-images/default.png') }}" alt="Christian K&uuml;hne" class="img-fluid">
145 <ul class="text-center"> 145 <ul class="text-center">
146 </ul> 146 </ul>
147 </div> 147 </div>
@@ -151,7 +151,7 @@
151 </div> 151 </div>
152 <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 profile"> 152 <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 profile">
153 <div class="img-box"> 153 <div class="img-box">
154 <img src="{{ url('team-images/default.png') }}" alt="Bart Polot" class="img-fluid"> 154 <img src="{{ url('static/team-images/default.png') }}" alt="Bart Polot" class="img-fluid">
155 <ul class="text-center"> 155 <ul class="text-center">
156 </ul> 156 </ul>
157 </div> 157 </div>
@@ -161,7 +161,7 @@
161 </div> 161 </div>
162 <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 profile"> 162 <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 profile">
163 <div class="img-box"> 163 <div class="img-box">
164 <img src="{{ url('team-images/default.png') }}" alt="LRN" class="img-fluid"> 164 <img src="{{ url('static/team-images/default.png') }}" alt="LRN" class="img-fluid">
165 <ul class="text-center"> 165 <ul class="text-center">
166 </ul> 166 </ul>
167 </div> 167 </div>
@@ -171,7 +171,7 @@
171 </div> 171 </div>
172 <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 profile"> 172 <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 profile">
173 <div class="img-box"> 173 <div class="img-box">
174 <img src="{{ url('team-images/default.png') }}" alt="Nils Durner" class="img-fluid"> 174 <img src="{{ url('static/team-images/default.png') }}" alt="Nils Durner" class="img-fluid">
175 <ul class="text-center"> 175 <ul class="text-center">
176 </ul> 176 </ul>
177 </div> 177 </div>
@@ -181,7 +181,7 @@
181 </div> 181 </div>
182 <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 profile"> 182 <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 profile">
183 <div class="img-box"> 183 <div class="img-box">
184 <img src="{{ url('team-images/ng0.jpg') }}" alt="ng0" class="img-fluid"> 184 <img src="{{ url('static/team-images/ng0.jpg') }}" alt="ng0" class="img-fluid">
185 <ul class="text-center"> 185 <ul class="text-center">
186 <a href="https://n0.is"><li><i class="fas fa-home"></i></li></a> 186 <a href="https://n0.is"><li><i class="fas fa-home"></i></li></a>
187 </ul> 187 </ul>
@@ -192,7 +192,7 @@
192 </div> 192 </div>
193 <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 profile"> 193 <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 profile">
194 <div class="img-box"> 194 <div class="img-box">
195 <img src="{{ url('team-images/default.png') }}" alt="tg" class="img-fluid"> 195 <img src="{{ url('static/team-images/default.png') }}" alt="tg" class="img-fluid">
196 <ul class="text-center"> 196 <ul class="text-center">
197 </ul> 197 </ul>
198 </div> 198 </div>
diff --git a/tutorial-archpi.html.j2 b/template/tutorial-archpi.html.j2
index 893a7de8..893a7de8 100644
--- a/tutorial-archpi.html.j2
+++ b/template/tutorial-archpi.html.j2
diff --git a/tutorial-debian9.html.j2 b/template/tutorial-debian9.html.j2
index 2f128333..2f128333 100644
--- a/tutorial-debian9.html.j2
+++ b/template/tutorial-debian9.html.j2
diff --git a/tutorial-macos.html.j2 b/template/tutorial-macos.html.j2
index df0ff757..df0ff757 100644
--- a/tutorial-macos.html.j2
+++ b/template/tutorial-macos.html.j2
diff --git a/tutorial-ubuntu1804.html.j2 b/template/tutorial-ubuntu1804.html.j2
index 9645f169..9645f169 100644
--- a/tutorial-ubuntu1804.html.j2
+++ b/template/tutorial-ubuntu1804.html.j2
diff --git a/tutorial.html.j2 b/template/tutorial.html.j2
index 91c6396d..91c6396d 100644
--- a/tutorial.html.j2
+++ b/template/tutorial.html.j2
diff --git a/video.html.j2 b/template/video.html.j2
index 90eebb9b..90eebb9b 100644
--- a/video.html.j2
+++ b/template/video.html.j2