random fixes

diff --git a/apps/opds/views.py b/apps/opds/views.py
index dc094bb..4f1bec0 100644 (file)
--- a/apps/opds/views.py
+++ b/apps/opds/views.py
@@ -2,10 +2,8 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from base64 import b64encode

 import os.path
 from urlparse import urljoin
 import os.path
 from urlparse import urljoin

-from urllib2 import unquote

 
 from django.contrib.syndication.views import Feed
 from django.core.urlresolvers import reverse
 
 from django.contrib.syndication.views import Feed
 from django.core.urlresolvers import reverse


@@ -187,10 +185,10 @@ class AcquisitionFeed(Feed):
             return u''
 
     def item_enclosure_url(self, book):
             return u''
 
     def item_enclosure_url(self, book):

-        return full_url(book.root_ancestor.epub_file.url)
+        return full_url(book.epub_file.url)

 
     def item_enclosure_length(self, book):
 
     def item_enclosure_length(self, book):

-        return book.root_ancestor.epub_file.size
+        return book.epub_file.size

 
 @piwik_track
 class RootFeed(Feed):
 
 @piwik_track
 class RootFeed(Feed):

diff --git a/wolnelektury/static/css/book_box.css b/wolnelektury/static/css/book_box.css
index 6b28068..8dee813 100755 (executable)
--- a/wolnelektury/static/css/book_box.css
+++ b/wolnelektury/static/css/book_box.css
@@ -180,13 +180,13 @@
 .book-box-formats span {
     display: block;
 }
 .book-box-formats span {
     display: block;
 }

- 

 
 

-.book-box-download:hover .book-box-formats span:first-child {
+.book-box-download .book-box-formats span:first-child {

     margin-top: 1.454em;
 }
 
     margin-top: 1.454em;
 }
 

-.book-box-download:hover .book-box-formats {
+.book-box-download:hover .book-box-formats,
+.book-box-download.hover .book-box-formats {

     display: block;
 }
 
     display: block;
 }
 

diff --git a/wolnelektury/static/css/header.css b/wolnelektury/static/css/header.css
index 0809240..1d0f5c4 100755 (executable)
--- a/wolnelektury/static/css/header.css
+++ b/wolnelektury/static/css/header.css
@@ -208,11 +208,13 @@ a.menu span {
     margin: 0;
 }
 
     margin: 0;
 }
 

-#lang-menu:hover button {
+#lang-menu:hover button,
+#lang-menu.hover button {

     display: block;
 }
 
     display: block;
 }
 

-#lang-menu:hover #lang-menu-items {
+#lang-menu:hover #lang-menu-items,
+#lang-menu.hover #lang-menu-items {

     position: absolute;
     width: 100%;
     padding: 0;
     position: absolute;
     width: 100%;
     padding: 0;

diff --git a/wolnelektury/static/js/base.js b/wolnelektury/static/js/base.js
index 33026ac..32cdd70 100755 (executable)
--- a/wolnelektury/static/js/base.js
+++ b/wolnelektury/static/js/base.js
@@ -114,6 +114,8 @@ $('.open-player').click(function(event) {
             return false;
         });
 
             return false;
         });
 

+       $('.hoverclick').click(function() {$(this).closest('.hoverget').toggleClass('hover');});
+

        $(function(){
            $("#search").search();});
 
        $(function(){
            $("#search").search();});
 

diff --git a/wolnelektury/static/js/widget.js b/wolnelektury/static/js/widget.js
index d058174..d8e1fec 100644 (file)
--- a/wolnelektury/static/js/widget.js
+++ b/wolnelektury/static/js/widget.js
@@ -17,7 +17,7 @@ stylesheet.setAttribute('rel', 'stylesheet');
 stylesheet.setAttribute('href', 'http://'+host+'/static/css/widget.css');
 linkLogo.setAttribute('href', 'http://'+host);
 logo.setAttribute('src', 'http://'+host+'/static/img/logo.png');
 stylesheet.setAttribute('href', 'http://'+host+'/static/css/widget.css');
 linkLogo.setAttribute('href', 'http://'+host);
 logo.setAttribute('src', 'http://'+host+'/static/img/logo.png');

-form.setAttribute('action', 'http://'+host+'/katalog/szukaj/');
+form.setAttribute('action', 'http://'+host+'/fullsearch/');

 form.setAttribute('method', 'get');
 form.setAttribute('accept-charset', 'utf-8');
 form.setAttribute('id', 'wl-form');
 form.setAttribute('method', 'get');
 form.setAttribute('accept-charset', 'utf-8');
 form.setAttribute('id', 'wl-form');

diff --git a/wolnelektury/templates/catalogue/book_short.html b/wolnelektury/templates/catalogue/book_short.html
index ee097ae..1b1eb4b 100644 (file)
--- a/wolnelektury/templates/catalogue/book_short.html
+++ b/wolnelektury/templates/catalogue/book_short.html
@@ -82,8 +82,8 @@
             <a href="{% url book_text book.slug %}" class="mono downarrow">{% trans "Read online" %}</a>
         {% endif %}
         </li>
             <a href="{% url book_text book.slug %}" class="mono downarrow">{% trans "Read online" %}</a>
         {% endif %}
         </li>

-        <li class="book-box-download">
-            <a class="mono downarrow">{% trans "Download" %}</a>
+        <li class="book-box-download hoverget">
+            <a class="mono downarrow hoverclick">{% trans "Download" %}</a>

             <div class="book-box-formats mono">
              {% if book.pdf_file %}
              <span><a href="{{ book.pdf_file.url}}">PDF</a> {% trans "to print" %}</span>
             <div class="book-box-formats mono">
              {% if book.pdf_file %}
              <span><a href="{{ book.pdf_file.url}}">PDF</a> {% trans "to print" %}</span>

diff --git a/wolnelektury/templates/catalogue/book_wide.html b/wolnelektury/templates/catalogue/book_wide.html
index 9c5c856..c683fce 100644 (file)
--- a/wolnelektury/templates/catalogue/book_wide.html
+++ b/wolnelektury/templates/catalogue/book_wide.html
@@ -52,6 +52,7 @@
     </ul>
   </div>
   <div class="other-download">
     </ul>
   </div>
   <div class="other-download">

+       {% if related.media.mp3 or related.media.ogg %}

     <h2 class="mono">{% trans "Download" %}</h2>
     <ul class="plain">
       <li>
     <h2 class="mono">{% trans "Download" %}</h2>
     <ul class="plain">
       <li>


@@ -61,10 +62,13 @@
        {% if related.media.ogg %}<a href="{% url download_zip_ogg book.slug %}">OGG</a>{% endif %}.
        {% endif %}
       </li>
        {% if related.media.ogg %}<a href="{% url download_zip_ogg book.slug %}">OGG</a>{% endif %}.
        {% endif %}
       </li>

+      {% comment %}

       <li>
        <a href="{% url custom_pdf_form %}?slug={{book.slug}}" id="custom-pdf" class="ajaxable">{% trans "Download a custom PDF" %}</a>
       </li>
       <li>
        <a href="{% url custom_pdf_form %}?slug={{book.slug}}" id="custom-pdf" class="ajaxable">{% trans "Download a custom PDF" %}</a>
       </li>

+      {% endcomment %}

     </ul>
     </ul>

+    {% endif %}

   </div>
 </div>
 {% endblock %}
   </div>
 </div>
 {% endblock %}

diff --git a/wolnelektury/templates/superbase.html b/wolnelektury/templates/superbase.html
index 19f4502..1cb43b0 100644 (file)
--- a/wolnelektury/templates/superbase.html
+++ b/wolnelektury/templates/superbase.html
@@ -124,8 +124,8 @@
                {% endcache %}
 
             <form action="{% url django.views.i18n.set_language %}" method="post">
                {% endcache %}
 
             <form action="{% url django.views.i18n.set_language %}" method="post">

-            <div id="lang-menu">
-                <span id='lang-button' class='mono'>
+            <div id="lang-menu" class="hoverget">
+                <span id='lang-button' class='mono hoverclick'>

                     <span class="lang-flag">⚐</span>
                     {% trans "Language versions" %}</span>
                 <div id="lang-menu-items">
                     <span class="lang-flag">⚐</span>
                     {% trans "Language versions" %}</span>
                 <div id="lang-menu-items">