diff --git a/lectures/froscon/image/.directory b/lectures/froscon/image/.directory new file mode 100644 index 0000000000000000000000000000000000000000..409c7ea77bb93ee7d7603429d3aa734fba786a17 --- /dev/null +++ b/lectures/froscon/image/.directory @@ -0,0 +1,4 @@ +[Dolphin] +PreviewsShown=true +Timestamp=2015,8,11,20,53,25 +Version=3 diff --git a/lectures/froscon/image/aufbau1.jpg b/lectures/froscon/image/aufbau1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..766281a3607048a245abbd5f13369dda83e97ced Binary files /dev/null and b/lectures/froscon/image/aufbau1.jpg differ diff --git a/lectures/froscon/image/aufraeumen.jpg b/lectures/froscon/image/aufraeumen.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b961c73c5aee500cf73eb2c6edd0d012b9e6ee7c Binary files /dev/null and b/lectures/froscon/image/aufraeumen.jpg differ diff --git a/lectures/froscon/image/briefing.jpg b/lectures/froscon/image/briefing.jpg new file mode 100644 index 0000000000000000000000000000000000000000..cfcb33252c6c5a6c3ddd9f6a5d24c81857636e93 Binary files /dev/null and b/lectures/froscon/image/briefing.jpg differ diff --git a/lectures/froscon/image/crypto_buffet.jpg b/lectures/froscon/image/crypto_buffet.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5a361fa1f188ce9331edd14014a1027ba8d2b834 Binary files /dev/null and b/lectures/froscon/image/crypto_buffet.jpg differ diff --git a/lectures/froscon/image/crypto_saal.jpg b/lectures/froscon/image/crypto_saal.jpg new file mode 100644 index 0000000000000000000000000000000000000000..766538d2d40ba20bdd68c016af4b0e486279528c Binary files /dev/null and b/lectures/froscon/image/crypto_saal.jpg differ diff --git a/lectures/froscon/image/install1.jpg b/lectures/froscon/image/install1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4fb1ba322d5640fdfa51df44acf9006504509618 Binary files /dev/null and b/lectures/froscon/image/install1.jpg differ diff --git a/lectures/froscon/image/install2.jpg b/lectures/froscon/image/install2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..7f71641f84024efee7ae4a1b24f5c9cd4be5fc91 Binary files /dev/null and b/lectures/froscon/image/install2.jpg differ diff --git a/lectures/froscon/image/kiss.jpg b/lectures/froscon/image/kiss.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9e07e36e5dcd8ddc4f13ea2527a6277125d162be Binary files /dev/null and b/lectures/froscon/image/kiss.jpg differ diff --git a/lectures/froscon/image/osak-2015.jpg b/lectures/froscon/image/osak-2015.jpg new file mode 100644 index 0000000000000000000000000000000000000000..78ae128b581a87828a17abda5ad57c5f35249d17 Binary files /dev/null and b/lectures/froscon/image/osak-2015.jpg differ diff --git a/lectures/froscon/image/pic_shot_1435255610835.jpg b/lectures/froscon/image/sitzung.jpg similarity index 100% rename from lectures/froscon/image/pic_shot_1435255610835.jpg rename to lectures/froscon/image/sitzung.jpg diff --git a/lectures/froscon/image/sticks1.jpg b/lectures/froscon/image/sticks1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..af3b6aca27645abaeb9409d6dbac10ed6e05d448 Binary files /dev/null and b/lectures/froscon/image/sticks1.jpg differ diff --git a/lectures/froscon/image/sticks2.jpg b/lectures/froscon/image/sticks2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..035c0e2b3e6f7eefec4b1a909d5e34e473628c72 Binary files /dev/null and b/lectures/froscon/image/sticks2.jpg differ diff --git a/lectures/froscon/lip.tex b/lectures/froscon/lip.tex index ad7d47e08f2f73171a9f28211a80bcbb23e23341..f4dbfcda8f0ff3a900e1034cae84a1e3a9b770b9 100644 --- a/lectures/froscon/lip.tex +++ b/lectures/froscon/lip.tex @@ -2,7 +2,8 @@ - +{ +\nologo \begin{frame}[t]{Geschichte} %\begin{center} @@ -141,7 +142,7 @@ Gegen UEFI: die EFI-Axt und GRUB 2 \end{frame} - +} \subsection{Organisation} @@ -180,7 +181,83 @@ Gegen UEFI: die EFI-Axt und GRUB 2 \subsection{Durchführung} \begin{frame}{bis Woche vor der LIP} +\vspace{-0.9cm} +\begin{center} +\includegraphics[width=1.01\textwidth]{image/sitzung.jpg} +\end{center} +\end{frame} + +{ +\nologo +\begin{frame}{Woche vor der LIP} +\textbf{Hardware, Schilder, Handouts, etc. Sortieren und Vorbereiten} + +\begin{figure} +\includegraphics[width=0.75\textwidth]{image/aufraeumen.jpg} +\end{figure} +\end{frame} +} + +\begin{frame}{Woche vor der LIP} +\textbf{Sortieren, Überprüfen und Flashen der USB-Sticks} +\begin{columns} +\begin{column}{.66\textwidth} +\begin{figure} +\includegraphics[width=1\textwidth]{image/sticks2.jpg} +\end{figure} + + +\end{column} +\begin{column}{.33\textwidth} +\begin{figure} +\includegraphics[width=1\textwidth]{image/sticks1.jpg} +\end{figure} + +\end{column} + +\end{columns} +\end{frame} + + +{ +\nologo +\begin{frame}{Tag der LIP} +\vspace{-.5\baselineskip} +\textbf{Aufbau und letztes Briefing} +\vspace{-.25\baselineskip} +\begin{figure} +\includegraphics[width=0.9\textwidth]{image/aufbau1.jpg} + +\includegraphics[width=0.9\textwidth]{image/briefing.jpg} +\end{figure} \end{frame} +} + +{ +\nologo +\begin{frame}{Die LIP} +\begin{figure} +\includegraphics[width=0.5\textwidth]{image/install1.jpg} +\end{figure} +\vspace{-1cm} +\begin{columns} +\begin{column}{.5\textwidth} +\begin{figure} +\includegraphics[width=0.85\textwidth]{image/install2.jpg} +\end{figure} +\end{column} +\begin{column}{.5\textwidth} +\begin{figure} +\includegraphics[width=0.85\textwidth]{image/IMG_6914.jpg} +\end{figure} +\end{column} +\end{columns} +\end{frame} +} + + + + % Zeitstrahl: bis Woche vor der LIP, Woche vor der LIP, "Tag vor der LIP (72h)", Nacht vor der LIP, Tag der LIP, LIP selbst \subsection{Software} diff --git a/lectures/froscon/main.pdf b/lectures/froscon/main.pdf index 1f899d644dece74174302b5c53e9039b17443d15..e8f5b8093bed76bc5b191c16b18ee779fc196749 100644 Binary files a/lectures/froscon/main.pdf and b/lectures/froscon/main.pdf differ diff --git a/lectures/froscon/main.tex b/lectures/froscon/main.tex index 063d146723a34909cb50d64ce4470d205250f986..689003ef6c230e69d16cb6fe26e4969ecf62193f 100644 --- a/lectures/froscon/main.tex +++ b/lectures/froscon/main.tex @@ -28,6 +28,8 @@ %Themes aussuchen z.B. über http://www.hartwork.org/beamer-theme-matrix/ \logo{\includegraphics[height=2cm]{../osak-logo}} +\newcommand{\nologo}{\setbeamertemplate{logo}{}} + \date{FrOSCon 2015} \begin{document} %hier fangen die eigentlichen Folien an diff --git a/lectures/froscon/osak.tex b/lectures/froscon/osak.tex index 42047811f1fd456631d12c4464655e1f7dc589b1..6f0a929cabca24363bd48154195cab07078d16c0 100644 --- a/lectures/froscon/osak.tex +++ b/lectures/froscon/osak.tex @@ -1,7 +1,14 @@ \section{Vorstellung des OSAKs} \begin{frame}{Open Source Arbeitskreis} - - \todo{FOTO Machen und einbinden} + +\vspace{-0.9cm} +\begin{center} +\includegraphics[width=1.01\textwidth]{image/osak-2015.jpg} +\end{center} + + + + %\begin{figure} % \includegraphics{osak-foto.jpg}