kk

5 files changed, 35 insertions, 24 deletions

diff --git a/zeitung/main.tex b/zeitung/main.tex
index d2b5881..6ba62e7 100644
--- a/zeitung/main.tex
+++ b/zeitung/main.tex
@@ -13,6 +13,7 @@
 \usepackage{fancyhdr}
 \usepackage{background,wallpaper}
 \usepackage{changepage}
+\usepackage{longtable}
 \usepackage{tabularx}
 \usepackage{pgf-pie,qrcode}
 \usepackage{etoolbox}
@@ -58,6 +59,9 @@
 	\backgroundsetup{contents={\oddflip[keepaspectratio=true, width=\paperwidth]{kordel.png}},scale=1.1,placement=top,opacity=1,position={0.4\textwidth, 3.3cm}}
 }
 
+% Awesome column type
+\newcolumntype{R}{>{\raggedright\arraybackslash}p{.30\textwidth}}
+
 % Advertisements
 \newcommand\advert[1]{
 	\newpage
@@ -75,6 +79,14 @@
 	\enableheader
 }
 
+\newcommand\adverthalfnorot[1]{
+	\newpage
+	\disableheader
+	\thispagestyle{empty}
+	\includepdf[noautoscale=true,width=\paperwidth]{parts/advertisements/#1.pdf}
+	\enableheader
+}
+
 % Class page
 \newcommand\classoverview[1]{
 	\newpage
@@ -148,6 +160,7 @@
 \part{classphoto}
 \part{questionnaire}
 \part{teacherprofiles}
+\part{teacherquotes}
 \part{teacherranking}
 \part{secrets}
 \advert{ihk}
@@ -155,6 +168,7 @@
 \advert{uni-ulm}
 \part{photos}
 \part{trips}
+\adverthalfnorot{b-group}
 \part{courseoverview}
 \part{committeeoverview}
 \part{conclusion}
diff --git a/zeitung/parts/final.tex b/zeitung/parts/final.tex
index 305f8f1..de718c7 100644
--- a/zeitung/parts/final.tex
+++ b/zeitung/parts/final.tex
@@ -1,9 +1,10 @@
 \disableheader
 \thispagestyle{empty}
-\ThisULCornerWallPaper{1.2}{vorderseitebg}
+%\ThisULCornerWallPaper{1.2}{vorderseitebg}
 
-\definecolor{textcolor}{rgb}{0.117, 0.176, 0.219}
-\color{textcolor}
+\definecolor{backcolor}{RGB}{41, 49, 51}
+\pagecolor{backcolor}
+\color{white}
 \bfseries
 
 \hspace{0pt}
@@ -12,15 +13,15 @@
 
 \begin{center}
 
-{\cartamarina{\Huge Abitur 2021}}
-\vspace*{1cm}
+	{\cartamarina{\Huge Abitur 2021}}
+	\vspace*{1cm}
 
-\generated{final}
+	\generated{final}
 
-\vspace*{1cm}
-{\cartamarina{\Huge Robert-Bosch-Schule Ulm}}
+	\vspace*{1cm}
+	{\cartamarina{\Huge Robert-Bosch-Schule Ulm}}
 
-\vfill
-\hspace{0pt}
+	\vfill
+	\hspace{0pt}
 
 \end{center}
diff --git a/zeitung/parts/rankingtemplate.tex b/zeitung/parts/rankingtemplate.tex
index 0bfb9fb..b0a397c 100644
--- a/zeitung/parts/rankingtemplate.tex
+++ b/zeitung/parts/rankingtemplate.tex
@@ -1,13 +1,12 @@
 \providecommand\rankingquestion[1]{
-	\noindent\textbf{#1}
+	\textbf{#1}
 }
 
-\providecommand\rankinganswer[2]{
-	\item[] #1
-		\setcounter{bottlecnt}{0}
-		\setcounter{bottlemax}{#2}
-		\stepcounter{bottlemax} % There is no <= in forloop
-		\forloop{bottlecnt}{1}{\value{bottlecnt} < \value{bottlemax}}{
-			\includegraphics[scale=.027]{flasche.png}
-		}
+\providecommand\rankingbottles[1]{
+	\setcounter{bottlecnt}{0}
+	\setcounter{bottlemax}{#1}
+	\stepcounter{bottlemax} % There is no <= in forloop
+	\forloop{bottlecnt}{1}{\value{bottlecnt} < \value{bottlemax}}{
+		\includegraphics[scale=.027]{flasche.png}
+	}
 }
diff --git a/zeitung/parts/studentprofiles.tex b/zeitung/parts/studentprofiles.tex
index 37d867a..4b9cfec 100644
--- a/zeitung/parts/studentprofiles.tex
+++ b/zeitung/parts/studentprofiles.tex
@@ -1,9 +1,4 @@
-\title{Schülersteckbriefe}
-\kant[1-3]
-\newpage
-
 \providecommand\studentprofile[1]{
-	\title{Übersicht - #1}
 	\classoverview{#1}
 
 	\inputall{parts/generated/students/#1}
diff --git a/zeitung/parts/teacherquotes.tex b/zeitung/parts/teacherquotes.tex
new file mode 100644
index 0000000..2c54923
--- /dev/null
+++ b/zeitung/parts/teacherquotes.tex
@@ -0,0 +1,2 @@
+\title{Lehrersteckbriefe}
+\generated{quotes/teacher}