[www] branch master updated: move applications

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository www.

The following commit(s) were added to refs/heads/master by this push:
     new 041283c  move applications
041283c is described below

commit 041283c4009db985fa2cbc96e4c209fa5de873b7
Author: Martin Schanzenbach <mschanzenbach@posteo.de>
AuthorDate: Fri Jun 19 16:14:06 2020 +0200

    move applications
---
 common/navigation.j2.inc      |   2 +-
 template/applications.html.j2 | 128 +++++++++++++++++++++++++++++++++++++++++
 template/index.html.j2        | 129 +-----------------------------------------
 3 files changed, 131 insertions(+), 128 deletions(-)

diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 2dbae42..6efce42 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -36,8 +36,8 @@
   <div class="collapse navbar-collapse bg-near-black" id="navbarMain">
     <ul class="navbar-nav mr-auto nav">
       <li class="nav-link"><a href="{{ url_localized('about.html') }}">{{ 
_("About") }}</a></li>
-
       <li class="nav-link"><a href="{{ url_localized('news/index.html') }}">{{ 
_("News") }}</a></li>
+      <li class="nav-link"><a href="{{ url_localized('applications.html') 
}}">{{ _("Applications") }}</a></li>
       <li class="nav-item dropdown">
         <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown"
            role="button" aria-haspopup="true" aria-expanded="false">
diff --git a/template/applications.html.j2 b/template/applications.html.j2
new file mode 100644
index 0000000..6a0108a
--- /dev/null
+++ b/template/applications.html.j2
@@ -0,0 +1,128 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+<div class="container-fluid">
+  <div class="container">
+    <div class="row">
+      <div class="container text-center">
+        <h1>{{ _("Featured Applications") }}</h1>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-4">
+      <section>
+      <h3>{{ _("GNU Taler (Alpha)") }}</h3>
+      <p>
+        {% trans %}
+        <a href="https://taler.net/";>GNU Taler</a>
+       is a new privacy-preserving electronic payment system.
+       Payments are cryptographically
+        secured and are confirmed within milliseconds with
+        extremely low transaction costs.
+        {% endtrans %}
+      </p>
+      </section>
+    </div>
+    <div class="col-lg-4">
+      <section>
+      <h3>{{ _("The GNU Name System") }}</h3>
+
+      <p>
+        {% trans %}
+          The <a href="https://gnunet.org/en/gns.html";>GNU Name System 
(GNS)</a>
+          is a fully decentralized replacement
+         for the Domain Name System (DNS).  Instead of using a
+         hierarchy, GNS uses a directed graph.  Naming conventions
+         are similar to DNS, but queries and replies are private even
+         with respect to peers providing the answers.  The integrity of
+         records and privacy of look-ups is cryptographically secured.
+         <!-- Too technical: GNS integrates
+              a robust, efficient and instant key revocation mechanism. -->
+        {% endtrans %}
+      </p>
+      </section>
+    </div>
+     <div class="col-lg-4">
+      <section>
+      <h3>{{ _("re:claimID") }}</h3>
+      <p>
+        {% trans %}
+        <a href="https://reclaim-identity.io/";>re:claimID</a>
+        is a decentralized Identity Provider (IdP) service built in top of the
+        GNU Name System. It allows users to securely share personal information
+        with websites using standardized protocols (OpenID Connect).
+        {% endtrans %}
+      </p>
+      </section>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-lg-4">
+      <section>
+      <h3>{{ _("Filesharing (Alpha)") }}</h3>
+      <p>
+        {% trans %}
+        GNUnet <a href="use.html#fs">filesharing</a>
+        is an application that aims to provide
+        censorship-resistant, anonymous filesharing. The publisher is
+       empowered to make a gradual choice between performance and anonymity.
+        {% endtrans %}
+      </p>
+      </section>
+    </div>
+    <div class="col-lg-4">
+      <section>
+      <h3>{{ _("Conversation (Pre-Alpha)") }}</h3>
+      <p>
+        {% trans %}
+       GNUnet conversation is an application that provides secure
+        voice communication in a fully decentralized way by employing
+        GNUnet for routing and transport.
+        {% endtrans %}
+      </p>
+      </section>
+    </div>
+  </div>
+  </div>
+</div>
+
+<div class="container-fluid c_acronym link-white bluebox">
+  <div class="container">
+    <div class="row">
+      <div class="container text-center">
+        <h1>{{ _("Upcoming Applications") }}</h1>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-6">
+        <section>
+        <h3>{{ _("secushare") }}</h3>
+        <p>
+          {% trans %}
+          <a href="https://secushare.org/";>secushare</a>
+          is creating a decentralized social networking
+          application on top of GNUnet.  Using overlay
+          multicast and the extensible PSYC protocol, notifications are
+          distributed end-to-end encrypted to authorized recipients only.
+          {% endtrans %}
+        </p>
+        </section>
+      </div>
+      <div class="col-lg-6">
+        <section>
+        <h3>{{ _("pretty Easy privacy") }}</h3>
+        <p>
+          {% trans %}
+          <a href="https://pep.foundation/";>pretty Easy privacy</a> (p&#8801;p)
+          is creating a usable end-to-end encrypted e-mail solution using
+          opportunistic key exchange.
+          p&#8801;p will use GNUnet to protect metadata and exploit new
+          cryptographic protocols to verify keys.
+          {% endtrans %}
+        </p>
+        </section>
+      </div>
+    </div>
+  </div>
+</div>
+
+{% endblock body_content %}
diff --git a/template/index.html.j2 b/template/index.html.j2
index 365ac67..d89fcbb 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -230,132 +230,7 @@
 </div>
 
 
-
-<div class="container-fluid">
-  <div class="container">
-    <div class="row">
-      <div class="container text-center">
-        <h1>{{ _("Featured Applications") }}</h1>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-lg-4">
-      <section>
-      <h3>{{ _("GNU Taler (Alpha)") }}</h3>
-      <p>
-        {% trans %}
-        <a href="https://taler.net/";>GNU Taler</a>
-       is a new privacy-preserving electronic payment system.
-       Payments are cryptographically
-        secured and are confirmed within milliseconds with
-        extremely low transaction costs.
-        {% endtrans %}
-      </p>
-      </section>
-    </div>
-    <div class="col-lg-4">
-      <section>
-      <h3>{{ _("The GNU Name System") }}</h3>
-
-      <p>
-        {% trans %}
-          The <a href="https://gnunet.org/en/gns.html";>GNU Name System 
(GNS)</a>
-          is a fully decentralized replacement
-         for the Domain Name System (DNS).  Instead of using a
-         hierarchy, GNS uses a directed graph.  Naming conventions
-         are similar to DNS, but queries and replies are private even
-         with respect to peers providing the answers.  The integrity of
-         records and privacy of look-ups is cryptographically secured.
-         <!-- Too technical: GNS integrates
-              a robust, efficient and instant key revocation mechanism. -->
-        {% endtrans %}
-      </p>
-      </section>
-    </div>
-     <div class="col-lg-4">
-      <section>
-      <h3>{{ _("re:claimID") }}</h3>
-      <p>
-        {% trans %}
-        <a href="https://reclaim-identity.io/";>re:claimID</a>
-        is a decentralized Identity Provider (IdP) service built in top of the
-        GNU Name System. It allows users to securely share personal information
-        with websites using standardized protocols (OpenID Connect).
-        {% endtrans %}
-      </p>
-      </section>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-lg-4">
-      <section>
-      <h3>{{ _("Filesharing (Alpha)") }}</h3>
-      <p>
-        {% trans %}
-        GNUnet <a href="use.html#fs">filesharing</a>
-        is an application that aims to provide
-        censorship-resistant, anonymous filesharing. The publisher is
-       empowered to make a gradual choice between performance and anonymity.
-        {% endtrans %}
-      </p>
-      </section>
-    </div>
-    <div class="col-lg-4">
-      <section>
-      <h3>{{ _("Conversation (Pre-Alpha)") }}</h3>
-      <p>
-        {% trans %}
-       GNUnet conversation is an application that provides secure
-        voice communication in a fully decentralized way by employing
-        GNUnet for routing and transport.
-        {% endtrans %}
-      </p>
-      </section>
-    </div>
-  </div>
-  </div>
-</div>
-
-<div class="container-fluid c_acronym link-white bluebox">
-  <div class="container">
-    <div class="row">
-      <div class="container text-center">
-        <h1>{{ _("Upcoming Applications") }}</h1>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-lg-6">
-        <section>
-        <h3>{{ _("secushare") }}</h3>
-        <p>
-          {% trans %}
-          <a href="https://secushare.org/";>secushare</a>
-          is creating a decentralized social networking
-          application on top of GNUnet.  Using overlay
-          multicast and the extensible PSYC protocol, notifications are
-          distributed end-to-end encrypted to authorized recipients only.
-          {% endtrans %}
-        </p>
-        </section>
-      </div>
-      <div class="col-lg-6">
-        <section>
-        <h3>{{ _("pretty Easy privacy") }}</h3>
-        <p>
-          {% trans %}
-          <a href="https://pep.foundation/";>pretty Easy privacy</a> (p&#8801;p)
-          is creating a usable end-to-end encrypted e-mail solution using
-          opportunistic key exchange.
-          p&#8801;p will use GNUnet to protect metadata and exploit new
-          cryptographic protocols to verify keys.
-          {% endtrans %}
-        </p>
-        </section>
-      </div>
-    </div>
-  </div>
-</div>
-<div class="container-fluid">
+<!--<div class="container-fluid">
   <div class="container">
     <div class="row">
       <div class="container text-center">
@@ -378,5 +253,5 @@
     </div>
   </div>
 </div>
-
+-->
 {% endblock body_content %}

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.