From 22732501605af681f671b988ac0c892d1b09faa6 Mon Sep 17 00:00:00 2001
From: TheJackiMonster <thejackimonster@gmail.com>
Date: Mon, 4 Jul 2022 12:47:40 +0200
Subject: Adjusted use information and applications regarding chatting

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
---
 template/applications.html.j2 | 123 ++++++++++++++++++++++--------------------
 template/use.html.j2          | 105 +++++++++++++++---------------------
 2 files changed, 108 insertions(+), 120 deletions(-)

(limited to 'template')

diff --git a/template/applications.html.j2 b/template/applications.html.j2
index bee316e4..15bd42d7 100644
--- a/template/applications.html.j2
+++ b/template/applications.html.j2
@@ -93,83 +93,88 @@
     </div>
     <div class="row">
       <div class="col-lg-6">
-      <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">
-    <center><img style="width: 20em" src="{{ url_static('images/logo-2018-dold.svg') }}"  alt="Taler" /></center>
-    </div>
-
+        <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">
+        <center>
+          <img style="width: 20em" src="{{ url_static('images/logo-2018-dold.svg') }}"  alt="Taler" />
+        </center>
+      </div>
     </div>
     <hr/>
     <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>
+          <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-4">
-    <center><img style="width: 14em" src="{{ url_static('images/secushare-0444.png') }}"  alt="secushare" /></center>
+      <div class="col-lg-4">
+        <center>
+          <img style="width: 14em" src="{{ url_static('images/secushare-0444.png') }}"  alt="secushare" />
+        </center>
+      </div>
     </div>
-     
-      <div class="row">
+    <hr/>
+    <div class="row">
       <div class="col-lg-6">
         <section>
-        <h3>{{ _("Messenger-GTK") }}</h3>
-        <p>
-          {% trans %}
-          <a href="https://git.gnunet.org/messenger-gtk.git/">Messenger-GTK</a>
-          is a convergent GTK messaging application using the GNUnet Messenger
-          service. The goal is to provide private and secure communication
-          between any group of devices.
-          {% endtrans %}
-        </p>
+          <h3>{{ _("Messenger-GTK") }}</h3>
+          <p>
+            {% trans %}
+            <a href="https://git.gnunet.org/messenger-gtk.git/">Messenger-GTK</a>
+            is a convergent GTK messaging application using the GNUnet Messenger
+            service. The goal is to provide private and secure communication
+            between any group of devices.
+            {% endtrans %}
+          </p>
         </section>
       </div>
-    <div class="col-lg-4">
-    <center><img style="width: 8em" src="{{ url_static('images/messenger-gtk.svg') }}"  alt="messenger-gtk" /></center>
-    </div>
-
+      <div class="col-lg-4">
+        <center>
+          <img style="width: 8em" src="{{ url_static('images/messenger-gtk.svg') }}"  alt="messenger-gtk" />
+        </center>
       </div>
-      <hr/>
-      <div class="row">
+    </div>
+    <hr/>
+    <div class="row">
       <div class="col-lg-6">
         <section>
-        <h3>{{ _("groupchat") }}</h3>
-        <p>
-          {% trans %}
-          <a href="https://git.gnunet.org/groupchat.git/">groupchat</a>
-          is a terminal user interface providing messaging using the CADET subsystem. It is
-          developed using nim. Cadet-GTK and groupchat are planned to be compatible.
-          {% endtrans %}
-        </p>
+          <h3>{{ _("messenger-cli") }}</h3>
+          <p>
+            {% trans %}
+            <a href="https://git.gnunet.org/messenger-cli.git/">messenger-cli</a>
+            is a terminal user interface providing messaging using the GNUnet Messenger
+            service. It is developed in C using ncurses. Messenger-GTK and messenger-cli 
+            are fully compatible.
+            {% endtrans %}
+          </p>
         </section>
       </div>
-    <div class="col-lg-4">
-    <center><img style="width: 14em" src="{{ url_static('images/groupchat.png') }}"  alt="groupchat" /></center>
-    </div>
-
+      <div class="col-lg-4">
+        <center>
+          <img style="width: 10em" src="{{ url_static('images/messenger-cli.png') }}"  alt="messenger-cli" />
+        </center>
       </div>
-
     </div>
   </div>
 </div>
diff --git a/template/use.html.j2 b/template/use.html.j2
index 5ee408cf..d2617386 100644
--- a/template/use.html.j2
+++ b/template/use.html.j2
@@ -11,7 +11,7 @@
       <nav class="nav subnav position-fixed flex-column border-right" style="position:fixed">
       <a class="nav-link" href="#filesharing">{{ _("Filesharing") }}</a>
       <a class="nav-link" href="#cadet">{{ _("CADET") }}</a>
-      <a class="nav-link" href="#groupchat">{{ _("Minimal Groupchat") }}</a>
+      <a class="nav-link" href="#messenger">{{ _("Convenient Messenger") }}</a>
       <a class="nav-link" href="#gns_cli">{{ _("GNS with CLI") }}</a>
       <a class="nav-link" href="#gns_browser">{{ _("GNS with Browser") }}</a>
       <a class="nav-link" href="#vpn">{{ _("VPN") }}</a>
@@ -213,69 +213,52 @@
         </p>
       </section>
 
-
-
       <section>
-        <h3><a name="groupchat" class="subnav-anchor"></a>{{ _("Chatting with a (simple) client") }}</h3>
-	<div class="alert" style="background-color: #419edb;">
-	     <div class="alert-content">
-	     	  Notice: The groupchat code is not working with the actual GNUnet release atm!
-	     </div>
-	</div>
-         <p>
-          To make chatting a tiny bit easier and prettier, we need to install and compile additional software.
-     </p>
-     <p>
-          First we have to install the Nim programming language. Please refer to their <a href="https://nim-lang.org/install.html">project site</a> for further details. The preferred method is using you distributions package manager, e.g. for Debian it would look like this: 
-      </p>
-      <code>
-        $ sudo apt install nim<br>
-        $ nim --version<br>
-        Nim Compiler Version 1.2.2 [Linux: amd64]<br>
-        Compiled at 2020-06-16<br>
-        Copyright (c) 2006-2020 by Andreas Rumpf<br>
-        <br>
-        active boot switches: -d:release -d:nativeStackTrace<br>
-      </code>
-      <p>
-       If the displayed version is <b>1.2.2 or newer</b>, we have a compatible version and can continue downloading and compiling the groupchat. If the version is older (like on Ubuntu 18.04) we can install Nim using a tool called <i>choosenim</i>:
-      </p>
-      <code>
-          $ curl https://nim-lang.org/choosenim/init.sh -sSf | sh
-      </code>
-      <p>
-      Then we follow the onscreen instructions. More information can be found in the <a href="https://nim-lang.org/install.html">official documentation</a>.
-      </p>
-      <p>In the onscreen instructions you'll be ask to add a line to your bashrc - once you've done that, re-read your bash environment to make the change active: 
-      </p>
-      <code>
-        $ source ~/.bashrc
-      </code>
-      
-      <p>
-          After we have installed (and maybe upgraded) Nim we download and compile the GNUnet groupchat application:
-         </p>
-         <p>
-         <code>
-              $ git clone https://git.gnunet.org/groupchat.git<br>
-              $ cd groupchat<br>
-              $ make<br>
-         </code>
-         <p>
-         <p>
-            We can now try to enter a chat server running on another GNUnet node using the command:
-         </p>
-         <p>
-         <code>
-               $ LD_LIBRARY_PATH=/path/to/gnunetlibs ./groupchat --config=/path/to/gnunet.conf --server=88RXABKJNMT426FY81N2DXN0M2X37SW5Q1NR005YPDZ1Q7A22CHG --port=t3ss --nick=YOURNICK<br>
-         </code>
-         <p>
-              The peer key and port name given in this example should work as they are almost always online and running groupchat on port "t3ss".
-         <p>
+        <h3><a name="messenger" class="subnav-anchor"></a>{{ _("Chatting with a convenient client") }}</h3>
+        <p>
+          To make chatting a tiny bit easier and prettier, we need to install additional software.
+        </p>
+        <p>
+          You can select one of the options listed <a href="applications.html">here</a> under applications 
+          using the Messenger service. Those are generally compatible with each other using the same 
+          underlying <a href="https://git.gnunet.org/libgnunetchat.git/">library</a> but tell apart in their 
+          user interface and design.
+        </p>
+        <p>
+          In other words: You can choose by your own preference how to chat.
+        </p>
+        <p>
+          After you have picked an application (for example <a href="https://git.gnunet.org/messenger-gtk.git/">Messenger-GTK</a> 
+          or <a href="https://git.gnunet.org/messenger-cli.git/">messenger-cli</a>), follow the instructions for build and installation.
+          Notice that depending on the picked application, you might need additional dependencies besides the library for the chatting
+          functionality.
+        </p>
+        <p>
+          Once you installed the application and started it, a dialog should open to ask you for an account to use or whether you want 
+          to create a new one. An account is pretty much an identity which can also be used for <a href="#gns_cli">GNS</a> capabilities.
+          Accounts don't require any information besides a chosen identifier or nick.
+        </p>
+        <p>
+          Next step is to enter a chat room via your application. The easiest step is choosing a public chat room which is similar to 
+          communicate via <a href="#cadet">CADET</a> through a shared port. Look for a function to add a new room or "platform".
+          You should be able to enter any sort of text as key for the room and confirm.
+        </p>
+        <p>
+          A chat room should open using the entered key as identifier and any other person you share the key with should be able to join
+          this room as well using one of the compatible applications as linked above. From here you can simply write text in a proper field
+          and send it as a message to communicate.
+        </p>
+        <p>
+          In case of any more advanced functionality it is recommended to look for a guide or more detailed information on the source of the
+          used application since implementations can vary, especially the design of user interface.
+        </p>
+        <p>
+          Also you can always use the simplified command line tool `gnunet-messenger` provided by GNUnet itself to open or join a chat with
+          its key in a similar way as described above. See the more detailed information in the 
+          <a href="https://docs.gnunet.org/handbook/gnunet.html#Using-the-GNUnet-Messenger">handbook</a> to use it.
+        </p>
       </section>
 
-
-
       <section>
         <h3><a name="gns_cli" class="subnav-anchor"></a>{{ _("Name resolution using GNS on the command line") }}</h3>
         <p>The GNU Name Service (GNS) is a fully decentralized alternative to the Domain Name System (DNS). Where GNS does not suffer the same major <a href="https://en.wikipedia.org/wiki/Domain_Name_System#Security_issues">security flaws as DNS</a>.
-- 
cgit v1.2.3