{% extends "base.html" %}
- {% load cache i18n %}
+ {% load i18n %}
{% load thumbnail %}
- {% load common_tags catalogue_tags pagination_tags %}
+ {% load common_tags catalogue_tags %}
{% block titleextra %}{{ book.pretty_title }}{% endblock %}
{% block ogimage %}{% if book.cover %}{{ book.cover.url|build_absolute_uri:request }}{% endif %}{% endblock %}
{% work_list book_children %}
-<h2 class="main-last"><span class="mono">{% trans "See also" %}:</span></h2>
+<section class="see-also">
+<h1>{% trans "See also" %}:</h1>
{% related_books book %}
+</section>
{% endblock %}
{% load catalogue_tags social_tags %}
{% load thumbnail %}
<div class="{% block box-class %}book-box{% endblock %}">
-<div class="book-box-inner" style="position: relative;">
+<div class="book-box-inner">
+<div class="book-left-column">
-<div class="cover-area">
- {% if book.cover %}
- {% if main_link %}<a href="{{ main_link }}">{% endif %}
- <img src="
- {% thumbnail book.cover "139x193" as thumb %}
- {{ thumb.url }}
- {% empty %}
- {{ book.cover.url }}
- {% endthumbnail %}
- " alt="Cover" class="cover" />
- {% if main_link %}</a>{% endif %}
- {% endif %}
- {% block cover-area-extra %}{% endblock %}
-</div>
<div class="book-box-body">
<div class="book-box-head">
- <div class="mono author">
+ <div class="author">
- {% for name, slug in related.tags.author %}
- <a href="{% tag_url 'author' slug %}">{{ name }}</a>{% if not forloop.last %},
+ {% for tag in related.tags.author %}
+ <a href="{% tag_url 'author' tag.slug %}">{% related_tag_name tag %}</a>{% if not forloop.last %},
{% endif %}{% endfor %}{% for title, slug in related.parents %},
<a href="{% url 'book_detail' slug %}">{{ title }}</a>{% endfor %}
</div>
</div>
</div>
+<div class="cover-area">
+ {% if book.cover %}
+ {% if main_link %}<a href="{{ main_link }}">{% endif %}
+ <img src="
+ {% thumbnail book.cover "139x193" as thumb %}
+ {{ thumb.url }}
+ {% empty %}
+ {{ book.cover.url }}
+ {% endthumbnail %}
+ " alt="Cover" class="cover" />
+ {% if main_link %}</a>{% endif %}
+ {% endif %}
+ {% block cover-area-extra %}{% endblock %}
+</div>
<div class="tags">
{% spaceless %}
+ <span class="category">
<span class="mono"> {% trans "Epoch" %}:</span> <span class="book-box-tag">
- {% for name, slug in related.tags.epoch %}
- <a href="{% tag_url 'epoch' slug %}">{{ name }}</a>
+ {% for tag in related.tags.epoch %}
+ <a href="{% tag_url 'epoch' tag.slug %}">{% related_tag_name tag %}</a>
- {% if not forloop.last %}<span>, </span>{% endif %}
+ {% if not forloop.last %}<span>, </span>{% endif %}
{% endfor %}
- </span>
+ </span></span>
+ <span class="category">
<span class="mono"> {% trans "Kind" %}:</span> <span class="book-box-tag">
- {% for name, slug in related.tags.kind %}
- <a href="{% tag_url 'kind' slug %}">{{ name }}</a>
+ {% for tag in related.tags.kind %}
+ <a href="{% tag_url 'kind' tag.slug %}">{% related_tag_name tag %}</a>
- {% if not forloop.last %}<span>, </span>{% endif %}
+ {% if not forloop.last %}<span>, </span>{% endif %}
{% endfor %}
- </span>
+ </span></span>
+ <span class="category">
<span class="mono"> {% trans "Genre" %}:</span> <span class="book-box-tag">
- {% for name, slug in related.tags.genre %}
- <a href="{% tag_url 'genre' slug %}">{{ name }}</a>
+ {% for tag in related.tags.genre %}
+ <a href="{% tag_url 'genre' tag.slug %}">{% related_tag_name tag %}</a>
- {% if not forloop.last %}<span>, </span>{% endif %}
+ {% if not forloop.last %}<span>, </span>{% endif %}
{% endfor %}
- </span>
+ </span></span>
{% endspaceless %}
</div>
<ul class="book-box-tools">
<li class="book-box-read">
{% if book.html_file %}
- <a href="{% url 'book_text' book.slug %}" class="mono downarrow">{% trans "Read online" %}</a>
+ <a href="{% url 'book_text' book.slug %}" class="downarrow">{% trans "Read online" %}</a>
{% endif %}
</li>
<li class="book-box-download hoverget">
- <a class="mono downarrow hoverclick">{% trans "Download" %}</a>
- <div class="book-box-formats mono">
+ <a class="downarrow hoverclick">{% trans "Download" %}</a>
+ <div class="book-box-formats">
{% if book.pdf_file %}
<span><a href="{{ book.pdf_file.url}}">PDF</a> {% trans "to print" %}</span>
{% endif %}
</li>
<li class="book-box-audiobook">
{% if related.media.mp3 or related.media.ogg %}
- <a href="{% url 'book_player' book.slug %}" class="open-player mono downarrow">{% trans "Listen" %}</a>
+ <a href="{% url 'book_player' book.slug %}" class="open-player downarrow">{% trans "Listen" %}</a>
{% endif %}
</li>
</ul>
{% block book-box-extra-info %}{% endblock %}
{% block box-append %}
{% endblock %}
+ </div>
{% block right-column %}
{% endblock %}
<div class="clearboth"></div>
from django.utils.datastructures import SortedDict
from django.utils.http import urlquote_plus
from django.utils import translation
- from django.utils.translation import ugettext as _, ugettext_lazy
+ from django.utils.translation import get_language, ugettext as _, ugettext_lazy
from django.views.decorators.vary import vary_on_headers
from ajaxable.utils import JSONResponse, AjaxableFormView
@vary_on_headers('X-Requested-With')
def catalogue(request):
- cache_key='catalogue.catalogue'
+ cache_key='catalogue.catalogue/' + get_language()
output = permanent_cache.get(cache_key)
if output is None:
tags = models.Tag.objects.exclude(
context=None,
):
""" generates a listing of all books, optionally filtered with a test function """
+ cache_key = "%s/%s" % (cache_key, get_language())
cached = permanent_cache.get(cache_key)
if cached is not None:
rendered_nav, rendered_book_list = cached
related = book.related_info()
return render_to_response('catalogue/book_text.html', locals(),
context_instance=RequestContext(request))
+def book_text2(request, slug):
+ book = get_object_or_404(models.Book, slug=slug)
+
+ if not book.has_html_file():
+ raise Http404
+ related = book.related_info()
+ return render_to_response('catalogue/book_text_new.html', locals(),
+ context_instance=RequestContext(request))
# ==========
{% block ogtitle %}{% trans "Wolne Lektury internet library" %}{% endblock %}
{% block body %}
- <div id="big-cite"{% if cite.image %}
+ <section id="big-cite"{% if cite.image %}
style="
background-image: url('{{ cite.image.url }}');
background-position: 50% {{ cite.image_shift|default_if_none:50 }}%;
"{% endif %} >
{% render_cite cite %}
- </div>
+ </section>
{% spaceless %}
- <div id="promo-box">
- <div id="promo-box-header"><h2 class="mono">
- {% trans "What's new?" %}
- </h2></div>
- <div id="promo-box-body">
- {% chunk "promo" %}
- </div>
- </div>
+ <section id="promo-box">
+ <h1>{% trans "What's new?" %}</h1>
+ <div id="promo-box-body">
+ {% chunk "promo" %}
+ </div>
+ </section>
- <h2 class="main-last"><a href="{% url 'recent_list' %}"><span class="mono">{% trans "Recent publications" %}</span></a></h2>
+ <section id="main-last">
+ <h1><a href="{% url 'recent_list' %}">{% trans "Recent publications" %}</a></h1>
- {% cache 60 last-published-on-main %}
+ {% cache 60 last-published-on-main LANGUAGE_CODE %}
{% for book in last_published %}
{% book_mini book %}
{% endfor %}
{% endcache %}
+ </section>
<div class="clearboth"></div>
- <div class="infopages-box">
- <h2><span class='mono'>{% trans "News" %}</span></h2>
+ <section class="infopages-box">
+ <h1>{% trans "News" %}</h1>
{# 135 is the id of new publications category of our master blog. perhaps this URL should go to settings. #}
{% cache 1800 latest-blog-posts %}
{% latest_blog_posts "http://nowoczesnapolska.org.pl/feed/?cat=-135" %}
{% endcache %}
- </div>
+ </section>
- <div class="infopages-box">
- <h2><span class='mono'>{% trans "Utilities" %}</span></h2>
+ <section class="infopages-box">
+ <h1>{% trans "Utilities" %}</h2>
<ul>
<li><a href="{% url 'suggest' %}" id="suggest" class="ajaxable">{% trans "Report a bug or suggestion" %}</a></li>
<li><a href="http://polski.wolnelektury.pl" lang="pl">Materiały do nauki j. polskiego</a></li>
</ul>
- </div>
+ </section>
- <div class="infopages-box">
- <h2><span class='mono'>{% trans "Information" %}</span></h2>
+ <section class="infopages-box">
+ <h1>{% trans "Information" %}</h1>
<ul>
<li><a href="http://nowoczesnapolska.org.pl/prywatnosc/">{% trans "Privacy policy" %}</a></li>
{% cache 60 infopages-on-main LANGUAGE_CODE %}
<img src="{% static "img/social/nk.png" %}" alt="Wolne Lektury @ NK.pl" />
</a>
</div>
- </div>
+ </section>
{% endspaceless %}
fnp / wolnelektury.git / commitdiff