diff options
| -rw-r--r-- | common/footer.j2.inc | 11 | ||||
| -rw-r--r-- | common/navigation.j2.inc | 1 | ||||
| -rw-r--r-- | team-images/christian-grothoff.jpg | bin | 47385 -> 0 bytes | |||
| -rw-r--r-- | team-images/cristina-onete.jpg | bin | 23650 -> 0 bytes | |||
| -rw-r--r-- | team-images/florian-dold.jpg | bin | 565895 -> 0 bytes | |||
| -rw-r--r-- | team-images/jeff-burdges.jpg | bin | 78753 -> 0 bytes | |||
| -rw-r--r-- | team-images/leon-schumacher.jpg | bin | 13920 -> 0 bytes | |||
| -rw-r--r-- | team-images/marcello-stanisci.jpg | bin | 58439 -> 0 bytes | |||
| -rw-r--r-- | team-images/michael-widmer.jpg | bin | 203583 -> 0 bytes | |||
| -rw-r--r-- | team-images/nana-karlstetter.jpg | bin | 656628 -> 0 bytes | |||
| -rw-r--r-- | team-images/richard-stallman.jpg | bin | 55243 -> 0 bytes | |||
| -rw-r--r-- | team-images/sree-harsha-totakura.jpg | bin | 15430 -> 0 bytes | |||
| -rw-r--r-- | template/investors.html.j2 | 2 | ||||
| -rw-r--r-- | template/team.html.j2 | 155 |
14 files changed, 4 insertions, 165 deletions
diff --git a/common/footer.j2.inc b/common/footer.j2.inc index 30103089..bce2b9a1 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 520b340b..c8a645bd 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 Binary files differdeleted file mode 100644 index e67e7e1a..00000000 --- a/team-images/christian-grothoff.jpg +++ /dev/null diff --git a/team-images/cristina-onete.jpg b/team-images/cristina-onete.jpg Binary files differdeleted file mode 100644 index 393d92a4..00000000 --- a/team-images/cristina-onete.jpg +++ /dev/null diff --git a/team-images/florian-dold.jpg b/team-images/florian-dold.jpg Binary files differdeleted file mode 100644 index b88e6a18..00000000 --- a/team-images/florian-dold.jpg +++ /dev/null diff --git a/team-images/jeff-burdges.jpg b/team-images/jeff-burdges.jpg Binary files differdeleted file mode 100644 index a7b77e9b..00000000 --- a/team-images/jeff-burdges.jpg +++ /dev/null diff --git a/team-images/leon-schumacher.jpg b/team-images/leon-schumacher.jpg Binary files differdeleted file mode 100644 index dd38fcd3..00000000 --- a/team-images/leon-schumacher.jpg +++ /dev/null diff --git a/team-images/marcello-stanisci.jpg b/team-images/marcello-stanisci.jpg Binary files differdeleted file mode 100644 index 65ae7559..00000000 --- a/team-images/marcello-stanisci.jpg +++ /dev/null diff --git a/team-images/michael-widmer.jpg b/team-images/michael-widmer.jpg Binary files differdeleted file mode 100644 index 386c2593..00000000 --- a/team-images/michael-widmer.jpg +++ /dev/null diff --git a/team-images/nana-karlstetter.jpg b/team-images/nana-karlstetter.jpg Binary files differdeleted file mode 100644 index 38b60596..00000000 --- a/team-images/nana-karlstetter.jpg +++ /dev/null diff --git a/team-images/richard-stallman.jpg b/team-images/richard-stallman.jpg Binary files differdeleted file mode 100644 index 42205b81..00000000 --- a/team-images/richard-stallman.jpg +++ /dev/null diff --git a/team-images/sree-harsha-totakura.jpg b/team-images/sree-harsha-totakura.jpg Binary files differdeleted file mode 100644 index 081c3bc7..00000000 --- a/team-images/sree-harsha-totakura.jpg +++ /dev/null diff --git a/template/investors.html.j2 b/template/investors.html.j2 index d31914b9..784d9897 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 9d319e3a..00000000 --- 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 & 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,") }} ….</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 & 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í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ü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ü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übin</h2> - <p>{{ _("Free software developer.") }}</p> - </div> - </div> - </div> -{% endblock body_content %} |
