Updating template files: docs, development, and contacts

Signed-off-by: Stefan Kügel <skuegel@web.de>

3 files changed, 173 insertions, 135 deletions

diff --git a/template/contact.html.j2 b/template/contact.html.j2
index 26797acf..880f007c 100644
--- a/template/contact.html.j2
+++ b/template/contact.html.j2
@@ -3,30 +3,53 @@
 <main id="maincontent">
   <div class="jumbotron">
     <div class="container text-center">
-      <h1>{{ _("Contact information") }}</h1>
+      <h1>{{ _("Contacts Overview") }}</h1>
     </div>
   </div>
 
   <div class="container">
     <div class="row">
       <div class="col-lg-6">
-        <h2>{{ _("The mailing list") }}</h2>
+        <h2>{{ _("GNU Taler Mailing List") }}</h2>
         <p>
           {% trans %}
-            An archived, public mailing list for GNU Taler is
-            hosted at
+            A public mailing list for GNU Taler is hosted at
           {% endtrans %}
-          <a href="https://lists.gnu.org/mailman/listinfo/taler">https://lists.gnu.org/mailman/listinfo/taler</a>
-          (<a href="https://lists.gnu.org/archive/html/taler/">{{ _("archive")}}</a>).
+          <a href="https://lists.gnu.org/mailman/listinfo/taler" target="_blank" rel="noopener noreferrer">https://lists.gnu.org/mailman/listinfo/taler</a>
+          (<a href="https://lists.gnu.org/archive/html/taler/" target="_blank" rel="noopener noreferrer">{{ _("archive")}}</a>).
           {% trans %}
-            You can send messages to the list at
+            You can send messages to the list via email to
           {% endtrans %}
           <a href="mailto:taler@gnu.org">taler@gnu.org</a>.
         </p>
       </div>
 
       <div class="col-lg-6">
-        <h2>{{ _("Contacting individuals") }}</h2>
+        <h2>{{ _("General Inquiries") }}</h2>
+        <p>
+          {% trans %}
+            You can reach a group of team members handling general inquiries by sending emails to 
+            <a href="mailto:contact@taler.net">contact@taler.net</a>.
+          {% endtrans %}
+        </p>
+      </div>
+
+      <div class="col-lg-6">
+        <h2>{{ _("Reporting Bugs") }}</h2>
+        <p>
+          {% trans %}
+            We track open feature requests and bugs in our
+          {% endtrans %}
+          <a href="https://bugs.taler.net/" target="_blank" rel="noopener noreferrer">{{ _("Bug tracker") }}</a>,
+          {% trans %}
+            which is shared with the GNUnet project.
+            You can also report bugs or feature requests to the mailing list.
+          {% endtrans %}
+        </p>
+      </div>
+
+      <div class="col-lg-6">
+        <h2>{{ _("Contacting Individuals") }}</h2>
         <p>
           {% trans %}
             Team members are generally reachable at
@@ -40,46 +63,62 @@
         <h2>{{ _("Chat") }}</h2>
         <p>
           {% trans %}
-            We frequently discuss issues using <a href="https://mumble.sf.net/">Mumble</a>
+            We frequently discuss issues using <a href="https://mumble.sf.net/" target="_blank" rel="noopener noreferrer">Mumble</a>
             on <tt>gnunet.org</tt>. Feel free to join us in the lobby or developer rooms.
           {% endtrans %}
         </p>
       </div>
 
       <div class="col-lg-6">
-        <h2>{{ _("Reporting bugs") }}</h2>
+        <h2>{{ _("Executive Team") }}</h2>
         <p>
           {% trans %}
-            We track open feature requests and bugs in our
+            For non-technical commercial requests, please contact
+            <a href="mailto:ceo@taler-systems.com">ceo@taler-systems.com</a>.
           {% endtrans %}
-          <a href="https://bugs.taler.net/">{{ _("Bug tracker") }}</a>,
+        </p>
+      </div>
+
+      <div class="col-lg-6">
+        <h2>{{ _("IRC") }}</h2>
+        <p>
           {% trans %}
-            which is shared with the GNUnet project.
-            You can also report bugs or feature requests to the
-            mailing list.
-          {% endtrans %}
+            Our IRC channel is #taler on 
+          <a href="https://web.libera.chat/" target="_blank" rel="noopener noreferrer">
+          Libera{% endtrans %}</a>.
         </p>
       </div>
 
       <div class="col-lg-6">
-        <h2>{{ _("General inquiries") }}</h2>
+        <h2>{{ _("Sales and Marketing") }}</h2>
         <p>
           {% trans %}
-            You can reach a group of team members handling
-            general inquiries at <tt>contact AT taler.net</tt>.
-          {% endtrans %}
+            You can reach our Head of Marketing handling your requests by sending an email to 
+            <a href="mailto:sales@taler.net">sales@taler.net</a> respectively 
+            <a href="mailto:marketing@taler.net">marketing@taler.net</a>
+            .{% endtrans %}
         </p>
       </div>
 
       <div class="col-lg-6">
-        <h2>{{ _("Executive team") }}</h2>
+        <h2>{{ _("Onboarding &amp; Contributing") }}</h2>
         <p>
           {% trans %}
-            For non-technical commercial requests, please contact
-            <tt>ceo AT taler-systems.com</tt>.
-          {% endtrans %}
+            If you want to contribute to GNU Taler you can send us an email to 
+          <a href="mailto:onboarding@taler-systems.com">onboarding@taler-systems.com</a> or look up 
+          <a href="https://taler-systems.com/en/company.html" target="_blank" rel="noopener noreferrer">open positions and job opportunities</a>.{% endtrans %}
         </p>
       </div>
+
+      <div class="col-lg-6">
+        <h2>{{ _("Public Relations and Media Contact") }}</h2>
+        <p>
+          {% trans %}
+            You can reach our team members responsible for PR, press and media contacts via email to 
+            <a href="mailto:press@taler.net">press@taler.net</a>.{% endtrans %}
+        </p>
+      </div>
+
     </div>
   </div>
 {% endblock body_content %}
diff --git a/template/development.html.j2 b/template/development.html.j2
index f1f2a157..c8b7778a 100644
--- a/template/development.html.j2
+++ b/template/development.html.j2
@@ -4,108 +4,177 @@
 <div class="container">
   <div class="row">
     <div class="col">
-    <h1>{{ _("GNU Taler: Development")}}</h1>
+    <h1>{{ _("GNU Taler: Links and information for code development")}}</h1>
     </div>
   </div>
+
   <div class="row mt-5">
   </div>
   <div class="row justify-content-center text-center">
     <div class="col-8">
-      <h2>{{ _("Community Interaction")}}</h2>
+      <h2>{{ _("Developer Services")}}</h2>
     </div>
   </div>
   <div class="row mt-5">
   </div>
   <div class="row">
     <div class="col-lg-4 mb-4">
-      <a href="https://lists.gnu.org/mailman/listinfo/taler" target="_blank" rel="noopener noreferrer">
-        <img src="{{ url('icons/noun-email-list-4339749.svg') }}" height=60>
-        <h3>{{ _("Mailing List")}}</h3>
+      <a href="https://git.taler.net" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-git-2407191.svg') }}" height=60>
+        <h3>{{ _("Git Repositories") }}</h3>
       </a>
-      {{ _("The official GNU Taler mailing list.") }}
+      {{ _("Git repositories for all of GNU Taler.") }}
     </div>
 
     <div class="col-lg-4 mb-4">
-      <a href="https://web.libera.chat/" target="_blank" rel="noopener noreferrer">
-        <img src="{{ url('icons/noun-chat-5180308.svg') }}" height=60>
-        <h3>{{ _("IRC")}}</h3>
+      <a href="https://lcov.taler.net" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/icon-lcov.svg') }}" height=60>
+        <h3>{{ _("lcov Results") }}</h3>
       </a>
-      {{ _("Our IRC channel is #taler on Libera.") }}
+      {{ _("Shows results of the code coverage analysis for our test suite.") }}
     </div>
 
     <div class="col-lg-4 mb-4">
-      <a href="https://bugs.taler.net/" target="_blank" rel="noopener noreferrer">
-        <img src="{{ url('icons/noun-bug-tracking-2119186.svg') }}" height=60>
-        <h3>{{ _("Bug Tracker")}}</h3>
+      <a href="https://buildbot.taler.net" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-continuous-integration-4368507.svg') }}" height=60>
+        <h3>{{ _("Continuous Integration") }}</h3>
       </a>
-      {{ _("Our bug tracker for bugs and feature request.") }}
+      {{ _("Continuous integration and deployment is managed by our Buildbot.") }}
     </div>
 
     <div class="col-lg-4 mb-4">
-      <a href="https://{{ siteconf['docshost'] }}/developers-manual.html" target="_blank" rel="noopener noreferrer">
-        <img src="{{ url('icons/noun-onboarding-2896490.svg') }}" height=60>
-        <h3>{{ _("Onboarding")}}</h3>
+      <a href="https://weblate.taler.net/" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-translate-5177522.svg') }}" height=60>
+        <h3>{{ _("Internationalization")}}</h3>
+      </a>
+      {{ _("Using our Weblate service, everyone in the community can contribute with translations to the web pages and the GNU Taler applications.") }}
+    </div>
+
+    <div class="col-lg-4 mb-4">
+      <a href="https://git.taler.net/twister.git/" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-twister-2280690.svg') }}" height=60>
+        <h3>{{ _("Twister") }}</h3>
       </a>
       {% trans %}
-        Description of our taler.net setup and how to contribute.
+        HTTP modifying man-in-the-middle proxy to test error handling.
       {% endtrans %}
-      {{ gettext('Also available as <a href="%(link)s" target="_blank" rel="noopener noreferrer">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/developers-manual.pdf") }}
     </div>
   </div>
 
   <div class="row mt-5">
   </div>
+
   <div class="row justify-content-center text-center">
     <div class="col-8">
-      <h2>{{ _("Developer Services")}}</h2>
+      <h2>{{ _("Experimental Work")}}</h2>
     </div>
   </div>
 
   <div class="row mt-5">
   </div>
+
   <div class="row">
+    <div class="col-lg-4 mb-4">
+      <a href="https://git.gnunet.org/libbrandt.git/" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-auction-5172639.svg') }}" height=60>
+        <h3>{{ _("SMC Auctions") }}</h3>
+      </a>
+      {{ _("Secure multiparty auction protocol (future Taler Exchange extension).") }}
+    </div>
 
     <div class="col-lg-4 mb-4">
-      <a href="https://git.taler.net" target="_blank" rel="noopener noreferrer">
-        <img src="{{ url('icons/noun-git-2407191.svg') }}" height=60>
-        <h3>{{ _("Git repositories") }}</h3>
+      <a href="/papers/esorics2022-age-restriction.pdf" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-parental-discretion-233685.svg') }}" height=60>
+        <h3>{{ _("Age Restrictions")}}</h3>
       </a>
-      {{ _("Git repositories for all of GNU Taler.") }}
+      {% trans %}
+        Cryptographic background on how parents can set age-restrictions on Taler coins
+        to protect minors from inappropriate purchases while preserving privacy for everyone.
+      {% endtrans %}
     </div>
 
     <div class="col-lg-4 mb-4">
-      <a href="https://lcov.taler.net" target="_blank" rel="noopener noreferrer">
-        <img src="{{ url('icons/icon-lcov.svg') }}" height=60>
-        <h3>{{ _("lcov results") }}</h3>
+      <a href="https://git.taler.net/mch2022.git/" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-id-badge-348401.svg') }}" height=60>
+        <h3>{{ _("MCH 2022 Badge Integration") }}</h3>
       </a>
-      {{ _("Shows results of the code coverage analysis for our test suite.") }}
+      {% trans %}
+        Accept GNU Taler payments on your MCH 2022 badge.
+      {% endtrans %}
     </div>
 
     <div class="col-lg-4 mb-4">
-      <a href="https://buildbot.taler.net" target="_blank" rel="noopener noreferrer">
-        <img src="{{ url('icons/noun-continuous-integration-4368507.svg') }}" height=60>
-        <h3>{{ _("Continuous integration") }}</h3>
+      <a href="" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-point-of-sale-3185628.svg') }}" height=60>
+        <h3>{{ _("EMVco Integration") }}</h3>
       </a>
-      {{ _("Continuous integration and deployment is managed by our Buildbot.") }}
+      {{ _("Integration with EMVco PoS systems (to be started soon).") }}
     </div>
 
     <div class="col-lg-4 mb-4">
-      <a href="https://weblate.taler.net/" target="_blank" rel="noopener noreferrer">
-        <img src="{{ url('icons/noun-translate-5177522.svg') }}" height=60>
-        <h3>{{ _("Internationalization")}}</h3>
+      <a href="" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-vault-1775866.svg') }}" height=60>
+        <h3>{{ _("Taler Vault") }}</h3>
       </a>
-      {{ _("Using our weblate service, everyone in the community can contribute towards translating the Website and the GNU Taler applications.") }}
+      {{ _("Hardware security module for GNU Taler (to be started soon).") }}
     </div>
+  </div>
 
+  <div class="col-lg-4 mb-4">
+    <a href="" target="_blank" rel="noopener noreferrer">
+      <img src="{{ url('icons/noun-e-commerce-218402.svg') }}" height=60>
+      <h3>{{ _("Payage Payment Plugin") }}</h3>
+    </a>
+      {% trans %}
+        GNU Taler payment plugin for Payage/Joomla! (coming soon).
+      {% endtrans %}
+  </div>
+
+  <div class="row mt-5">
+  </div>
+  <div class="row justify-content-center text-center">
+    <div class="col-8">
+      <h2>{{ _("Community Interaction")}}</h2>
+    </div>
+  </div>
+  <div class="row mt-5">
+  </div>
+  <div class="row">
     <div class="col-lg-4 mb-4">
-      <a href="https://git.taler.net/twister.git/" target="_blank" rel="noopener noreferrer">
-        <img src="{{ url('icons/noun-twister-2280690.svg') }}" height=60>
-        <h3>{{ _("Twister") }}</h3>
+      <a href="https://lists.gnu.org/mailman/listinfo/taler" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-email-list-4339749.svg') }}" height=60>
+        <h3>{{ _("Mailing List")}}</h3>
+      </a>
+      {{ _("The public GNU Taler mailing list.") }}
+    </div>
+
+    <div class="col-lg-4 mb-4">
+      <a href="https://web.libera.chat/" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-chat-5180308.svg') }}" height=60>
+        <h3>{{ _("IRC")}}</h3>
+      </a>
+      {{ _("Our IRC channel is #taler on Libera.") }}
+    </div>
+
+    <div class="col-lg-4 mb-4">
+      <a href="https://bugs.taler.net/" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-bug-tracking-2119186.svg') }}" height=60>
+        <h3>{{ _("Bug Tracker")}}</h3>
+      </a>
+      {{ _("Our bug tracker for bugs and feature requests.") }}
+    </div>
+
+    <div class="col-lg-4 mb-4">
+      <a href="https://{{ siteconf['docshost'] }}/developers-manual.html" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-onboarding-2896490.svg') }}" height=60>
+        <h3>{{ _("Onboarding")}}</h3>
       </a>
       {% trans %}
-        HTTP modifying man-in-the-middle proxy to test error handling.
+        Description of our taler.net setup and how to contribute.
       {% endtrans %}
+      {{ gettext('Also available as <a href="%(link)s" target="_blank" rel="noopener noreferrer">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/developers-manual.pdf") }}
     </div>
+
   </div>
 </div>
 {% endblock body_content %}
diff --git a/template/docs.html.j2 b/template/docs.html.j2
index 36373bcf..5c966827 100644
--- a/template/docs.html.j2
+++ b/template/docs.html.j2
@@ -55,7 +55,7 @@
     <div class="col-lg-4 mb-4">
       <a href="https://{{ siteconf['docshost'] }}/taler-backoffice-manual.html" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/icon-backoffice.svg') }}" height=60>
-        <h3>{{ _("Back office") }}</h3>
+        <h3>{{ _("Back Office") }}</h3>
       </a>
       {% trans %}
         Manual to run the back-office Web application.
@@ -236,17 +236,6 @@
       {% endtrans %}
     </div>
 
-    <div class="col-lg-4 mb-4">
-      <a href="" target="_blank" rel="noopener noreferrer">
-        <img src="{{ url('icons/noun-e-commerce-218402.svg') }}" height=60>
-        <h3>{{ _("Payage Payment Plugin") }}</h3>
-      </a>
-      {% trans %}
-        GNU Taler payment plugin for Payage/Joomla!
-        (coming soon).
-      {% endtrans %}
-    </div>
-
   </div>
 
   <div class="row mt-5">
@@ -283,64 +272,5 @@
     </div>
 
   </div>
-
-  <div class="row mt-5">
-  </div>
-
-  <div class="row justify-content-center text-center">
-    <div class="col-8">
-      <h2>{{ _("Experimental work")}}</h2>
-    </div>
-  </div>
-
-  <div class="row mt-5">
-  </div>
-
-  <div class="row">
-    <div class="col-lg-4 mb-4">
-      <a href="https://git.gnunet.org/libbrandt.git/" target="_blank" rel="noopener noreferrer">
-        <img src="{{ url('icons/noun-auction-5172639.svg') }}" height=60>
-        <h3>{{ _("SMC Auctions") }}</h3>
-      </a>
-      {{ _("Secure multiparty auction protocol (future Taler Exchange extension).") }}
-    </div>
-
-    <div class="col-lg-4 mb-4">
-      <a href="/papers/esorics2022-age-restriction.pdf" target="_blank" rel="noopener noreferrer">
-        <img src="{{ url('icons/noun-parental-discretion-233685.svg') }}" height=60>
-        <h3>{{ _("Age restrictions")}}</h3>
-      </a>
-      {% trans %}
-        Cryptographic background on how parents can set age-restrictions on Taler coins
-        to protect minors from inappropriate purchases while preserving privacy for everyone.
-      {% endtrans %}
-    </div>
-
-    <div class="col-lg-4 mb-4">
-      <a href="https://git.taler.net/mch2022.git/" target="_blank" rel="noopener noreferrer">
-        <img src="{{ url('icons/noun-id-badge-348401.svg') }}" height=60>
-        <h3>{{ _("MCH 2022 Badge Integration") }}</h3>
-      </a>
-      {% trans %}
-        Accept GNU Taler payments on your MCH 2022 badge.
-      {% endtrans %}
-    </div>
-
-    <div class="col-lg-4 mb-4">
-      <a href="" target="_blank" rel="noopener noreferrer">
-        <img src="{{ url('icons/noun-point-of-sale-3185628.svg') }}" height=60>
-        <h3>{{ _("EMVco Integration") }}</h3>
-      </a>
-      {{ _("Integration with EMVco PoS systems (to be started soon).") }}
-    </div>
-
-    <div class="col-lg-4 mb-4">
-      <a href="" target="_blank" rel="noopener noreferrer">
-        <img src="{{ url('icons/noun-vault-1775866.svg') }}" height=60>
-        <h3>{{ _("Taler Vault") }}</h3>
-      </a>
-      {{ _("Hardware security module for GNU Taler (to be started soon).") }}
-    </div>
-  </div>
 </div>
 {% endblock body_content %}