From e091de9b221b7817f301cd1500b01fd22a79c2f6 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Mon, 19 Mar 2012 10:25:40 +0100 Subject: [PATCH] random fixes --- apps/opds/views.py | 6 ++---- wolnelektury/static/css/book_box.css | 6 +++--- wolnelektury/static/css/header.css | 6 ++++-- wolnelektury/static/js/base.js | 2 ++ wolnelektury/static/js/widget.js | 2 +- wolnelektury/templates/catalogue/book_short.html | 4 ++-- wolnelektury/templates/catalogue/book_wide.html | 4 ++++ wolnelektury/templates/superbase.html | 4 ++-- 8 files changed, 20 insertions(+), 14 deletions(-) diff --git a/apps/opds/views.py b/apps/opds/views.py index dc094bba7..4f1bec09e 100644 --- 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. # -from base64 import b64encode import os.path from urlparse import urljoin -from urllib2 import unquote 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 full_url(book.root_ancestor.epub_file.url) + return full_url(book.epub_file.url) def item_enclosure_length(self, book): - return book.root_ancestor.epub_file.size + return book.epub_file.size @piwik_track class RootFeed(Feed): diff --git a/wolnelektury/static/css/book_box.css b/wolnelektury/static/css/book_box.css index 6b2806851..8dee81384 100755 --- 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-download:hover .book-box-formats span:first-child { +.book-box-download .book-box-formats span:first-child { 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; } diff --git a/wolnelektury/static/css/header.css b/wolnelektury/static/css/header.css index 080924066..1d0f5c4e2 100755 --- a/wolnelektury/static/css/header.css +++ b/wolnelektury/static/css/header.css @@ -208,11 +208,13 @@ a.menu span { margin: 0; } -#lang-menu:hover button { +#lang-menu:hover button, +#lang-menu.hover button { 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; diff --git a/wolnelektury/static/js/base.js b/wolnelektury/static/js/base.js index 33026ac04..32cdd7068 100755 --- a/wolnelektury/static/js/base.js +++ b/wolnelektury/static/js/base.js @@ -114,6 +114,8 @@ $('.open-player').click(function(event) { return false; }); + $('.hoverclick').click(function() {$(this).closest('.hoverget').toggleClass('hover');}); + $(function(){ $("#search").search();}); diff --git a/wolnelektury/static/js/widget.js b/wolnelektury/static/js/widget.js index d0581746c..d8e1feca7 100644 --- 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'); -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'); diff --git a/wolnelektury/templates/catalogue/book_short.html b/wolnelektury/templates/catalogue/book_short.html index ee097ae6a..1b1eb4b43 100644 --- a/wolnelektury/templates/catalogue/book_short.html +++ b/wolnelektury/templates/catalogue/book_short.html @@ -82,8 +82,8 @@ {% trans "Read online" %} {% endif %} -
  • - {% trans "Download" %} +
  • + {% trans "Download" %}
    {% if book.pdf_file %} PDF {% trans "to print" %} diff --git a/wolnelektury/templates/catalogue/book_wide.html b/wolnelektury/templates/catalogue/book_wide.html index 9c5c85697..c683fce61 100644 --- a/wolnelektury/templates/catalogue/book_wide.html +++ b/wolnelektury/templates/catalogue/book_wide.html @@ -52,6 +52,7 @@
    + {% if related.media.mp3 or related.media.ogg %}

    {% trans "Download" %}

    + {% endif %}
    {% endblock %} diff --git a/wolnelektury/templates/superbase.html b/wolnelektury/templates/superbase.html index 19f4502ce..1cb43b082 100644 --- a/wolnelektury/templates/superbase.html +++ b/wolnelektury/templates/superbase.html @@ -124,8 +124,8 @@ {% endcache %}
    -
    - +
    + ⚐ {% trans "Language versions" %}
    -- 2.20.1