diff --git a/Content.tex b/Content.tex
index 9e49dc5..b78cdfc 100644
--- a/Content.tex
+++ b/Content.tex
@@ -1,4 +1,5 @@
%all the content goes here
\input{frames/Aufmacher.tex}
\input{frames/Umstände-Ford.tex}
-\input{frames/Umstände-Musk.tex}
\ No newline at end of file
+\input{frames/Umstände-Musk.tex}
+\input{frames/Werdegang-Musk.tex}
diff --git a/Ford_vs_Musk_Presentation.pdf b/Ford_vs_Musk_Presentation.pdf
index 4b187b9..53340d3 100644
Binary files a/Ford_vs_Musk_Presentation.pdf and b/Ford_vs_Musk_Presentation.pdf differ
diff --git a/Ford_vs_Musk_Presentation.tex b/Ford_vs_Musk_Presentation.tex
index 74e2c9a..66012f5 100644
--- a/Ford_vs_Musk_Presentation.tex
+++ b/Ford_vs_Musk_Presentation.tex
@@ -12,6 +12,16 @@
\begin{document}
\definecolor{th-grey}{HTML}{38434b};
+ \definecolor{th-red}{HTML}{ed114c};
+
+ %timeline
+ \newcommand\ytl[2]{
+ \vspace{-2mm}
+ \parbox[b]{0.1\textwidth}{\hfill{\color{black}\bfseries\sffamily #1}}\hspace{.05\textwidth}
+ \makebox[0pt][c]{\Huge$\blacktriangledown$}\vrule\hspace{.05\textwidth}
+ \parbox[c]{.775\textwidth}{\vspace{5mm}\color{black}\sffamily\normalsize #2\\}
+ \vspace{-2mm}
+ }
\input{TitlePage.tex}
diff --git a/Packages.tex b/Packages.tex
index 14a19d2..9277506 100644
--- a/Packages.tex
+++ b/Packages.tex
@@ -19,6 +19,8 @@ rightsub = \grq%
\usepackage[framemethod=tikz]{mdframed}
%enumeration
\usepackage{enumerate}
+%timeline
+\usepackage{array,booktabs}
%tikz
\usepackage{tikz}
\usetikzlibrary{positioning}
\ No newline at end of file
diff --git a/beamerinnerthemeth-owl.sty b/beamerinnerthemeth-owl.sty
index d85ca6f..707c482 100644
--- a/beamerinnerthemeth-owl.sty
+++ b/beamerinnerthemeth-owl.sty
@@ -9,7 +9,7 @@
\fill[white,opacity=1] (0,0) rectangle(\the\paperwidth,\the\paperheight);
\node [below left] at (current bounding box.north east)
{\includesvg[width=.15\paperwidth]{./images/TH_OWL_Logo_small}};
- \node[above right] (0,0) {
+ \node[below right] at (current bounding box.north west) {
\footnotesize
\hspace{.05\paperwidth}
{\tiny\inserttitle \space | \insertshortauthor \space | \insertdate}
diff --git a/frames/Umstände-Ford.tex b/frames/Umstände-Ford.tex
index d878044..6f1e9a5 100644
--- a/frames/Umstände-Ford.tex
+++ b/frames/Umstände-Ford.tex
@@ -1,26 +1,28 @@
\begin{frame}{Geschichtliche Einordnung - Henry Ford}{Bürger-, Weltkriege und die 2. industrielle Revolution}
- \begin{columns}
- \begin{column}{.45\textwidth}
- Henry Ford lebte von 1863 bis 1947
- \begin{itemize}
- \item Ende des Amerikanischen Bürgerkrieges (1865)
- \item Beginn der 2. Industriellen Revolution (Beginn der 1860er)
- \item 1. Weltkrieg (1914-1918)
- \item Spanische Grippe (1918-1920)
- \item 2. Weltkrieg (1933-1945)
- \end{itemize}
- \end{column}
- \begin{column}{.45\textwidth}
- \begin{tikzpicture}
- \node (ir) at (0,0) {\includegraphics[width=1.1\textwidth]{2nd-industrial-revolution.jpg}};
- \node[below = 0mm of ir,draw=th-grey] {
- \tiny
- \begin{tabular}{l}
- Quellen:\\\\
- https://pngeans.com/wp-content/uploads/2019/12/\\Hartmann\_Maschinenhalle\_1868\_01-1-1024x665.jpg
- \end{tabular}
- };
- \end{tikzpicture}
- \end{column}
- \end{columns}
+ \begin{tikzpicture}
+ \useasboundingbox (0,0) rectangle(\textwidth,0.8\textheight);
+ \node [below right] at (current bounding box.north west){
+ \begin{minipage}[t]{.5\linewidth}
+ Henry Ford lebte von 1863 bis 1947
+ \begin{itemize}
+ \item Ende des Amerikanischen Bürgerkrieges (1865)
+ \item Beginn der 2. Industriellen Revolution (Beginn der 1860er)
+ \item 1. Weltkrieg (1914-1918)
+ \item Spanische Grippe (1918-1920)
+ \item 2. Weltkrieg (1933-1945)
+ \end{itemize}
+ \end{minipage}
+ };
+
+ \node [below left = 5mm and -7mm] (zip2) at (current bounding box.north east){
+ \includegraphics[width=.5\textwidth]{2nd-industrial-revolution.jpg}
+ };
+ \node[above right] at (current bounding box.south west) {
+ \begin{minipage}[t]{\linewidth}
+ \tiny
+ \textbf{Quellen:}\\
+ https://pngeans.com/wp-content/uploads/2019/12/Hartmann\_Maschinenhalle\_1868\_01-1-1024x665.jpg
+ \end{minipage}
+ };
+ \end{tikzpicture}
\end{frame}
\ No newline at end of file
diff --git a/frames/Umstände-Musk.tex b/frames/Umstände-Musk.tex
index c183f5c..dce1c45 100644
--- a/frames/Umstände-Musk.tex
+++ b/frames/Umstände-Musk.tex
@@ -1,24 +1,26 @@
\begin{frame}{Geschichtliche Einordnung - Elon Musk}{Die Dotcom-Blase und der Beginn der kommerziellen Raumfahrt}
- \begin{columns}
- \begin{column}{.45\textwidth}
- Elon Musk wurde in 1971 geboren
- \begin{itemize}
- \item Aufstände gegen und Ende der Apartheid in Süd-Afrika (1950-1995)
- \item Dotcom-Blase (2000)
- \item Ende der staatlich organisierten Raumfahrt in den USA (2011)
- \end{itemize}
- \end{column}
- \begin{column}{.45\textwidth}
- \begin{tikzpicture}
- \node (dc) at (0,0) {\includesvg[width=1.1\textwidth]{dot-com-bubble.svg}};
- \node[below = 0mm of dc,draw=th-grey] {
- \tiny
- \begin{tabular}{l}
- Daten-Quellen:\\\\
- https://finance.yahoo.com/quote/\textasciicircum IXIC
- \end{tabular}
- };
- \end{tikzpicture}
- \end{column}
- \end{columns}
+ \begin{tikzpicture}
+ \useasboundingbox (0,0) rectangle(\textwidth,0.8\textheight);
+ \node [below right] at (current bounding box.north west){
+ \begin{minipage}[t]{.5\linewidth}
+ Elon Musk wurde in 1971 geboren
+ \begin{itemize}
+ \item Aufstände gegen und Ende der Apartheid in Süd-Afrika (1950-1995)
+ \item Dotcom-Blase (2000)
+ \item Ende der staatlich organisierten Raumfahrt in den USA (2011)
+ \end{itemize}
+ \end{minipage}
+ };
+
+ \node [above left = 0mm and -7mm] (zip2) at (current bounding box.south east){
+ \includesvg[width=.6\textwidth]{dot-com-bubble.svg}
+ };
+ \node[above right] at (current bounding box.south west) {
+ \begin{minipage}[t]{\linewidth}
+ \tiny
+ \textbf{Quellen:}\\
+ https://finance.yahoo.com/quote/\textasciicircum IXIC
+ \end{minipage}
+ };
+ \end{tikzpicture}
\end{frame}
\ No newline at end of file
diff --git a/frames/Werdegang-Musk.tex b/frames/Werdegang-Musk.tex
new file mode 100644
index 0000000..c48abee
--- /dev/null
+++ b/frames/Werdegang-Musk.tex
@@ -0,0 +1,99 @@
+\def \frameTitle {Werdegang - Elon Musk}
+\def \frameSubTitle {vom belächelten Phantast zum zweitreichsten Mensch der Werlt}
+
+\begin{frame}{\frameTitle}{\frameSubTitle}
+ \begin{tikzpicture}
+ \useasboundingbox (0,0) rectangle(\textwidth,0.8\textheight);
+ \node [below right] at (current bounding box.north west){
+ \begin{minipage}[t]{\linewidth}
+ \color{th-red}
+ \ytl{1971}{Geburt und Kindheit in Pretoria (Süd-Afrika)}
+ \ytl{1989}{Umzug zu seiner Mutter nach Kanada} %kein Militärdienst in Südafrika
+ \ytl{1992}{Wirtschaft- und Physik-Studium an der University of Pennsylvania}
+ \ytl{1992}{Beginn der Doktorarbeit an der Stanford University in California} % nach 2 Tagen abgebrochen
+ \end{minipage}
+ };
+ \node[above right] at (current bounding box.south west) {
+ \begin{minipage}[t]{\linewidth}
+ \tiny
+ \textbf{Quellen:}\\
+ https://www.biography.com/business-figure/elon-musk\\
+ \end{minipage}
+ };
+ \end{tikzpicture}
+\end{frame}
+
+\begin{frame}{\frameTitle}{\frameSubTitle}
+ \begin{tikzpicture}
+ \useasboundingbox (0,0) rectangle(\textwidth,0.8\textheight);
+ \node [below right] at (current bounding box.north west){
+ \begin{minipage}[t]{\linewidth}
+ \color{th-red}
+ \ytl{1995}{Gründung von Zip2} %zusammen mit Bruder Kimbal und einem weiteren Freund
+ \ytl{1999}{Verkauf von Zip2 an Compaq}
+ \ytl{1999}{Gründung von X.com (später PayPal)}
+ \ytl{2002}{Verkauf von PayPal an eBay}
+ \end{minipage}
+ };
+
+ \node [below left = 5mm and 0 mm] (zip2) at (current bounding box.north east){
+ \includegraphics[width=.3\textwidth]{zip2.jpg}
+ };
+
+ \node [below = 0mm of zip2] (paypal){
+ \includegraphics[width=.3\textwidth]{paypal-logo.png}
+ };
+ \node[above right] at (current bounding box.south west) {
+ \begin{minipage}[t]{\linewidth}
+ \tiny
+ \textbf{Quellen:}\\
+ https://www.biography.com/business-figure/elon-musk\\
+ https://www.paypal.com\\
+ https://topicimages.mrowl.com/large/prithvi\_c/elonmusk/career/zip2\_1.jpg
+ \end{minipage}
+ };
+ \end{tikzpicture}
+\end{frame}
+
+\begin{frame}{\frameTitle}{\frameSubTitle}
+ \begin{tikzpicture}
+ \useasboundingbox (0,0) rectangle(\textwidth,0.8\textheight);
+ \node [below right] at (current bounding box.north west){
+ \begin{minipage}[t]{\linewidth}
+ \color{th-red}
+ \ytl{2002}{Gründung von SpaceX}
+ \ytl{2003}{Gründung von Tesla Motors}
+ \ytl{2016}{Tesla übernimmt SolarCity Corp.}
+ \ytl{2017}{Gründung der Boring Company}
+ \end{minipage}
+ };
+
+ \node [below left = 5mm and 0 mm] (spacex) at (current bounding box.north east){
+ \includesvg[width=.3\textwidth]{SpaceX_logo.svg}
+ };
+
+ \node [below = 0mm of spacex] (tesla){
+ \includesvg[width=.15\textwidth]{Tesla_Motors-logo.svg}
+ };
+
+ \node [below = 0mm of tesla] (solarCity){
+ \includesvg[width = .2\textwidth]{SolarCity-logo.svg}
+ };
+
+ \node [below = 0mm of solarCity] {
+ \includesvg[width = .2\textwidth]{The_Boring_Company_Logo.svg}
+ };
+
+ \node[above right] at (current bounding box.south west) {
+ \begin{minipage}[t]{\linewidth}
+ \tiny
+ \textbf{Quellen:}\\
+ https://www.biography.com/business-figure/elon-musk\\
+ https://en.wikipedia.org/wiki/File:SpaceX\_logo\_black.svg\\
+ https://en.wikipedia.org/wiki/File:SolarCity\_wordmark.svg\\
+ https://en.wikipedia.org/wiki/File:Tesla\_Motors.svg\\
+ https://en.wikipedia.org/wiki/File:The\_Boring\_Company\_Logo.svg
+ \end{minipage}
+ };
+ \end{tikzpicture}
+\end{frame}
\ No newline at end of file
diff --git a/images/SolarCity-logo.svg b/images/SolarCity-logo.svg
new file mode 100644
index 0000000..08b4d1d
--- /dev/null
+++ b/images/SolarCity-logo.svg
@@ -0,0 +1,58 @@
+
+
+
\ No newline at end of file
diff --git a/images/SpaceX_logo.svg b/images/SpaceX_logo.svg
new file mode 100644
index 0000000..e590d8a
--- /dev/null
+++ b/images/SpaceX_logo.svg
@@ -0,0 +1,52 @@
+
\ No newline at end of file
diff --git a/images/Tesla_Motors-logo.svg b/images/Tesla_Motors-logo.svg
new file mode 100644
index 0000000..356ce34
--- /dev/null
+++ b/images/Tesla_Motors-logo.svg
@@ -0,0 +1,54 @@
+
+
+
\ No newline at end of file
diff --git a/images/The_Boring_Company_Logo.svg b/images/The_Boring_Company_Logo.svg
new file mode 100644
index 0000000..0fb70f8
--- /dev/null
+++ b/images/The_Boring_Company_Logo.svg
@@ -0,0 +1,75 @@
+
+
+
\ No newline at end of file
diff --git a/images/paypal-logo.png b/images/paypal-logo.png
new file mode 100644
index 0000000..602f020
Binary files /dev/null and b/images/paypal-logo.png differ
diff --git a/images/zip2.jpg b/images/zip2.jpg
new file mode 100644
index 0000000..7546d5f
Binary files /dev/null and b/images/zip2.jpg differ