{% block title %}{% endblock %} :: {% trans "Wolne Lektury" %}

From: Radek Czajka Date: Fri, 10 Jan 2014 16:05:13 +0000 (+0100) Subject: Merge branch 'master' into rwd X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/1e9113af163a3d002b0b9c3e8c339f22af5b848a?hp=--cc Merge branch 'master' into rwd Conflicts: apps/catalogue/templates/catalogue/book_short.html apps/picture/templates/picture/picture_short.html wolnelektury/settings/static.py --- 1e9113af163a3d002b0b9c3e8c339f22af5b848a diff --cc apps/catalogue/templates/catalogue/book_mini_box.html index b5c7d9735,74202fc2f..82038e712 --- a/apps/catalogue/templates/catalogue/book_mini_box.html +++ b/apps/catalogue/templates/catalogue/book_mini_box.html @@@ -1,21 -1,9 +1,15 @@@ - {% load thumbnail %}

+ {% if with_link %} + {% endif %} {% if book.cover %} - ${{ author_str }} â {{ book.title }}$ + ${{ author_str }} â {{ book.title }}$ {% endif %} + {% if show_lang %} + {{ book.language_code }} + {% endif %}

{{ author_str }} {{ book.title }} diff --cc apps/catalogue/templates/catalogue/book_short.html index 98f9bf880,d69757793..5757c6a03 --- a/apps/catalogue/templates/catalogue/book_short.html +++ b/apps/catalogue/templates/catalogue/book_short.html @@@ -1,11 -1,18 +1,10 @@@ {% load i18n %} {% load catalogue_tags social_tags %} - {% load thumbnail %}

- {% if book.cover %} - {% if main_link %}{% endif %} - Cover

- {% if main_link %}{% endif %} - {% endif %} - {% block cover-area-extra %}{% endblock %} -

@@@ -40,20 -47,6 +39,15 @@@

+ {% if book.cover %} + {% if main_link %}{% endif %} -

+ {% if main_link %}{% endif %} + {% endif %} + {% block cover-area-extra %}{% endblock %} +

{% spaceless %} diff --cc apps/catalogue/templates/catalogue/viewer_base.html index 1092ead87,000000000..dccd4e887 mode 100644,000000..100644 --- a/apps/catalogue/templates/catalogue/viewer_base.html +++ b/apps/catalogue/templates/catalogue/viewer_base.html @@@ -1,73 -1,0 +1,74 @@@ + +{% load i18n %} +{% load static from staticfiles %} +{% load compressed %} + + + + + {% block title %}{% endblock %} :: {% trans "Wolne Lektury" %} + + {% compressed_css "book_text" %} + {% block extrahead %}{% endblock %} + + + + + + + + {% block big-pane %} +

+ + {% block main %} +

+ {% block main-text %}{% endblock %} +

+ {% endblock main %} + {% endblock big-pane %} + + + + +

+ + + {% block js-dependencies %}{% endblock %} + + {% compressed_js "book_text" %} + - ++ {{ piwik_tag|safe }} + {% block extrabody %}{% endblock %} ++ + +