display changes, mostly in book boxes

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index 9f26ae5..03cf0c8 100644 (file)
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -782,14 +782,26 @@ class Book(models.Model):
             return self._related_info
         else:
             rel = {'tags': {}, 'media': {}}
             return self._related_info
         else:
             rel = {'tags': {}, 'media': {}}

+

             tags = self.tags.filter(category__in=(
                     'author', 'kind', 'genre', 'epoch'))
             tags = split_tags(tags)
             for category in tags:
                 rel['tags'][category] = [
                         (t.name, t.get_absolute_url()) for t in tags[category]]
             tags = self.tags.filter(category__in=(
                     'author', 'kind', 'genre', 'epoch'))
             tags = split_tags(tags)
             for category in tags:
                 rel['tags'][category] = [
                         (t.name, t.get_absolute_url()) for t in tags[category]]

+

             for media_format in BookMedia.formats:
                 rel['media'][media_format] = self.has_media(media_format)
             for media_format in BookMedia.formats:
                 rel['media'][media_format] = self.has_media(media_format)

+
+            book = self
+            parents = []
+            while book.parent:
+                parents.append((book.parent.title, book.parent.slug))
+                book = book.parent
+            parents = parents[::-1]
+            if parents:
+                rel['parents'] = parents
+

             if self.pk:
                 type(self).objects.filter(pk=self.pk).update(_related_info=rel)
             return rel
             if self.pk:
                 type(self).objects.filter(pk=self.pk).update(_related_info=rel)
             return rel

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index 2254299..542f1cd 100644 (file)
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -17,8 +17,9 @@ from django.conf import settings
 from django.template.defaultfilters import stringfilter
 from django.utils.translation import ugettext as _
 
 from django.template.defaultfilters import stringfilter
 from django.utils.translation import ugettext as _
 

+from catalogue import forms

 from catalogue.utils import split_tags
 from catalogue.utils import split_tags

-from catalogue.models import Book, Fragment
+from catalogue.models import Book, Fragment, Tag

 
 register = template.Library()
 
 
 register = template.Library()
 


@@ -282,27 +283,29 @@ def book_info(book):
 
 @register.inclusion_tag('catalogue/book_wide.html', takes_context=True)
 def book_wide(context, book):
 
 @register.inclusion_tag('catalogue/book_wide.html', takes_context=True)
 def book_wide(context, book):

-    formats = {}
-    # files generated during publication
-    for ebook_format in book.ebook_formats:
-        if book.has_media(ebook_format):
-            formats[ebook_format] = book.get_media(ebook_format)
+    theme_counter = book.theme_counter
+    book_themes = Tag.objects.filter(pk__in=theme_counter.keys())
+    for tag in book_themes:
+        tag.count = theme_counter[tag.pk]
+    extra_info = book.get_extra_info_value()
+    hide_about = extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl')

 
     return {
 
     return {

-        'related': book.related_info(),

         'book': book,
         'book': book,

-        'formats': formats,
+        'related': book.related_info(),

         'extra_info': book.get_extra_info_value(),
         'extra_info': book.get_extra_info_value(),

+        'hide_about': hide_about,
+        'themes': book_themes,
+        'custom_pdf_form': forms.CustomPDFForm(),

         'request': context.get('request'),
         'request': context.get('request'),

-        'fragment': book.choose_fragment(),

     }
 
 
 @register.inclusion_tag('catalogue/book_short.html', takes_context=True)
 def book_short(context, book):
     return {
     }
 
 
 @register.inclusion_tag('catalogue/book_short.html', takes_context=True)
 def book_short(context, book):
     return {

-        'related': book.related_info(),

         'book': book,
         'book': book,

+        'related': book.related_info(),

         'request': context.get('request'),
     }
 
         'request': context.get('request'),
     }
 


@@ -310,8 +313,8 @@ def book_short(context, book):
 @register.inclusion_tag('catalogue/book_mini_box.html')
 def book_mini(book):
     return {
 @register.inclusion_tag('catalogue/book_mini_box.html')
 def book_mini(book):
     return {

-        'related': book.related_info(),

         'book': book,
         'book': book,

+        'related': book.related_info(),

     }
 
 
     }
 
 

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 463b330..20fecb7 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -213,29 +213,9 @@ def book_detail(request, slug):
     try:
         book = models.Book.objects.get(slug=slug)
     except models.Book.DoesNotExist:
     try:
         book = models.Book.objects.get(slug=slug)
     except models.Book.DoesNotExist:

-        return pdcounter_views.book_stub_detail(request, kwargs['slug'])
+        return pdcounter_views.book_stub_detail(request, slug)

 
 

-    book_tag = book.book_tag()
-    tags = list(book.tags.filter(~Q(category='set')))
-    categories = split_tags(tags)

     book_children = book.children.all().order_by('parent_number', 'sort_key')
     book_children = book.children.all().order_by('parent_number', 'sort_key')

-
-    _book = book
-    parents = []
-    while _book.parent:
-        parents.append(_book.parent)
-        _book = _book.parent
-    parents = reversed(parents)
-
-    theme_counter = book.theme_counter
-    book_themes = models.Tag.objects.filter(pk__in=theme_counter.keys())
-    for tag in book_themes:
-        tag.count = theme_counter[tag.pk]
-
-    extra_info = book.get_extra_info_value()
-    hide_about = extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl')
-
-    custom_pdf_form = forms.CustomPDFForm()

     return render_to_response('catalogue/book_detail.html', locals(),
         context_instance=RequestContext(request))
 
     return render_to_response('catalogue/book_detail.html', locals(),
         context_instance=RequestContext(request))
 

diff --git a/apps/lesmianator/models.py b/apps/lesmianator/models.py
index 1d057c2..1b53efd 100644 (file)
--- a/apps/lesmianator/models.py
+++ b/apps/lesmianator/models.py
@@ -123,16 +123,15 @@ class Continuations(models.Model):
 
     @classmethod
     def for_book(cls, book, length=3):
 
     @classmethod
     def for_book(cls, book, length=3):

-        from librarian import text
-

         # count from this book only
         output = StringIO()
         # count from this book only
         output = StringIO()

-        f = open(book.xml_file.path)
-        text.transform(f, output, False, ('raw-text',))
-        f.close()
+        wldoc = book.wldocument(parse_dublincore=False)
+        output = wldoc.as_text(('raw-text',)).get_string()
+        del wldoc
+

         conts = {}
         last_word = ''
         conts = {}
         last_word = ''

-        for letter in output.getvalue().decode('utf-8').strip().lower():
+        for letter in output.decode('utf-8').strip().lower():

             mydict = conts.setdefault(last_word, {})
             mydict.setdefault(letter, 0)
             mydict[letter] += 1
             mydict = conts.setdefault(last_word, {})
             mydict.setdefault(letter, 0)
             mydict[letter] += 1

diff --git a/apps/social/templates/social/shelf_tags.html b/apps/social/templates/social/shelf_tags.html
new file mode 100755 (executable)
index 0000000..70108eb
--- /dev/null
+++ b/apps/social/templates/social/shelf_tags.html
@@ -0,0 +1,7 @@
+{% if tags %}
+<ul class='social-shelf-tags'>
+    {% for tag in tags %}
+        <li><a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a></li>
+    {% endfor %}
+</ul>
+{% endif %}

diff --git a/apps/social/templatetags/social_tags.py b/apps/social/templatetags/social_tags.py
index deac93d..e78f20f 100755 (executable)
--- a/apps/social/templatetags/social_tags.py
+++ b/apps/social/templatetags/social_tags.py
@@ -28,4 +28,14 @@ def cite_promo(ctx=None, fallback=False):
         'cite': cites.order_by('?')[0] if cites.exists() else None,
         'fallback': fallback,
         'ctx': ctx,
         'cite': cites.order_by('?')[0] if cites.exists() else None,
         'fallback': fallback,
         'ctx': ctx,

-    }
\ No newline at end of file
+    }
+
+
+@register.inclusion_tag('social/shelf_tags.html', takes_context=True)
+def shelf_tags(context, book):
+    user = context['request'].user
+    if not user.is_authenticated():
+        tags = []
+    else:
+        tags = book.tags.filter(category='set', user=user).exclude(name='')
+    return {'tags': tags}

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index be5f32c..f5c9cf2 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -198,7 +198,8 @@ COMPRESS_CSS = {
             'css/book_box.css',
             'css/catalogue.css',
             'css/sponsors.css',
             'css/book_box.css',
             'css/catalogue.css',
             'css/sponsors.css',

-            
+
+            'css/social/shelf_tags.css',

             'css/ui-lightness/jquery-ui-1.8.16.custom.css',
         ],
         'output_filename': 'css/all.min?.css',
             'css/ui-lightness/jquery-ui-1.8.16.custom.css',
         ],
         'output_filename': 'css/all.min?.css',

diff --git a/wolnelektury/static/css/base.css b/wolnelektury/static/css/base.css
index a188285..33223b0 100755 (executable)
--- a/wolnelektury/static/css/base.css
+++ b/wolnelektury/static/css/base.css
@@ -35,6 +35,12 @@ h1 {
     margin-top: .4em
 }
 
     margin-top: .4em
 }
 

+ul.plain {
+    list-style:none;
+    margin: 0;
+    padding: 0;
+}
+

 .left-column {
     width: 47em;
     float: left;
 .left-column {
     width: 47em;
     float: left;

diff --git a/wolnelektury/static/css/book_box.css b/wolnelektury/static/css/book_box.css
index 2df2fa4..f54f5ff 100755 (executable)
--- a/wolnelektury/static/css/book_box.css
+++ b/wolnelektury/static/css/book_box.css
@@ -112,6 +112,9 @@
     font-size: 1.1em;
     color: #707b7a;
     display: block;
     font-size: 1.1em;
     color: #707b7a;
     display: block;

+    overflow:hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;

 }
 .book-mini-box .title {
     font-size: 1.4em;
 }
 .book-mini-box .title {
     font-size: 1.4em;


@@ -126,7 +129,7 @@
 }
 
 .book-wide-box .book-box-body {
 }
 
 .book-wide-box .book-box-body {

-    height: 21.8em;
+    min-height: 17em;

 }
 
 .book-box-head {
 }
 
 .book-box-head {


@@ -134,6 +137,9 @@
     margin-top: 1.4em;
     margin-bottom: 1em;
 }
     margin-top: 1.4em;
     margin-bottom: 1em;
 }

+.book-box-head a {
+    color: black;
+}

 .book-box-head .author {
     font-size: 1.1em;
 }
 .book-box-head .author {
     font-size: 1.1em;
 }


@@ -194,6 +200,12 @@
     margin-left: 14em;
 }
 
     margin-left: 14em;
 }
 

+.book-wide-box #themes-list-wrapper {
+    margin-left: 14em;
+}
+
+
+

 .book-box-read a:before {
     content: "\2609";
     font-family: WL-Nav;
 .book-box-read a:before {
     content: "\2609";
     font-family: WL-Nav;


@@ -203,7 +215,7 @@
     font-weight: normal;
 }
 
     font-weight: normal;
 }
 

-.book-box-download a:before {
+.book-box-download a.downarrow:before {

     content: "\21E9";
     font-family: WL-Nav;
     font-size: 2.25em;
     content: "\21E9";
     font-family: WL-Nav;
     font-size: 2.25em;


@@ -263,7 +275,7 @@ ul.inline-items li {
 
 .book-wide-box .other-download {
     float: left;
 
 .book-wide-box .other-download {
     float: left;

-    width: 22.5em;
+    width: 22em;

     margin: 6em 1.5em 0em 1.5em;
 }
 
     margin: 6em 1.5em 0em 1.5em;
 }
 

diff --git a/wolnelektury/static/css/social/shelf_tags.css b/wolnelektury/static/css/social/shelf_tags.css
new file mode 100755 (executable)
index 0000000..b963b1c
--- /dev/null
+++ b/wolnelektury/static/css/social/shelf_tags.css
@@ -0,0 +1,18 @@
+.social-shelf-tags {
+    list-style: none;
+    padding: 0;
+    margin: 1em 0;
+}
+
+.social-shelf-tags li {
+    display: inline-block;
+    margin-right:1em;
+}
+
+.social-shelf-tags a {
+    display: block;
+    padding: .3em 1em;
+    background: #ABDADE;
+    color: #0b838d;
+    border-radius: 1em;
+}

diff --git a/wolnelektury/static/js/dialogs.js b/wolnelektury/static/js/dialogs.js
index 0df6508..846331c 100755 (executable)
--- a/wolnelektury/static/js/dialogs.js
+++ b/wolnelektury/static/js/dialogs.js
@@ -79,6 +79,7 @@
                                 $('.target', $window).text(response.message);
                                 setTimeout(function() { $window.jqmHide() }, 1000);
                                 $form.submit();
                                 $('.target', $window).text(response.message);
                                 setTimeout(function() { $window.jqmHide() }, 1000);
                                 $form.submit();

+                                location.reload();

                             }
                             else {
                                 $('.error', $window).remove();
                             }
                             else {
                                 $('.error', $window).remove();


@@ -145,7 +146,7 @@
         };
 
         var ajaxable_callbacks = {
         };
 
         var ajaxable_callbacks = {

-            'social-book-sets': update_star
+            'social-book-sets': location.reload

         };
 
 
         };
 
 

diff --git a/wolnelektury/templates/catalogue/book_short.html b/wolnelektury/templates/catalogue/book_short.html
index 90ac6af..a6d3028 100644 (file)
--- a/wolnelektury/templates/catalogue/book_short.html
+++ b/wolnelektury/templates/catalogue/book_short.html
@@ -38,10 +38,12 @@
         <div class="book-box-head">
             <div class="mono author">
                 {% for name, url in related.tags.author %}
         <div class="book-box-head">
             <div class="mono author">
                 {% for name, url in related.tags.author %}

-                    {{ name }}{% if not forloop.last %}, {% endif %}
+                    <a href="{{ url }}">{{ name }}</a>{% if not forloop.last %},
+                {% endif %}{% endfor %}{% for title, slug in related.parents %},
+                    <a href="{% url book_detail slug %}">{{ title }}</a>

                 {% endfor %}
             </div>
                 {% endfor %}
             </div>

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

         </div>
         <div class="tags">
             {% spaceless %}
         </div>
         <div class="tags">
             {% spaceless %}


@@ -65,8 +67,13 @@
             </span>
 
             {% endspaceless %}
             </span>
 
             {% endspaceless %}

+
+            {% shelf_tags book %}

         </div>
     </div>
         </div>
     </div>

+
+    {% block book-box-extra-info %}{% endblock %}
+

     <ul class="book-box-tools">
         <li class="book-box-read">
         {% if book.html_file %}
     <ul class="book-box-tools">
         <li class="book-box-read">
         {% if book.html_file %}


@@ -76,17 +83,17 @@
         <li class="book-box-download">
             <a class="mono downarrow">{% trans "Download" %}</a>
             <div class="book-box-formats mono">
         <li class="book-box-download">
             <a class="mono downarrow">{% trans "Download" %}</a>
             <div class="book-box-formats mono">

-             {% if formats.pdf %}
-             <span><a href="{{formats.pdf.url}}">PDF</a> do wydruku</span>
+             {% if book.pdf_file %}
+             <span><a href="{{ book.pdf_file.url}}">PDF</a> do wydruku</span>

              {% endif %}
              {% endif %}

-             {% if formats.epub %}
-             <span><a href="{{formats.epub.url}}">EPUB</a> na czytnik</span>
+             {% if  book.epub_file %}
+             <span><a href="{{ book.epub_file.url}}">EPUB</a> na czytnik</span>

              {% endif %}
              {% endif %}

-             {% if formats.mobi %}
-             <span><a href="{{formats.mobi.url}}">MOBI</a> na Kindle</span>
+             {% if  book.mobi_file %}
+             <span><a href="{{ book.mobi_file.url}}">MOBI</a> na Kindle</span>

              {% endif %}
              {% endif %}

-             {% if formats.txt %}
-             <span><a href="{{formats.txt.url}}">TXT</a> do zadań specjalnych</span>
+             {% if  book.txt_file %}
+             <span><a href="{{ book.txt_file.url}}">TXT</a> do zadań specjalnych</span>

              {% endif %}
             </div>
         </li>
              {% endif %}
             </div>
         </li>


@@ -98,5 +105,6 @@
     </ul>
     {% block box-append %}
     {% endblock %}
     </ul>
     {% block box-append %}
     {% endblock %}

+    <div class="clearboth"></div>

 </div>
 </div>
 </div>
 </div>

diff --git a/wolnelektury/templates/catalogue/book_wide.html b/wolnelektury/templates/catalogue/book_wide.html
index ebbea8c..dfe57b6 100644 (file)
--- a/wolnelektury/templates/catalogue/book_wide.html
+++ b/wolnelektury/templates/catalogue/book_wide.html
@@ -1,9 +1,29 @@
 {% extends "catalogue/book_short.html" %}
 {% load i18n %}
 {% extends "catalogue/book_short.html" %}
 {% load i18n %}

+{% load tag_list from catalogue_tags %}

 {% load cite_promo from social_tags %}
 
 {% load cite_promo from social_tags %}
 

+

 {% block box-class %}book-wide-box{% endblock %}
 
 {% block box-class %}book-wide-box{% endblock %}
 

+
+{% block book-box-extra-info %}
+{% if themes %}
+    <div id="themes-list-wrapper">
+        <p><a class="mono" id="themes-list-toggle"
+                href="#">{% trans "motifs and themes" %}</a></p>
+        <div id="themes-list">
+            <ul>
+            {% for theme in themes %}
+                <li><a href="{% url book_fragments book.urlid theme.slug %}">{{ theme }} ({{ theme.count }})</a></li>
+            {% endfor %}
+            </ul>
+        </div>
+    </div>
+{% endif %}
+{% endblock %}
+
+

 {% block right-column %}
 <div class="right-column">
     <div class="quote">
 {% block right-column %}
 <div class="right-column">
     <div class="quote">


@@ -12,10 +32,11 @@
 
   <div class="other-tools">
     <h2 class="mono">{% trans "See" %}</h2>
 
   <div class="other-tools">
     <h2 class="mono">{% trans "See" %}</h2>

-    <ul class="inline-items">
+    <ul class="plain">

       {% if extra_info.source_url %}
       <li><a href="{{ extra_info.source_url }}">{% trans "Source" %}</a> {% trans "of the book" %}</li>
       {% endif %}
       {% if extra_info.source_url %}
       <li><a href="{{ extra_info.source_url }}">{% trans "Source" %}</a> {% trans "of the book" %}</li>
       {% endif %}

+      <li><a href="{{ book.xml_file.url }}">{% trans "Source XML file" %}</a></li>

       {% if extra_info.about and not hide_about %}
       <li>{% trans "Book on" %} <a href="{{ extra_info.about }}">{% trans "Editor's Platform" %}</a></li>
       {% endif %}
       {% if extra_info.about and not hide_about %}
       <li>{% trans "Book on" %} <a href="{{ extra_info.about }}">{% trans "Editor's Platform" %}</a></li>
       {% endif %}


@@ -25,11 +46,12 @@
       {% if book.wiki_link %}
       <li><a href="{{ book.wiki_link }}">{% trans "Book description on Wikipedia" %}</a></li>
       {% endif %}
       {% if book.wiki_link %}
       <li><a href="{{ book.wiki_link }}">{% trans "Book description on Wikipedia" %}</a></li>
       {% endif %}

+      <li><a href="{% url poem_from_book book.slug %}">{% trans "Mix this book" %}</a></li>

     </ul>
   </div>
   <div class="other-download">
     <h2 class="mono">{% trans "Download" %}</h2>
     </ul>
   </div>
   <div class="other-download">
     <h2 class="mono">{% trans "Download" %}</h2>

-    <ul class="inline-items">
+    <ul class="plain">

       <li>
        {% if related.media.mp3 or related.media.ogg %}
        {% trans "Download all audiobooks for this book" %}: 
       <li>
        {% if related.media.mp3 or related.media.ogg %}
        {% trans "Download all audiobooks for this book" %}: 

diff --git a/wolnelektury/templates/catalogue/tagged_object_list.html b/wolnelektury/templates/catalogue/tagged_object_list.html
index 0777d84..45459f1 100644 (file)
--- a/wolnelektury/templates/catalogue/tagged_object_list.html
+++ b/wolnelektury/templates/catalogue/tagged_object_list.html
@@ -62,33 +62,11 @@
         {% cite_promo tags 1 %}
 
         <div class="see-also">
         {% cite_promo tags 1 %}
 
         <div class="see-also">

+            {% if last_tag.gazeta_link or last_tag.wiki_link %}

             <h2 class='mono'>{% trans "See also" %}:</h2>
             <ul>
             <h2 class='mono'>{% trans "See also" %}:</h2>
             <ul>

-                <li><a href="">Wiki</a></li>
-                <li><a href="">Gazeta</a></li>
-            </ul>
-        </div>
-
-        <div class="download">
-            <h2 class='mono'>{% trans "Download" %}:</h2>
-            <ul>
-                <li><a href="">wszystko</a></li>
-                <li><a href="">część</a></li>
-            </ul>
-        </div>
-
-    </div>
-
-    <div class="clearboth"></div>
-
-
-
-
-    <div id="books-list">
-
-

         {% if last_tag.gazeta_link %}
         {% if last_tag.gazeta_link %}

-        <p><a href="{{ last_tag.gazeta_link }}">
+        <li><a href="{{ last_tag.gazeta_link }}">

             {% switch last_tag.category %}
                 {% case "author" %}
                     {% trans "Read work's study of this author on Lektury.Gazeta.pl" %}
             {% switch last_tag.category %}
                 {% case "author" %}
                     {% trans "Read work's study of this author on Lektury.Gazeta.pl" %}


@@ -101,10 +79,10 @@
                 {% else %}
                     {% trans "Read related study on Lektury.Gazeta.pl" %}
             {% endswitch %}
                 {% else %}
                     {% trans "Read related study on Lektury.Gazeta.pl" %}
             {% endswitch %}

-        </a></p>
+        </a></li>

         {% endif %}
         {% if last_tag.wiki_link %}
         {% endif %}
         {% if last_tag.wiki_link %}

-        <p><a href="{{ last_tag.wiki_link }}">
+        <li><a href="{{ last_tag.wiki_link }}">

                {% switch last_tag.category %}
                            {% case "author" %}
                                    {% trans "Read article about this author on Wikipedia" %}
                {% switch last_tag.category %}
                            {% case "author" %}
                                    {% trans "Read article about this author on Wikipedia" %}


@@ -117,9 +95,33 @@
                                {% else %}
                                    {% trans "Read related article on Wikipedia" %}
                        {% endswitch %}
                                {% else %}
                                    {% trans "Read related article on Wikipedia" %}
                        {% endswitch %}

-        </a></p>
+        </a></li>

         {% endif %}
 
         {% endif %}
 

+
+
+            </ul>
+            {% endif %}
+        </div>
+
+        <div class="download">
+            {% comment %}
+            <h2 class='mono'>{% trans "Download" %}:</h2>
+            <ul>
+                <li><a href="">wszystko</a></li>
+                <li><a href="">część</a></li>
+            </ul>
+            {% endcomment %}
+        </div>
+
+    </div>
+
+    <div class="clearboth"></div>
+
+
+
+
+    <div id="books-list">

         {% if object_list %}
             {% work_list object_list %}
         {% else %}
         {% if object_list %}
             {% work_list object_list %}
         {% else %}