Merge branch 'master' into forum

Conflicts:
	edumed/templates/home.html

diff --git a/catalogue/templates/catalogue/lesson/project/lesson_detail.html b/catalogue/templates/catalogue/lesson/project/lesson_detail.html
index ed36341..88e4a34 100755 (executable)
--- a/catalogue/templates/catalogue/lesson/project/lesson_detail.html
+++ b/catalogue/templates/catalogue/lesson/project/lesson_detail.html
@@ -4,7 +4,7 @@
 
 <section class="box">
     <h1 class="realisation">Projekt</h1>
-    <p>To jest projekt w ramach tematu
+    <p>To jest <a href="{% url 'info' 'metoda-projektowa' %}">projekt</a> w ramach tematu
     <strong>{{ object.section }}</strong></a>{% if object.level.slug = "liceum" %}
         (na poziomie zaawansowanym)
     {% endif %}.

diff --git a/catalogue/templates/catalogue/section_list.html b/catalogue/templates/catalogue/section_list.html
index 1457be3..9f48c4f 100755 (executable)
--- a/catalogue/templates/catalogue/section_list.html
+++ b/catalogue/templates/catalogue/section_list.html
@@ -23,6 +23,7 @@
             {% for lesson in appendix %}
                 <li><a href="{{ lesson.get_absolute_url }}">{{ lesson }}</a></li>
             {% endfor %}
+            <li><a href="{% url 'info' 'infografiki' %}">Infografiki</a></li>
         </ul>
     </section>
 </aside>

diff --git a/edumed/templates/home.html b/edumed/templates/home.html
index e7977e8..3a82a7b 100755 (executable)
--- a/edumed/templates/home.html
+++ b/edumed/templates/home.html
@@ -44,6 +44,7 @@
     <li><a href="{% url 'catalogue_lesson' 'slowniczek' %}">Słowniczek</a></li>
     <li><a href="{% url 'catalogue_lesson' 'metody' %}">Metody edukacyjne</a></li>
     {% if request.user.is_authenticated %}<li><a href="{% url 'pybb:index' %}">Forum</a></li>{% endif %}
+    <li><a href="{% url 'info' 'infografiki' %}">Infografiki</a></li>
     <li><a href="http://nowoczesnapolska.org.pl/prywatnosc/">Polityka prywatności i ciasteczka</a></li>
 </ul>
 </section>