From: Jan Szejko Date: Mon, 11 Dec 2017 14:08:59 +0000 (+0100) Subject: new curriculum X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/0f1c8bae458a33ac5ea270050d99bb3e8d89f34d?ds=sidebyside new curriculum --- diff --git a/catalogue/templates/catalogue/lesson/lesson_detail.html b/catalogue/templates/catalogue/lesson/lesson_detail.html index 3da0600..812cbc7 100755 --- a/catalogue/templates/catalogue/lesson/lesson_detail.html +++ b/catalogue/templates/catalogue/lesson/lesson_detail.html @@ -41,6 +41,10 @@ +

Nowa podstawa programowa:

+ {% endif %} diff --git a/curriculum/templates/curriculum/snippets/curriculum.html b/curriculum/templates/curriculum/snippets/curriculum.html index ea4f3fb..467c3f3 100755 --- a/curriculum/templates/curriculum/snippets/curriculum.html +++ b/curriculum/templates/curriculum/snippets/curriculum.html @@ -1,7 +1,7 @@ {% if currset %} {% for what, types in currset.items %}
  • - {{ what.0 }}, {{ what.1 }} poziom edukacyjny
    + {{ what.0 }}, {{ what.1 }} {% if new %}klasa{% else %}poziom edukacyjny{% endif %}
    {% for type, currs in types.items %} {{ type }}:
    {% for curr in currs %} diff --git a/curriculum/templatetags/curriculum_tags.py b/curriculum/templatetags/curriculum_tags.py index 983ceac..f3e9279 100755 --- a/curriculum/templatetags/curriculum_tags.py +++ b/curriculum/templatetags/curriculum_tags.py @@ -21,7 +21,7 @@ def competence(texts, level): @register.inclusion_tag("curriculum/snippets/curriculum.html") -def curriculum(identifiers): +def curriculum(identifiers, new=False): # shouldn't be needed, but is identifiers = [id for id in identifiers if id] try: @@ -42,6 +42,7 @@ def curriculum(identifiers): return { 'currset': currset, + 'new': new, } diff --git a/lib/librarian b/lib/librarian index 6c528bc..482477c 160000 --- a/lib/librarian +++ b/lib/librarian @@ -1 +1 @@ -Subproject commit 6c528bcbd5a184387bbb30500b67caef8a21889d +Subproject commit 482477cced586463d7f342cdde8482a4d97d7685