X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/1a798a8611063ff9abc2b8cd9104e45580f7bffd..4174245c6e2a2770aba9fa3451452397eb15a15c:/catalogue/templates/catalogue/lesson/lesson_detail.html?ds=sidebyside

diff --git a/catalogue/templates/catalogue/lesson/lesson_detail.html b/catalogue/templates/catalogue/lesson/lesson_detail.html
index 8eec0da..a8087bf 100755
--- a/catalogue/templates/catalogue/lesson/lesson_detail.html
+++ b/catalogue/templates/catalogue/lesson/lesson_detail.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load url from future %}
 {% load lesson_link lesson_nav person_list from catalogue_tags %}
 {% load competence curriculum url_for_level from curriculum_tags %}
 
@@ -42,6 +41,10 @@
         <ul class="plain">
         {% curriculum object.dc.curriculum %}
         </ul>
+        <h1>Podstawa programowa 2017:</h1>
+        <ul class="plain">
+        {% curriculum object.dc.curriculum_new new=True %}
+        </ul>
     </section>
     {% endif %}
 
@@ -57,6 +60,9 @@
         {% if object.dc.authors_expert %}
         Konsultacja merytoryczna: {{ object.dc.authors_expert|person_list }}<br/>
         {% endif %}
+        {% if object.dc.authors_methodologist %}
+        Konsultacja metodyczna: {{ object.dc.authors_methodologist|person_list }}<br/>
+        {% endif %}
         Licencja: <a href="{{ object.dc.license }}">{{ object.dc.license_description }}</a>.</p>
     </section>
 
@@ -75,6 +81,10 @@
 </aside>
 
 <div id="main-bar">
+
+{% block lesson-info %}
+{% endblock %}
+
 {{ object.html_file.read|safe }}
 
 
@@ -102,7 +112,27 @@
 {% endif %}
 
 <div class="clr"></div>
+
+<p class="section-info">
+    {% block suggest-link %}
+    <a href="{% url 'contact_form' 'sugestie' %}?temat={{ 'Lekcja: '|add:object.title|urlencode }}">
+        Zgłoś swoją uwagę na temat tej lekcji.
+    </a>
+    {% endblock %}
+</p>
+
 </footer>
+
+
+{% if request.user.is_authenticated and object.forum_topics.all.count %}
+    <h2>Na forum</h2>
+    <ul>
+    {% for forum_topic in object.forum_topics.all %}
+        <li><a href="{{forum_topic.pybb_topic.get_absolute_url}}">{{forum_topic.pybb_topic.name}}</a></li>
+    {% endfor %}
+    </ul>
+{% endif %}
+
 </div>
 
 {% endblock %}