diff --git a/seminar/models.py b/seminar/models.py index f8d560ff..c5a80b27 100644 --- a/seminar/models.py +++ b/seminar/models.py @@ -469,6 +469,9 @@ class Problem(SeminarModelBase): else: return reverse('admin:seminar_problemnavrh_change', args=(self.id, )) + def body_v_zavorce(self): + return u"({}\u2009b)".format(self.body) if self.body else "" + @reversion.register(ignore_duplicate_revisions=True) @python_2_unicode_compatible diff --git a/seminar/templates/seminar/archiv/cislo.html b/seminar/templates/seminar/archiv/cislo.html index d5e9f18c..b20346fc 100644 --- a/seminar/templates/seminar/archiv/cislo.html +++ b/seminar/templates/seminar/archiv/cislo.html @@ -13,14 +13,14 @@

Zadané problémy

Řešené problémy

diff --git a/seminar/templates/seminar/archiv/problem.html b/seminar/templates/seminar/archiv/problem.html index 493c5089..0fafb2b4 100644 --- a/seminar/templates/seminar/archiv/problem.html +++ b/seminar/templates/seminar/archiv/problem.html @@ -7,10 +7,7 @@ {% if problem.cislo_zadani %}

{% block nadpis1a %}{% block nadpis1b %} - {{ problem.nazev_typu }} {{ problem.kod_v_rocniku }}: {{ problem.nazev }} - {% if problem.body %} - ({{ problem.body }}b) - {% endif %} + {{ problem.nazev_typu }} {{ problem.kod_v_rocniku }}: {{ problem.nazev }} {{ problem.body_v_zavorce }} {% endblock %}{% endblock %}

diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html index 15d4081c..8ae89be1 100644 --- a/seminar/templates/seminar/zadani/AktualniZadani.html +++ b/seminar/templates/seminar/zadani/AktualniZadani.html @@ -23,9 +23,7 @@ {# publikace jednotlivych zadani #} {% for problem in sada %} {# TODO použít {{problem.kod_v_rocniku}} ? vrací 4.u1 místo 4.1 #} -

{{problem.cislo_zadani.cislo}}.{{problem.kod}} {{problem.nazev}} - {# nezobrazuj body, pokud nejsou zadane #} - {% if problem.body %}({{problem.body}}b){% endif %}

+

{{problem.cislo_zadani.cislo}}.{{problem.kod}} {{problem.nazev}} {{ problem.body_v_zavorce }}

{% autoescape off %}{{problem.text_zadani}}{% endautoescape %}
{% endfor %}