From: zuber@web50.webfaction.com <zuber@web50.webfaction.com>
Date: Mon, 20 Oct 2008 14:18:18 +0000 (-0500)
Subject: Merged with branch 1.0.
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/3f84dfec54e97d5d5b4f8a1d37c2a1e8ba8a2933?ds=sidebyside;hp=-c

Merged with branch 1.0.
---

3f84dfec54e97d5d5b4f8a1d37c2a1e8ba8a2933
diff --combined wolnelektury/templates/catalogue/book_detail.html
index 986605313,a61396af3..1ffcccc1a
--- a/wolnelektury/templates/catalogue/book_detail.html
+++ b/wolnelektury/templates/catalogue/book_detail.html
@@@ -12,7 -12,6 +12,7 @@@
      </form>
      
      <div id="books-list">
 +        <p>Na podstawie: {{ book.extra_info.source_name }}</p>
          {% if book.has_description %}
              <div id="description">
                  {{ book.description|safe }}
@@@ -80,18 -79,17 +80,18 @@@
                      <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>
                      {% endfor %}
                  </li>
 +                <li><a href="{{ book.extra_info.about }}">Lektura na wiki projektu</a></li>
 +                <li><a href="{{ book.extra_info.source_url }}">Lektura w CBN Polona</a></li>
 +                <li><a href="{{ book.xml_file.url }}">Kod źródłowy utworu (XML)</a></li>
              </ul>
          </div>
          <div id="themes-list">
 -            {% if categories.theme %}
 -                <h2>Motywy w utworze</h2>
 -                <ul>
 -                {% for theme in categories.theme %}
 -                    <li><a href="{{ theme.get_absolute_url }}">{{ theme }}</a></li>
 -                {% endfor %}
 -                </ul>
 -            {% endif %}
 +            <h2>Motywy w utworze</h2>
 +            <ul>
 +            {% for theme in book_themes %}
 +                <li><a href="{% url book_fragments book.slug,theme.slug %}">{{ theme }} ({{ theme.count }})</a></li>
 +            {% endfor %}
 +            </ul>
          </div>
          <div class="clearboth"></div>
      </div>
@@@ -101,4 -99,4 +101,4 @@@
              <p><img src="/media/img/indicator.gif" alt="*"/> Ładowanie</p>
          </div>
      </div>
--{% endblock %}
++{% endblock %}