mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 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-13 18:08:18 +02:00
commit f19a80806d
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
seminar/templates/seminar/clanky/organizatorske_clanky.html
View file

@ -1,5 +1,11 @@
{% extends 'seminar/clanky/resitelske_clanky.html' %} {% extends 'seminar/clanky/resitelske_clanky.html' %}
{% block submenu %}
{% with "org" as selected %}
{% include "seminar/clanky/submenu.html" %}
{% endwith %}
{% endblock submenu %}
{% block nadpis1a %}{% block nadpis1b %} {% block nadpis1a %}{% block nadpis1b %}
Organizátorské články Organizátorské články
{% endblock %}{% endblock %} {% endblock %}{% endblock %}

8
seminar/templates/seminar/clanky/resitelske_clanky.html
View file

@ -1,5 +1,13 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% block menu_clanky %}selected{% endblock %}
{% block submenu %}
{% with "resitel" as selected %}
{% include "seminar/clanky/submenu.html" %}
{% endwith %}
{% endblock submenu %}
{% block content %} {% block content %}
<h2> <h2>