aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-02-15 23:52:07 +0000
committerng0 <ng0@n0.is>2019-02-15 23:52:07 +0000
commitc3d21940ebcce2659e9dd4583f32fc7d818720ae (patch)
tree25d85e9bbea496741a8a0510005f555f0f94860f
parente81e536ccd32b7e101d63437d209b92e2e9a477c (diff)
downloadwww-c3d21940ebcce2659e9dd4583f32fc7d818720ae.tar.gz
www-c3d21940ebcce2659e9dd4583f32fc7d818720ae.zip
about becomes team, add and change pages in footer
-rw-r--r--about.html.j2104
-rw-r--r--common/footer.j2.inc3
-rw-r--r--team.html.j297
3 files changed, 110 insertions, 94 deletions
diff --git a/about.html.j2 b/about.html.j2
index df7e855f..06d8560c 100644
--- a/about.html.j2
+++ b/about.html.j2
@@ -1,97 +1,15 @@
1{% extends "common/base.j2" %} 1{% extends "common/base.j2" %}
2{% block body_content %} 2{% block body_content %}
3<div class="container-wide"> 3<div class="container">
4<!-- list alphabetical, first those with images, then those without --> 4 <article>
5<div class="row"> 5 <section>
6 <div class="col-6 col-md-4"> 6 <h3>{{ _("About GNUnet") }}</h3>
7 <h2><a href="https://grothoff.org/christian/">Christian Grothoff</a></h2> 7 <p>
8 <img src="{{ url('team-images/christian-grothoff.jpg') }}" height="240" alt="Christian Grothoff" align="middle"> 8 {% trans %}
9 <br><br><p>{{ _("GNU maintainer.") }}</p> 9 We still have to write this section.
10 </div> 10 {% endtrans %}
11 <div class="col-6 col-md-4"> 11 </p>
12 <h2>dvn</h2> 12 </section>
13 <img src="{{ url('team-images/dvn.jpg') }}" height="240" alt="dvn" align="middle"> 13 </article>
14 <br><br><p>{{ _("Continuous Integration, secushare, packaging (Guix).") }}</p>
15 </div>
16 <div class="col-6 col-md-4">
17 <h2><a href="https://fdold.eu">Florian Dold</a></h2>
18 <img src="{{ url('team-images/florian-dold.jpg') }}" height="240" alt="Florian Dold" align="middle">
19 <br><br><p>{{ _("Set, Consensus, Voting.") }}</p>
20 </div>
21</div>
22<div class="row">
23 <div class="col-6 col-md-4">
24 <h2>Jeffrey Burdges</h2>
25 <img src="{{ url('team-images/jeff-burdges.jpg') }}" height="240" alt="Jeffrey Burdges" align="middle">
26 <br><br><p>{{ _("Mix networking.") }}</p>
27 </div>
28 <div class="col-6 col-md-4">
29 <h2>Julius B&uuml;ger</h2>
30 <img src="{{ url('team-images/julius-buenger.jpg') }}" height="240" alt="Julius B&uuml;nger" align="middle">
31 <br><br><p>{{ _("Random peer sampling.") }}</p>
32 </div>
33 <div class="col-6 col-md-4">
34 <h2>lurchi</h2>
35 <img src="{{ url('team-images/lurchi.jpg') }}" height="240" alt="lurchi" align="middle">
36 <br><br><p>{{ _("secushare, Social, PSYC, Multicast.") }}</p>
37 </div>
38</div>
39<div class="row">
40 <div class="col-6 col-md-4">
41 <h2>Martin Schanzenbach</h2>
42 <br><br><p>{{ _("GNU Name System, Identity Management, ABE.") }}</p>
43 </div>
44 <div class="col-6 col-md-4">
45 <h2><a href="http://sreeharsha.totakura.in/">Sree Harsha Totakura</a></h2>
46 <img src="{{ url('team-images/sree-harsha-totakura.jpg') }}" height="240" alt="Sree Harsha Totakura" align="middle">
47 <br><br><p>{{ _("Testbed, voice.") }}</p>
48 </div>
49 <div class="col-6 col-md-4">
50 <h2>t3sserakt</h2>
51 <img src="{{ url('team-images/t3sserakt.jpg') }}" height="240" alt="t3sserakt" align="middle">
52 <br><br><p>{{ _("secushare, Social, PSYC, Multicast.") }}</p>
53 </div>
54</div>
55<div class="row">
56 <div class="col-6 col-md-4">
57 <h2>wldhx</h2>
58 <img src="{{ url('team-images/wldhx.jpg') }}" height="240" alt="wldhx" align="middle">
59 <br><br><p>{{ _("Web site, packaging (Nix/Guix).") }}</p>
60 </div>
61 <div class="col-6 col-md-4">
62 <h2><a href="http://my.pages.de">carlo von lynX</a></h2>
63 <img src="{{ url('images/gnunet-logo_bright.svg') }}" height="240" alt="lynX" align="middle">
64 <br><br><p>{{ _("secushare, PSYC, multicast, advocacy, sights and sounds, UX.") }}</p>
65 </div>
66 <div class="col-6 col-md-4">
67 <h2>Christian Kühne</h2>
68 <img src="{{ url('team-images/ck.jpg') }}" height="240" alt="Christian Kühne" align="middle">
69 <br><br><p>{{ _("secushare, Social, PSYC, Multicast, data protection theory.") }}</p>
70 </div>
71</div>
72<div class="row">
73 <div class="col-6 col-md-4">
74 <h2>Bart Polot</h2>
75 <br><br><p>{{ _("NSE, CADET.") }}</p>
76 </div>
77 <div class="col-6 col-md-4">
78 <h2>LRN</h2>
79 <br><br><p>{{ _("W32 port.") }}</p>
80 </div>
81 <div class="col-6 col-md-4">
82 <h2>Nils Durner</h2>
83 <br><br><p>{{ _("W32 port.") }}</p>
84 </div>
85</div>
86<div class="row">
87 <div class="col-6 col-md-4">
88 <h2><a href="http://n0.is">ng0</a></h2>
89 <br><br><p>{{ _("Documentation, gnURL, and in the broader sense all tasks related to System Integration of GNUnet") }}</p>
90 </div>
91 <div class="col-6 col-md-4">
92 <h2>tg</h2>
93 <br><br><p>{{ _("Multicast.") }}</p>
94 </div>
95</div>
96</div> 14</div>
97{% endblock body_content %} 15{% endblock body_content %}
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index 8f9b70b9..3ba13291 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -4,9 +4,10 @@
4 <div class="row"> 4 <div class="row">
5 <div class="col-12 col-sm-4"> 5 <div class="col-12 col-sm-4">
6 <ul class="footer-list"> 6 <ul class="footer-list">
7 <li><p><a href="about.html">{{ _("About") }}</a></p></li> 7 <li><p><a href="team.html">{{ _("Developer Team") }}</a></p></li>
8 <li><p><a href="contact.html">{{ _("Contact") }}</a></p></li> 8 <li><p><a href="contact.html">{{ _("Contact") }}</a></p></li>
9 <li><p><a href="ev.html">{{ _("GNUnet e.V.") }}</a></p></li> 9 <li><p><a href="ev.html">{{ _("GNUnet e.V.") }}</a></p></li>
10 <li><p><a href="about.html">{{ _("About GNUnet") }}</a></p></li>
10 </ul> 11 </ul>
11 </div> 12 </div>
12 <div class="col-12 col-sm-4"> 13 <div class="col-12 col-sm-4">
diff --git a/team.html.j2 b/team.html.j2
new file mode 100644
index 00000000..df7e855f
--- /dev/null
+++ b/team.html.j2
@@ -0,0 +1,97 @@
1{% extends "common/base.j2" %}
2{% block body_content %}
3<div class="container-wide">
4<!-- list alphabetical, first those with images, then those without -->
5<div class="row">
6 <div class="col-6 col-md-4">
7 <h2><a href="https://grothoff.org/christian/">Christian Grothoff</a></h2>
8 <img src="{{ url('team-images/christian-grothoff.jpg') }}" height="240" alt="Christian Grothoff" align="middle">
9 <br><br><p>{{ _("GNU maintainer.") }}</p>
10 </div>
11 <div class="col-6 col-md-4">
12 <h2>dvn</h2>
13 <img src="{{ url('team-images/dvn.jpg') }}" height="240" alt="dvn" align="middle">
14 <br><br><p>{{ _("Continuous Integration, secushare, packaging (Guix).") }}</p>
15 </div>
16 <div class="col-6 col-md-4">
17 <h2><a href="https://fdold.eu">Florian Dold</a></h2>
18 <img src="{{ url('team-images/florian-dold.jpg') }}" height="240" alt="Florian Dold" align="middle">
19 <br><br><p>{{ _("Set, Consensus, Voting.") }}</p>
20 </div>
21</div>
22<div class="row">
23 <div class="col-6 col-md-4">
24 <h2>Jeffrey Burdges</h2>
25 <img src="{{ url('team-images/jeff-burdges.jpg') }}" height="240" alt="Jeffrey Burdges" align="middle">
26 <br><br><p>{{ _("Mix networking.") }}</p>
27 </div>
28 <div class="col-6 col-md-4">
29 <h2>Julius B&uuml;ger</h2>
30 <img src="{{ url('team-images/julius-buenger.jpg') }}" height="240" alt="Julius B&uuml;nger" align="middle">
31 <br><br><p>{{ _("Random peer sampling.") }}</p>
32 </div>
33 <div class="col-6 col-md-4">
34 <h2>lurchi</h2>
35 <img src="{{ url('team-images/lurchi.jpg') }}" height="240" alt="lurchi" align="middle">
36 <br><br><p>{{ _("secushare, Social, PSYC, Multicast.") }}</p>
37 </div>
38</div>
39<div class="row">
40 <div class="col-6 col-md-4">
41 <h2>Martin Schanzenbach</h2>
42 <br><br><p>{{ _("GNU Name System, Identity Management, ABE.") }}</p>
43 </div>
44 <div class="col-6 col-md-4">
45 <h2><a href="http://sreeharsha.totakura.in/">Sree Harsha Totakura</a></h2>
46 <img src="{{ url('team-images/sree-harsha-totakura.jpg') }}" height="240" alt="Sree Harsha Totakura" align="middle">
47 <br><br><p>{{ _("Testbed, voice.") }}</p>
48 </div>
49 <div class="col-6 col-md-4">
50 <h2>t3sserakt</h2>
51 <img src="{{ url('team-images/t3sserakt.jpg') }}" height="240" alt="t3sserakt" align="middle">
52 <br><br><p>{{ _("secushare, Social, PSYC, Multicast.") }}</p>
53 </div>
54</div>
55<div class="row">
56 <div class="col-6 col-md-4">
57 <h2>wldhx</h2>
58 <img src="{{ url('team-images/wldhx.jpg') }}" height="240" alt="wldhx" align="middle">
59 <br><br><p>{{ _("Web site, packaging (Nix/Guix).") }}</p>
60 </div>
61 <div class="col-6 col-md-4">
62 <h2><a href="http://my.pages.de">carlo von lynX</a></h2>
63 <img src="{{ url('images/gnunet-logo_bright.svg') }}" height="240" alt="lynX" align="middle">
64 <br><br><p>{{ _("secushare, PSYC, multicast, advocacy, sights and sounds, UX.") }}</p>
65 </div>
66 <div class="col-6 col-md-4">
67 <h2>Christian Kühne</h2>
68 <img src="{{ url('team-images/ck.jpg') }}" height="240" alt="Christian Kühne" align="middle">
69 <br><br><p>{{ _("secushare, Social, PSYC, Multicast, data protection theory.") }}</p>
70 </div>
71</div>
72<div class="row">
73 <div class="col-6 col-md-4">
74 <h2>Bart Polot</h2>
75 <br><br><p>{{ _("NSE, CADET.") }}</p>
76 </div>
77 <div class="col-6 col-md-4">
78 <h2>LRN</h2>
79 <br><br><p>{{ _("W32 port.") }}</p>
80 </div>
81 <div class="col-6 col-md-4">
82 <h2>Nils Durner</h2>
83 <br><br><p>{{ _("W32 port.") }}</p>
84 </div>
85</div>
86<div class="row">
87 <div class="col-6 col-md-4">
88 <h2><a href="http://n0.is">ng0</a></h2>
89 <br><br><p>{{ _("Documentation, gnURL, and in the broader sense all tasks related to System Integration of GNUnet") }}</p>
90 </div>
91 <div class="col-6 col-md-4">
92 <h2>tg</h2>
93 <br><br><p>{{ _("Multicast.") }}</p>
94 </div>
95</div>
96</div>
97{% endblock body_content %}