Added ordering to book children relation.

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index b12f933..f31dbe6 100644 (file)
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -6,6 +6,7 @@ from django.contrib.auth.models import User
 from django.core.files import File
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
 from django.core.files import File
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe

+from django.core.urlresolvers import reverse

 
 from newtagging.models import TagBase
 from newtagging import managers
 
 from newtagging.models import TagBase
 from newtagging import managers


@@ -81,6 +82,7 @@ class Book(models.Model):
     description = models.TextField(_('description'), blank=True)
     created_at = models.DateTimeField(_('creation date'), auto_now=True)
     _short_html = models.TextField(_('short HTML'), editable=False)
     description = models.TextField(_('description'), blank=True)
     created_at = models.DateTimeField(_('creation date'), auto_now=True)
     _short_html = models.TextField(_('short HTML'), editable=False)

+    parent_number = models.IntegerField(_('parent number'), default=0)

     
     # Formats
     xml_file = models.FileField(_('XML file'), upload_to=book_upload_path('xml'), blank=True)
     
     # Formats
     xml_file = models.FileField(_('XML file'), upload_to=book_upload_path('xml'), blank=True)


@@ -104,7 +106,7 @@ class Book(models.Model):
 
             formats = []
             if self.html_file:
 
             formats = []
             if self.html_file:

-                formats.append(u'<a href="%s">Czytaj online</a>' % self.html_file.url)
+                formats.append(u'<a href="%s">Czytaj online</a>' % reverse('book_text', kwargs={'slug': self.slug}))

             if self.pdf_file:
                 formats.append(u'<a href="%s">Plik PDF</a>' % self.pdf_file.url)
             if self.odt_file:
             if self.pdf_file:
                 formats.append(u'<a href="%s">Plik PDF</a>' % self.pdf_file.url)
             if self.odt_file:


@@ -164,10 +166,11 @@ class Book(models.Model):
         book.tags = book_tags
         
         if hasattr(book_info, 'parts'):
         book.tags = book_tags
         
         if hasattr(book_info, 'parts'):

-            for part_url in book_info.parts:
+            for part_url, n in enumerate(book_info.parts):

                 base, slug = part_url.rsplit('/', 1)
                 child_book = Book.objects.get(slug=slug)
                 child_book.parent = book
                 base, slug = part_url.rsplit('/', 1)
                 child_book = Book.objects.get(slug=slug)
                 child_book.parent = book

+                child_book.parent_number = n

                 child_book.save()
         
         # Save XML and HTML files
                 child_book.save()
         
         # Save XML and HTML files

diff --git a/wolnelektury/templates/catalogue/book_detail.html b/wolnelektury/templates/catalogue/book_detail.html
index 22c09cb..e6b5eb0 100644 (file)
--- a/wolnelektury/templates/catalogue/book_detail.html
+++ b/wolnelektury/templates/catalogue/book_detail.html
@@ -40,7 +40,7 @@
         <div id="formats">
             <ul>
             {% if book.html_file %}
         <div id="formats">
             <ul>
             {% if book.html_file %}

-                <li><a href="{{ book.html_file.url }}">Czytaj online</a></li>
+                <li><a href="{% url book_text book.slug %}">Czytaj online</a></li>

             {% endif %}
             {% if book.pdf_file %}
                 <li><a href="{{ book.pdf_file.url }}">Pobierz plik PDF</a></li>
             {% endif %}
             {% if book.pdf_file %}
                 <li><a href="{{ book.pdf_file.url }}">Pobierz plik PDF</a></li>

diff --git a/wolnelektury/templates/catalogue/book_short.html b/wolnelektury/templates/catalogue/book_short.html
index a942442..7f93a59 100644 (file)
--- a/wolnelektury/templates/catalogue/book_short.html
+++ b/wolnelektury/templates/catalogue/book_short.html
@@ -2,10 +2,14 @@
     <div class="change-sets">
         <a href="{% url catalogue.views.book_sets book.slug %}" class="jqm-trigger">Na półkę!</a>
     </div>
     <div class="change-sets">
         <a href="{% url catalogue.views.book_sets book.slug %}" class="jqm-trigger">Na półkę!</a>
     </div>

-    <div class="book-thumbnail"></div>
+    {% if book.children %}
+        <div class="book-parent-thumbnail"></div>
+    {% else %}
+        <div class="book-thumbnail"></div>
+    {% endif %}

     <div class="book-description">
         <h2><a href="{{ book.get_absolute_url }}">{{ book.title }}</a></h2>
     <div class="book-description">
         <h2><a href="{{ book.get_absolute_url }}">{{ book.title }}</a></h2>

-        <p style="margin: 0">Formaty: {{ formats|join:", "|safe }}</p>
+        <p style="margin: 0">Na skróty: {{ formats|join:", "|safe }}</p>

         <p style="margin: 0">Utwór w kategoriach: {{ tags|join:", "|safe }}</p>
     </div>
 </div>
         <p style="margin: 0">Utwór w kategoriach: {{ tags|join:", "|safe }}</p>
     </div>
 </div>