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

part1/08/08.md

@@ -6,7 +6,106 @@
 
 ---
 
-<div class="layout-wide-content">
+<div class="layout-content-and-preview">
+    <div class="layout-content">
+    <h2>Wir haben da schon mal was vorbereitet</h2>
+    <ul>
+        <li>Ubuntu (GNOME)</li>
+    </ul>
+    </div>
+    <div class="layout-preview">
+    <img src="part1/08/ubuntu.png" class="thin-padding">
+    </div>
+</div>
+
+---
+
+<div class="layout-content-and-preview">
+    <div class="layout-content">
+    <h2>Wir haben da schon mal was vorbereitet</h2>
+    <ul>
+        <li>Ubuntu (GNOME)</li>
+        <li>Linux Mint (Cinnamon)</li>
+    </ul>
+    </div>
+    <div class="layout-preview">
+    <img src="part1/08/mint.png" class="thin-padding">
+    </div>
+</div>
+
+---
+
+<div class="layout-content-and-preview">
+    <div class="layout-content">
+    <h2>Wir haben da schon mal was vorbereitet</h2>
+    <ul>
+        <li>Ubuntu (GNOME)</li>
+        <li>Linux Mint (Cinnamon)</li>
+        <li>elementaryOS (Pantheon)</li>
+    </ul>
+    </div>
+    <div class="layout-preview">
+    <img src="part1/08/elementary.png" class="thin-padding">
+    </div>
+</div>
+
+---
+
+<div class="layout-content-and-preview">
+    <div class="layout-content">
+    <h2>Wir haben da schon mal was vorbereitet</h2>
+    <ul>
+        <li>Ubuntu (GNOME)</li>
+        <li>Linux Mint (Cinnamon)</li>
+        <li>elementaryOS (Pantheon)</li>
+        <li>Manjaro (xfce)</li>
+    </ul>
+    </div>
+    <div class="layout-preview">
+    <img src="part1/08/manjaro.png" class="thin-padding">
+    </div>
+</div>
+
+---
+
+<div class="layout-content-and-preview">
+    <div class="layout-content">
+    <h2>Wir haben da schon mal was vorbereitet</h2>
+    <ul>
+        <li>Ubuntu (GNOME)</li>
+        <li>Linux Mint (Cinnamon)</li>
+        <li>elementaryOS (Pantheon)</li>
+        <li>Manjaro (xfce)</li>
+        <li>openSUSE (KDE)</li>
+    </ul>
+    </div>
+    <div class="layout-preview">
+    <img src="part1/08/suse.png" class="thin-padding">
+    </div>
+</div>
+
+---
+
+<div class="layout-content-and-preview">
+    <div class="layout-content">
+    <h2>Wir haben da schon mal was vorbereitet</h2>
+    <ul>
+        <li>Ubuntu (GNOME)</li>
+        <li>Linux Mint (Cinnamon)</li>
+        <li>elementaryOS (Pantheon)</li>
+        <li>Manjaro (xfce)</li>
+        <li>openSUSE (KDE)</li>
+        <li>Fedora (LXQt)</li>
+    </ul>
+    </div>
+    <div class="layout-preview">
+    <img src="part1/08/fedora.png" class="thin-padding">
+    </div>
+</div>
+
+---
+
+<div class="layout-content-and-preview">
     <div class="layout-content">
     <h2>Live Image booten</h2>
     <ul>
@@ -15,6 +114,10 @@
         <li>Boot-Medium auswählen: abhängig von Hardware mit <kbd>Esc</kbd>, <kbd>F10</kbd>, <kbd>F12</kbd>, <kbd>F8</kbd>, ...</li>
     </ul>
     </div>
+   </div>
+    <div class="layout-preview">
+    <img src=".png">
+    </div>
 </div>
 
 ---
@@ -46,7 +149,7 @@
 
 <div class="layout-content-only">
     <div class="layout-content">
-        <h2>Ist denn heut' schon Weihnachten?</h2>
+        <h2>Ist denn heut' schon Weihnachten? 🎁</h2>
         <h3>Pakete und Paketmanager</h3>
         <ul>
             <li>Findet das GUI-Tool, mit dem ihr Software installieren und updaten könnt.</li>
@@ -112,11 +215,13 @@
 ---
 
 <div class="layout-two-columns">
+    <h2 class="layout-title">Aufgabenübersicht</h2>
     <div class="layout-column-one">
-        <h2>Aufgaben</h2>
        <ul>
-            <li>vertraute Programme finden</li>
+            <li>vertraute Programme finden<br/>
-            <li>Verbindung mit dem Internet einrichten</li>
+            Office-Anwendungen, Internetbrowser, Mail-Client, Datei-Explorer</li>
+            <li>Verbindung mit dem Internet einrichten<br/>
+            Bayern-WLAN</li>
             <li>GUI-Tool zur Software-Verwaltung ausprobieren: <br/>
             Tux-Spiel</li>
         </ul>