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:
Matej Lieskovský 2015-09-13 11:27:05 +02:00
commit 8aef9d67e1
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mamweb/templates/flatpages/default.html
View file

@ -1,7 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}{{ flatpage.title }}{% endblock title %}
{% block nadpis1a %}{% block nadpis1b%} {% block nadpis1a %}{% block nadpis1b%}
{{ flatpage.title }} {{ flatpage.title }}
{% endblock %}{% endblock %} {% endblock %}{% endblock %}

2
seminar/templates/seminar/archiv/problem.html
View file

@ -27,7 +27,7 @@
{{ problem.text_reseni |safe }} {{ problem.text_reseni |safe }}
{% endif %} {% endif %}
{# TODO Kontrola, zda je uzivatel org #}
{% if user.is_authenticated %} {% if user.is_authenticated %}
<div class='mam-org-only'> <div class='mam-org-only'>