ok

5 files changed, 42 insertions, 24 deletions

diff --git a/zeitung/figures/mittelwelle.png b/zeitung/figures/mittelwelle.png
new file mode 100644
index 0000000..9da3097
--- /dev/null
+++ b/zeitung/figures/mittelwelle.png
diff --git a/zeitung/figures/ring.png b/zeitung/figures/ring.png
index 9ef3aaf..7fac388 100644
--- a/zeitung/figures/ring.png
+++ b/zeitung/figures/ring.png
diff --git a/zeitung/main.tex b/zeitung/main.tex
index 49a7496..510a29f 100644
--- a/zeitung/main.tex
+++ b/zeitung/main.tex
@@ -1,7 +1,7 @@
 \documentclass[a4paper, 13pt]{article}
 
 % Packages
-\usepackage[a4paper, inner=2.5cm, outer=2.5cm, top=2.5cm, bottom=2cm, bindingoffset=0cm]{geometry}
+\usepackage[a4paper, inner=2.5cm, outer=2.5cm, top=2.5cm, bottom=2.5cm, bindingoffset=0cm]{geometry}
 \usepackage{amsmath,amsthm,amssymb,amsfonts}
 \usepackage{graphicx}
 \usepackage[colorlinks=true, allcolors=blue]{hyperref}
diff --git a/zeitung/parts/studenttemplate.tex b/zeitung/parts/studenttemplate.tex
index e7243e7..0bb97e6 100644
--- a/zeitung/parts/studenttemplate.tex
+++ b/zeitung/parts/studenttemplate.tex
@@ -1,12 +1,8 @@
 % Student template
-% TODO: Image borders
-
-%\begin{figure}[H]
-%\includesvg[keepaspectratio=true, scale=0.2]{ring}
-%\end{figure}
 
 \clearpage
-\def\studentinformation#1#2#3#4#5#6{
+
+\providecommand\studentimages[1]{%
 	% Bild in Ring
 	\begin{tikzpicture}[remember picture, overlay]
 		\node[inner sep=0pt] at (2, -4) {
@@ -21,31 +17,52 @@
 		};
 	\end{tikzpicture}
 
-	% Steckbrief Tabelle
-	\sectionmark{Steckbrief - #2}
-	\begin{tikzpicture}[overlay]
-		\node[] at (11, -1) {
-			\Large{\begin{tabular}{ l l }
-				\textbf{Name:} & #2 \\
-				\textbf{Geburtstag:} & #3 \\
-				\textbf{Lieblingsfach:} & #4 \\
-				\textbf{Hobbies:} & #5 \\
-				\textbf{Lieblingsgenre:} & #6 \\
-			\end{tabular}}
-		};
-	\end{tikzpicture}
-
 	% Bild in Rahmen
 	\begin{tikzpicture}[remember picture, overlay]
-		\node[inner sep=0pt] at (14, -17.5) {
+		\node[inner sep=0pt] at (14, -18.5) {
 			\includegraphics[keepaspectratio=true, width=160pt]{parts/students/figures/#1_child.jpg}
 		};
 	\end{tikzpicture}
 
 	% Rahmen
 	\begin{tikzpicture}[remember picture, overlay]
-		\node[inner sep=0pt] at (14, -17) {
+		\node[inner sep=0pt] at (14, -18) {
 			\includegraphics[keepaspectratio=true, width=180pt]{rahmen.png}
 		};
 	\end{tikzpicture}
 }
+
+\providecommand\studentprofile[8]{%
+	\sectionmark{Steckbrief - #1}
+
+	% Steckbrief Tabelle
+	\begin{tikzpicture}[overlay]
+		\node[text width=250pt, align=left] at (12, -4) {
+			\Large{\begin{tabular}{@{}ll@{}}
+				\textbf{Name:} & #1 \\
+				\textbf{Geburtstag:} & #2 \\
+				\textbf{Lieblingsfach:} & #3 \\
+				\textbf{Hobbies:} & #4 \\
+				\textbf{Lieblingsgenre:} & #5 \\
+			\end{tabular}}\\~\\
+			\textbf{Das werde ich am meisten vermissen:}\\#6\\~\\
+			\textbf{Ohne das hätte ich die Oberstufe nicht geschafft:}\\#7\\~\\
+			\textbf{Lebensmotto:}\\#8\\~\\
+		};
+	\end{tikzpicture}
+}
+
+\providecommand\studenttable[2]{%
+	\vskip 9cm
+	\hspace*{-1.2cm}
+	\Large{\begin{tabular}{@{}ll@{}}
+		\textbf{Erkennungsmerkmale:} & #1 \\
+		\textbf{Zukunftspläne:} & #2 \\
+	\end{tabular}}
+}
+
+\providecommand\studentcomments[1]{%
+	\begin{figure}[H]
+		\hspace*{-2.5cm}\includegraphics[keepaspectratio=true, width=\paperwidth]{mittelwelle.png}
+	\end{figure}
+}
diff --git a/zeitung/run b/zeitung/run
index ceb28ad..303a280 100755
--- a/zeitung/run
+++ b/zeitung/run
@@ -6,4 +6,5 @@ fi
 
 mkdir -p build/ &&
     latexmk -shell-escape -output-directory=build/ -xelatex &&
-    zathura build/main.pdf
+    zathura build/main.pdf &&
+    (scp build/main.pdf server:/home/melvin/Abizeugs/zeitung.pdf &>/dev/null)