mam/mamweb
11
0
Fork 0
Code Issues Pull requests 11 Projects Wiki Activity Actions

Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb

Browse source
This commit is contained in:
Aneta 2015-09-03 22:12:49 +02:00
commit 5710434de5
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mamweb/settings_prod.py
View file

@ -37,6 +37,7 @@ import os
SERVER_EMAIL = 'mamweb-prod-errors@mam.mff.cuni.cz' SERVER_EMAIL = 'mamweb-prod-errors@mam.mff.cuni.cz'
ADMINS = [ ADMINS = [
('Tomas Gavenciak', 'gavento@ucw.cz'), ('Tomas Gavenciak', 'gavento@ucw.cz'),
('Petr Pecha', 'nejlepsitextovyeditorjevim@gmail.com'),
] ]

2
seminar/templates/seminar/zadani/submenu.html
View file

@ -1,7 +1,7 @@
{% with "/zadani" as cesta %} {% with "/zadani" as cesta %}
<ul> <ul>
<li><a href="{{cesta}}/aktualni-zadani/">Aktuální zadání</a> <li><a href="{{cesta}}/aktualni/">Aktuální zadání</a>
<li><a href="{{cesta}}/ulohy/">Úlohy</a> <li><a href="{{cesta}}/ulohy/">Úlohy</a>
<li><a href="{{cesta}}/temata/">Témata</a> <li><a href="{{cesta}}/temata/">Témata</a>
<li><a href="{{cesta}}/aktualni-cislo/">Aktuální číslo</a> <li><a href="{{cesta}}/aktualni-cislo/">Aktuální číslo</a>