Merge branch 'test' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into test

mamweb/settings_prod.py

@@ -50,7 +50,7 @@ SERVER_EMAIL = 'mamweb-prod-errors@mam.mff.cuni.cz'
 ADMINS = [
         ('Tomas Gavenciak', 'gavento@gmail.com'),
         ('Matěj Kocián', 'matej.kocian@gmail.com'),
-        ('M&M ERRORs', 'mam-errors@atrey.karlin.mff.cuni.cz'),
+        ('M&M ERRORs', 'mam-errors@mam.mff.cuni.cz'),
         ]
 
 

mamweb/settings_test.py

@@ -52,7 +52,7 @@ import os
 
 SERVER_EMAIL = 'mamweb-test-errors@mam.mff.cuni.cz'
 ADMINS = [
-    ('M&M ERRORs', 'mam-errors@atrey.karlin.mff.cuni.cz'),
+    ('M&M ERRORs', 'mam-errors@mam.mff.cuni.cz'),
 ]
 
 

seminar/templates/seminar/archiv/obalky.tex

@@ -68,13 +68,16 @@
 \def\stat{#7}%
 
 \hbox{\tofont{\jmeno\ \prijm}}
+\vskip .2 em
 \ifx \skola \empty
 {}
 \else
 \hbox{\tofont{\skola}}
 \fi
+\vskip .2 em
 \hbox{\tofont{\ulice}}
-
+\vskip .2 em
+\vskip .2 em
 \hbox to 18pt{\tofont{\predsunout{\PSC\ }\mesto}}
 \vskip 5 pt
 \tofont{\stat}