summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@taler.net>2019-09-17 19:20:17 +0000
committerng0 <ng0@taler.net>2019-09-17 19:20:17 +0000
commitb944a90ef7b11922e9b54f38d15237ca20425180 (patch)
treea885a580bdfc1bc0a426700ef4c2e966eb4c369a
parente5120af3cc7c44ef0d0c7df4cef89b6a518866c1 (diff)
parent578989edb6e20add35f9caf2ef7c86ce7c4e6fe9 (diff)
downloadwww-b944a90ef7b11922e9b54f38d15237ca20425180.tar.gz
www-b944a90ef7b11922e9b54f38d15237ca20425180.tar.bz2
www-b944a90ef7b11922e9b54f38d15237ca20425180.zip
Merge branch 'master' of git.taler.net:www
-rw-r--r--common/footer.j2.inc11
-rw-r--r--common/navigation.j2.inc1
-rw-r--r--team-images/christian-grothoff.jpgbin47385 -> 0 bytes
-rw-r--r--team-images/cristina-onete.jpgbin23650 -> 0 bytes
-rw-r--r--team-images/florian-dold.jpgbin565895 -> 0 bytes
-rw-r--r--team-images/jeff-burdges.jpgbin78753 -> 0 bytes
-rw-r--r--team-images/leon-schumacher.jpgbin13920 -> 0 bytes
-rw-r--r--team-images/marcello-stanisci.jpgbin58439 -> 0 bytes
-rw-r--r--team-images/michael-widmer.jpgbin203583 -> 0 bytes
-rw-r--r--team-images/nana-karlstetter.jpgbin656628 -> 0 bytes
-rw-r--r--team-images/richard-stallman.jpgbin55243 -> 0 bytes
-rw-r--r--team-images/sree-harsha-totakura.jpgbin15430 -> 0 bytes
-rw-r--r--template/investors.html.j22
-rw-r--r--template/team.html.j2155
14 files changed, 4 insertions, 165 deletions
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index 3010308..bce2b9a 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -6,22 +6,17 @@
</div>
</div>
<div class="row">
- <div class="col-12 col-sm-3">
- <ul class="footer-list">
- <li><p><a href="team.html">{{ _("Team") }}</a></p></li>
- </ul>
- </div>
- <div class="col-12 col-sm-3">
+ <div class="col-12 col-sm-4">
<ul class="footer-list">
<li><p><a href="contact.html">{{ _("Contact") }}</a></p></li>
</ul>
</div>
- <div class="col-12 col-sm-3">
+ <div class="col-12 col-sm-4">
<ul class="footer-list">
<li><p><a href="faq.html">{{ _("FAQ") }}</a></p></li>
</ul>
</div>
- <div class="col-12 col-sm-3">
+ <div class="col-12 col-sm-4">
<ul class="footer-list">
<li><p><a href="bibliography.html">{{ _("Bibliography") }}</a></p></li>
</ul>
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 520b340..c8a645b 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -21,7 +21,6 @@
{{ navlink('features.html', _('Features')) }}
{{ navlink('principles.html', _('Principles')) }}
{{ navlink('docs.html', _('Docs')) }}
- {{ navlink('team.html', _('Team')) }}
</div>
<div class="nav-item dropdown">
diff --git a/team-images/christian-grothoff.jpg b/team-images/christian-grothoff.jpg
deleted file mode 100644
index e67e7e1..0000000
--- a/team-images/christian-grothoff.jpg
+++ /dev/null
Binary files differ
diff --git a/team-images/cristina-onete.jpg b/team-images/cristina-onete.jpg
deleted file mode 100644
index 393d92a..0000000
--- a/team-images/cristina-onete.jpg
+++ /dev/null
Binary files differ
diff --git a/team-images/florian-dold.jpg b/team-images/florian-dold.jpg
deleted file mode 100644
index b88e6a1..0000000
--- a/team-images/florian-dold.jpg
+++ /dev/null
Binary files differ
diff --git a/team-images/jeff-burdges.jpg b/team-images/jeff-burdges.jpg
deleted file mode 100644
index a7b77e9..0000000
--- a/team-images/jeff-burdges.jpg
+++ /dev/null
Binary files differ
diff --git a/team-images/leon-schumacher.jpg b/team-images/leon-schumacher.jpg
deleted file mode 100644
index dd38fcd..0000000
--- a/team-images/leon-schumacher.jpg
+++ /dev/null
Binary files differ
diff --git a/team-images/marcello-stanisci.jpg b/team-images/marcello-stanisci.jpg
deleted file mode 100644
index 65ae755..0000000
--- a/team-images/marcello-stanisci.jpg
+++ /dev/null
Binary files differ
diff --git a/team-images/michael-widmer.jpg b/team-images/michael-widmer.jpg
deleted file mode 100644
index 386c259..0000000
--- a/team-images/michael-widmer.jpg
+++ /dev/null
Binary files differ
diff --git a/team-images/nana-karlstetter.jpg b/team-images/nana-karlstetter.jpg
deleted file mode 100644
index 38b6059..0000000
--- a/team-images/nana-karlstetter.jpg
+++ /dev/null
Binary files differ
diff --git a/team-images/richard-stallman.jpg b/team-images/richard-stallman.jpg
deleted file mode 100644
index 42205b8..0000000
--- a/team-images/richard-stallman.jpg
+++ /dev/null
Binary files differ
diff --git a/team-images/sree-harsha-totakura.jpg b/team-images/sree-harsha-totakura.jpg
deleted file mode 100644
index 081c3bc..0000000
--- a/team-images/sree-harsha-totakura.jpg
+++ /dev/null
Binary files differ
diff --git a/template/investors.html.j2 b/template/investors.html.j2
index d31914b..784d989 100644
--- a/template/investors.html.j2
+++ b/template/investors.html.j2
@@ -25,7 +25,7 @@
<p>
{% trans %}
- Our <a href="about.html">team</a> combines world-class business leaders,
+ Our team combines world-class business leaders,
cryptographers, software engineers, civil-rights
activists and academics. We are unified by a vision
of how payments should work and the goal of
diff --git a/template/team.html.j2 b/template/team.html.j2
deleted file mode 100644
index 9d319e3..0000000
--- a/template/team.html.j2
+++ /dev/null
@@ -1,155 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
- <div class="container">
- <div class="row">
- <div class="col">
- <h1>{{ _("GNU Taler: Team")}}</h1>
- <p>
- {% trans %}
- GNU Taler is proudly brought to you by the humans on this page.
- To contact the whole team, please write to
- {% endtrans %}
- <a href="mailto:contact@taler.net">contact@taler.net</a>.
- </p>
- </div>
- </div>
- <div class="row mt-5"></div>
- <div class="row">
- <div class="col-lg-4">
- <h2><a href="http://grothoff.org/christian/">Dr. Christian Grothoff</a></h2>
- <img src="{{ url('team-images/christian-grothoff.jpg') }}" height="240" alt="Christian Grothoff" align="middle">
- <p>{{ _("GNU maintainer. Network security &amp; privacy researcher. Software architect.") }}</p>
- </div>
- <div class="col-lg-4">
- <h2><a href="http://www.digitalekho.com/about-us/index.html">Leon Schumacher</a></h2>
- <img src="{{ url('team-images/leon-schumacher.jpg') }}" height="240" alt="Leon Schumacher" align="middle">
- <p>{{ _("Entrepreneur, Investor, Fortune 100 CIO, IT company director in different industries,") }} &#x2026;.</p>
- </div>
- <div class="col-lg-4">
- <h2>Michael Widmer</h2>
- <img src="{{ url('team-images/michael-widmer.jpg') }}" height="240" alt="Michael Widmer" align="middle">
- <p>{{ _("Lawyer and banker.") }}</p>
- </div>
- </div>
- <div class="row">
- <div class="col-lg-4">
- <h2><a href="https://fdold.eu/">Dr. Florian Dold</a></h2>
- <img src="{{ url('team-images/florian-dold.jpg') }}" height="240" alt="Florian Dold" align="middle">
- <p>{{ _("GNU maintainer, lead developer.") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Dr. Jeffrey Burdges</h2>
- <img src="{{ url('team-images/jeff-burdges.jpg') }}" height="240" alt="Jeffrey Burdges" align="middle">
- <p>{{ _("Applied cryptography. Contact to W3c &amp; Tor.") }}</p>
- </div>
- <div class="col-lg-4">
- <h2><a href="https://www.stallman.org/">Dr. Richard M. Stallman</a></h2>
- <img src="{{ url('team-images/richard-stallman.jpg') }}" height="240" alt="Richard Stallman" align="middle">
- <p>{{ _("Founder of the GNU project. Software Freedom Advisor.") }}</p>
- </div>
- </div>
- <div class="row">
- <div class="col-lg-4">
- <h2>Marcello Stanisci</h2>
- <img src="{{ url('team-images/marcello-stanisci.jpg') }}" height="240" alt="Marcello Stanisci" align="middle">
- <p>{{ _("Software engineer.") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Dr. Nana Karlstetter</h2>
- <img src="{{ url('team-images/nana-karlstetter.jpg') }}" height="240" alt="Nana Karlstetter" align="middle">
- <p>{{ _("Sustainable business development.") }}</p>
- </div>
- <div class="col-lg-4">
- <h2><a href="http://www.onete.net/">Dr. Cristina Onete</a></h2>
- <img src="{{ url('team-images/cristina-onete.jpg') }}" height="240" alt="Cristina Onete" align="middle">
- <p>{{ _("Theoretical foundations.") }}</p>
- </div>
- </div>
- <div class="row">
- <div class="col-lg-4">
- <h2>ng0</h2>
- <p>{{ _("System administration, Taler Systems SA.") }}</p>
- </div>
- </div>
- <!-- keep translators together -->
- <div class="row">
- <div class="col-lg-4">
- <h2><a href="https://ar.linkedin.com/in/martinolivera">Mart&#237;n Olivera</a></h2>
- <p>{{ _("Translator (Spanish)") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Patricia Sunshine</h2>
- <p>{{ _("Translator (Spanish)") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Fumiko</h2>
- <p>{{ _("Translator (Spanish)") }}</p>
- </div>
- </div>
- <div class="row">
- <div class="col-lg-4">
- <h2>Greta Breveglieri</h2>
- <p>{{ _("Translator (Italian)") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Ylenia Baldanza</h2>
- <p>{{ _("Translator (Italian)") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Valeria Salerno</h2>
- <p>{{ _("Translator (Italian)") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Stefan K&uuml;gel</h2>
- <p>{{ _("Translator (German)") }}</p>
- </div>
- </div>
- <!-- more 'remote' people -->
- <div class="row">
- <div class="col-lg-4">
- <h2><a href="https://www.nitrokey.com/">Jan Suhr</a></h2>
- <p>{{ _("Hardware security module") }}</p>
- </div>
- <div class="col-lg-4">
- <h2><a href="http://www.goebel-consult.de/">Hartmut Goebel</a></h2>
- <p>{{ _("Risk management") }}</p>
- </div>
- </div>
- <!-- students -->
- <div class="row">
- <div class="col-lg-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">
- <p>{{ _("PhD Student, TU Munich. Currently teaching.") }}</p>
- </div>
- <div class="col-lg-4">
- <h2><a href="https://www.sec.in.tum.de/julian-kirsch/">Julian Kirsch</a></h2>
- <p>{{ _("PhD student, TU Munich. Currently teaching.") }}</p>
- </div>
- </div>
- <div class="row">
- <div class="col-lg-4">
- <h2>Oliver Broome</h2>
- <p>{{ _("Free software developer.") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Shivam Kohli</h2>
- <p>{{ _("Free software developer.") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Benedikt M&uuml;ller</h2>
- <p>{{ _("Free software developer.") }}</p>
- </div>
- </div>
- <div class="row">
- <div class="col-lg-4">
- <h2>Dominique Hofmann</h2>
- <p>{{ _("Free software developer.") }}</p>
- </div>
- <div class="col-lg-4">
- <h2>Jan Str&uuml;bin</h2>
- <p>{{ _("Free software developer.") }}</p>
- </div>
- </div>
- </div>
-{% endblock body_content %}