From c3d21940ebcce2659e9dd4583f32fc7d818720ae Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Fri, 15 Feb 2019 23:52:07 +0000
Subject: about becomes team, add and change pages in footer

---
 about.html.j2        | 104 ++++++---------------------------------------------
 common/footer.j2.inc |   3 +-
 team.html.j2         |  97 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 110 insertions(+), 94 deletions(-)
 create mode 100644 team.html.j2

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 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
-<div class="container-wide">
-<!-- list alphabetical, first those with images, then those without -->
-<div class="row">
-  <div class="col-6 col-md-4">
-    <h2><a href="https://grothoff.org/christian/">Christian Grothoff</a></h2>
-    <img src="{{ url('team-images/christian-grothoff.jpg') }}" height="240" alt="Christian Grothoff" align="middle">
-    <br><br><p>{{ _("GNU maintainer.") }}</p>
-  </div>
-  <div class="col-6 col-md-4">
-    <h2>dvn</h2>
-    <img src="{{ url('team-images/dvn.jpg') }}" height="240" alt="dvn" align="middle">
-    <br><br><p>{{ _("Continuous Integration, secushare, packaging (Guix).") }}</p>
-  </div>
-  <div class="col-6 col-md-4">
-    <h2><a href="https://fdold.eu">Florian Dold</a></h2>
-    <img src="{{ url('team-images/florian-dold.jpg') }}" height="240" alt="Florian Dold" align="middle">
-    <br><br><p>{{ _("Set, Consensus, Voting.") }}</p>
-  </div>
-</div>
-<div class="row">
-  <div class="col-6 col-md-4">
-    <h2>Jeffrey Burdges</h2>
-    <img src="{{ url('team-images/jeff-burdges.jpg') }}" height="240" alt="Jeffrey Burdges" align="middle">
-    <br><br><p>{{ _("Mix networking.") }}</p>
-  </div>
-  <div class="col-6 col-md-4">
-    <h2>Julius B&uuml;ger</h2>
-    <img src="{{ url('team-images/julius-buenger.jpg') }}" height="240" alt="Julius B&uuml;nger" align="middle">
-    <br><br><p>{{ _("Random peer sampling.") }}</p>
-  </div>
-  <div class="col-6 col-md-4">
-    <h2>lurchi</h2>
-    <img src="{{ url('team-images/lurchi.jpg') }}" height="240" alt="lurchi" align="middle">
-    <br><br><p>{{ _("secushare, Social, PSYC, Multicast.") }}</p>
-  </div>
-</div>
-<div class="row">
-  <div class="col-6 col-md-4">
-    <h2>Martin Schanzenbach</h2>
-    <br><br><p>{{ _("GNU Name System, Identity Management, ABE.") }}</p>
-  </div>
-  <div class="col-6 col-md-4">
-    <h2><a href="http://sreeharsha.totakura.in/">Sree Harsha Totakura</a></h2>
-    <img src="{{ url('team-images/sree-harsha-totakura.jpg') }}" height="240" alt="Sree Harsha Totakura" align="middle">
-    <br><br><p>{{ _("Testbed, voice.") }}</p>
-  </div>
-  <div class="col-6 col-md-4">
-    <h2>t3sserakt</h2>
-    <img src="{{ url('team-images/t3sserakt.jpg') }}" height="240" alt="t3sserakt" align="middle">
-    <br><br><p>{{ _("secushare, Social, PSYC, Multicast.") }}</p>
-  </div>
-</div>
-<div class="row">
-  <div class="col-6 col-md-4">
-    <h2>wldhx</h2>
-    <img src="{{ url('team-images/wldhx.jpg') }}" height="240" alt="wldhx" align="middle">
-    <br><br><p>{{ _("Web site, packaging (Nix/Guix).") }}</p>
-  </div>
-  <div class="col-6 col-md-4">
-    <h2><a href="http://my.pages.de">carlo von lynX</a></h2>
-    <img src="{{ url('images/gnunet-logo_bright.svg') }}" height="240" alt="lynX" align="middle">
-    <br><br><p>{{ _("secushare, PSYC, multicast, advocacy, sights and sounds, UX.") }}</p>
-  </div>
-  <div class="col-6 col-md-4">
-    <h2>Christian Kühne</h2>
-    <img src="{{ url('team-images/ck.jpg') }}" height="240" alt="Christian Kühne" align="middle">
-    <br><br><p>{{ _("secushare, Social, PSYC, Multicast, data protection theory.") }}</p>
-  </div>
-</div>
-<div class="row">
-  <div class="col-6 col-md-4">
-    <h2>Bart Polot</h2>
-    <br><br><p>{{ _("NSE, CADET.") }}</p>
-  </div>
-  <div class="col-6 col-md-4">
-    <h2>LRN</h2>
-    <br><br><p>{{ _("W32 port.") }}</p>
-  </div>
-  <div class="col-6 col-md-4">
-    <h2>Nils Durner</h2>
-    <br><br><p>{{ _("W32 port.") }}</p>
-  </div>
-</div>
-<div class="row">
-  <div class="col-6 col-md-4">
-    <h2><a href="http://n0.is">ng0</a></h2>
-    <br><br><p>{{ _("Documentation, gnURL, and in the broader sense all tasks related to System Integration of GNUnet") }}</p>
-  </div>
-  <div class="col-6 col-md-4">
-    <h2>tg</h2>
-    <br><br><p>{{ _("Multicast.") }}</p>
-  </div>
-</div>
+<div class="container">
+  <article>
+    <section>
+      <h3>{{ _("About GNUnet") }}</h3>
+      <p>
+	{% trans %}
+        We still have to write this section. 
+	{% endtrans %}
+      </p>
+    </section>
+  </article>
 </div>
 {% 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 @@
       <div class="row">
         <div class="col-12 col-sm-4">
           <ul class="footer-list">
-            <li><p><a href="about.html">{{ _("About") }}</a></p></li>
+            <li><p><a href="team.html">{{ _("Developer Team") }}</a></p></li>
             <li><p><a href="contact.html">{{ _("Contact") }}</a></p></li>
             <li><p><a href="ev.html">{{ _("GNUnet e.V.") }}</a></p></li>
+            <li><p><a href="about.html">{{ _("About GNUnet") }}</a></p></li>
           </ul>
         </div>
         <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 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+<div class="container-wide">
+<!-- list alphabetical, first those with images, then those without -->
+<div class="row">
+  <div class="col-6 col-md-4">
+    <h2><a href="https://grothoff.org/christian/">Christian Grothoff</a></h2>
+    <img src="{{ url('team-images/christian-grothoff.jpg') }}" height="240" alt="Christian Grothoff" align="middle">
+    <br><br><p>{{ _("GNU maintainer.") }}</p>
+  </div>
+  <div class="col-6 col-md-4">
+    <h2>dvn</h2>
+    <img src="{{ url('team-images/dvn.jpg') }}" height="240" alt="dvn" align="middle">
+    <br><br><p>{{ _("Continuous Integration, secushare, packaging (Guix).") }}</p>
+  </div>
+  <div class="col-6 col-md-4">
+    <h2><a href="https://fdold.eu">Florian Dold</a></h2>
+    <img src="{{ url('team-images/florian-dold.jpg') }}" height="240" alt="Florian Dold" align="middle">
+    <br><br><p>{{ _("Set, Consensus, Voting.") }}</p>
+  </div>
+</div>
+<div class="row">
+  <div class="col-6 col-md-4">
+    <h2>Jeffrey Burdges</h2>
+    <img src="{{ url('team-images/jeff-burdges.jpg') }}" height="240" alt="Jeffrey Burdges" align="middle">
+    <br><br><p>{{ _("Mix networking.") }}</p>
+  </div>
+  <div class="col-6 col-md-4">
+    <h2>Julius B&uuml;ger</h2>
+    <img src="{{ url('team-images/julius-buenger.jpg') }}" height="240" alt="Julius B&uuml;nger" align="middle">
+    <br><br><p>{{ _("Random peer sampling.") }}</p>
+  </div>
+  <div class="col-6 col-md-4">
+    <h2>lurchi</h2>
+    <img src="{{ url('team-images/lurchi.jpg') }}" height="240" alt="lurchi" align="middle">
+    <br><br><p>{{ _("secushare, Social, PSYC, Multicast.") }}</p>
+  </div>
+</div>
+<div class="row">
+  <div class="col-6 col-md-4">
+    <h2>Martin Schanzenbach</h2>
+    <br><br><p>{{ _("GNU Name System, Identity Management, ABE.") }}</p>
+  </div>
+  <div class="col-6 col-md-4">
+    <h2><a href="http://sreeharsha.totakura.in/">Sree Harsha Totakura</a></h2>
+    <img src="{{ url('team-images/sree-harsha-totakura.jpg') }}" height="240" alt="Sree Harsha Totakura" align="middle">
+    <br><br><p>{{ _("Testbed, voice.") }}</p>
+  </div>
+  <div class="col-6 col-md-4">
+    <h2>t3sserakt</h2>
+    <img src="{{ url('team-images/t3sserakt.jpg') }}" height="240" alt="t3sserakt" align="middle">
+    <br><br><p>{{ _("secushare, Social, PSYC, Multicast.") }}</p>
+  </div>
+</div>
+<div class="row">
+  <div class="col-6 col-md-4">
+    <h2>wldhx</h2>
+    <img src="{{ url('team-images/wldhx.jpg') }}" height="240" alt="wldhx" align="middle">
+    <br><br><p>{{ _("Web site, packaging (Nix/Guix).") }}</p>
+  </div>
+  <div class="col-6 col-md-4">
+    <h2><a href="http://my.pages.de">carlo von lynX</a></h2>
+    <img src="{{ url('images/gnunet-logo_bright.svg') }}" height="240" alt="lynX" align="middle">
+    <br><br><p>{{ _("secushare, PSYC, multicast, advocacy, sights and sounds, UX.") }}</p>
+  </div>
+  <div class="col-6 col-md-4">
+    <h2>Christian Kühne</h2>
+    <img src="{{ url('team-images/ck.jpg') }}" height="240" alt="Christian Kühne" align="middle">
+    <br><br><p>{{ _("secushare, Social, PSYC, Multicast, data protection theory.") }}</p>
+  </div>
+</div>
+<div class="row">
+  <div class="col-6 col-md-4">
+    <h2>Bart Polot</h2>
+    <br><br><p>{{ _("NSE, CADET.") }}</p>
+  </div>
+  <div class="col-6 col-md-4">
+    <h2>LRN</h2>
+    <br><br><p>{{ _("W32 port.") }}</p>
+  </div>
+  <div class="col-6 col-md-4">
+    <h2>Nils Durner</h2>
+    <br><br><p>{{ _("W32 port.") }}</p>
+  </div>
+</div>
+<div class="row">
+  <div class="col-6 col-md-4">
+    <h2><a href="http://n0.is">ng0</a></h2>
+    <br><br><p>{{ _("Documentation, gnURL, and in the broader sense all tasks related to System Integration of GNUnet") }}</p>
+  </div>
+  <div class="col-6 col-md-4">
+    <h2>tg</h2>
+    <br><br><p>{{ _("Multicast.") }}</p>
+  </div>
+</div>
+</div>
+{% endblock body_content %}
-- 
cgit v1.2.3