Merge branch 'infographics'

diff --git a/catalogue/management/commands/repackage.py b/catalogue/management/commands/repackage.py
index eed8576..3946e82 100755 (executable)
--- a/catalogue/management/commands/repackage.py
+++ b/catalogue/management/commands/repackage.py
@@ -42,6 +42,9 @@ class Command(BaseCommand):
                     elif lesson.type == 'synthetic':
                         prefix = "%s/%s (synteza)/" % (
                                 section_dir, lesson.slug)
+                    elif lesson.type == 'project':
+                        prefix = "%s/%s (projekt)/" % (
+                                section_dir, lesson.slug)
                     else:
                         prefix = "%s/%s/" % (
                                 section_dir, lesson.slug)

diff --git a/catalogue/templates/catalogue/lesson/project/lesson_detail.html b/catalogue/templates/catalogue/lesson/project/lesson_detail.html
index d4336ec..ed36341 100755 (executable)
--- a/catalogue/templates/catalogue/lesson/project/lesson_detail.html
+++ b/catalogue/templates/catalogue/lesson/project/lesson_detail.html
@@ -15,7 +15,7 @@
 </section>
 
 {% if object.package %}
-    <section class="box-button"><a href="{{ object.package.url }}" class="dl-button">Pobierz całą lekcję</a></section>
+    <section class="box-button"><a href="{{ object.package.url }}" class="dl-button">Pobierz cały projekt</a></section>
 {% endif %}
 
 {% endblock %}

diff --git a/catalogue/templates/catalogue/snippets/lesson_nav.html b/catalogue/templates/catalogue/snippets/lesson_nav.html
index fa9d8ad..4e36e22 100755 (executable)
--- a/catalogue/templates/catalogue/snippets/lesson_nav.html
+++ b/catalogue/templates/catalogue/snippets/lesson_nav.html
@@ -3,6 +3,8 @@
     <a href="{{ root.get_absolute_url }}">{{ root }}</a>
 {% elif lesson.type == 'synthetic' %}
     <a href="{% url 'catalogue_lessons' %}">Lekcje syntetyczne ze wszystkich tematów</a>
+{% elif lesson.type == 'project' %}
+    <a href="{% url 'catalogue_lessons' %}">Projekty ze wszystkich tematów</a>
 {% else %}
     <a href="{% url 'catalogue_lessons' %}">Inne</a>
 {% endif %}
@@ -23,6 +25,7 @@
 {% endfor %}
 </ul>
 
+{% if link_other_level %}
 {% with other=lesson.get_other_level %}
     {% if other %}
         <p>Ten temat jest dostępny również na 
@@ -30,3 +33,4 @@
         {% if other.slug == 'liceum' %}zaawansowanym{% else %}podstawowym{% endif %}</a>.</p>
     {% endif %}
 {% endwith %}
+{% endif %}

diff --git a/catalogue/templatetags/catalogue_tags.py b/catalogue/templatetags/catalogue_tags.py
index c642f18..a8d69e6 100755 (executable)
--- a/catalogue/templatetags/catalogue_tags.py
+++ b/catalogue/templatetags/catalogue_tags.py
@@ -53,10 +53,11 @@ def lesson_nav(lesson):
         root = lesson.section
         siblings = Lesson.objects.filter(type='course', level=lesson.level, section=root)
         mark_level = False
+        link_other_level = True
     else:
         root = None
         siblings = Lesson.objects.filter(type=lesson.type)
-        mark_level = True
+        mark_level = link_other_level = lesson.type == 'course'
     return {
         "lesson": lesson,
         "root": root,