Merge branch 'master' of gnunet.org:www

3 files changed, 64 insertions, 1 deletions

diff --git a/static/images/gns-logo.png b/static/images/gns-logo.png
new file mode 100644
index 00000000..fc5dc133
--- /dev/null
+++ b/static/images/gns-logo.png
diff --git a/template/gns.html.j2 b/template/gns.html.j2
new file mode 100644
index 00000000..9ac34ad2
--- /dev/null
+++ b/template/gns.html.j2
@@ -0,0 +1,63 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+<article class="container">
+
+  <header>
+    <center><img style="width: 14em" src="{{ url_static('images/gns-logo.png') }}"  alt="GNS" /></center>
+    <h1>{{ _("The GNU Name System") }}</h1>
+  </header>
+
+  <div class="container">
+    <div class="row">
+      <div class="col-md">
+        <h2>{{ _("Motivation") }}</h2>
+        <p>
+          {% trans %}
+          The Domain Name System today enables traffic amplification attacks,
+          censorship (i.e. China), mass surveillance (MORECOWBELL) and offensive
+          cyber war (QUANTUMDNS).<br/>
+          Unfortunately, band aid solutions such as DoT, DoH, DNSSEC, DPRIVE
+          and the like will not fix this. This is why we built the GNU Name
+          System (GNS), a secure, decentralized name system built on top of
+          GNUnet.
+          {% endtrans %}
+        </p>
+
+      </div>
+      <div class="col-md">
+      <h2>{{ _("Overview") }}</h2>
+      <p>
+      The GNU Name System (GNS) is a decentralized database that enables users to securely resolve names to values. Names can be used to identify other users (for example, in social networking), or network services (for example, VPN services running at a peer in GNUnet, or purely IP-based services on the Internet). Users interact with GNS by typing in a hostname that ends in a top-level domain that is configured in the “GNS” section, matches an identity of the user or ends in a Base32-encoded public key.
+      </p>
+      </div>
+    </div>
+
+    <div class="row">
+    <div class="col-md">
+    <h2>{{ _("Features") }}</h2>
+    <p>
+{% trans %}
+The GNU Name System (GNS) is secure and decentralized naming system. It allows its users to register names as top-level domains (TLDs) and resolve other namespaces within their TLDs.
+<br/>
+GNS is designed to provide:
+<ul>
+<li>Censorship resistance</li>
+<li>Query privacy</li>
+<li>Secure name resolution</li>
+<li>Compatibility with DNS</li>
+{% endtrans %}
+</p>
+</div>
+      <div class="col-md">
+      <h2>{{ _("Resources") }}</h2>
+      <p>
+Videos giving an overview of most of the GNS and the motivations behind it is available in our <a href="{{ url_localized('video.html') }}">videos section</a>.<br/>
+        Read more about GNS in the respective section of our <a href="https://docs.gnunet.org/handbook/gnunet.html#GNU-Name-System-_0028GNS_0029" target="_blank">handbook</a>.
+        </p>
+      </div>
+    </div>
+
+  </div>
+
+</article>
+{% endblock body_content %}
diff --git a/www.yml b/www.yml
index 03f654ab..fab7a7dd 100644
--- a/www.yml
+++ b/www.yml
@@ -45,7 +45,7 @@ staticfiles:
     - file: moved_about.html
       targets:
         - about.html
-    - file: moved_gns.html
+    - file: gns.html
       targets:
         - gns.html
 meetingnotes: