detail page getting shape

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index b4a3ec5..c5b904d 100644 (file)
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -15,6 +15,7 @@ from django.conf import settings
 from django.utils.translation import ugettext as _
 
 from catalogue.forms import SearchForm
+from catalogue.utils import split_tags
 
 
 register = template.Library()
@@ -275,3 +276,19 @@ def inline_tag_list(tags, choices=None):
 @register.inclusion_tag('catalogue/book_info.html')
 def book_info(book):
     return locals()
+
+
+@register.inclusion_tag('catalogue/book_wide.html')
+def book_wide(book):
+    tags = book.tags.filter(category__in=('author', 'kind', 'genre', 'epoch'))
+    tags = split_tags(tags)
+
+    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)
+
+    extra_info = book.get_extra_info_value()
+
+    return locals()

diff --git a/scripts/make-tags b/scripts/make-tags
index 0afb859..754e635 100755 (executable)
--- a/scripts/make-tags
+++ b/scripts/make-tags
@@ -8,3 +8,6 @@ if [ -n "$VIRTUAL_ENV" ]; then
 else
     echo "No Virtual env enabled, will not add it to TAGS"
 fi
+
+find $ROOT/wolnelektury/static/css -name '*.css' |xargs etags -a -o ${ROOT}/TAGS
+find $ROOT/wolnelektury/static/js -name '*.js' |xargs etags -a -o ${ROOT}/TAGS

diff --git a/wolnelektury/static/css/base.css b/wolnelektury/static/css/base.css
index dd686c7..922915a 100755 (executable)
--- a/wolnelektury/static/css/base.css
+++ b/wolnelektury/static/css/base.css
@@ -69,9 +69,11 @@ h2 {
 .page-desc {
     margin-left: 1.5em;
 }
+
 .inline-tag-lists {
     font-size: 1.1em;
 }
+
 #themes-list-toggle:after {
     padding-left: 1em;
     content: "↓";

diff --git a/wolnelektury/static/css/book_box.css b/wolnelektury/static/css/book_box.css
index b517502..aa50e67 100755 (executable)
--- a/wolnelektury/static/css/book_box.css
+++ b/wolnelektury/static/css/book_box.css
@@ -1,4 +1,4 @@
-.book-mini-box, .book-box {
+.book-wide-box, .book-mini-box, .book-box {
     display: inline-block;
     margin: 0;
     vertical-align: top;
@@ -13,6 +13,10 @@
     width: 16.15em;
 }
 
+.book-wide-box {
+    width: 98.5em;
+}
+
 .book-mini-box a, .book-box-inner {
     display: block;
     color: black;
@@ -36,14 +40,14 @@
     margin: .5em;
 }
 
-.book-mini-box img, .book-box img {
+.book-mini-box img, .book-box img, .book-wide-box img {
     width: 13.9em;
     height: 19.3em;
 }
 .book-mini-box img {
     margin-bottom: 1.8em;
 }
-.book-box img {
+.book-box img, .book-wide-box img {
     float: left;
     margin-right: 1.5em;
 }
@@ -132,6 +136,16 @@
     margin-right: .25em;
     vertical-align: middle;
 }
+
+ul.book-box-tools {
+    margin: 0;
+    padding: 0;
+}
+
+.book-box-tools li {
+    display: inline-block;
+}
+
 .book-box-read {
     width: 11em;
 }
@@ -141,3 +155,38 @@
 .book-box-audiobook {
     width: 8em;
 }
+
+.book-wide-box .right-column {
+    float: right;
+    width: 41.5em;
+}
+
+.book-wide-box blockquote.cite-body {
+    /* @ 18pt */
+    width: 100%; /*23.055em;*/
+    height: 7.222em;
+    background-color: #f7f7f7;
+    margin: 0;
+    position: relative;
+    top: -0.444em;
+    right: -0.555em;
+    vertical-align: center;
+}
+
+.book-wide-box blockquote div {
+    padding: 0.888em;
+}
+
+.book-wide-box #other-tools {
+    float: left;
+    width: 14.5em;
+    margin-left: 1.5em;
+    
+}
+
+
+.book-wide-box #other-download {
+    float: left;
+    width 22.5em;
+    margin: 0em 1.5em 0em 1.5em
+}

diff --git a/wolnelektury/static/css/header.css b/wolnelektury/static/css/header.css
index 8615d8b..04f2c87 100755 (executable)
--- a/wolnelektury/static/css/header.css
+++ b/wolnelektury/static/css/header.css
@@ -37,7 +37,7 @@
 
 #logo {
     position: absolute;
-    top: 5.5em;
+    top: 1.9em;
     margin-left: 1.5em;
 }
 

diff --git a/wolnelektury/templates/catalogue/book_detail.html b/wolnelektury/templates/catalogue/book_detail.html
index 4b4ee2f..0a8b223 100644 (file)
--- a/wolnelektury/templates/catalogue/book_detail.html
+++ b/wolnelektury/templates/catalogue/book_detail.html
@@ -9,206 +9,8 @@
 {% block bodyid %}book-detail{% endblock %}
 
 {% block body %}
-    <h1>{% book_title book %}</h1>
 
-    <div id="books-list">
-        <div id='breadcrumbs'>
-            {% if categories.author %}
-                {% for tag in categories.author %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
-                {% endfor %}
-                &#187; 
-            {% endif %}
-            {% for parent in parents %}
-                <a href="{{ parent.get_absolute_url }}">{{ parent }}</a> &#187; 
-            {% endfor %}
-        </div>
+{% book_wide book %}
 
-        {% if extra_info.license %}
-        <p>{% trans "Work is licensed under " %} <a href="{{ extra_info.license }}">{{ extra_info.license_description }}</a>.</p>
-        {% endif %}
-        <p>{% trans "Based on" %}: {{ extra_info.source_name }}</p>
-        {% if book.has_description %}
-            <div id="description">
-                <div id='description-long'>{{ book.description|safe }}</div>
-                <div id='description-short'>{{ book.description|safe|truncatewords_html:30 }}</div>
-            </div>
-            <div id="toggle-description"><p></p></div>
-        {% endif %}
-        <div id="formats">
-            <p class="change-sets">{% trans "Put a book" %} <span><a href="{% url catalogue.views.book_sets book.urlid %}" class="jqm-trigger">{% trans "on the shelf!" %}</a></span></p>
-            <div class="clearboth"></div>
-            <div class="wrap">
-                {% if book.has_html_file %}
-                    <a class="online" href="{% url book_text book.fileid %}">{% trans "Read online" %}</a>
-                {% endif %}
-                <div class="download">
-                    {% if book.pdf_file %}
-                        <a href="{{ book.pdf_file.url }}"><img src="{{ STATIC_URL }}img/pdf.png" title="{% trans "Download PDF" %} &ndash; {% trans "for reading" %} {% trans "and printing using" %} Adobe Reader" %}" alt="{% trans "Download PDF" %}" /></a>
-                    {% endif %}
-                    {% if book.epub_file %}
-                        <a href="{{ book.epub_file.url }}"><img src="{{ STATIC_URL }}img/epub.png" title="{% trans "Download EPUB" %} &ndash; {% trans "for reading" %} {% trans "on mobile devices" %}" alt="{% trans "Download EPUB" %}" /></a>
-                    {% endif %}
-                    {% if book.mobi_file %}
-                        <a href="{{ book.mobi_file.url }}"><img src="{{ STATIC_URL }}img/mobi.png" title="{% trans "Download MOBI" %} &ndash; {% trans "for reading" %} {% trans "on mobile devices" %}" alt="{% trans "Download MOBI" %}" /></a>
-                    {% endif %}
-                    {% if book.txt_file %}
-                        <a href="{{ book.txt_file.url }}"><img src="{{ STATIC_URL }}img/txt.png" title="{% trans "Download TXT" %} &ndash; {% trans "for reading" %} {% trans "on small displays, for example mobile phones" %}" alt="{% trans "Download TXT" %}" /></a>
-                    {% endif %}
-                       
-                    {% if book.pdf_file %}
-                       <br/><a href="#" id="custom-pdf-link">{% trans "Dowload customized PDF" %}</a>.
-                   {% endif %}
-                       <div style="display: none" class="custom-pdf">
-                         <form action="{% url catalogue.views.download_custom_pdf book.fileid %}" method="GET">
-                           {{custom_pdf_form.as_p}}
-                           <input type="submit" value="{% trans "Download" %}"/>
-                         </form>
-                       </div>
-                </div>
-                {% if book.has_mp3_file or book.has_ogg_file or book.has_daisy_file %}
-                    <p class="header">
-                        <span class="desc">{% trans "Audiobooks" %}:</span>
-                        <span class="audiotabs">
-                            {% if book.has_mp3_file %}<span class="active" data-format="mp3">MP3</span>{% endif %}
-                            {% if book.has_ogg_file %}<span data-format="ogg">Ogg Vorbis</span>{% endif %}
-                            {% if book.has_daisy_file %}<span data-format="daisy">DAISY</span>{% endif %}
-                        </span>
-                    </p>
-                    <div class="audiobooks">
-                        <img src="{{ STATIC_URL }}img/speaker.png" id="speaker" alt="Speaker icon"/>
-                        {% if book.has_mp3_file %}
-                            <ul class="audiobook-list" id="mp3-files">
-                            {% for media in book.get_mp3 %}
-                                <li class="mp3Player">
-                                  <a href="{{ media.file.url }}">{{ media.name }}</a><br/>
-                                  {% trans "Artist" %}: {{ media.get_extra_info_value.artist_name }}<br/>
-                                  {% trans "Director"%}: {{ media.get_extra_info_value.director_name }}<br/>
-                                  <object type="application/x-shockwave-flash" style="margin-top: 0.5em" data="{{ STATIC_URL }}player.swf" width="226" height="20">
-                                        <param name="movie" value="{{ STATIC_URL }}player.swf" />
-                                        <param name="bgcolor" value="#ffffff" />
-                                        <param name="FlashVars" value="mp3={{ media.file.url }}&amp;width=226&amp;showvolume=1&amp;bgcolor1=eeeeee&amp;bgcolor2=eeeeee&amp;buttoncolor=666666" />
-                                    </object>
-                                    
-                                </li>
-                            {% endfor %}
-                            </ul>     
-                        {% endif %}
 
-                        {% if book.has_ogg_file %}
-                            <ul class="audiobook-list" id="ogg-files">
-                            {% for media in book.get_ogg %}
-                                <li><a href="{{ media.file.url }}">{{ media.name }}</a></li>
-                            {% endfor %}
-                            </ul>
-                        {% endif %}
-                        {% if book.has_daisy_file %}
-                            <ul class="audiobook-list" id="daisy-files">
-                            {% for media in book.get_daisy %}
-                                <li><a href="{{ media.file.url }}">{{ media.name }}</a></li>
-                            {% endfor %}
-                            </ul>
-                        {% endif %}
-                    </div> <!-- /audiobooks -->
-                    {% if projects|length > 1 %}
-                        <p>{% trans "Audiobooks were prepared as a part of the projects:" %}</p>
-                        <ul>
-                        {% for cs, fb in projects %}
-                            <li>
-                            {% if fb %}
-                                {% blocktrans %}{{ cs }}, funded by {{ fb }}{% endblocktrans %}
-                            {% else %}
-                                {{ cs }}
-                            {% endif %}
-                            </li>
-                        {% endfor %}
-                        </ul>
-                    {% else %}
-                        <p>
-                        {% with projects.0.0 as cs %}
-                        {% with projects.0.1 as fb %}
-                            {% if fb %}
-                                {% blocktrans %}Audiobooks were prepared as a part of the {{ cs }} project funded by {{ fb }}.{% endblocktrans %}
-                            {% else %}
-                                {% blocktrans %}Audiobooks were prepared as a part of the {{ cs }} project.{% endblocktrans %}
-                            {% endif %}
-                        {% endwith %}
-                        {% endwith %}
-                        </p>
-                    {% endif %}
-                {% endif %}
-            </div>
-        </div>
-
-        {% if book_children %}
-        {% autopaginate book_children 10 %}
-        <div id="book-children">
-            <ol>
-            {% for book in book_children %}
-                <li>{{ book.short_html }}</li>
-            {% endfor %}
-            </ol>
-        </div>
-        {% paginate %}
-        {% endif %}
-
-    </div>
-
-    <div id="tags-list">
-        <div id="book-info">
-            <h2>{% trans "Details" %}</h2>
-            <ul>
-                <li>
-                    {% trans "Author" %}:
-                    {% for tag in categories.author %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
-                    {% endfor %}
-                </li>
-                <li>
-                    {% trans "Epoch" %}:
-                    {% for tag in categories.epoch %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
-                    {% endfor %}
-                </li>
-                <li>
-                    {% trans "Kind" %}:
-                    {% for tag in categories.kind %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
-                    {% endfor %}
-                </li>
-                <li>
-                    {% trans "Genre" %}:
-                    {% for tag in categories.genre %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
-                    {% endfor %}
-                </li>              
-            </ul>
-            <h2>{% trans "Other resources" %}</h2>
-            <ul>
-                {% if extra_info.source_url %}
-                <li><a href="{{ extra_info.source_url }}">{% trans "Source of the book" %}</a></li>
-                {% endif %}
-                {% if extra_info.about and not hide_about %}
-                <li><a href="{{ extra_info.about }}">{% trans "Book on the Editor's Platform" %}</a></li>
-                {% endif %}
-                {% if book.gazeta_link %}
-                <li><a href="{{ book.gazeta_link }}">{% trans "Book description on Lektury.Gazeta.pl" %}</a></li>
-                {% endif %}
-                {% if book.wiki_link %}
-                <li><a href="{{ book.wiki_link }}">{% trans "Book description on Wikipedia" %}</a></li>
-                {% endif %}
-            </ul>
-            <p><a href="{{ book.xml_file.url }}">{% trans "View XML source" %}</a></p>
-            <p><a href="{% url poem_from_book book.urlid %}">Miksuj ten utwór</a></p>
-        </div>
-        <div id="themes-list">
-            <h2>{% trans "Work's themes " %}</h2>
-            <ul>
-            {% for theme in book_themes %}
-                <li><a href="{% url book_fragments book.urlid theme.slug %}">{{ theme }} ({{ theme.count }})</a></li>
-            {% endfor %}
-            </ul>
-        </div>
-        <div class="clearboth"></div>
-    </div>
 {% endblock %}

diff --git a/wolnelektury/templates/catalogue/book_short.html b/wolnelektury/templates/catalogue/book_short.html
index 8ac23a3..5a9b17d 100644 (file)
--- a/wolnelektury/templates/catalogue/book_short.html
+++ b/wolnelektury/templates/catalogue/book_short.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% load thumbnail %}
-<div class="book-box">
+<div class="{% block box-class %}book-box{% endblock %}">
 <div class="book-box-inner">
     <a href="{{ book.get_absolute_url }}">
         {% if book.cover %}
@@ -13,6 +13,8 @@
             " alt="Cover" />
         {% endif %}
     </a>
+    {% block right-column %}
+    {% endblock %}
     <div class="book-box-body">
         <div class="book-box-head">
             <div class="mono author">
@@ -75,5 +77,7 @@
         {% endif %}
         </li>
     </ul>
+    {% block box-append %}
+    {% endblock %}
 </div>
 </div>

diff --git a/wolnelektury/templates/catalogue/book_wide.html b/wolnelektury/templates/catalogue/book_wide.html
new file mode 100644 (file)
index 0000000..1cfde2e
--- /dev/null
+++ b/wolnelektury/templates/catalogue/book_wide.html
@@ -0,0 +1,35 @@
+{% extends "catalogue/book_short.html" %}
+{% load i18n %}
+
+{% block box-class %}book-wide-box{% endblock %}
+
+{% block right-column %}
+<div class="right-column">
+  <blockquote id="quote" class="cite-body">
+    <div>Ten, który walczy z potworami powinien zadbać, by sam nie stał się potworem. 
+    Gdy długo spoglądamy w otchłań, otchłań spogląda również w nas.</div>
+  </blockquote>
+
+  <div id="other-tools">
+    <h2 class="mono">{% trans "See" %}</h2>
+    <ul>
+      {% if extra_info.source_url %}
+      <li><a href="{{ extra_info.source_url }}">{% trans "Source of the book" %}</a></li>
+      {% endif %}
+      {% if extra_info.about and not hide_about %}
+      <li><a href="{{ extra_info.about }}">{% trans "Book on the Editor's Platform" %}</a></li>
+      {% endif %}
+      {% if book.gazeta_link %}
+      <li><a href="{{ book.gazeta_link }}">{% trans "Book description on Lektury.Gazeta.pl" %}</a></li>
+      {% endif %}
+      {% if book.wiki_link %}
+      <li><a href="{{ book.wiki_link }}">{% trans "Book description on Wikipedia" %}</a></li>
+      {% endif %}
+    </ul>
+  </div>
+  <div id="other-download">
+    <h2 class="mono">{% trans "Download" %}</h2>
+    <p>{% trans "Download all audiobooks for this book" %}</p>
+  </div>
+</div>
+{% endblock %}