diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 877de3bd0967f58668fbae38116c88726ff541ba..0ac9b638a52012a58a469bc4ce699529fe0f510d 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,6 @@ <project version="4"> <component name="VcsDirectoryMappings"> <mapping directory="$PROJECT_DIR$" vcs="Git" /> - <mapping directory="$PROJECT_DIR$/schoolapps/static/materialize" vcs="Git" /> + <mapping directory="$PROJECT_DIR$/schoolapps/static/materialize" vcs="" /> </component> -</project> +</project> \ No newline at end of file diff --git a/schoolapps/timetable/templates/timetable/latex/hints.tex b/schoolapps/timetable/templates/timetable/latex/hints.tex index 7fc99548ea406d1aa500dbdad485b32cbe2a4323..dcf77041f49e612f5a708bfafbf7cbe1c8fae801 100644 --- a/schoolapps/timetable/templates/timetable/latex/hints.tex +++ b/schoolapps/timetable/templates/timetable/latex/hints.tex @@ -1,6 +1,6 @@ {% load martortags %} {% if hints %} -\subsection*{Hinweise} +\subsection*{\hspace{0.7em}Hinweise} \vspace{-0.7em} \begin{itemize} \setlength\itemsep{0.1em} @@ -12,5 +12,4 @@ {{ hint.text_as_latex|safe }} {% endfor %} \end{itemize} -\vspace{-1em} {% endif %} \ No newline at end of file diff --git a/schoolapps/timetable/templates/timetable/latex/substitutions.tex b/schoolapps/timetable/templates/timetable/latex/substitutions.tex index 48d001e5ae5a9a52ec4b6a2138eaeb5ad7de2350..05c7a1aef7388eeafe1486ba2f49451bf2fbf383 100644 --- a/schoolapps/timetable/templates/timetable/latex/substitutions.tex +++ b/schoolapps/timetable/templates/timetable/latex/substitutions.tex @@ -5,7 +5,7 @@ \usepackage[ngerman]{babel} \usepackage[sfdefault]{cabin} \usepackage[utf8]{inputenc} -\usepackage[a4paper,left=1cm,right=1cm,top=2cm,bottom=2cm,bindingoffset=0mm]{geometry} +\usepackage[a4paper,left=1cm,right=1cm,top=1.5cm,bottom=1.5cm,bindingoffset=0mm]{geometry} % Packages \usepackage{fancyhdr} @@ -24,12 +24,12 @@ % Badge box \usepackage{tcolorbox} -\newtcbox{\badge}{nobeforeafter,colframe=green,colback=green,boxrule=0.5pt,arc=4pt, -boxsep=0pt,left=4pt,right=4pt,top=4pt,bottom=4pt,tcbox raise base, +\newtcbox{\badge}{nobeforeafter,colframe=green,colback=green,boxrule=0pt,arc=2pt, +boxsep=0pt,left=4pt,right=4pt,top=2pt,bottom=3pt,tcbox raise base, grow to left by=0pt, grow to right by=-3pt, -enlarge top by=3pt, -enlarge bottom by=3pt,coltext=white} +enlarge top by=1pt, +enlarge bottom by=1pt,coltext=white} % Define colors \definecolor{grey}{RGB}{208, 208, 208} @@ -48,6 +48,7 @@ enlarge bottom by=3pt,coltext=white} % Define footer \lfoot{Katharineum zu Lübeck} +\cfoot{} \rfoot{\small Umsetzung: © 2018--2019 by Computer-AG} \rhead{\textbf{ Vertretungen {{ date|date:"j. F Y, \\K\\W W"}}}\\ @@ -63,7 +64,7 @@ Stand: {% now "j. F Y H:i" %}\\ {% include "timetable/latex/hints.tex" %} {% if header_info.is_box_needed %} - \begin{tabular}{p{0.22\linewidth}p{0.73\linewidth}} + \begin{tabular}{@{\hspace{-1em}}p{0.22\linewidth}p{0.73\linewidth}} {% for row in header_info.rows %} \textbf{ {{ row.0 }} } & {{ row.1 }} \\ {% endfor %} @@ -74,8 +75,8 @@ Stand: {% now "j. F Y H:i" %}\\ {% set color_background = 1 %} {% set last_classes = "" %} - \def\arraystretch{1.5} - \begin{longtable}{p{20mm}p{8mm}p{32mm}p{25mm}p{30mm}p{45mm}} + \def\arraystretch{1.1} + \begin{longtable}{p{20mm}p{10mm}p{30mm}p{25mm}p{30mm}p{45mm}} \textbf{Klassen} & \textbf{Std.} & \textbf{Lehrer} & @@ -125,7 +126,7 @@ Stand: {% now "j. F Y H:i" %}\\ {# Display badge (for cancellations) #} {# Display notice and new line #} {% if sub.badge %} - \normalsize\badge{ {{ sub.badge }} } + \footnotesize\badge{ {{ sub.badge }} } {% endif %} \color{ {{c}}} \large\textit{ {{sub.text|default:""|safe|texify|safe}} } \\ {% endwith %}