X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/95045552540ca917d273954ebfa20b47a306bb93..7e6d14043e3e2dce8e3fdcef0b0fc649680b07b3:/wolnelektury/templates/catalogue/tagged_object_list.html

diff --git a/wolnelektury/templates/catalogue/tagged_object_list.html b/wolnelektury/templates/catalogue/tagged_object_list.html
index 5f7d69fe6..f845c624f 100644
--- a/wolnelektury/templates/catalogue/tagged_object_list.html
+++ b/wolnelektury/templates/catalogue/tagged_object_list.html
@@ -9,8 +9,8 @@
 {% block body %}
     <h1>{% title_from_tags tags %}</h1>
     {% breadcrumbs tags %}
-    
-    {% if shelf_is_set and not object_list %}
+
+    {% if only_shelf and not object_list %}
     <div id="books-list">
         <h2>{% trans "Your shelf is empty" %}</h2>
         <p>{% trans "You can put a book on a shelf by entering page of the reading and clicking 'Put on the shelf'." %}</p>
@@ -27,7 +27,7 @@
             <div class="clearboth"></div>
             <div id="toggle-description"><p></p></div>
         {% endif %}
-        {% if shelf_is_set %}
+        {% if only_shelf %}
             <a id="download-shelf" href="{% url download_shelf last_tag.slug %}">
                 {% trans "Download all books from this shelf" %}
             </a>
@@ -35,16 +35,18 @@
                 <form action="{% url download_shelf last_tag.slug %}" method="get" accept-charset="utf-8" id="download-formats-form" data-formats-feed="{% url shelf_book_formats last_tag.slug %}">
                     <p>{% trans "Choose books' formats which you want to download:" %}</p>
                     <li data-format="pdf"><label for="id_formats_2"><input type="checkbox" name="formats" value="pdf" id="id_formats_2" /> PDF</label> <em><strong>{% trans "for reading" %}</strong> {% trans "and printing using" %} <a href="http://get.adobe.com/reader/">Adobe Reader</a></em></li>
-                    <li data-format="epub"><label for="id_formats_5"><input type="checkbox" name="formats" value="epub" id="id_formats_5" /> EPUB</label> </li>
+                    <li data-format="epub"><label for="id_formats_5"><input type="checkbox" name="formats" value="epub" id="id_formats_5" /> EPUB</label> <em><strong>{% trans "for reading" %}</strong> {% trans "on mobile devices" %}</em></li>
+                    <li data-format="mobi"><label for="id_formats_7"><input type="checkbox" name="formats" value="mobi" id="id_formats_7" /> MOBI</label> <em><strong>{% trans "for reading" %}</strong> {% trans "on mobile devices" %}</em></li>
                     <li data-format="odt"><label for="id_formats_3"><input type="checkbox" name="formats" value="odt" id="id_formats_3" /> ODT</label> <em><strong>{% trans "for reading" %}</strong> {% trans "and editing using" %} <a href="http://pl.openoffice.org/">OpenOffice.org</a></em></li>
                     <li data-format="txt"><label for="id_formats_4"><input type="checkbox" name="formats" value="txt" id="id_formats_4" /> TXT</label> <em><strong>{% trans "for reading" %}</strong> {% trans "on small displays, for example mobile phones" %}</em></li>
                     <li data-format="mp3"><label for="id_formats_0"><input type="checkbox" name="formats" value="mp3" id="id_formats_0" /> MP3</label> <em><strong>{% trans "for listening" %}</strong> {% trans "on favourite MP3 player" %}</em></li>
                     <li data-format="ogg"><label for="id_formats_1"><input type="checkbox" name="formats" value="ogg" id="id_formats_1" /> Ogg Vorbis</label> <em><strong>{% trans "for listening" %}</strong> &mdash; {% trans "open format" %} <a href="http://www.vorbis.com/">{% trans "Xiph.org Foundation" %}</a></em></li>
+                    <li data-format="daisy"><label for="id_formats_6"><input type="checkbox" name="formats" value="daisy" id="id_formats_6" /> DAISY</label> </li>
                     <li id="download-formats-form-submit-li"><label><input type="submit" name="submit" value="{% trans "Download" %}" id="download-formats-form-submit" disabled="disabled" />&nbsp;<img src="{{ STATIC_URL }}img/indicator.gif" /></label> <span id="updating-formats">{% trans "Updating list of books' formats on the shelf" %}</span><span id="formats-updated" style="display:none;">{% trans "or" %} <a href="#" id="download-formats-form-cancel">{% trans "cancel" %}</a></span></li>
                     <div class="clearboth"></div>
                 </form>
             </div>
-            {% if user_is_owner %}
+            {% if only_my_shelf %}
             <div id="toggle-share-shelf"><p>{% trans "Share this shelf" %}</p></div>
             <div id="share-shelf">
                 <p>{% trans "Copy this link and share it with other people to let them see your shelf." %}
@@ -91,34 +93,17 @@
             {% for book in object_list %}
                 <li>
                     {% if user_is_owner %}
-                        <a href="{% url remove_from_shelf last_tag.slug book.slug %}" class="remove-from-shelf">{% trans "Delete" %}</a>
+                        <a href="{% url remove_from_shelf last_tag.slug book.urlid %}" class="remove-from-shelf">{% trans "Delete" %}</a>
                     {% endif %}
                     {{ book.short_html }}</li>
             {% endfor %}
             </ol>
+            {% paginate %}
         {% else %}
-			{% if only_author %}
-	            {% if last_tag.alive %}
-					{% trans "This author's works are copyrighted." %}
-				{% else %}{% comment %} Is dead {% endcomment %}
-            	    {% if last_tag.in_pd %}
-						<p>{% trans "This author's works are in public domain and will be published on Internet school library of Wolne Lektury soon." %}</p>		 
-	                {% else %}
-						{% comment %} Is dead, but not yet in public domain {% endcomment %}
-    	                <div>
-        	                <p>{% trans "This author's works will become part of public domain and will be allowed to be published without restrictions in" %}</p>
-							{% include "catalogue/pd_counter.html" %}
-                            <p>{% trans "Find out why Internet libraries can't publish this author's works." %}</p>
-						</div>
-	                {% endif %}
-                {% endif %}
-			{% else %}
-			    {% trans "Sorry! Search cirteria did not match any resources." %}
-			{% endif %}
+            {% trans "Sorry! Search cirteria did not match any resources." %}
             {% include "info/join_us.html" %}
         {% endif %}
         {% endwith %}
-        {% paginate %}
     </div>
 	{% if object_list %}
 	{% comment %} If we didn't find anything there will be nothing on the right side as well {% endcomment %}
@@ -139,7 +124,10 @@
             {% if categories.epoch %}
                 <h2>{% trans "Epochs" %}</h2>
                 {% tag_list categories.epoch tags %}
-            {% endif %}        
+            {% endif %}
+            {% if only_shelf %}
+                <p><a href="{% url poem_from_set tags.0.slug %}">Miksuj utwory z tej półki</a>
+            {% endif %}
         </div>
         <div id="themes-list">
             {% if categories.theme %}
@@ -157,4 +145,4 @@
             <p><img src="{{ STATIC_URL }}img/indicator.gif" alt="*"/> {% trans "Loading" %}</p>
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}