Merge branch 'master' of git.stuve-bamberg.de:asauer/linux-tutorium

part1/03/03.md

@@ -1,6 +1,6 @@
 <div class="layout-content-only">
     <div class="layout-content">
-    <h1>Distro Disko</h1>
+    <h1>Distro Disko 🕺</h1>
     </div>
 </div>
 

part1/04/04.md

@@ -1,7 +1,11 @@
-<div class="layout-content-only">
+<div class="layout-content-and-preview">
     <div class="layout-content">
     <h1>Schicke Gegend: Desktop-umgebungen</h1>
     </div>
+    <div class="layout-preview">
+    <img src="part1/04/desktop_monty.jpg">
+    <figcaption><a href="https://secure.i.telegraph.co.uk/multimedia/archive/02738/MontyPythonCleese_2738935b.jpg">Quelle</a></figcaption>
+    </div>
 </div>
 
 ---
@@ -45,6 +49,14 @@
         <li>Mailclient</li>
         <li>Kalender</li>
     </ul>
+</div>
+
+---
+
+<div class="layout-preview-only">
+    <div class="layout-preview">
+    <img src="part1/04/desktop_monty2.gif">
+    <figcaption><a href="https://78.media.tumblr.com/78375cbe5c8590520af29af29dc752/tumblr_nifvorNaq01u0k6deo1_500.gif">Quelle</a></figcaption>
     </div>
 </div>
 
@@ -65,7 +77,7 @@
 
 ---
 
-<div class="layout-content-only">
+<div class="layout-content-and-preview">
     <div class="layout-content">
     <h2>KDE</h2>
     <h3>K(ool) Desktop Environment, seit 1996</h3>
@@ -75,6 +87,10 @@
         <li>von sehr großer und lebendiger Community entwickelt</li>
         <li>KDE Applications</li>
     </div>
+    <div class="layout-preview">
+    <img src="part1/04/kde_mascot.png">
+    <figcaption>Konqi, das KDE-Maskottchen (<a href="https://commons.wikimedia.org/wiki/File:KDE_Mascot_Konqi_by_Tyson_tan.png">Quelle</a>)</figcaption>
+    </div>
 </div>
 
 ---
@@ -113,7 +129,7 @@
 
 ---
 
-<div class="layout-content-only">
+<div class="layout-content-and-preview">
     <div class="layout-content">
     <h2>GNOME</h2>
     <h3>GNU Network Object Model Environment, seit 1997</h3>
@@ -125,6 +141,10 @@
         <li>Fokus auf "kognitive Ergonomik"</li>
     </ul>
    </div>
+   <div class="layout-preview">
+    <img src="part1/04/gnome_logo.png">
+    <figcaption>deshalb ist Gnome sehr beliebt bei Fußfetischist*innen... (<a href="https://commons.wikimedia.org/wiki/File:Gnomelogo.svg">Quelle</a>)</figcaption>
+    </div>
 </div>
 
 ---
@@ -164,7 +184,7 @@
 
 ---
 
-<div class="layout-content-only">
+<div class="layout-content-and-preview">
     <div class="layout-content">
     <h2>Cinnamon</h2>
     <h3>seit 2011</h2>
@@ -172,6 +192,10 @@
         <li>basiert auf GNOME</li>
         <li>vom Linux Mint Team entwickelt</li>
     </div>
+   <div class="layout-preview">
+    <img src="part1/04/cinnamon_bun.jpg">
+    <figcaption>mmh, lecker 😋 (<a href="https://commons.wikimedia.org/wiki/File:Kanelboller.jpg">Quelle</a>)</figcaption>
+    </div>
 </div>
 
 ---
@@ -221,13 +245,23 @@
     </ul>
     </div>
     <div class="layout-preview">
-    <img src="part1/04/pantheon.png">
+    <img src="part1/04/pantheon_rome.jpg">
+    <figcaption>das Pantheon (<a href="https://commons.wikimedia.org/wiki/File:Rome_Pantheon_front.jpg">Quelle</a>)</figcaption>
     </div>
 </div>
 
 ---
 
-<div class="layout-content-only">
+<div class="layout-preview-only">
+    <div class="layout-preview">
+    <img src="part1/04/pantheon.png">
+    <figcaption>für nen Apple und nen Ei zu haben (<a href="https://commons.wikimedia.org/wiki/File:elementary_OS_5.0_Juno.png">Quelle</a>)</figcaption>
+    </div>
+</div>
+
+---
+
+<div class="layout-content-and-preview">
     <div class="layout-content">
     <h2>Xfce</h2>
     <h3>XForms Common Environment, seit 1996</h3>
@@ -237,6 +271,10 @@
         <li>nur Grundausstattung an Werkzeugen vorinstalliert</li>
     </ul>
     </div>
+    <div class="layout-preview">
+    <img src="part1/04/xfce_logo.png">
+    <figcaption>Per Mausgetier steuerbar (<a href="https://commons.wikimedia.org/wiki:File:Xfce_logo.svg">Quelle</a>)</figcaption>
+    </div>
 </div>
 
 ---
@@ -275,7 +313,7 @@
 
 ---
 
-<div class="layout-content-only">
+<div class="layout-content-and-preview">
     <div class="layout-content">
     <h2>LXQt</h2>
     <h3>Desktopumgebung LXDE (Linux X11 Desktop Environment) + Widget-Mangager Qt, seit 2013</h3>
@@ -285,6 +323,10 @@
         <li>nur Grundausstattung an Werkzeugen vorinstalliert</li>
     </ul>
     </div>
+    <div class="layout-preview">
+    <img src="part1/04/lxqt_logo.png">
+    <figcaption>wer möchte einen Vogel haben? (<a href="https://commons.wikimedia.org/wiki/File:Helix_lxqt.svg">Quelle</a>)</figcaption>
+    </div>
 </div>
 
 ---