X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/b9bf77dc8f2d4b1b64bd7a29730bec3e3f885a6e..938fc832934e508085dad3645c01060a4dc9f0c9:/wolnelektury/templates/catalogue/book_detail.html?ds=sidebyside

diff --git a/wolnelektury/templates/catalogue/book_detail.html b/wolnelektury/templates/catalogue/book_detail.html
index 2d83c733b..62b16f242 100644
--- a/wolnelektury/templates/catalogue/book_detail.html
+++ b/wolnelektury/templates/catalogue/book_detail.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load catalogue_tags pagination_tags %}
 
-{% block title %}{{ book.title }} {% trans "on WolneLektury.pl" %}{% endblock %}
+{% block titleextra %}{{ book.title }}{% endblock %}
 
 {% block metadescription %}{% book_title book %}. {{ block.super }}{% endblock %}
 
@@ -10,9 +10,6 @@
 
 {% block body %}
     <h1>{% book_title book %}</h1>
-    <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">
-        <p>{{ form.q }} <input type="submit" value="{% trans "Search" %}" /> <strong>{% trans "or" %}</strong> <a href="{% url main_page %}">{% trans "return to main page" %}</a></p>
-    </form>
 
     <div id="books-list">
         <div id='breadcrumbs'>
@@ -39,18 +36,18 @@
             <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>
+            <p class="change-sets">{% trans "Put a book" %} <span><a href="{% url catalogue.views.book_sets book.slug %}" 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>
+                    <a class="online" href="{% url book_text book.slug %}">{% 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.root_ancestor.epub_file %}
-                        <a href="{{ book.root_ancestor.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>
+                    {% 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>
@@ -58,91 +55,17 @@
                     {% 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 %}
-                    {% for media in book.get_odt %}
-                        <a href="{{ media.file.url }}"><img src="{{ STATIC_URL }}img/odt.png" title="{% trans "Download ODT" %} &ndash; {% trans "for reading" %} {% trans "and editing using" %} OpenOffice.org: {{ media.name }}" alt="{% trans "Download ODT" %}" /></a>
-                    {% endfor %}
 			
                     {% 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">
+			  <form action="{% url catalogue.views.download_custom_pdf book.slug %}" 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>
 
@@ -205,22 +128,16 @@
                 {% 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>
+            <p><a href="{% url poem_from_book book.slug %}">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>
+                <li><a href="{% url book_fragments book.slug theme.slug %}">{{ theme }} ({{ theme.count }})</a></li>
             {% endfor %}
             </ul>
         </div>
         <div class="clearboth"></div>
     </div>
-    <div id="set-window">
-        <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
-        <div class="target">
-            <p><img src="{{ STATIC_URL }}img/indicator.gif" alt="*"/> {% trans "Loading" %}</p>
-        </div>
-    </div>
 {% endblock %}