new curriculum

diff --git a/catalogue/templates/catalogue/lesson/lesson_detail.html b/catalogue/templates/catalogue/lesson/lesson_detail.html
index 3da0600..812cbc7 100755 (executable)
--- a/catalogue/templates/catalogue/lesson/lesson_detail.html
+++ b/catalogue/templates/catalogue/lesson/lesson_detail.html
@@ -41,6 +41,10 @@
         <ul class="plain">
         {% curriculum object.dc.curriculum %}
         </ul>
         <ul class="plain">
         {% curriculum object.dc.curriculum %}
         </ul>

+        <h1>Nowa podstawa programowa:</h1>
+        <ul class="plain">
+        {% curriculum object.dc.curriculum_new new=True %}
+        </ul>

     </section>
     {% endif %}
 
     </section>
     {% endif %}
 

diff --git a/curriculum/templates/curriculum/snippets/curriculum.html b/curriculum/templates/curriculum/snippets/curriculum.html
index ea4f3fb..467c3f3 100755 (executable)
--- 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 %}
         <li>
 {% if currset %}
     {% for what, types in currset.items %}
         <li>

-            {{ what.0 }}, {{ what.1 }} poziom edukacyjny<br/>
+            {{ what.0 }}, {{ what.1 }} {% if new %}klasa{% else %}poziom edukacyjny{% endif %}<br/>

             {% for type, currs in types.items %}
                 {{ type }}:<br>
                 {% for curr in currs %}
             {% for type, currs in types.items %}
                 {{ type }}:<br>
                 {% for curr in currs %}

diff --git a/curriculum/templatetags/curriculum_tags.py b/curriculum/templatetags/curriculum_tags.py
index 983ceac..f3e9279 100755 (executable)
--- 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")
 
 
 @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:
     # 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,
 
     return {
         'currset': currset,

+        'new': new,

     }
     
 
     }
     
 

diff --git a/lib/librarian b/lib/librarian
index 6c528bc..482477c 160000 (submodule)
--- a/lib/librarian
+++ b/lib/librarian
@@ -1 +1 @@
-Subproject commit 6c528bcbd5a184387bbb30500b67caef8a21889d
+Subproject commit 482477cced586463d7f342cdde8482a4d97d7685