Merge pull request 'Several page updates' (#14) from devel_content into master

Reviewed-on: #14

LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 mogad0n
+Copyright (c) 2021 mogad0n, cranberry
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -3,5 +3,3 @@
 Welcome to [Liberta Casa](http://liberta.casa)!
 
 This repository is for generating static pages.
-
-[![Build Status](https://drone-local.two.secure.squirrelcube.xyz/api/badges/LibertaCasa/website/status.svg)](https://drone.two.secure.squirrelcube.xyz/LibertaCasa/website)

git.html

@@ -16,13 +16,29 @@
 ┌─┐ ┬─┐ ┐─┐ ┬─┐
 │   │─┤ └─┐ │─┤
 └─┘ ┘ │ ──┘ ┘ │
+</pre>
+<h3>Git</h3>
+<pre>
 
-
+<p><a href="https://git-scm.com/">What's Git (official website)</a></p>
-<p><a href="https://git-scm.com/">> What's Git</a></p>
 
 > We aim to publish all relevant infrastructure and configuration details to our community in a way that not only allows for easy access, but also allows for uncomplicated contributions.
 > We chose to use a self-hosted Git server to achieve this. Full repository access is possible through Gitea (<a href="https://git.com.de/">https://git.com.de</a>), there you may register for your own account, browse, contribute, and, if desired, also publish your own repositories.
 > For a quick-glance at only LibertaCasa specific repositories we employ a cgit instance on <a href="https://git.casa/">https://git.casa</a> - if you only want to look, without editing anything, this is the perfect place to go, as it is blazing fast and easy to navigate.
+
+
+
+
+
+
+
+
+
+
+
+<footer>
+    <a href="mailto:hello@liberta.casa">Contact </a>
+</footer>
 </pre>
 </body>
 </html>

i2p.html

@@ -60,7 +60,6 @@ Nickname, Username and SASL password are the regular details you would use for c
 
 
 
-
 <footer>
     <a href="mailto:hello@liberta.casa"> Contact </a>
 </footer>

index.html

@@ -23,13 +23,11 @@ A community with multiple interconnected services which provides a safe space fo
 of various topics under the umbrella of Science, Philosophy, Politics and a general place to hang back and idle away.
 
 
-There is a focus on supporting <a href="https://en.wikipedia.org/wiki/Free_and_open-source_software">FOSS</a> protocols 
+There is a focus on supporting <a href="https://en.wikipedia.org/wiki/Free_and_open-source_software">FOSS</a> protocols.
 
 
 You can also visit us over The Onion Routing protocol at <a href="http://qzzf2qcfbhievvs5nzkccuwddroipy62qjocqtmgcgh75vd6w57m7yad.onion">our onion address.</a>
 
-Contribute: <a href="git.html">/git</a>
-
 Donts:
 ======
 
@@ -46,19 +44,51 @@ Donts:
     -Any other behavior deemed inappropriate by network staff.
 
 
-Services:
+Services (Clearnet):
-=========
+===================
 
-Communcations:
+Communications:
 --------------
 
-<a href="/xmpp.html">XMPP</a> | <a href="/matrix.html">Matrix</a> | <a href="/irc.html">IRC</a> | <a href="https://meet.lysergic.dev"> Jitsi Video Conferencing </a>
+<a href="/irc.html">IRC</a> | <a href="/xmpp.html">XMPP</a> | <a href="/matrix.html">Matrix</a> | <a href="https://meet.lysergic.dev">Jitsi Video Conferencing </a>
 
-Services:
+Search Engines:
----------
+--------------
 
-<a href="https://pasta.lysergic.dev">Private Bin</a> | <a href="https://git.com.de">Gitea</a> | <a href="https://searx.xkek.net"> Searx search </a> | <a href="https://yacy.xkek.net"> Yacy Search </a> | <a href="https://party.lysergic.dev"> Cytube - Watch together</a>
+<a href="https://searx.xkek.net">SearX</a> | <a href="https://yacy.xkek.net">YaCy</a>
 
+Others:
+------
+
+<a href="https://pasta.lysergic.dev">Private Bin</a> | <a href="https://git.com.de">Gitea</a> | <a href="https://party.lysergic.dev">Cytube - Watch together</a>
+
+
+Services (Tor):
+==============
+
+Communications:
+--------------
+
+<a href="/irc.html">IRC</a>
+
+Search Engines:
+--------------
+
+<a href="http://searx.bsbvtqi5oq2cqzn32zt4cr2f2z2rwots3dq7gmdcnlyqoxko2wx6reqd.onion/">SearX</a> | <a href="http://yacy.bsbvtqi5oq2cqzn32zt4cr2f2z2rwots3dq7gmdcnlyqoxko2wx6reqd.onion/">YaCy</a>
+
+
+Services (I2P):
+==============
+
+Communications:
+--------------
+
+<a href="/irc.html">IRC</a>
+
+
+Contribute:
+==========
+Check our <a href="git.html">/git</a> info page or head directly to the <a href="https://git.casa/">main repository.</a>
 
 
 
@@ -71,7 +101,7 @@ Services:
 
 
 <footer>
-  <a href="mailto:hello@liberta.casa"> Contact </a> 
+  <a href="mailto:hello@liberta.casa">Contact </a>
 </footer>
 </pre>
 </body>

irc.html

@@ -16,6 +16,9 @@
 ┌─┐ ┬─┐ ┐─┐ ┬─┐
 │   │─┤ └─┐ │─┤
 └─┘ ┘ │ ──┘ ┘ │
+</pre>
+<h3>IRC</h3>
+<pre>
 
 <a href="/register">Registration</a>
 
@@ -42,7 +45,7 @@ you can access the network via
    Port:     6667
    SSL/TLS:  False
 
-Webclient via Tor is available <a href="http://qzzf2qcfbhievvs5nzkccuwddroipy62qjocqtmgcgh75vd6w57m7yad.onion">here</a>
+Webchat via Tor is available through the links on the top - KiwiIRC will offer the best experience.
 
 2. I2P
 
@@ -120,10 +123,8 @@ in place of your cloaked IP-based hostname).
 
 
 
-
-
 <footer>
-  <a href="mailto:hello@liberta.casa"> Contact </a> 
+  <a href="mailto:hello@liberta.casa">Contact </a>
 </footer>
 </pre>
 </body>

matrix.html

@@ -16,9 +16,16 @@
 ┌─┐ ┬─┐ ┐─┐ ┬─┐
 │   │─┤ └─┐ │─┤
 └─┘ ┘ │ ──┘ ┘ │
+</pre>
+<h3>Matrix</h3>
+<pre>
 
+Connection Details:
+===================
 
-<a href="https://element.liberta.casa">Matrix WebClient</a>
+The only fully featured Matrix client is Element. Our instance is available at <a href="https://element.liberta.casa/">https://element.liberta.casa</a>.
+
+After having created an account in Element, it is possible to connect other Matrix clients using the Homeserver address <code>matrix.liberta.casa</code>.
 
 
 

xmpp.html

@@ -16,22 +16,28 @@
 ┌─┐ ┬─┐ ┐─┐ ┬─┐
 │   │─┤ └─┐ │─┤
 └─┘ ┘ │ ──┘ ┘ │
-
+</pre>
-
+<h3>XMPP</h3>
-<p><a href="https://xmpp.org/">What's XMPP</a></p>
+<pre>
+<p><a href="https://xmpp.org/">What's XMPP (official website)</a></p>
+<a href="https://xmpp.org/about/faq.html">XMPP FAQs (more)</a>
 
 <p><a href="https://xmpp.org/about/technology-overview.html">Overview: </a> XMPP is the Extensible Messaging and Presence Protocol, a set of open technologies for instant messaging, presence, multi-party chat, voice and video calls, collaboration, lightweight middleware, content syndication, and generalized routing of XML data.</p>
 
-<a href="https://xmpp.org/about/faq.html">FAQs</a>
 
-There are quite a few <a href="https://xmpp.org/software/clients.html">clients</a> available.
+There are quite a few clients available. You can check the overview <a href="https://xmpp.org/software/clients.html">here</a>.
-You can register using a "name"
+You can register by choosing a "name", which will make for the first part of the JID.
+
 JID: name@liberta.casa
-
+(and the password of your choice).
-and the password of your choice.
 
 Host: xmpp.liberta.casa
 Port: 5222
+TLS/SSL: Enforced
+
+If you don't feel like installing any additional software,
+you can register for an account <a href="https://xmpp.liberta.casa/register_web">here</a>, and
+use the <a href="https://liberta.casa/candy/">Candy webchat</a>, however keep in mind that this makes for an extremely rudimentary experience.
 
 
 
@@ -44,7 +50,7 @@ Port: 5222
 
 
 <footer>
-  <a href="mailto:hello@liberta.casa"> Contact </a> 
+  <a href="mailto:hello@liberta.casa">Contact</a>
 </footer>
 </pre>
 </body>