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

2015-09-13 11:27:05 +02:00 · 2015-09-13 11:27:05 +02:00 · 8aef9d67e1
commit 8aef9d67e1
parent 37a03cf1e2 681456f53f
2 changed files with 1 additions and 3 deletions
--- a/mamweb/templates/flatpages/default.html
+++ b/mamweb/templates/flatpages/default.html
@ -1,7 +1,5 @@
 {% extends "base.html" %}

-{% block title %}{{ flatpage.title }}{% endblock title %}
-
 {% block nadpis1a %}{% block nadpis1b%}
  {{ flatpage.title }}
 {% endblock %}{% endblock %}
--- a/seminar/templates/seminar/archiv/problem.html
+++ b/seminar/templates/seminar/archiv/problem.html
@ -27,7 +27,7 @@
    {{ problem.text_reseni |safe }}
  {% endif %}

-  
+  {# TODO Kontrola, zda je uzivatel org #} 
  {% if user.is_authenticated %}
  <div class='mam-org-only'>