From 9b9d30e25a717fc05e2dceec0606852147aa1a6f Mon Sep 17 00:00:00 2001
From: Aneta <aneta.stastna@email.cz>
Date: Sat, 12 Sep 2015 14:44:05 +0200
Subject: [PATCH 1/3] =?UTF-8?q?Op=C4=9Btovn=C3=BD=20pokus=20o=20zru=C5=A1e?=
 =?UTF-8?q?n=C3=AD=20=C3=BAloh.=20A.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mamweb/templates/menu.html | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 mamweb/templates/menu.html

diff --git a/mamweb/templates/menu.html b/mamweb/templates/menu.html
deleted file mode 100644
index d0af5551..00000000
--- a/mamweb/templates/menu.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% load i18n cache mam_menu %}
-{% aktualni_rocniky as rs %}
-
-<ul>
-  <li><a href="/co-je-MaM/uvod/">Co je M&amp;M</a>
-  <li><a href="{% url 'seminar_seznam_soustredeni' %}">Soustředění</a>
-  <li><a href="/zadani/aktualni/">Zadání</a>
-  <li><a href="/clanky/uvod/">Články</a>
-  <li><a href="/archiv/cisla/">Archiv</a>
-  <li><a href="/odevzdat-reseni/muj-ucet">Odeslat řešení</a>
-</ul>
-
-<!-- TODO smazat <ul>
-{% for r in rs %}
-<li><a href='{{ r.verejne_url }}'>Ročník {{ r }}</a>
-{% endfor %}
-</ul>-->

From 6a755c2b88e82358c6637def8d5a786b6629bdba Mon Sep 17 00:00:00 2001
From: "Bc. Petr Pecha" <nejlepsitextovyeditorjevim@gmail.com>
Date: Sat, 12 Sep 2015 14:43:31 +0200
Subject: [PATCH 2/3] Odkaz na soustredeni vede na uvod

---
 mamweb/templates/base.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html
index 73a73647..dd8a7bcd 100644
--- a/mamweb/templates/base.html
+++ b/mamweb/templates/base.html
@@ -61,7 +61,8 @@
           {# ============= MENU ============== #}
           <ul>
             <li class="{% block menu_uvod %}{% endblock %}"><a href="/co-je-MaM/uvod/">Co je M&amp;M</a>
-            <li class="{% block menu_soustredeni %}{% endblock %}"><a href="{% url 'seminar_seznam_soustredeni' %}">Soustředění</a>
+            {# ukazka jak pouzit tag url <li class="{% block menu_soustredeni %}{% endblock %}"><a href="{% url 'seminar_seznam_soustredeni' %}">Soustředění</a> #}
+            <li class="{% block menu_soustredeni %}{% endblock %}"><a href="/soustredeni/">Soustředění</a>
             <li class="{% block menu_zadani %}{% endblock %}"><a href="/zadani/aktualni/">Zadání</a>
             <li class="{% block menu_clanky %}{% endblock %}"><a href="/clanky/uvod/">Články</a>
             <li class="{% block menu_archiv %}{% endblock %}"><a href="/archiv/cisla/">Archiv</a>

From ed37f16035bccc0758d8a9384fdd47e9b5157c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?= <matej.kocian@gmail.com>
Date: Sat, 12 Sep 2015 15:02:54 +0200
Subject: [PATCH 3/3] =?UTF-8?q?U=20max=20po=C4=8Dtu=20bod=C5=AF=20nezobraz?=
 =?UTF-8?q?uj=20deset.=20=C4=8D=C3=A1st,=20je-li=200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seminar/models.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/seminar/models.py b/seminar/models.py
index 87b7092a..1301a0d2 100644
--- a/seminar/models.py
+++ b/seminar/models.py
@@ -477,7 +477,15 @@ class Problem(SeminarModelBase):
             return reverse('admin:seminar_problemnavrh_change', args=(self.id, ))
 
     def body_v_zavorce(self):
-        return u"({}\u2009b)".format(self.body) if self.body else ""
+        """Vrať string s body v závorce jsou-li u problému vyplněné, jinak ''
+
+        Je-li desetinná část nulová, nezobrazuj ji.
+        """
+        pocet_bodu = None
+        if self.body:
+            b = self.body
+            pocet_bodu = int(b) if int(b) == b else b
+        return u"({}\u2009b)".format(pocet_bodu) if self.body else ""
 
 
 @reversion.register(ignore_duplicate_revisions=True)