add the all-uk variant, use TeX conditionals correctly

metadata.tex

@@ -1,16 +1,38 @@
 
-% choose a language
-\def\ifEN#1\else#2\fi{#1}   % uncomment this for english
-%\def\ifEN#1\else#2\fi{#2}   % uncomment this for czech
 
-% Fill in the rest of the file.
+%%% Choose a language %%%
+
+\newif\ifEN
+\ENtrue   % uncomment this for english
+%\ENfalse   % uncomment this for czech
+
+%%% Configuration of the title page %%%
+
+\newif\ifMFF
+\MFFtrue % comment this out for the version with a big UK university logo
+\def\UKName{Charles University in Prague} %this is used in UK-logo-version
+\def\UKFaculty{Faculty of Mathematics and Physics}
+\def\ThesisTypeName{\ifEN BACHELOR THESIS \else BAKALÁŘSKÁ PRÁCE \fi}
+%\def\ThesisTypeName{\ifEN MASTER THESIS \else DIPLOMOVÁ PRÁCE \fi}
+%\def\ThesisTypeName{\ifEN RIGOROUS THESIS \else RIGORÓZNÍ PRÁCE \fi}
+%\def\ThesisTypeName{\ifEN DOCTORAL THESIS \else DISERTAČNÍ PRÁCE \fi}
+\def\SupervisedThesisName{\ifEN bachelor \else bakalářské \fi}
+%\def\SupervisedThesisName{\ifEN master \else diplomové \fi}
+%\def\SupervisedThesisName{\ifEN rigorous \else rigorózní \fi}
+%\def\SupervisedThesisName{\ifEN doctoral \else disertační \fi}
+
+
+%%% Fill in your details in the rest of the file %%%
+
 % (Note: \xxx is a "ToDo label" which makes the unfilled visible. Remove it.)
 \def\ThesisTitle{\xxx{Thesis title}}
 \def\ThesisAuthor{\xxx{Name Surname}}
 \def\YearSubmitted{\xxx{YEAR}}
 
-\def\Department{\xxx{Name of the department}} % department assigned to the thesis
+% department assigned to the thesis
-\def\DeptType{\xxx{Department}} % Is it a department (katedra), or an institute (ústav)?
+\def\Department{\xxx{Name of the department}}
+% Is it a department (katedra), or an institute (ústav)?
+\def\DeptType{\xxx{Department}}
 
 \def\Supervisor{\xxx{Supername Supersurname}}
 \def\SupervisorsDepartment{\xxx{department}}
@@ -41,8 +63,7 @@ Dedication. \xxx{It is nice to say thanks to supervisors, friends, family, book
 \def\InfoPageFont{}
 %\def\InfoPageFont{\small}  %uncomment to decrease font size
 
-\ifEN\iffalse\else\iftrue\fi %this line is an ugly hack
+\ifEN\relax\else
-
 % If you are writing a czech thesis, you additionally need to fill in the
 % english translation of the metadata here!
 \def\ThesisTitleEN{\xxx{Thesis title in English}}
@@ -57,5 +78,4 @@ Dedication. \xxx{It is nice to say thanks to supervisors, friends, family, book
 \def\KeywordsEN{%
 \xxx{{key} {words}}
 }
-
+\fi
-\fi %hack ends here

title.tex

@@ -4,24 +4,26 @@
 \hypersetup{pageanchor=false}
 \begin{center}
 
+\ifMFF
 \ifEN
 \centerline{\mbox{\includegraphics[width=166mm]{img/logo-en.pdf}}}
 \else
 \centerline{\mbox{\includegraphics[width=166mm]{img/logo-cs.pdf}}}
 \fi
-
 \vspace{-8mm}
-\vfill
-
-
-\ifEN
-{\bf\Large BACHELOR THESIS}
 \else
-{\bf\Large BAKALÁŘSKÁ PRÁCE}
+{\large\noindent\UKName\par\medskip\par\UKFaculty }
 \fi
+\vfill
+
+{\bf\Large\ThesisTypeName}
 
 \vfill
 
+\ifMFF\relax\else\includegraphics[width=70mm]{img/uklogo.pdf}
+
+\vfill\fi
+
 {\LARGE\ThesisAuthor}
 
 \vspace{15mm}
@@ -36,7 +38,8 @@
 
 {
 \centerline{\vbox{\halign{\hbox to 0.45\hsize{\hfil #}&\hskip 0.5em\parbox[t]{0.45\hsize}{\raggedright #}\cr
-\ifEN Supervisor of the bachelor thesis: \else Vedoucí bakalářské práce: \fi
+\ifEN Supervisor of the \SupervisedThesisName thesis:
+\else Vedoucí \SupervisedThesisName práce: \fi
 & \Supervisor \cr
 \noalign{\vspace{2mm}}
 \ifEN Study programme: \else Studijní program: \fi
@@ -55,9 +58,7 @@
 
 \newpage
 
-
 % remember to sign this!
-
 \openright
 \hypersetup{pageanchor=true}
 \pagestyle{plain}
@@ -145,8 +146,7 @@ V \hbox to 6em{\dotfill} dne \hbox to 6em{\dotfill}
 \ifEN Keywords: \else Klíčová slova: \fi
 \Keywords
 
-% ugly hack strikes again
+\vss}\ifEN\relax\else\nobreak\vbox to 0.49\vsize{\InfoPageFont
-\vss}\ifEN\iffalse\else\iftrue\fi\nobreak\vbox to 0.49\vsize{\InfoPageFont
 \setlength\parindent{0mm}
 \setlength\parskip{5mm}