diff --git a/content/_index.en.md b/content/_index.en.md
index 3b42d6296ead5c3d06cf79dbf079cc6f98b4b2fd..c036ea30ccaac7cb2b681d478f883a281a44ca41 100644
--- a/content/_index.en.md
+++ b/content/_index.en.md
@@ -16,43 +16,33 @@ In order to meet the demand for real-time communication, the open communication
## Topics
* [Why Matrix and no other chat system?]({{< relref "why/_index.en.md" >}})
-
* [How can Matrix be used? (registration and first steps)]({{< relref "first-steps/_index.en.md" >}})
-
* [Recommendations for further important settings after first login]({{< relref "settings/_index.en.md" >}})
-
-* [Installation of a client / program]({{< relref "clients/_index.en.md" >}})
-
- * [Browsersettings]({{< relref "clients/browser.en.md" >}})
-
+* [Install and setup Matrix clients]({{< relref "clients/_index.en.md" >}})
+ * [Element Web]({{< relref "clients/browser/_index.en.md" >}})
+ * [Element Desktop]({{< relref "clients/desktop/_index.en.md" >}})
+ * [Element Android]({{< relref "clients/android/_index.en.md" >}})
+ * [Element iOS]({{< relref "clients/ios/_index.en.md" >}})
+ * [Element installation under Linux]({{< relref "clients/install_linux/_index.en.md" >}})
+ * [More Clients]({{< relref "clients/more_clients/_index.en.md" >}})
* [Find people and send direct messages]({{< relref "messaging/_index.en.md" >}})
-
-* [Use end-to-end encryption]({{< relref "encryption/_index.en.md" >}})
-
+ * [Format messages]({{< relref "messaging/formatting/_index.en.md" >}})
+ * [Search messages]({{< relref "messaging/search/_index.en.md" >}})
* [Create rooms and take responsibility]({{< relref "rooms/_index.en.md" >}})
-
- * [Sharing rooms and making them public]({{< relref "rooms/sharing.en.md" >}})
-
+ * [Create rooms]({{< relref "rooms/create/_index.en.md" >}})
* [Find rooms]({{< relref "rooms/find/_index.en.md" >}})
-
* [Delete and leave rooms]({{< relref "rooms/delete/_index.en.md" >}})
-
+ * [Sharing rooms and making them public]({{< relref "rooms/sharing.en.md" >}})
* [Fine-tune notifications]({{< relref "notifications/_index.en.md" >}})
-
-* [Use integrations, bridges, bots (e.g. Jitsi)]({{< relref "integrations/_index.en.md" >}})
-
-* [More Clients]({{< relref "clients/more_clients.en.md" >}})
-
* [Using communities as room filters]({{< relref "communities/_index.en.md" >}})
-
* [Using Spaces for managing rooms]({{< relref "spaces/_index.en.md" >}})
-
+* [Use end-to-end encryption]({{< relref "encryption/_index.en.md" >}})
+* [Use integrations, bridges, bots (e.g. Jitsi)]({{< relref "integrations/_index.en.md" >}})
+* [Frequently asked questions (FAQ)]({{< relref "faq/_index.en.md" >}})
* [Further development of Matrix]({{< relref "development/_index.en.md" >}})
-
+* [Blog/News]({{< relref "blog/_index.en.md" >}})
* [Privacy policy]({{< relref "privacy/_index.en.md" >}})
-
* [Imprint]({{< relref "imprint/_index.en.md" >}})
-
* [Declaration of Accessibility]({{< relref "accessibility/_index.en.md" >}})
### Questions and Contact
diff --git a/content/_index.md b/content/_index.md
index 9fcedc93e449e0f119f26c611dc6e1e2492941cf..a1929e30fe3a5ea58a7226f73c8529b2489e3513 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -30,41 +30,32 @@ setInterval(() => {
* [Warum Matrix und kein anderes Chat-System?]({{< relref "why/_index.md" >}})
* [Wie kann Matrix genutzt werden? (Anmeldung und erste Schritte)]({{< relref "first-steps/_index.md" >}})
-
* [Empfehlungen zu weiteren wichtigen Einstellungen nach dem Erstlogin]({{< relref "settings/_index.md" >}})
-
-* [Installation eines Clients / Programms]({{< relref "clients/_index.md" >}})
-
- * [Browsereinstellungen]({{< relref "clients/browser/_index.md" >}})
-
+* [Matrix-Clients installieren und einrichten]({{< relref "clients/_index.md" >}})
+ * [Element Web]({{< relref "clients/browser/_index.md" >}})
+ * [Element Desktop]({{< relref "clients/desktop/_index.md" >}})
+ * [Element Android]({{< relref "clients/android/_index.md" >}})
+ * [Element iOS]({{< relref "clients/ios/_index.md" >}})
+ * [Element-Installation unter Linux]({{< relref "clients/install_linux/_index.md" >}})
+ * [Weitere Clients]({{< relref "clients/more_clients/_index.md" >}})
* [Personen finden und direkte Nachrichten versenden]({{< relref "messaging/_index.md" >}})
-
-* [Ende-zu-Ende-Verschlüsselung nutzen]({{< relref "encryption/_index.md" >}})
-
+ * [Nachrichten formatieren]({{< relref "messaging/formatting/_index.md" >}})
+ * [Nachrichten suchen]({{< relref "messaging/search/_index.md" >}})
* [Räume erstellen und Verantwortung übernehmen]({{< relref "rooms/_index.md" >}})
-
- * [Räume teilen und publik machen]({{< relref "rooms/sharing/_index.md" >}})
-
+ * [Räume erstellen]({{< relref "rooms/create/_index.md" >}})
* [Räume finden]({{< relref "rooms/find/_index.md" >}})
-
* [Räume löschen und aus Räumen austreten]({{< relref "rooms/delete/_index.md" >}})
-
+ * [Räume teilen und publik machen]({{< relref "rooms/sharing/_index.md" >}})
* [Benachrichtigungen feiner einstellen]({{< relref "notifications/_index.md" >}})
-
-* [Integrations, Bridges, Bots nutzen (u.a. Jitsi)]({{< relref "integrations/_index.md" >}})
-
-* [Weitere Clients]({{< relref "clients/more_clients/_index.md" >}})
-
* [Communities als Raum-Filter einsetzen]({{< relref "communities/_index.md" >}})
-
* [Spaces zur Raumverwaltung einsetzen]({{< relref "spaces/_index.md" >}})
-
+* [Ende-zu-Ende-Verschlüsselung nutzen]({{< relref "encryption/_index.md" >}})
+* [Integrations, Bridges, Bots nutzen (u.a. Jitsi)]({{< relref "integrations/_index.md" >}})
+* [Häufige Fragen (FAQ)]({{< relref "faq/_index.md" >}})
* [Weiterentwicklung von Matrix]({{< relref "development/_index.md" >}})
-
+* [Blog/News]({{< relref "blog/_index.md" >}})
* [Datenschutzerklärung]({{< relref "privacy/_index.md" >}})
-
* [Impressum]({{< relref "imprint/_index.md" >}})
-
* [Barrierefreiheitserklärung]({{< relref "accessibility/_index.md" >}})
### Fragen / Kontakt
diff --git a/content/clients/_index.en.md b/content/clients/_index.en.md
index 7524da78697e47c20049b0fa79b87a75130759ba..df1237381e8f422b3b2fcdef431114793e93a4ab 100644
--- a/content/clients/_index.en.md
+++ b/content/clients/_index.en.md
@@ -1,40 +1,39 @@
---
-title: "Clients / Installation"
+title: "Matrix Clients"
date: 2020-07-02T21:22:27+02:00
draft: false
chapter: true
weight: 15
---
-# Installation of a client / program
+# Matrix Clients
-The recommended client for using Matrix is called Element and can be used on different systems and devices:
-1. **Element Web:** [The TU Dresden browser web application](#web-app)
-1. **Element Desktop:** [Downloads for Linux/Windows/Mac](#desktop-app)
-1. **Element mobile:** [Android/iOS](#mobile-app)
+The recommended reference client for using Matrix is called Element and is available for various platforms:
-
-
-## Element Web {#web-app}
+## [Element Web]({{< ref "clients/browser" >}} "Setup of Element Web (Browser)")
Web-App: {{% button href="https://matrix.tu-dresden.de" icon="fas fa-globe" %}}matrix.tu-dresden.de{{% /button %}}
The easiest way is to open the Element Web application directly in a modern browser (e.g. [Mozilla Firefox](https://www.mozilla.org/de/firefox/)).
-Further information can be found in the submenu ["Element Web (Browser)"]({{< ref "clients/browser" >}} "Element Web (Browser)").
-
-## Element Desktop {#desktop-app}
+## [Element Desktop]({{< ref "desktop.md" >}} "Setup of Element Desktop") (Linux, macOS, Windows)
Downloads for: {{% button href="https://packages.riot.im/desktop/install/win32/x64/Element%20Setup.exe" icon="fas fa-download" %}}Windows{{% /button %}} {{% button href="https://packages.riot.im/desktop/install/macos/Element.dmg" icon="fas fa-download" %}}macOS{{% /button %}} {{% button href="/clients/install_linux" icon="fas fa-download" %}}Linux{{% /button %}}
More recommendable than using a browser tab is the installation of the program Element on your own computer. Here you can keep the overview independently of the browser (however, you should also take care of the updates of the program).
-More information can be found in the submenu ["Element Desktop"]({{< ref "desktop.md" >}} "Element Desktop").
+## Element Mobile
+
+On the road, access to Matrix is possible, for example, via smartphone with the help of the mobile Element Apps.
-## Element Mobile {#mobile-app}
-Downloads for: {{% button href="https://play.google.com/store/apps/details?id=im.vector.app" icon="fas fa-download" %}}Android (Google Play){{% /button %}} {{% button href="https://apps.apple.com/app/vector/id1083446067" icon="fas fa-download" %}}iOS (iPhone/iPad){{% /button %}} {{% button href="https://f-droid.org/packages/im.vector.app/" icon="fas fa-download" %}}Android (F-Driod){{% /button %}}
+## [Element Android]({{< ref "android.md" >}} "Setup of Element Android")
-To have access to Matrix on the road, there is the possibility to install a mobile element client on the smartphone.
+Downloads for: {{% button href="https://play.google.com/store/apps/details?id=im.vector.app" icon="fas fa-download" %}}Android (Google Play){{% /button %}} {{% button href="https://f-droid.org/packages/im.vector.app/" icon="fas fa-download" %}}Android (F-Driod){{% /button %}}
-Further information can be found in the submenu ["Element Mobile"]({{< ref "mobile.md" >}} "Element Mobile").
+
+## [Element iOS]({{< ref "ios.md" >}} "Setup of Element iOS")
+
+Downloads for: {{% button href="https://apps.apple.com/app/vector/id1083446067" icon="fas fa-download" %}}iOS (iPhone/iPad){{% /button %}}
+
+
diff --git a/content/clients/_index.md b/content/clients/_index.md
index 2dff92952bc7b35c5f3c2ee8527956d2d2e0d2c0..0e24eddc2f242e13d000ecd2b84050f0a140ca5c 100644
--- a/content/clients/_index.md
+++ b/content/clients/_index.md
@@ -1,40 +1,37 @@
---
-title: "Clients / Installation"
+title: "Matrix-Clients"
date: 2020-07-02T21:22:27+02:00
draft: false
chapter: true
weight: 15
---
-# Installation eines Clients / Programms
+# Matrix-Clients
-Der empfohlene Client zur Nutzung von Matrix heißt Element und kann auf verschiedenen Systemen und Geräten genutzt werden:
-1. **Element Web:** [Die Browser-Web-App der TU Dresden](#web-app)
-2. **Element Desktop:** [Downloads für Linux/Windows/Mac](#desktop-app)
-3. **Element Mobil:** [Android/iOS](#mobile-app)
+Der empfohlene Referenzclient zur Nutzung von Matrix heißt Element und ist für verschiedene Plattformen erhältlich:
-[](https://element.io/get-started)
-
-## Element Web {#web-app}
+## [Element Web]({{< ref "browser.md" >}} "Einrichtung von Element Web (Browser)")
Zur Web-App: {{% button href="https://matrix.tu-dresden.de" icon="fas fa-globe" %}}matrix.tu-dresden.de{{% /button %}}
Der einfachste Weg ist das direkte Öffnen der Element Web Anwendung in einem modernen Browser (z.B. [Mozilla Firefox](https://www.mozilla.org/de/firefox/)).
-Weitere Informationen sind im Untermenü ["Element Web (Browser)"]({{< ref "browser.md" >}} "Element Web (Browser)") zu finden.
-
-## Element Desktop {#desktop-app}
+## [Element Desktop]({{< ref "desktop.md" >}} "Einrichtung von Element Desktop") (Linux, macOS, Windows)
Downloads für: {{% button href="https://packages.riot.im/desktop/install/win32/x64/Element%20Setup.exe" icon="fas fa-download" %}}Windows{{% /button %}} {{% button href="https://packages.riot.im/desktop/install/macos/Element.dmg" icon="fas fa-download" %}}macOS{{% /button %}} {{% button href="/clients/install_linux" icon="fas fa-download" %}}Linux{{% /button %}}
Empfehlenswerter als die Nutzung eines Browsertabs ist jedoch die Installation des Programms Element auf dem eigenen Rechner. Hier kann unabhängig vom Browser der Überblick behalten werden (allerdings sollte man sich auch um die Aktualisierungen des Programms kümmern).
-Weitere Informationen sind im Untermenü ["Element Desktop"]({{< ref "desktop.md" >}} "Element Desktop") zu finden.
+## Element Mobil
+
+Unterwegs ist der Zugriff auf Matrix bspw. per Smartphone mit Hilfe der mobilen Element Apps möglich.
+
+## [Element Android]({{< ref "android.md" >}} "Einrichtung von Element Android")
-## Element Mobil {#mobile-app}
+Downloads für: {{% button href="https://play.google.com/store/apps/details?id=im.vector.app" icon="fas fa-download" %}}Android (Google Play){{% /button %}} {{% button href="https://f-droid.org/packages/im.vector.app/" icon="fas fa-download" %}}Android (F-Droid){{% /button %}}
-Downloads für: {{% button href="https://play.google.com/store/apps/details?id=im.vector.app" icon="fas fa-download" %}}Android (Google Play){{% /button %}} {{% button href="https://apps.apple.com/app/vector/id1083446067" icon="fas fa-download" %}}iOS (iPhone/iPad){{% /button %}} {{% button href="https://f-droid.org/packages/im.vector.app/" icon="fas fa-download" %}}Android (F-Droid){{% /button %}}
+## [Element iOS]({{< ref "ios.md" >}} "Einrichtung von Element iOS")
-Um unterwegs Zugriff auf Matrix zu haben, gibt es die Möglichkeit einen mobilen Element Client auf dem Smartphone zu installieren.
+Downloads für: {{% button href="https://apps.apple.com/app/vector/id1083446067" icon="fas fa-download" %}}iOS (iPhone/iPad){{% /button %}}
-Weitere Informationen sind im Untermenü ["Element Mobil"]({{< ref "mobile.md" >}} "Element Mobil") zu finden.
+[](https://element.io/get-started)
\ No newline at end of file
diff --git a/content/clients/android.en.md b/content/clients/android.en.md
new file mode 100644
index 0000000000000000000000000000000000000000..d7c33528470eb9246d13b83c082b38f9249e07e3
--- /dev/null
+++ b/content/clients/android.en.md
@@ -0,0 +1,29 @@
+---
+title: "Element Android"
+date: 2020-10-12T09:29:07+02:00
+draft: false
+chapter: true
+weight: 29
+---
+
+# Element Android
+
+Downloads for: {{% button href="https://play.google.com/store/apps/details?id=im.vector.app" icon="fas fa-download" %}}Android (Google Play){{% /button %}} {{% button href="https://f-droid.org/packages/im.vector.app/" icon="fas fa-download" %}}Android (F-Driod){{% /button %}}
+
+## Setup
+
+1. After opening the Element app for the first time, select **"I already have an account"**. You will then be prompted to select a server.
+
+
+
+2. Tap here on the last option **"Other"**.
+
+
+
+3. Enter `tu-dresden.de` in the address field and confirm server address by tapping the **"Continue"** button.
+
+
+
+4. Enter your ZIH login in the **"User name or e-mail address"** field. (You can find your ZIH login name in the [Self-Service Portal](https://selfservice.zih.tu-dresden.de/l/index.php/idm_my_profile).) After entering your ZIH password in the second field, you can log in using the **"Login"** button.
+
+
diff --git a/content/clients/android.md b/content/clients/android.md
new file mode 100644
index 0000000000000000000000000000000000000000..9eeb086913c23c8f067e45a4ec340579ea20e9e7
--- /dev/null
+++ b/content/clients/android.md
@@ -0,0 +1,29 @@
+---
+title: "Element Android"
+date: 2020-10-12T09:29:07+02:00
+draft: false
+chapter: true
+weight: 29
+---
+
+# Element Android
+
+Downloads für: {{% button href="https://play.google.com/store/apps/details?id=im.vector.app" icon="fas fa-download" %}}Android (Google Play){{% /button %}} {{% button href="https://f-droid.org/packages/im.vector.app/" icon="fas fa-download" %}}Android (F-Driod){{% /button %}}
+
+## Einrichtung
+
+1. Nach dem erstmaligen Öffnen der Element-App wählen Sie **„Ich habe schon ein Konto“**. Anschließend werden Sie aufgefordert, einen Server auszuwählen.
+
+
+
+2. Tippen Sie hier auf die letzte Option **„Andere“**.
+
+
+
+3. Geben Sie im Adress-Feld `tu-dresden.de` ein und bestätigen Sie Serveradresse durch einen Tipp auf den **„Fortfahren“**-Button.
+
+
+
+4. Geben Sie im Feld **„Benutzername oder E-Mail-Adresse“** Ihr ZIH-Login ein. (Ihren ZIH-Login-Namen finden Sie im [Self-Service-Portal](https://selfservice.zih.tu-dresden.de/l/index.php/idm_my_profile).) Nach Eingabe Ihres ZIH-Passworts im zweiten Feld können Sie sich über den **„Anmelden“**-Button einloggen.
+
+
diff --git a/content/clients/browser.en.md b/content/clients/browser.en.md
index 9da5474df2cc88e48cf77e1734f90e6bbef799e3..21d3ce406ed732038bdc4b6fd5a51031b59a9e06 100644
--- a/content/clients/browser.en.md
+++ b/content/clients/browser.en.md
@@ -3,10 +3,10 @@ title: "Element Web (Browser)"
date: 2020-07-15T16:46:07+02:00
draft: false
chapter: true
-weight: 10
+weight: 5
---
-# Using the Element webclient
+# Element Web
Start here: [https://matrix.tu-dresden.de](https://matrix.tu-dresden.de)
diff --git a/content/clients/browser.md b/content/clients/browser.md
index c5b9c434ad2fba8edbbfb92393f8ea90537e7666..6f86d02e3b8c1c884190f35360dace68e5e9eabb 100644
--- a/content/clients/browser.md
+++ b/content/clients/browser.md
@@ -3,10 +3,10 @@ title: "Element Web (Browser)"
date: 2020-07-15T16:46:07+02:00
draft: false
chapter: true
-weight: 10
+weight: 5
---
-## Nutzung des Webclients
+# Element Web
Starten Sie auf [matrix.tu-dresden.de](https://matrix.tu-dresden.de).
diff --git a/content/clients/desktop.en.md b/content/clients/desktop.en.md
index 526eee92cca9b3c6a2c1d0e691f413b688ee1f44..605afc65abb05c0c4d5c286401ca003632dcd6bd 100644
--- a/content/clients/desktop.en.md
+++ b/content/clients/desktop.en.md
@@ -3,10 +3,10 @@ title: "Element Desktop"
date: 2020-10-12T09:27:07+02:00
draft: false
chapter: true
-weight: 20
+weight: 10
---
-## Element Desktop
+# Element Desktop
Downloads for: {{% button href="https://packages.riot.im/desktop/install/win32/x64/Element%20Setup.exe" icon="fas fa-download" %}}Windows{{% /button %}}
{{% button href="https://packages.riot.im/desktop/install/macos/Element.dmg" icon="fas fa-download" %}}macOS{{% /button %}}
diff --git a/content/clients/desktop.md b/content/clients/desktop.md
index e4d6b815cd12c44cbf55b30a6fecf6d2f134c919..b9dd3b6209fc8c34396c275266e6b47f5bd77148 100644
--- a/content/clients/desktop.md
+++ b/content/clients/desktop.md
@@ -3,10 +3,10 @@ title: "Element Desktop"
date: 2020-10-12T09:27:07+02:00
draft: false
chapter: true
-weight: 5
+weight: 10
---
-## Element Desktop
+# Element Desktop
Downloads für:
{{% button href="https://packages.riot.im/desktop/install/win32/x64/Element%20Setup.exe" icon="fas fa-download" %}}Windows{{% /button %}}
diff --git a/content/clients/install_linux.en.md b/content/clients/install_linux.en.md
index d406a09785f1ef6ed2600e7745ee73d0d4b0cb62..3620fedb2e064e645e99d5b6b584349fa2be3f65 100644
--- a/content/clients/install_linux.en.md
+++ b/content/clients/install_linux.en.md
@@ -12,9 +12,9 @@ We recommend using the package manager of your System to install Element Desktop
```sh
sudo apt install -y wget apt-transport-https
-sudo wget -O /usr/share/keyrings/riot-im-archive-keyring.gpg https://packages.riot.im/debian/riot-im-archive-keyring.gpg
+sudo wget -O /usr/share/keyrings/element-io-archive-keyring.gpg https://packages.element.io/debian/element-io-archive-keyring.gpg
-echo "deb [signed-by=/usr/share/keyrings/riot-im-archive-keyring.gpg] https://packages.riot.im/debian/ default main" | sudo tee /etc/apt/sources.list.d/riot-im.list
+echo "deb [signed-by=/usr/share/keyrings/element-io-archive-keyring.gpg] https://packages.element.io/debian/ default main" | sudo tee /etc/apt/sources.list.d/element-io.list
sudo apt update
diff --git a/content/clients/install_linux.md b/content/clients/install_linux.md
index f3a5143f207473c9427c310fb613122ec6935700..2ba01071e8217fc1fa9cde73b9b1627021616640 100644
--- a/content/clients/install_linux.md
+++ b/content/clients/install_linux.md
@@ -12,9 +12,9 @@ Wir empfehlen das Installieren des Clients über die Paketverwaltung der jeweili
```sh
sudo apt install -y wget apt-transport-https
-sudo wget -O /usr/share/keyrings/riot-im-archive-keyring.gpg https://packages.riot.im/debian/riot-im-archive-keyring.gpg
+sudo wget -O /usr/share/keyrings/element-io-archive-keyring.gpg https://packages.element.io/debian/element-io-archive-keyring.gpg
-echo "deb [signed-by=/usr/share/keyrings/riot-im-archive-keyring.gpg] https://packages.riot.im/debian/ default main" | sudo tee /etc/apt/sources.list.d/riot-im.list
+echo "deb [signed-by=/usr/share/keyrings/element-io-archive-keyring.gpg] https://packages.element.io/debian/ default main" | sudo tee /etc/apt/sources.list.d/element-io.list
sudo apt update
diff --git a/content/clients/ios.en.md b/content/clients/ios.en.md
new file mode 100644
index 0000000000000000000000000000000000000000..b72690e2b121bc8255ae138a176b9c8063b6ca99
--- /dev/null
+++ b/content/clients/ios.en.md
@@ -0,0 +1,27 @@
+---
+title: "Element iOS"
+date: 2020-10-12T09:29:07+02:00
+draft: false
+chapter: true
+weight: 30
+---
+
+# Element iOS
+
+Downloads for: {{% button href="https://apps.apple.com/app/vector/id1083446067" icon="fas fa-download" %}}iOS (iPhone/iPad){{% /button %}}
+
+## Setup
+
+1. After opening the Element app for the first time, select **"I already have an account"**.
+
+
+
+2. Then enter your ZIH login in the **"Email or username"** field. (You will find your ZIH login in the profile of the [Self-Service Portal](https://selfservice.tu-dresden.de/profile/) in the Account Information section as "Login name".) In the **"Password"** field, enter your ZIH password.
+
+
+
+3. Check the **"individual server options"** checkbox and enter `https://matrix.tu-dresden.de` in the **"home server URL"** field.
+
+
+
+4. Finally, you can log in by pressing the **"Sign in"** button.
diff --git a/content/clients/ios.md b/content/clients/ios.md
new file mode 100644
index 0000000000000000000000000000000000000000..c41b6eaafe7d2db30702d739759cab50c6a95898
--- /dev/null
+++ b/content/clients/ios.md
@@ -0,0 +1,27 @@
+---
+title: "Element iOS"
+date: 2020-10-12T09:29:07+02:00
+draft: false
+chapter: true
+weight: 30
+---
+
+# Element iOS
+
+Downloads für: {{% button href="https://apps.apple.com/app/vector/id1083446067" icon="fas fa-download" %}}iOS (iPhone/iPad){{% /button %}}
+
+## Einrichtung
+
+1. Nach dem erstmaligen Öffnen der Element-App wählen Sie **„Ich habe bereits ein Konto“**.
+
+
+
+2. Geben Sie Anschließend im Feld **„E-Mail oder Nutzername“** Ihr ZIH-Login ein. (Ihren ZIH-Login finden Sie im Profil des [Self-Service-Portals](https://selfservice.tu-dresden.de/profile/) im Abschnitt Kontoinformationen als „Login-Name“.) Geben Sie im **„Passwort“**-Feld Ihr ZIH-Passworts ein.
+
+
+
+3. Aktivieren Sie die Checkbox **„individuelle Server-Optionen“** und tragen Sie im Feld **„Heimserver-URL“** die Adresse `https://matrix.tu-dresden.de` ein.
+
+
+
+4. Abschließend können Sie sich durch Betätigen des **„Anmelden“**-Buttons einloggen.
diff --git a/content/clients/mobile.en.md b/content/clients/mobile.en.md
deleted file mode 100644
index 281c2fe7f16842bf7ddc03f9aa61885fd18bc42b..0000000000000000000000000000000000000000
--- a/content/clients/mobile.en.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-title: "Element Mobile"
-date: 2020-10-12T09:29:07+02:00
-draft: false
-chapter: true
-weight: 30
----
-
-## Element Mobile
-
-Downloads for: {{% button href="https://play.google.com/store/apps/details?id=im.vector.app" icon="fas fa-download" %}}Android (Google Play){{% /button %}} {{% button href="https://apps.apple.com/app/vector/id1083446067" icon="fas fa-download" %}}iOS (iPhone/iPad){{% /button %}} {{% button href="https://f-droid.org/packages/im.vector.app/" icon="fas fa-download" %}}Android (F-Driod){{% /button %}}
-
-The following series of images shows screenshots of the setup of Android or iOS Element:
-
-{{% notice info %}}
-In contrast to the here shown screenshots you have to use the cumstom homeserver url matrix.tu-dresden.de in iOS Element.
-{{% /notice %}}
-
-
-
-
diff --git a/content/clients/mobile.md b/content/clients/mobile.md
deleted file mode 100644
index d5450e8267bd4b06f1a96737c0d31e6efb498c86..0000000000000000000000000000000000000000
--- a/content/clients/mobile.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-title: "Element Mobil"
-date: 2020-10-12T09:29:07+02:00
-draft: false
-chapter: true
-weight: 30
----
-
-## Element Mobil
-
-Downloads für: {{% button href="https://play.google.com/store/apps/details?id=im.vector.app" icon="fas fa-download" %}}Android (Google Play){{% /button %}} {{% button href="https://apps.apple.com/app/vector/id1083446067" icon="fas fa-download" %}}iOS (iPhone/iPad){{% /button %}} {{% button href="https://f-droid.org/packages/im.vector.app/" icon="fas fa-download" %}}Android (F-Driod){{% /button %}}
-
-Die folgende Bilderreihe zeigt Bildschirmfotos der Einrichtung von Android oder iOS Element:
-
-{{% notice info %}}
-Abweichend von den hier gezeigten Screenshots ist bei iOS Element die Adresse des Homeservers mit matrix.tu-dresden.de anzugeben.
-{{% /notice %}}
-
-
-
-
diff --git a/content/faq/_index.md b/content/faq/_index.md
index 249f6bd543f580f3fec518661426ded5a661aeb8..1968e84caf8e387c00eca1c9e192f41618a2e695 100644
--- a/content/faq/_index.md
+++ b/content/faq/_index.md
@@ -68,8 +68,8 @@ Dafür bitte prüfen, ob diese überhaupt eingerichtet wurde. Siehe [Schlüssels
***
#### Wie kann ich die Schlüsselsicherung zurücksetzen, wenn ich meine Sicherheitsphrase UND meinen (abgespeicherten und ausgedruckten) Sicherheitsschlüssel verloren habe? {#reset-securityphrase}
Bitte folgendes ausführen:
- 1. In einer Matrix-Sitzung (=Client/Geräte/Browser), wo man die früheren verschlüsselten Gespräche noch lesen kann, die Raumschlüssel exportieren. Dazu zu unter `Einstellungen`-> `Sicherheit` -> `Verschlüsselung` auf E2E-Raumschlüssel exportieren klicken. Sollte es keinen Zugang zu irgendeiner Matrix-Sitzung mehr geben, in der frühere verschlüsselte Nachrichten lesbar sind, diesen Schritt überspringen.
- 2. In der einen Matrix-Sitzung, bei der man soeben in Schritt 1 die Raumschlüssel manuell exportiert hat, unter `Einstellungen`-> `Sicherheit` -> `Verschlüsselung` alle weiteren Sitzungen über die Checkbox am Zeilenende markieren und unterhalb der Liste auf den rot umrandeten Knopf „x ausgewählte Geräte abmelden“ klicken. Die oberste in Fettschrift ist die aktuelle Sitzung, diese nicht mit anhaken, also nicht löschen.
+ 1. In einer Matrix-Sitzung (=Client/Geräte/Browser), wo man die früheren verschlüsselten Gespräche noch lesen kann, die Raumschlüssel exportieren. Dazu unter `Einstellungen`-> `Sicherheit` -> `Verschlüsselung` auf den Knopf "E2E-Raumschlüssel exportieren" klicken. Sollte es keinen Zugang zu irgendeiner Matrix-Sitzung mehr geben, in der frühere verschlüsselte Nachrichten lesbar sind, diesen Schritt überspringen.
+ 2. In der einen Matrix-Sitzung, bei der man soeben in Schritt 1 die Raumschlüssel manuell exportiert hat, unter `Einstellungen`-> `Sicherheit` -> `Verschlüsselung` alle weiteren Sitzungen über die Checkbox am Zeilenanfang markieren und unterhalb der Liste auf den rot umrandeten Knopf „x ausgewählte Geräte abmelden“ klicken. Die oberste Zeile unter der Überschrift "Dieses Gerät" ist die aktuelle Sitzung, diese nicht mit anhaken, also nicht löschen.
3. Ggf. ausloggen und wieder einloggen, dabei Nachfragen ignorieren.
4. Unter `Einstellungen`-> `Sicherheit` -> `Sicheres Backup` schauen ob dort ein grüner Knopf `Einrichten` und keine roten Knöpfe da sind. Oder wenn noch rote Knöpfe da sind, erst den Knopf `Sicherung löschen`, dann den Knopf `Zurücksetzen` klicken. Möglicherweise ist ein löschen des Zwischenspeichers (roter Knopf unter `Einstellungen`-> `Hilfe & Über`) nötig, möglicherweise auch ein Abmelden und erneutes aAnmelden.
5. Anschließend unter `Einstellungen`-> `Sicherheit` -> `Quersignierung` auf den roten Knopf `Zurücksetzen` drücken. Die Aktion war erfolgreich, wenn für `Sicheres Backup` und `Quersignierung` nur noch der grüne Einrichten Knopf angezeigt wird.
diff --git a/static/css/theme-tud.css b/static/css/theme-tud.css
index 7924d3245c2d234d88174585ab03bed06af939be..25a8838b50f5cf93d53e6fb2263e574c9e9bf432 100644
--- a/static/css/theme-tud.css
+++ b/static/css/theme-tud.css
@@ -1,33 +1,105 @@
:root{
- --MAIN-TEXT-color:#323232; /* Color of text by default */
+ --MAIN-TEXT-color: #333; /* Color of text by default */
--MAIN-TITLES-TEXT-color: #5e5e5e; /* Color of titles h2-h3-h4-h5 */
- --MAIN-LINK-color:#006ab3; /* Color of links */
- --MAIN-LINK-HOVER-color:#006ab3; /* Color of hovered links */
+ --MAIN-LINK-color: #dd2727; /* Color of links */
+ --MAIN-LINK-HOVER-color: #333; /* Color of hovered links */
--MAIN-ANCHOR-color: #0077b3; /* color of anchors on titles */
- --MENU-HEADER-BG-color:#00305e; /* Background color of menu header */
- --MENU-HEADER-BORDER-color:#006ab3; /*Color of menu header border */
+ --MENU-HEADER-BG-color: #002557; /* Background color of menu header */
+ --MENU-HEADER-BORDER-color: #0069b4; /*Color of menu header border */
- --MENU-SEARCH-BG-color:#006ab3; /* Search field background color (by default borders + icons) */
- --MENU-SEARCH-BOX-color: #006ab3; /* Override search field border color */
+ --MENU-SEARCH-BG-color: #0069b4; /* Search field background color (by default borders + icons) */
+ --MENU-SEARCH-BOX-color: #0069b4; /* Override search field border color */
--MENU-SEARCH-BOX-ICONS-color: #a1d2fd; /* Override search field icons color */
- --MENU-SECTIONS-ACTIVE-BG-color:#20272b; /* Background color of the active section and its childs */
- --MENU-SECTIONS-BG-color:#252c31; /* Background color of other sections */
+ --MENU-SECTIONS-ACTIVE-BG-color: #20272b; /* Background color of the active section and its childs */
+ --MENU-SECTIONS-BG-color: #252c31; /* Background color of other sections */
--MENU-SECTIONS-LINK-color: #ccc; /* Color of links in menu */
--MENU-SECTIONS-LINK-HOVER-color: #e6e6e6; /* Color of links in menu, when hovered */
--MENU-SECTION-ACTIVE-CATEGORY-color: #777; /* Color of active category text */
--MENU-SECTION-ACTIVE-CATEGORY-BG-color: #fff; /* Color of background for the active category (only) */
- --MENU-VISITED-color: #006ab3; /* Color of 'page visited' icons in menu */
+ --MENU-VISITED-color: #0069b4; /* Color of 'page visited' icons in menu */
--MENU-SECTION-HR-color: #20272b; /* Color of <hr> separator in menu */
}
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 300;
+ src: url("../fonts/OpenSans-Light.ttf") format("truetype");
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ font-style: italic;
+ font-weight: 300;
+ src: url("../fonts/OpenSans-LightItalic.ttf") format("truetype");
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 400;
+ src: url("../fonts/OpenSans-Regular.ttf") format("truetype");
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ font-style: italic;
+ font-weight: 400;
+ src: url("../fonts/OpenSans-Italic.ttf") format("truetype");
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 600;
+ src: url("../fonts/OpenSans-SemiBold.ttf") format("truetype");
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ font-style: italic;
+ font-weight: 600;
+ src: url("../fonts/OpenSans-SemiBoldItalic.ttf") format("truetype");
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 700;
+ src: url("../fonts/OpenSans-Bold.ttf") format("truetype");
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ font-style: italic;
+ font-weight: 700;
+ src: url("../fonts/OpenSans-BoldItalic.ttf") format("truetype");
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 800;
+ src: url("../fonts/OpenSans-ExtraBold.ttf") format("truetype");
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ font-style: italic;
+ font-weight: 800;
+ src: url("../fonts/OpenSans-ExtraBoldItalic.ttf") format("truetype");
+}
+
body {
color: var(--MAIN-TEXT-color) !important;
+ font-family: "Open Sans", "OpenSans", "Helvetica", "Arial", sans-serif;
+ font-weight: 400;
}
textarea:focus, input[type="email"]:focus, input[type="number"]:focus, input[type="password"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="text"]:focus, input[type="url"]:focus, input[type="color"]:focus, input[type="date"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="week"]:focus, select[multiple=multiple]:focus {
@@ -35,8 +107,39 @@ textarea:focus, input[type="email"]:focus, input[type="number"]:focus, input[typ
box-shadow: none;
}
+h1 {
+ font-family: "Open Sans", "OpenSans", "Helvetica", "Arial", sans-serif;
+ text-align: left;
+ font-weight: 400;
+ font-size: 2rem;
+}
+
+body #chapter h1 {
+ font-size: 1.5rem;
+}
+
h2, h3, h4, h5 {
color: var(--MAIN-TITLES-TEXT-color) !important;
+ font-family: "Open Sans", "OpenSans", "Helvetica", "Arial", sans-serif;
+ font-weight: 600 !important;
+}
+
+h2 {
+ font-size: 1.5rem !important;
+}
+
+h3 {
+ font-size: 1.3rem !important;
+}
+
+h4 {
+ font-size: 1.2rem !important;
+}
+
+h6 {
+ color: var(--MAIN-TITLES-TEXT-color) !important;
+ font-family: "Open Sans", "OpenSans", "Helvetica", "Arial", sans-serif;
+ font-weight: 600 !important;
}
a {
@@ -51,12 +154,26 @@ a:hover {
color: var(--MAIN-LINK-HOVER-color);
}
+#top-bar a {
+ color: var(--MAIN-ANCHOR-color);
+}
+#top-bar a:hover {
+ color: var(--MAIN-TEXT-color);
+}
+
#sidebar ul li.visited > a .read-icon {
color: var(--MENU-VISITED-color);
}
#chapter p{
text-align: start;
+ font-size: 1rem;
+}
+
+#chapter h3 {
+ font-family: "Open Sans", "OpenSans", "Helvetica", "Arial", sans-serif;
+ font-weight: 400;
+ text-align: left;
}
#chapter h4 {
@@ -74,21 +191,27 @@ a:hover {
transition: width 0.5s ease;
background-color: var(--MAIN-LINK-HOVER-color);
}
+
#sidebar {
background-color: var(--MENU-SECTIONS-BG-color);
+ font-weight: 400 !important;
}
+
#sidebar #header-wrapper {
background: var(--MENU-HEADER-BG-color);
color: var(--MENU-SEARCH-BOX-color);
border-color: var(--MENU-HEADER-BORDER-color);
}
+
#sidebar .searchbox {
border-color: var(--MENU-SEARCH-BOX-color);
background: var(--MENU-SEARCH-BG-color);
}
+
#sidebar ul.topics > li.parent, #sidebar ul.topics > li.active {
background: var(--MENU-SECTIONS-ACTIVE-BG-color);
}
+
#sidebar .searchbox * {
color: var(--MENU-SEARCH-BOX-ICONS-color);
}
@@ -110,6 +233,11 @@ a:hover {
border-color: var(--MENU-SECTION-HR-color);
}
+#sidebar #shortcuts h3 {
+ font-family: "Open Sans", "OpenSans", "Helvetica", "Arial", sans-serif;
+}
+
+
div.notices.warning:lang(de) p:first-child:after {
content: 'Warnung';
}
@@ -122,3 +250,7 @@ div.notices.info:lang(de) p:first-child:after {
div.notices.tip:lang(de) p:first-child:after {
content: 'Tipp';
}
+
+.tooltipped:after {
+ font: normal normal 11px/1.5 "Open Sans", "OpenSans", "Helvetica", "Arial", sans-serif;
+}
\ No newline at end of file
diff --git a/static/fonts/OpenSans-Bold.ttf b/static/fonts/OpenSans-Bold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..7b529456032abf9132194ddaac62d2d163247c38
Binary files /dev/null and b/static/fonts/OpenSans-Bold.ttf differ
diff --git a/static/fonts/OpenSans-BoldItalic.ttf b/static/fonts/OpenSans-BoldItalic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..a670e14265a806cffbc66ea3be0083e14369fffa
Binary files /dev/null and b/static/fonts/OpenSans-BoldItalic.ttf differ
diff --git a/static/fonts/OpenSans-ExtraBold.ttf b/static/fonts/OpenSans-ExtraBold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..3660681d398100fd0e2dcffa089570eea893629d
Binary files /dev/null and b/static/fonts/OpenSans-ExtraBold.ttf differ
diff --git a/static/fonts/OpenSans-ExtraBoldItalic.ttf b/static/fonts/OpenSans-ExtraBoldItalic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..8c4c15d88afd016a601cff5d0bdbf726ff571b95
Binary files /dev/null and b/static/fonts/OpenSans-ExtraBoldItalic.ttf differ
diff --git a/static/fonts/OpenSans-Italic.ttf b/static/fonts/OpenSans-Italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e6c541417348e930324056bb998a4ec4da37650c
Binary files /dev/null and b/static/fonts/OpenSans-Italic.ttf differ
diff --git a/static/fonts/OpenSans-Light.ttf b/static/fonts/OpenSans-Light.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..563872c7680aed4d9f8f7a4bc4f3c1506c2cbbc1
Binary files /dev/null and b/static/fonts/OpenSans-Light.ttf differ
diff --git a/static/fonts/OpenSans-LightItalic.ttf b/static/fonts/OpenSans-LightItalic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..5ebe2a2994aa32ae9b00233f99e9192162babfd9
Binary files /dev/null and b/static/fonts/OpenSans-LightItalic.ttf differ
diff --git a/static/fonts/OpenSans-Regular.ttf b/static/fonts/OpenSans-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..2e31d02424ed50b9e05c19b5d82500699a6edbb0
Binary files /dev/null and b/static/fonts/OpenSans-Regular.ttf differ
diff --git a/static/fonts/OpenSans-SemiBold.ttf b/static/fonts/OpenSans-SemiBold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..99db86aa0282e425450c86508d42da77a9f4102b
Binary files /dev/null and b/static/fonts/OpenSans-SemiBold.ttf differ
diff --git a/static/fonts/OpenSans-SemiBoldItalic.ttf b/static/fonts/OpenSans-SemiBoldItalic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..8cad4e32f33a8781af2debeff6bd821a09561058
Binary files /dev/null and b/static/fonts/OpenSans-SemiBoldItalic.ttf differ
diff --git a/static/images/15_Element_Android1_de.jpg b/static/images/15_Element_Android1_de.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ad1c5a6c464ad52327e54e9bf55909c72864541b
Binary files /dev/null and b/static/images/15_Element_Android1_de.jpg differ
diff --git a/static/images/15_Element_Android1_en.jpg b/static/images/15_Element_Android1_en.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..850dc884ee5bc016f0c994708e50db39b22f4875
Binary files /dev/null and b/static/images/15_Element_Android1_en.jpg differ
diff --git a/static/images/15_Element_Android2_de.jpg b/static/images/15_Element_Android2_de.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..661ec7cdf9c23e92ee1b3883dd1523ad5c83ac14
Binary files /dev/null and b/static/images/15_Element_Android2_de.jpg differ
diff --git a/static/images/15_Element_Android2_en.jpg b/static/images/15_Element_Android2_en.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a1196fd2629d0899d22f8f4fc6370b8ae0a8ee7f
Binary files /dev/null and b/static/images/15_Element_Android2_en.jpg differ
diff --git a/static/images/15_Element_Android3_de.jpg b/static/images/15_Element_Android3_de.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..35739bc3d38dd3043a7050f20ebd04765a7aab37
Binary files /dev/null and b/static/images/15_Element_Android3_de.jpg differ
diff --git a/static/images/15_Element_Android3_en.jpg b/static/images/15_Element_Android3_en.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..7eb84987161faafe7790b896afd43d07f147f967
Binary files /dev/null and b/static/images/15_Element_Android3_en.jpg differ
diff --git a/static/images/15_Element_Android4_de.jpg b/static/images/15_Element_Android4_de.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ef9f73744b9f6b5f3b2380042a502bcaa627ca5a
Binary files /dev/null and b/static/images/15_Element_Android4_de.jpg differ
diff --git a/static/images/15_Element_Android4_en.jpg b/static/images/15_Element_Android4_en.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4fb0227a003c44cc3071b62db84fdde6a8347e1a
Binary files /dev/null and b/static/images/15_Element_Android4_en.jpg differ
diff --git a/static/images/15_Element_iOS1_de.png b/static/images/15_Element_iOS1_de.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ee50a939a28f5e5f88d666561428d655074ad09
Binary files /dev/null and b/static/images/15_Element_iOS1_de.png differ
diff --git a/static/images/15_Element_iOS2_de.png b/static/images/15_Element_iOS2_de.png
new file mode 100644
index 0000000000000000000000000000000000000000..f59b4d6a03ada95d3d2f0c6f9ba7ad432c3488e1
Binary files /dev/null and b/static/images/15_Element_iOS2_de.png differ
diff --git a/static/images/15_Element_iOS3_de.png b/static/images/15_Element_iOS3_de.png
new file mode 100644
index 0000000000000000000000000000000000000000..d919042974ad03b24e5867d66384982eace79f24
Binary files /dev/null and b/static/images/15_Element_iOS3_de.png differ