From 3c0e373447323b5e33b273859e790a2054771afa Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Wed, 20 Apr 2016 17:32:00 +0200 Subject: [PATCH] reformat templates --- lib/librarian | 2 +- src/ajaxable/templates/ajaxable/form.html | 14 +- .../templates/ajaxable/form_on_page.html | 14 +- src/api/templates/api/main.html | 155 +++++----- .../templates/catalogue/book_detail.html | 129 ++++---- .../templates/catalogue/book_fragments.html | 20 +- .../templates/catalogue/book_info.html | 46 +-- .../templates/catalogue/book_list.html | 22 +- .../templates/catalogue/book_searched.html | 60 ++-- .../templates/catalogue/book_short.html | 190 ++++++------ .../templates/catalogue/book_text.html | 154 +++++----- .../templates/catalogue/book_wide.html | 10 +- .../templates/catalogue/catalogue.html | 19 +- .../templates/catalogue/collection.html | 10 +- .../templates/catalogue/collection_box.html | 30 +- .../templates/catalogue/collection_list.html | 4 +- .../templates/catalogue/collections.html | 17 +- .../templates/catalogue/daisy_list.html | 6 +- .../catalogue/differentiate_tags.html | 16 +- .../templates/catalogue/fragment_promo.html | 6 +- .../templates/catalogue/fragment_short.html | 34 +-- .../templates/catalogue/inline_tag_list.html | 36 +-- .../templates/catalogue/picture_detail.html | 151 +++++----- .../templates/catalogue/picture_list.html | 31 +- .../templates/catalogue/plain_list.html | 32 +- src/catalogue/templates/catalogue/player.html | 132 ++++----- .../catalogue/recent_audiobooks_list.html | 10 +- .../catalogue/recent_daisy_list.html | 10 +- .../templates/catalogue/recent_list.html | 22 +- .../templates/catalogue/related_books.html | 25 +- .../catalogue/search_multiple_hits.html | 170 +++++------ .../templates/catalogue/search_no_hits.html | 31 +- .../templates/catalogue/search_too_short.html | 13 +- .../catalogue/snippets/audiobook_list.html | 14 +- .../catalogue/snippets/book_list.html | 14 +- .../catalogue/snippets/book_list_nav.html | 18 +- .../snippets/custom_pdf_link_li.html | 2 +- .../catalogue/snippets/license_icon.html | 5 +- .../catalogue/snippets/like_button.html | 21 +- .../templates/catalogue/tag_box.html | 17 +- .../templates/catalogue/tag_catalogue.html | 17 +- .../templates/catalogue/tag_list.html | 21 +- .../templates/catalogue/tag_list_split.html | 9 +- .../catalogue/tagged_object_list.html | 166 ++++++----- .../templates/catalogue/viewer_base.html | 113 ++++--- .../templates/catalogue/work-list.html | 22 +- .../templates/dictionary/note_list.html | 201 +++++++------ .../admin/funding/offer/change_form.html | 36 +-- .../funding/disable_notifications.html | 48 ++- .../templates/funding/includes/funding.html | 107 ++++--- .../templates/funding/includes/fundings.html | 38 ++- .../funding/includes/offer_status.html | 46 +-- .../funding/includes/offer_status_more.html | 40 +-- src/funding/templates/funding/no_thanks.html | 25 +- .../templates/funding/offer_detail.html | 78 +++-- src/funding/templates/funding/offer_list.html | 42 ++- .../funding/snippets/any_remaining.html | 4 +- src/funding/templates/funding/thanks.html | 78 +++-- .../templates/funding/widgets/amount.html | 28 +- src/funding/templates/funding/wlfund.html | 80 ++--- .../templates/infopages/infopage.html | 24 +- .../templates/infopages/on_main.html | 2 +- .../templates/lesmianator/lesmianator.html | 74 ++--- .../templates/lesmianator/poem.html | 109 +++---- .../templates/libraries/catalog_view.html | 21 +- .../templates/libraries/library_view.html | 15 +- .../templates/libraries/main_view.html | 22 +- .../templates/pdcounter/author_detail.html | 83 +++--- .../templates/pdcounter/book_stub_detail.html | 47 +-- .../admin/picture/picture/change_list.html | 16 +- src/picture/templates/picture/collection.html | 2 +- .../templates/picture/picture_detail.html | 17 +- .../templates/picture/picture_info.html | 16 +- .../templates/picture/picture_list_thumb.html | 21 +- .../templates/picture/picture_mini_box.html | 27 +- .../templates/picture/picture_short.html | 114 ++++---- .../templates/picture/picture_viewer.html | 124 ++++---- .../templates/picture/picture_wide.html | 133 +++++---- .../templates/picture/picturearea_short.html | 16 +- src/polls/templates/polls/poll.html | 14 +- src/reporting/templates/reporting/main.html | 54 ++-- src/search/templates/newsearch/search.html | 85 +++--- src/social/templates/social/cite_info.html | 20 +- src/social/templates/social/cite_promo.html | 39 ++- src/social/templates/social/my_shelf.html | 12 +- src/social/templates/social/sets_form.html | 14 +- src/social/templates/social/shelf_tags.html | 8 +- src/sponsors/templates/sponsors/page.html | 20 +- src/suggest/templates/publishing_suggest.html | 26 +- src/waiter/templates/waiter/wait.html | 125 ++++---- src/wolnelektury/static/js/base.js | 272 ++++++++--------- .../static/scss/main/book_box.scss | 1 + src/wolnelektury/templates/404.html | 19 +- src/wolnelektury/templates/500.html | 34 +-- src/wolnelektury/templates/503.html | 38 +-- src/wolnelektury/templates/account/base.html | 9 +- .../templates/admin/base_site.html | 6 +- .../admin/catalogue/book/change_form.html | 58 ++-- .../admin/catalogue/book/change_list.html | 11 +- src/wolnelektury/templates/annoy.html | 21 +- src/wolnelektury/templates/auth/login.html | 10 +- .../templates/auth/login_register.html | 27 +- src/wolnelektury/templates/auth/register.html | 2 +- .../templates/{ => base}/base.html | 2 +- .../templates/base/superbase.html | 178 +++++++++++ src/wolnelektury/templates/info/join_us.html | 35 ++- .../templates/latest_blog_posts.html | 12 +- src/wolnelektury/templates/main_page.html | 276 +++++++++--------- src/wolnelektury/templates/openid/login.html | 42 ++- .../templates/pagination/pagination.html | 29 +- .../templates/piston/authorize_token.html | 14 +- src/wolnelektury/templates/publish_plan.html | 15 +- src/wolnelektury/templates/site_base.html | 2 +- .../socialaccount/login_cancelled.html | 2 +- src/wolnelektury/templates/superbase.html | 194 ------------ src/wolnelektury/templates/user.html | 17 +- src/wolnelektury/templates/widget.html | 63 ++-- 117 files changed, 2775 insertions(+), 2825 deletions(-) rename src/wolnelektury/templates/{ => base}/base.html (70%) create mode 100644 src/wolnelektury/templates/base/superbase.html delete mode 100644 src/wolnelektury/templates/superbase.html diff --git a/lib/librarian b/lib/librarian index 90f6c5d93..7f5ff5c99 160000 --- a/lib/librarian +++ b/lib/librarian @@ -1 +1 @@ -Subproject commit 90f6c5d936cafdc51639b251591a909696ea4935 +Subproject commit 7f5ff5c99803e281dc90364cd6efb77b8d91fa26 diff --git a/src/ajaxable/templates/ajaxable/form.html b/src/ajaxable/templates/ajaxable/form.html index 963f411f7..af98d5158 100755 --- a/src/ajaxable/templates/ajaxable/form.html +++ b/src/ajaxable/templates/ajaxable/form.html @@ -4,19 +4,19 @@

{{ title }}

-{% ssi_csrf_token %} -{% if honeypot %} + class="cuteform{% if placeholdize %} hidelabels{% endif %}"> + {% ssi_csrf_token %} + {% if honeypot %} {% load honeypot %} {% render_honeypot_field %} -{% endif %} -
    + {% endif %} +
      {{ form.as_ul }}
      2. -
    +
-{% block extra %}{% endblock %} + {% block extra %}{% endblock %}
diff --git a/src/ajaxable/templates/ajaxable/form_on_page.html b/src/ajaxable/templates/ajaxable/form_on_page.html index 8e495234a..e5c27a807 100755 --- a/src/ajaxable/templates/ajaxable/form_on_page.html +++ b/src/ajaxable/templates/ajaxable/form_on_page.html @@ -1,18 +1,18 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% block titleextra %}{{ title }}{% endblock %} {% block body %} -
+
- {% include ajax_template %} + {% include ajax_template %} - {% if response_data.message %} -

{{ response_data.message }}

- {% endif %} + {% if response_data.message %} +

{{ response_data.message }}

+ {% endif %} -
+
{% endblock %} diff --git a/src/api/templates/api/main.html b/src/api/templates/api/main.html index 04244dc91..67ff426fe 100755 --- a/src/api/templates/api/main.html +++ b/src/api/templates/api/main.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load build_absolute_uri from fnp_common %} @@ -7,91 +7,90 @@ {% block bodyid %}api{% endblock %} {% block body %} +

API

-

API

+
+

+ {% url "api" as u %} + {% blocktrans with u=u|build_absolute_uri:request %} + WolneLektury.pl API resides under {{ u }}. + You can use it to access information about books, their fragments and + their metadata. + {% endblocktrans %} +

-
-

-{% url "api" as u %} -{% blocktrans with u=u|build_absolute_uri:request %} -WolneLektury.pl API resides under {{ u }}. -You can use it to access information about books, their fragments and -their metadata. -{% endblocktrans %} -

+

+ {% blocktrans %} + Default data serialization format is + JSON, + but you can also use XML by appending ?format=xml + query parameter to each URL. + {% endblocktrans %} +

-

-{% blocktrans %} -Default data serialization format is -JSON, -but you can also use XML by appending ?format=xml -query parameter to each URL. -{% endblocktrans %} -

+

+ {% blocktrans %} + The URLs in WolneLektury.pl API are: + {% endblocktrans %} +

-

-{% blocktrans %} -The URLs in WolneLektury.pl API are: -{% endblocktrans %} -

+ +

+ {% url "api_book" "studnia-i-wahadlo" as e1 %} + {% url "api_tag" "authors" "edgar-allan-poe" as e2 %} + {% blocktrans %} + Each element of those lists contains a link (in a "href") attibute + which points to individual resource's details, i.e.: + {{e1}} or + {{e2}}. + {% endblocktrans %} +

-

-{% url "api_book" "studnia-i-wahadlo" as e1 %} -{% url "api_tag" "authors" "edgar-allan-poe" as e2 %} -{% blocktrans %} -Each element of those lists contains a link (in a "href") attibute -which points to individual resource's details, i.e.: -{{e1}} or -{{e2}}. -{% endblocktrans %} -

+

+ {% blocktrans with "/api/authors/adam-mickiewicz/kinds/liryka/books/" as e %} + You can combine authors, epochs, genres and kinds to find only books matching + those criteria. For instance: + {{e}}. + {% endblocktrans %} +

-

-{% blocktrans with "/api/authors/adam-mickiewicz/kinds/liryka/books/" as e %} -You can combine authors, epochs, genres and kinds to find only books matching -those criteria. For instance: -{{e}}. -{% endblocktrans %} -

+

+ {% blocktrans with "/api/authors/adam-mickiewicz/kinds/liryka/parent_books/" as e %} + If you only want top-level books and not all the children, you can use /parent_books/, as in: + {{e}}. + {% endblocktrans %} +

-

-{% blocktrans with "/api/authors/adam-mickiewicz/kinds/liryka/parent_books/" as e %} -If you only want top-level books and not all the children, you can use /parent_books/, as in: -{{e}}. -{% endblocktrans %} -

- -

-{% url "api_fragment" "sen-nocy-letniej" "1290526312912-3814598192" as f %} -{% blocktrans with "/api/authors/william-shakespeare/themes/zabawa/fragments/" as e %} -The same way, using also books and themes, you can search for a list of fragments: -{{e}}. -Again, each entry has a "href" attribute which links to the fragment's details, i.e.: -{{f}}. -{% endblocktrans %} -

-
+

+ {% url "api_fragment" "sen-nocy-letniej" "1290526312912-3814598192" as f %} + {% blocktrans with "/api/authors/william-shakespeare/themes/zabawa/fragments/" as e %} + The same way, using also books and themes, you can search for a list of fragments: + {{e}}. + Again, each entry has a "href" attribute which links to the fragment's details, i.e.: + {{f}}. + {% endblocktrans %} +

+
{% endblock %} diff --git a/src/catalogue/templates/catalogue/book_detail.html b/src/catalogue/templates/catalogue/book_detail.html index 308318161..4f590ce79 100644 --- a/src/catalogue/templates/catalogue/book_detail.html +++ b/src/catalogue/templates/catalogue/book_detail.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load common_tags catalogue_tags %} {% load ssify %} @@ -13,68 +13,71 @@ {% block bodyid %}book-detail{% endblock %} {% block body %} - -{% ssi_include 'catalogue_book_wide' pk=book.pk %} - -{% work_list book_children %} - -{% spaceless %} -{% if book.other_versions %} -
-

{% trans "Other versions" %}:

-{% for rel in book.other_versions %} - {% cache 86400 book_mini_box rel.pk %} - {% include 'catalogue/book_mini_box.html' with book=rel %} - {% endcache %} - {#% ssi_include 'catalogue_book_mini' pk=rel.pk %#} -{% endfor %} -
-{% endif %} - -
-

{% trans "See also" %}:

-{% related_books book taken=book.other_versions|length %} -
-{% endspaceless %} - - - -{% with book.related_themes as themes %} -{% if themes %} -

{% trans "Themes" %}

- {% plain_list themes book=book %} -{% endif %} -{% endwith %} - - - -

{% trans "Information about the work" %}

-{% for tag in tags %} -
- + {% ssi_include 'catalogue_book_wide' pk=book.pk %} + + {% work_list book_children %} + + {% spaceless %} + {% if book.other_versions %} +
+

{% trans "Other versions" %}:

+ {% for rel in book.other_versions %} + {% cache 86400 book_mini_box rel.pk %} + {% include 'catalogue/book_mini_box.html' with book=rel %} + {% endcache %} + {#% ssi_include 'catalogue_book_mini' pk=rel.pk %#} + {% endfor %} +
+ {% endif %} + +
+

{% trans "See also" %}:

+ {% related_books book taken=book.other_versions|length %} +
+ {% endspaceless %} + + {% with book.related_themes as themes %} + {% if themes %} +

{% trans "Themes" %}

+ {% plain_list themes book=book %} + {% endif %} + {% endwith %} + + +

{% trans "Information about the work" %}

+ {% for tag in tags %} +
+ {% ssi_include 'catalogue_tag_box' pk=tag.pk %} - -
-{% endfor %} - - - {% if extra_info.source_url %} -
{% trans "Source" %} {% trans "of the book" %} - {% trans "in" %} {% source_name extra_info.source_url %}
- {% endif %} -
{% trans "Source XML file" %}
- {% if extra_info.about and not hide_about %} -
{% trans "Book on" %} {% trans "Editor's Platform" %}
- {% endif %} - {% if book.gazeta_link %} -
{% trans "Book description on Lektury.Gazeta.pl" %}
- {% endif %} - {% if book.wiki_link %} -
{% trans "Book description on Wikipedia" %}
- {% endif %} -
{% trans "Mix this book" %}
- - - + +
+ {% endfor %} + + + {% if extra_info.source_url %} +
+ {% trans "Source" %} {% trans "of the book" %} + {% trans "in" %} {% source_name extra_info.source_url %} +
+ {% endif %} +
{% trans "Source XML file" %}
+ {% if extra_info.about and not hide_about %} +
+ {% trans "Book on" %} {% trans "Editor's Platform" %} +
+ {% endif %} + {% if book.gazeta_link %} +
+ {% trans "Book description on Lektury.Gazeta.pl" %} +
+ {% endif %} + {% if book.wiki_link %} +
+ {% trans "Book description on Wikipedia" %} +
+ {% endif %} +
+ {% trans "Mix this book" %} +
{% endblock %} diff --git a/src/catalogue/templates/catalogue/book_fragments.html b/src/catalogue/templates/catalogue/book_fragments.html index d46f869d8..7696c149f 100644 --- a/src/catalogue/templates/catalogue/book_fragments.html +++ b/src/catalogue/templates/catalogue/book_fragments.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load work_list from catalogue_tags %} @@ -7,14 +7,14 @@ {% block bodyid %}tagged-object-list{% endblock %} {% block body %} -
-

{% trans "Theme" %} - {{ theme }} -
{% trans "in work " %} - {{ book }}

-
+
+

{% trans "Theme" %} + {{ theme }} +
{% trans "in work " %} + {{ book }}

+
-
- {% work_list fragments %} -
+
+ {% work_list fragments %} +
{% endblock %} diff --git a/src/catalogue/templates/catalogue/book_info.html b/src/catalogue/templates/catalogue/book_info.html index e245335ee..5b67ad631 100755 --- a/src/catalogue/templates/catalogue/book_info.html +++ b/src/catalogue/templates/catalogue/book_info.html @@ -2,18 +2,18 @@ {% load catalogue_tags %}

- {% if book.extra_info.license %} - {% trans "This work is licensed under:" %} - {{ book.extra_info.license_description }} - {% else %} - {% blocktrans %}This work isn't covered by copyright and is part of the - public domain, which means it can be freely used, published and - distributed. If there are any additional copyrighted materials - provided with this work (such as annotations, motifs etc.), those - materials are licensed under the - Creative Commons Attribution-ShareAlike 3.0 - license.{% endblocktrans %} - {% endif %} + {% if book.extra_info.license %} + {% trans "This work is licensed under:" %} + {{ book.extra_info.license_description }} + {% else %} + {% blocktrans %}This work isn't covered by copyright and is part of the + public domain, which means it can be freely used, published and + distributed. If there are any additional copyrighted materials + provided with this work (such as annotations, motifs etc.), those + materials are licensed under the + Creative Commons Attribution-ShareAlike 3.0 + license.{% endblocktrans %} + {% endif %}

{% if book.extra_info.source_name %} @@ -25,22 +25,26 @@ {% endif %} {% if book.extra_info.editor or book.extra_info.technical_editor %} -

{% if is_picture %} - {% trans "Edited by:" %} +

+ {% if is_picture %} + {% trans "Edited by:" %} {% else %} - {% trans "Edited and annotated by:" %} + {% trans "Edited and annotated by:" %} {% endif %} - {% all_editors book.extra_info %}.

+ {% all_editors book.extra_info %}. +

{% endif %} {% if book.extra_info.funders %} -

{% trans "Publication funded by:" %} - {% for funder in book.extra_info.funders %}{{ funder }}{% if not forloop.last %}, {% else %}.{% endif %}{% endfor %} +

+ {% trans "Publication funded by:" %} + {% for funder in book.extra_info.funders %}{{ funder }}{% if not forloop.last %}, {% else %}.{% endif %}{% endfor %}

{% endif %} {% if book.extra_info.cover_by %} -

{% trans "Cover image by:" %} - - {{ book.extra_info.cover_by }}.

+

+ {% trans "Cover image by:" %} + {{ book.extra_info.cover_by }}. +

{% endif %} diff --git a/src/catalogue/templates/catalogue/book_list.html b/src/catalogue/templates/catalogue/book_list.html index e29cd50ec..b5c3b60ca 100644 --- a/src/catalogue/templates/catalogue/book_list.html +++ b/src/catalogue/templates/catalogue/book_list.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load catalogue_tags %} {% load ssi_include from ssify %} @@ -8,14 +8,13 @@ {% block titleextra %}{% trans "Listing of all works" %}{% endblock %} {% block body %} -{% spaceless %} - + {% spaceless %}

{% block book_list_header %}{% trans "Listing of all works" %}{% endblock %}

- {% block book_list_info %} - {% ssi_include 'chunk' key='book-list' %} - {% endblock %} + {% block book_list_info %} + {% ssi_include 'chunk' key='book-list' %} + {% endblock %}
@@ -23,10 +22,10 @@
-

{% trans "Table of Content" %}

-
- {{ rendered_nav }} -
+

{% trans "Table of Content" %}

+
+ {{ rendered_nav }} +
{% block book_list %} @@ -34,6 +33,5 @@ {% endblock %}
{% trans "↑ top ↑" %} - -{% endspaceless %} + {% endspaceless %} {% endblock %} diff --git a/src/catalogue/templates/catalogue/book_searched.html b/src/catalogue/templates/catalogue/book_searched.html index 357491ce6..26b9f6130 100644 --- a/src/catalogue/templates/catalogue/book_searched.html +++ b/src/catalogue/templates/catalogue/book_searched.html @@ -1,38 +1,34 @@ {% spaceless %} + {% load i18n %} + {% load inline_tag_list from catalogue_tags %} + {% load ssi_include from ssify %} -{% load i18n %} -{% load inline_tag_list from catalogue_tags %} -{% load ssi_include from ssify %} +
+ {% ssi_include 'catalogue_book_short' pk=book.pk %} -
+
+ {% for hit in hits %} + {% if hit.snippet %} +
+ {{hit.snippet|safe}} +
+ {% elif hit.fragment %} +
+ {% if hit.themes_hit %} + {% inline_tag_list hit.themes_hit %} + {% endif %} + + {% if hit.snippet %} + {{hit.snippet|safe}} + {% else %} + {{hit.fragment.text|truncatewords_html:15|safe}} + {% endif %} + +
+ {% endif %} + {% endfor %} +
-{% ssi_include 'catalogue_book_short' pk=book.pk %} - -
- {% for hit in hits %} - {% if hit.snippet %} -
{{hit.snippet|safe}}
- {% else %} - {% if hit.fragment %} -
- {% if hit.themes_hit %} - {% inline_tag_list hit.themes_hit %} - {% endif %} - - {% if hit.snippet %} - {{hit.snippet|safe}} - {% else %} - {{hit.fragment.text|truncatewords_html:15|safe}} - {% endif %} - +
- {% endif %} - {% endif %} - {% endfor %} -
- -
- -
- {% endspaceless %} \ No newline at end of file diff --git a/src/catalogue/templates/catalogue/book_short.html b/src/catalogue/templates/catalogue/book_short.html index 6f5b19f47..0cba65cc9 100644 --- a/src/catalogue/templates/catalogue/book_short.html +++ b/src/catalogue/templates/catalogue/book_short.html @@ -1,129 +1,127 @@ {% spaceless %} -{% load i18n %} -{% load catalogue_tags %} -{% load book_shelf_tags from social_tags %} -
-
+ {% load i18n %} + {% load catalogue_tags %} + {% load book_shelf_tags from social_tags %} -{% block book-box-pre %} - {% include "catalogue/snippets/like_button.html" %} -{% endblock %} +
+
-
+ {% block book-box-pre %} + {% include "catalogue/snippets/like_button.html" %} + {% endblock %} -
+
+
{% block book-box-body-pre %} {% endblock %}
-
- {% for tag in tags.author %} - {{ tag.name }}{% if not forloop.last %}, - {% endif %}{% endfor %}{% for parent in parents %}, - {{ parent.title }}{% endfor %} -
-
- {% if main_link %}{% endif %}{{ book.title }}{% if main_link %}{% endif %} -
+
+ {% for tag in tags.author %} + {{ tag.name }}{% if not forloop.last %}, + {% endif %}{% endfor %}{% for parent in parents %}, + {{ parent.title }}{% endfor %} +
+
+ {% if main_link %}{% endif %}{{ book.title }}{% if main_link %}{% endif %} +
- {% if book.cover_thumb %} - {% if main_link %}{% endif %} - Cover - {% if main_link %}{% endif %} - {% endif %} - {% block cover-area-extra %}{% endblock %} + {% if book.cover_thumb %} + {% if main_link %}{% endif %} + Cover + {% if main_link %}{% endif %} + {% endif %} + {% block cover-area-extra %}{% endblock %}
- {% spaceless %} - - - {% trans "Epoch" %}:  - {% for tag in tags.epoch %} - {{ tag.name }} - {% if not forloop.last %}, {% endif %} - {% endfor %} - + + {% trans "Epoch" %}:  + {% for tag in tags.epoch %} + {{ tag.name }} + {% if not forloop.last %}, {% endif %} + {% endfor %} + - - {% trans "Kind" %}:  - {% for tag in tags.kind %} - {{ tag.name }} - {% if not forloop.last %}, {% endif %} - {% endfor %} - + + {% trans "Kind" %}:  + {% for tag in tags.kind %} + {{ tag.name }} + {% if not forloop.last %}, {% endif %} + {% endfor %} + - - {% trans "Genre" %}:  - {% for tag in tags.genre %} - {{ tag.name }} - {% if not forloop.last %}, {% endif %} - {% endfor %} - + + {% trans "Genre" %}:  + {% for tag in tags.genre %} + {{ tag.name }} + {% if not forloop.last %}, {% endif %} + {% endfor %} + - {% if show_lang %} + {% if show_lang %} - {% trans "Language" %}:  + {% trans "Language" %}:  {{ book.language_name }} - - {% endif %} - - {% if stage_note %} -
- {{ stage_note }} + - {% endif %} + {% endif %} - {% endspaceless %} + {% if stage_note %} +
+ + {{ stage_note }} + + {% endif %}
-
- {% book_shelf_tags book.pk %} +
+ {% book_shelf_tags book.pk %} -
    +
    • - {% if book.html_file %} + {% if book.html_file %} {% trans "Read online" %} - {% endif %} + {% endif %}
    • - {% trans "Download" %}: -
      - {% if book.pdf_file %} - PDF - {% endif %} - {% custom_pdf_link_li book %} - {% if book.epub_file %} - EPUB - {% endif %} - {% if book.mobi_file %} - MOBI - {% endif %} - {% if book.fb2_file %} - FB2 - {% endif %} - {% if book.txt_file %} - TXT - {% endif %} - {% download_audio book %} -
      + {% trans "Download" %}: +
      + {% if book.pdf_file %} + PDF + {% endif %} + {% custom_pdf_link_li book %} + {% if book.epub_file %} + EPUB + {% endif %} + {% if book.mobi_file %} + MOBI + {% endif %} + {% if book.fb2_file %} + FB2 + {% endif %} + {% if book.txt_file %} + TXT + {% endif %} + {% download_audio book %} +
      • -
    - {% block book-box-extra-info %}{% endblock %} - {% block box-append %} - {% endblock %} -
+ + {% block book-box-extra-info %}{% endblock %} + {% block box-append %} + {% endblock %} +
-{% block right-column %} - {% if audiobooks %} + {% block right-column %} + {% if audiobooks %}
- {% include 'catalogue/snippets/jplayer.html' %} + {% include 'catalogue/snippets/jplayer.html' %}
- {% endif %} -{% endblock %} + {% endif %} + {% endblock %} -
-
-
+
+
+
{% endspaceless %} diff --git a/src/catalogue/templates/catalogue/book_text.html b/src/catalogue/templates/catalogue/book_text.html index f51e565e6..5a6db1138 100644 --- a/src/catalogue/templates/catalogue/book_text.html +++ b/src/catalogue/templates/catalogue/book_text.html @@ -9,97 +9,107 @@ {% block menu %} -
  • - {{ book.pretty_title }} -
    • - -{% if book.other_versions.exists %} -
  • + + {{ book.pretty_title }} +
    • + + {% if book.other_versions.exists %} + -{% endif %} + {% endif %} - + - + - + - + - + {% endblock menu %} - {% block big-pane %} -
    +
    + +
    -
    - -
    - - {% endblock big-pane %} - - - {% block footer %} -
    - {% book_info book %} -
    - -{% if book.other_versions.exists %} - -{% endif %} - -
    +
    + {% book_info book %} +
    + + {% if book.other_versions.exists %} + + {% endif %} + + - - + +
    {% ssi_include 'catalogue_book_short' pk=book.pk %} -
    +
    {% endblock footer %} diff --git a/src/catalogue/templates/catalogue/book_wide.html b/src/catalogue/templates/catalogue/book_wide.html index aa78292a8..88cc0be32 100644 --- a/src/catalogue/templates/catalogue/book_wide.html +++ b/src/catalogue/templates/catalogue/book_wide.html @@ -1,6 +1,6 @@ {% extends "catalogue/book_short.html" %} {% load i18n %} -{% load choose_fragment download_audio custom_pdf_link_li license_icon source_name from catalogue_tags %} +{% load choose_fragment license_icon from catalogue_tags %} {% load choose_cite from social_tags %} {% load ssi_include from ssify %} @@ -9,9 +9,9 @@ {% block cover-area-extra %} -{% if extra_info.license %} - {% license_icon extra_info.license %} -{% endif %} + {% if extra_info.license %} + {% license_icon extra_info.license %} + {% endif %} {% endblock %} @@ -33,7 +33,7 @@ {% block book-box-body-pre %} - {% include "catalogue/snippets/like_button.html" %} + {% include "catalogue/snippets/like_button.html" %} {% endblock %} {% block book-box-pre %} diff --git a/src/catalogue/templates/catalogue/catalogue.html b/src/catalogue/templates/catalogue/catalogue.html index 1fc8b7b3d..482e8286c 100644 --- a/src/catalogue/templates/catalogue/catalogue.html +++ b/src/catalogue/templates/catalogue/catalogue.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load catalogue_tags %} @@ -8,14 +8,13 @@ {% block bodyid %}catalogue-catalogue{% endblock %} {% block body %} -

    {% trans "All works" %}

    - - -
    - -

    +

    {% trans "All works" %}

    +
    +

    + {% trans "Download the catalogue in PDF format." %} -

    + +

    {% trans "Literature" %}

    {% plain_list books by_author=True paged=False initial_blocks=True %} @@ -25,7 +24,5 @@

    {% trans "Gallery" %}

    {% plain_list pictures by_author=True paged=False initial_blocks=True %} - - -
    +
    {% endblock %} diff --git a/src/catalogue/templates/catalogue/collection.html b/src/catalogue/templates/catalogue/collection.html index cf43ef36b..7a08ab6c7 100755 --- a/src/catalogue/templates/catalogue/collection.html +++ b/src/catalogue/templates/catalogue/collection.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load catalogue_tags %} @@ -7,11 +7,9 @@ {% block bodyid %}collection{% endblock %} {% block body %} -

    {{ collection.title }}

    - - {{ collection.description|safe }} - - {% plain_list collection.get_books by_author=True %} +

    {{ collection.title }}

    + {{ collection.description|safe }} + {% plain_list collection.get_books by_author=True %} {% endblock %} diff --git a/src/catalogue/templates/catalogue/collection_box.html b/src/catalogue/templates/catalogue/collection_box.html index 1d9206b60..ac59fbe86 100644 --- a/src/catalogue/templates/catalogue/collection_box.html +++ b/src/catalogue/templates/catalogue/collection_box.html @@ -1,24 +1,24 @@ {% spaceless %} -{% load i18n %} -{% load ssi_include from ssify %} -{% load cache %} -
    + {% load i18n %} + {% load ssi_include from ssify %} + {% load cache %} +

    {% trans "Collection" %}: {{ obj }}

    {% if obj.description %} - {{ obj.description|safe|truncatewords_html:40 }} + {{ obj.description|safe|truncatewords_html:40 }} {% endif %} {% for book in obj.get_books|slice:":5" %} - {% cache 86400 book_mini_box book.pk %} - {% include 'catalogue/book_mini_box.html' %} - {% endcache %} - {#% ssi_include 'catalogue_book_mini' pk=book.pk %#} + {% cache 86400 book_mini_box book.pk %} + {% include 'catalogue/book_mini_box.html' %} + {% endcache %} + {#% ssi_include 'catalogue_book_mini' pk=book.pk %#} {% endfor %} {% with obj.get_books.count|add:-5 as more %} - {% if more > 0 %} - - {% blocktrans count c=more %}and one more{% plural %}and {{ c }} more{% endblocktrans %} - - {% endif %} + {% if more > 0 %} + + {% blocktrans count c=more %}and one more{% plural %}and {{ c }} more{% endblocktrans %} + + {% endif %} {% endwith %} -
    +
    {% endspaceless %} diff --git a/src/catalogue/templates/catalogue/collection_list.html b/src/catalogue/templates/catalogue/collection_list.html index 38466f157..f6b806e8f 100755 --- a/src/catalogue/templates/catalogue/collection_list.html +++ b/src/catalogue/templates/catalogue/collection_list.html @@ -1,5 +1,5 @@
      -{% for collection in collections %} + {% for collection in collections %}
    • {{ collection }}
      • -{% endfor %} + {% endfor %}
    diff --git a/src/catalogue/templates/catalogue/collections.html b/src/catalogue/templates/catalogue/collections.html index 1c6987278..2f8d1214b 100644 --- a/src/catalogue/templates/catalogue/collections.html +++ b/src/catalogue/templates/catalogue/collections.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load catalogue_tags %} {% load ssi_include from ssify %} @@ -8,15 +8,12 @@ {% block bodyid %}collections{% endblock %} {% block body %} -

    {% trans "Collections" %}

    - - {% for obj in best %} - {% ssi_include 'catalogue_collection_box' pk=obj.pk %} - {% endfor %} - -

    {% trans "All collections" %}

    - {% plain_list objects %} - +

    {% trans "Collections" %}

    + {% for obj in best %} + {% ssi_include 'catalogue_collection_box' pk=obj.pk %} + {% endfor %} +

    {% trans "All collections" %}

    + {% plain_list objects %} {% endblock %} diff --git a/src/catalogue/templates/catalogue/daisy_list.html b/src/catalogue/templates/catalogue/daisy_list.html index 65d9d6bcd..22a82d60f 100644 --- a/src/catalogue/templates/catalogue/daisy_list.html +++ b/src/catalogue/templates/catalogue/daisy_list.html @@ -7,11 +7,13 @@ {% block titleextra %}{% trans "Listing of all DAISY files" %}{% endblock %} {% block extrahead %} - + {% endblock %} {% block book_list_header %}{% trans "Listing of all DAISY files" %}{% endblock %} {% block book_list_info %} -{% ssi_include 'chunk' key='daisy-list' %} + {% ssi_include 'chunk' key='daisy-list' %} {% endblock %} diff --git a/src/catalogue/templates/catalogue/differentiate_tags.html b/src/catalogue/templates/catalogue/differentiate_tags.html index b8ef906ef..6c0fcfca4 100644 --- a/src/catalogue/templates/catalogue/differentiate_tags.html +++ b/src/catalogue/templates/catalogue/differentiate_tags.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load catalogue_tags %} @@ -7,14 +7,14 @@ {% block bodyid %}differentiate_tags{% endblock %} {% block body %} -

    {% title_from_tags tags %}

    +

    {% title_from_tags tags %}

    -

    {% trans "The criteria are ambiguous. Please select one of the following options:" %}

    +

    {% trans "The criteria are ambiguous. Please select one of the following options:" %}

    {% endblock %} diff --git a/src/catalogue/templates/catalogue/fragment_promo.html b/src/catalogue/templates/catalogue/fragment_promo.html index cf817ae7c..fc8de0cf6 100755 --- a/src/catalogue/templates/catalogue/fragment_promo.html +++ b/src/catalogue/templates/catalogue/fragment_promo.html @@ -1,8 +1,8 @@ {% if fragment %} - +
    - {{ fragment.get_short_text|safe }} + {{ fragment.get_short_text|safe }}

    {{ fragment.book.pretty_title }}

    -     + {% endif %} diff --git a/src/catalogue/templates/catalogue/fragment_short.html b/src/catalogue/templates/catalogue/fragment_short.html index b5921f215..935a1a545 100644 --- a/src/catalogue/templates/catalogue/fragment_short.html +++ b/src/catalogue/templates/catalogue/fragment_short.html @@ -2,25 +2,25 @@ {% load book_title_html from catalogue_tags %}
    - {% if fragment.short_text %} -
    -
    - - {{ fragment.short_text|safe }} - -
    - ↓ {% trans "Expand fragment" %} ↓ + {% if fragment.short_text %} +
    +
    + + {{ fragment.short_text|safe }} + +
    + ↓ {% trans "Expand fragment" %} ↓
    - {% endif %} -
    + {% endif %} +
    - + {{ fragment.text|safe }} - +
    - {% if fragment.short_text %} - ↑ {% trans "Hide fragment" %} ↑ - {% endif %} -
    -

    {% book_title_html fragment.book %}

    + {% if fragment.short_text %} + ↑ {% trans "Hide fragment" %} ↑ + {% endif %} +
    +

    {% book_title_html fragment.book %}

    diff --git a/src/catalogue/templates/catalogue/inline_tag_list.html b/src/catalogue/templates/catalogue/inline_tag_list.html index 802fcb19e..a552d9121 100755 --- a/src/catalogue/templates/catalogue/inline_tag_list.html +++ b/src/catalogue/templates/catalogue/inline_tag_list.html @@ -2,26 +2,26 @@ {% load catalogue_tags %} {% if choices %} - {% if category_choices %} -
      - {% for tag in category_choices %} -
    • {{ tag }} X
      • - {% endfor %} -
    - {% endif %} -{% endif %} -{% if tags %} + {% if category_choices %} + {% endif %} +{% endif %} +{% if tags %} + {% endif %} {% if other %} -
      -
    • {% trans "Other" %}:
      • - {% for tag in other %} -
    • {{ tag }}
      • - {% endfor %} -
    +
      +
    • {% trans "Other" %}:
      • + {% for tag in other %} +
    • {{ tag }}
      • + {% endfor %} +
    {% endif %} diff --git a/src/catalogue/templates/catalogue/picture_detail.html b/src/catalogue/templates/catalogue/picture_detail.html index b8b70c6be..5eeea7f5b 100644 --- a/src/catalogue/templates/catalogue/picture_detail.html +++ b/src/catalogue/templates/catalogue/picture_detail.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load catalogue_tags pagination_tags %} {% load thumbnail %} @@ -9,86 +9,85 @@ {% block bodyid %}picture-detail{% endblock %} {% block body %} -

    {{picture.title}}

    +

    {{picture.title}}

    -
    - +
    + + + {% thumbnail picture.image_file "400x500" upscale="false" as im %} + + {% endthumbnail %} - {% thumbnail picture.image_file "400x500" upscale="false" as im %} - - {% endthumbnail %} + {% if picture.info.license %} +

    {% trans "Work is licensed under " %} {{ picture.info.license_description }}.

    + {% endif %} +

    {% trans "Based on" %}: {{ picture.info.source_name }}

    + {% if picture.info.description %} +
    +
    {{ picture.info.description|safe }}
    + {#
    {{ picture.info.description|safe|truncatewords_html:30 }}
    #} +
    +

    + {% endif %} +
    - {% if picture.info.license %} -

    {% trans "Work is licensed under " %} {{ picture.info.license_description }}.

    +
    +
    +

    {% trans "Details" %}

    +
      +
    • + {% trans "Author" %}: + {% for tag in categories.author %} + {{ tag }}{% if not forloop.last %}, {% endif %} + {% endfor %} +
      • +
    • + {% trans "Epoch" %}: + {% for tag in categories.epoch %} + {{ tag }}{% if not forloop.last %}, {% endif %} + {% endfor %} +
      • +
    • + {% trans "Kind" %}: + {% for tag in categories.kind %} + {{ tag }}{% if not forloop.last %}, {% endif %} + {% endfor %} +
      • +
    +

    {% trans "Other resources" %}

    + +

    {% trans "View XML source" %}

    - -
    -
    -

    {% trans "Details" %}

    -
      -
    • - {% trans "Author" %}: - {% for tag in categories.author %} - {{ tag }}{% if not forloop.last %}, {% endif %} - {% endfor %} -
      • -
    • - {% trans "Epoch" %}: - {% for tag in categories.epoch %} - {{ tag }}{% if not forloop.last %}, {% endif %} - {% endfor %} -
      • -
    • - {% trans "Kind" %}: - {% for tag in categories.kind %} - {{ tag }}{% if not forloop.last %}, {% endif %} - {% endfor %} -
      • -
    -

    {% trans "Other resources" %}

    - -

    {% trans "View XML source" %}

    -
    -
    -

    {% trans "Work's themes " %}

    - -
    -
    +
    +

    {% trans "Work's themes " %}

    +
    +
    +
    {% endblock %} diff --git a/src/catalogue/templates/catalogue/picture_list.html b/src/catalogue/templates/catalogue/picture_list.html index ce61ec48b..60f2eb0d9 100644 --- a/src/catalogue/templates/catalogue/picture_list.html +++ b/src/catalogue/templates/catalogue/picture_list.html @@ -11,22 +11,19 @@ {% block book_list %} -{% for author, group in pictures_by_author.items %} - -
    -

    {{ author }}

    - {% for picture in group %} -
    - {% thumbnail picture.image_file "300x300" as im %} - - {% endthumbnail %} - {{picture.title}} -
    -
    + {% for author, group in pictures_by_author.items %} + +
    +

    {{ author }}

    + {% for picture in group %} +
    + {% thumbnail picture.image_file "300x300" as im %} + + {% endthumbnail %} + {{picture.title}} +
    +
    + {% endfor %} +
    {% endfor %} -
    - -{% endfor %} - {% endblock %} - diff --git a/src/catalogue/templates/catalogue/plain_list.html b/src/catalogue/templates/catalogue/plain_list.html index e26bb7f15..b96eb96cd 100644 --- a/src/catalogue/templates/catalogue/plain_list.html +++ b/src/catalogue/templates/catalogue/plain_list.html @@ -1,23 +1,21 @@ {% spaceless %} -{% load catalogue_tags %} + {% load catalogue_tags %} - -
    -
    +
    +
    -
    -
    - {% for initial, object_list in names %} - {% if initial_blocks %}
    {% endif %} - {% if initial %} -

    {{ initial }}

    - {% endif %} - {% for item in object_list %} -

    {{ item }}{% if item.count %} ({{ item.count}}){% endif %}

    +
    +
    + {% for initial, object_list in names %} + {% if initial_blocks %}
    {% endif %} + {% if initial %} +

    {{ initial }}

    + {% endif %} + {% for item in object_list %} +

    {{ item }}{% if item.count %} ({{ item.count}}){% endif %}

    + {% endfor %} + {% if initial_blocks %}
    {% endif %} {% endfor %} - {% if initial_blocks %}
    {% endif %} - {% endfor %} +
    -
    - {% endspaceless %} diff --git a/src/catalogue/templates/catalogue/player.html b/src/catalogue/templates/catalogue/player.html index 91f0fa6a0..2e32f711f 100755 --- a/src/catalogue/templates/catalogue/player.html +++ b/src/catalogue/templates/catalogue/player.html @@ -1,84 +1,74 @@ - {% load static from staticfiles %} - {% load i18n pipeline %} - {% load catalogue_tags %} - {% load thumbnail %} - {% load piwik_tags %} - - - - {% trans "Wolne Lektury" %} :: - {{ book.title }} - {{ audiobook }} - - {% stylesheet "all" %} - {% stylesheet "player" %} - - - - - {% if book.cover_thumb %} - Cover - {% endif %} + {% load static from staticfiles %} + {% load i18n pipeline %} + {% load catalogue_tags %} + {% load thumbnail %} + {% load piwik_tags %} + + + + {% trans "Wolne Lektury" %} :: + {{ book.title }} - {{ audiobook }} + + {% stylesheet "all" %} + {% stylesheet "player" %} + + + {% if book.cover_thumb %} + Cover + {% endif %} -

    {% book_title book %}

    +

    {% book_title book %}

    -
    -

    {% trans "Book's page" %}.

    -

    {% trans "Download as" %} {% download_audio book False %}.

    +
    +

    {% trans "Book's page" %}.

    +

    {% trans "Download as" %} {% download_audio book False %}.

    {% if book.has_daisy_file %} -

    DAISY:

    - +

    DAISY:

    + {% endif %} -
    +
    -
    - {% include "catalogue/snippets/jplayer.html" %} - - {% if projects|length > 1 %} -

    {% trans "Audiobooks were prepared as a part of the projects:" %}

    -
      - {% for cs, fb in projects %} -
    • - {% if fb %} - {% blocktrans %}{{ cs }}, funded by {{ fb }}{% endblocktrans %} - {% else %} - {{ cs }} - {% endif %} -
      • - {% endfor %} -
    - {% else %} -

    - {% with projects.0.0 as cs %} - {% with projects.0.1 as fb %} - {% if fb %} - {% blocktrans %}Audiobooks were prepared as a part of the {{ cs }} project funded by {{ fb }}.{% endblocktrans %} - {% else %} - {% blocktrans %}Audiobooks were prepared as a part of the {{ cs }} project.{% endblocktrans %} - {% endif %} - {% endwith %} - {% endwith %} -

    - {% endif %} +
    + {% include "catalogue/snippets/jplayer.html" %} + {% if projects|length > 1 %} +

    {% trans "Audiobooks were prepared as a part of the projects:" %}

    +
      + {% for cs, fb in projects %} +
    • + {% if fb %} + {% blocktrans %}{{ cs }}, funded by {{ fb }}{% endblocktrans %} + {% else %} + {{ cs }} + {% endif %} +
      • + {% endfor %} +
    + {% else %} +

    + {% with cs=projects.0.0 fb=projects.0.1 %} + {% if fb %} + {% blocktrans %}Audiobooks were prepared as a part of the {{ cs }} project funded by {{ fb }}.{% endblocktrans %} + {% else %} + {% blocktrans %}Audiobooks were prepared as a part of the {{ cs }} project.{% endblocktrans %} + {% endif %} + {% endwith %} +

    + {% endif %} - - {% javascript "player" %} + + {% javascript "player" %} - {% tracking_code %} - + {% tracking_code %} + diff --git a/src/catalogue/templates/catalogue/recent_audiobooks_list.html b/src/catalogue/templates/catalogue/recent_audiobooks_list.html index 762cb80d7..a597f0b88 100755 --- a/src/catalogue/templates/catalogue/recent_audiobooks_list.html +++ b/src/catalogue/templates/catalogue/recent_audiobooks_list.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load catalogue_tags %} @@ -7,9 +7,9 @@ {% block bodyid %}recent-list{% endblock %} {% block body %} -

    {% trans "Recent audiobooks" %}

    +

    {% trans "Recent audiobooks" %}

    -
    - {% work_list object_list %} -
    +
    + {% work_list object_list %} +
    {% endblock %} diff --git a/src/catalogue/templates/catalogue/recent_daisy_list.html b/src/catalogue/templates/catalogue/recent_daisy_list.html index 6675af206..2b0ab83ed 100755 --- a/src/catalogue/templates/catalogue/recent_daisy_list.html +++ b/src/catalogue/templates/catalogue/recent_daisy_list.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load catalogue_tags %} @@ -7,9 +7,9 @@ {% block bodyid %}recent-list{% endblock %} {% block body %} -

    {% trans "Recent DAISY files" %}

    +

    {% trans "Recent DAISY files" %}

    -
    - {% work_list object_list %} -
    +
    + {% work_list object_list %} +
    {% endblock %} diff --git a/src/catalogue/templates/catalogue/recent_list.html b/src/catalogue/templates/catalogue/recent_list.html index 28a96b831..f0fadb30b 100755 --- a/src/catalogue/templates/catalogue/recent_list.html +++ b/src/catalogue/templates/catalogue/recent_list.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load catalogue_tags %} @@ -7,16 +7,16 @@ {% block bodyid %}recent-list{% endblock %} {% block body %} -

    {% trans "Recent publications" %}

    +

    {% trans "Recent publications" %}

    - {% url 'recent_audiobooks_list' as a %} - {% url 'recent_daisy_list' as d %} -

    - {% blocktrans %}You can also see recent audiobooks - and recent DAISY files.{% endblocktrans %} -

    + {% url 'recent_audiobooks_list' as a %} + {% url 'recent_daisy_list' as d %} +

    + {% blocktrans %}You can also see recent audiobooks + and recent DAISY files.{% endblocktrans %} +

    -
    - {% work_list object_list %} -
    +
    + {% work_list object_list %} +
    {% endblock %} diff --git a/src/catalogue/templates/catalogue/related_books.html b/src/catalogue/templates/catalogue/related_books.html index 03d779342..74e680f59 100755 --- a/src/catalogue/templates/catalogue/related_books.html +++ b/src/catalogue/templates/catalogue/related_books.html @@ -1,29 +1,28 @@ {% spaceless %} -{% load catalogue_random_book from catalogue_tags %} -{% load picture_random_picture from picture_tags %} -{% load ssi_include from ssify %} -{% load cache %} + {% load catalogue_random_book from catalogue_tags %} + {% load picture_random_picture from picture_tags %} + {% load ssi_include from ssify %} + {% load cache %} -{% for pic in pics %} + {% for pic in pics %} {% ssi_include 'picture_mini' pk=pic.pk %} -{% endfor %} + {% endfor %} -{% for book in books %} + {% for book in books %} {% cache 86400 book_mini_box book.pk %} {% include 'catalogue/book_mini_box.html' %} {% endcache %} {#% ssi_include 'catalogue_book_mini' pk=book.pk %#} -{% endfor %} + {% endfor %} -{% if random %} + {% if random %} {% catalogue_random_book random_excluded_books as random_book_pk %} {% picture_random_picture random_excluded_pics unless=random_book_pk as random_pic_pk %} {{ random_book_pk.if }} - {% ssi_include 'catalogue_book_mini' pk=random_book_pk %} + {% ssi_include 'catalogue_book_mini' pk=random_book_pk %} {{ random_book_pk.endif }} {{ random_pic_pk.if }} - {% ssi_include 'picture_mini' pk=random_pic_pk %} + {% ssi_include 'picture_mini' pk=random_pic_pk %} {{ random_pic_pk.endif }} -{% endif %} - + {% endif %} {% endspaceless %} \ No newline at end of file diff --git a/src/catalogue/templates/catalogue/search_multiple_hits.html b/src/catalogue/templates/catalogue/search_multiple_hits.html index 24a7a7930..28e3985b9 100644 --- a/src/catalogue/templates/catalogue/search_multiple_hits.html +++ b/src/catalogue/templates/catalogue/search_multiple_hits.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load pagination_tags %} {% load inline_tag_list from catalogue_tags %} @@ -10,128 +10,132 @@ {% block bodyid %}tagged-object-list{% endblock %} {% block body %} - {% if did_you_mean %} - {% trans "Did you mean" %} {{did_you_mean|lower}}? + {% if did_you_mean %} + {% trans "Did you mean" %} + {{did_you_mean|lower}}? + {% endif %} + +
    + {% if tags.author %} +
    +

    {% trans "Authors" %}:

    + {% for tag in tags.author %} + + {% ssi_include "catalogue_tag_box" pk=tag.pk %} + + {% endfor %} +
    {% endif %} - -
    - {% if tags.author %} -
    -

    {% trans "Authors" %}:

    - {% for tag in tags.author %} - - {% ssi_include "catalogue_tag_box" pk=tag.pk %} - - {% endfor %} -
    - {% endif %} - {% if tags.kind %} -
    -

    {% trans "Kinds" %}:

    - {% for tag in tags.kind %} - - {% ssi_include "catalogue_tag_box" pk=tag.pk %} - - {% endfor %} -
    - {% endif %} - {% if tags.genre %} -
    -

    {% trans "Genres" %}:

    - {% for tag in tags.genre %} - - {% ssi_include "catalogue_tag_box" pk=tag.pk %} - - {% endfor %} -
    - {% endif %} - {% if tags.epoch %} -
    -

    {% trans "Epochs" %}:

    - {% for tag in tags.epoch %} - - {% ssi_include "catalogue_tag_box" pk=tag.pk %} - - {% endfor %} -
    - {% endif %} + {% if tags.kind %} +
    +

    {% trans "Kinds" %}:

    + {% for tag in tags.kind %} + + {% ssi_include "catalogue_tag_box" pk=tag.pk %} + + {% endfor %} +
    + {% endif %} + {% if tags.genre %} +
    +

    {% trans "Genres" %}:

    + {% for tag in tags.genre %} + + {% ssi_include "catalogue_tag_box" pk=tag.pk %} + + {% endfor %}
    + {% endif %} + {% if tags.epoch %} +
    +

    {% trans "Epochs" %}:

    + {% for tag in tags.epoch %} + + {% ssi_include "catalogue_tag_box" pk=tag.pk %} + + {% endfor %} +
    + {% endif %} +
    - {% if results.title %} + {% if results.title %}
    -

    {% trans "Results by title" %}

    +

    {% trans "Results by title" %}

      - {% for result in results.title %}
    1. - {% ssi_include 'catalogue_book_short' pk=result.book.pk %} -
      2. {% endfor %} + {% for result in results.title %} +
    2. + {% ssi_include 'catalogue_book_short' pk=result.book.pk %} +
      3. + {% endfor %}
    - {% endif %} + {% endif %} - {% if results.author %} + {% if results.author %}
    -

    {% trans "Results by authors" %}

    +

    {% trans "Results by authors" %}

      - {% for author in results.author %}
    1. {% ssi_include 'catalogue_book_short' pk=author.book.pk %}
      2. {% endfor %} + {% for author in results.author %} +
    2. {% ssi_include 'catalogue_book_short' pk=author.book.pk %}
      3. + {% endfor %}
    - {% endif %} + {% endif %} - {% if results.translator %} + {% if results.translator %}
    -

    {% trans "Results by translators" %}

    +

    {% trans "Results by translators" %}

      - {% for translator in results.translator %}
    1. {% ssi_include 'catalogue_book_short' pk=translator.book.pk %}
      2. {% endfor %} + {% for translator in results.translator %} +
    2. {% ssi_include 'catalogue_book_short' pk=translator.book.pk %}
      3. + {% endfor %}
    - {% endif %} + {% endif %} - {% if results.content %} -
    -
    + {% if results.content %} +
    +

    {% trans "Results in text" %}

    -
    -
    -
      - {% for result in results.content %} -
    1. +
    +
    +
      + {% for result in results.content %} +
    1. {% book_searched result %} -
      2. - {% endfor %} -
    -
    - {% endif %} + + {% endfor %} + +
    + {% endif %} - {% if results.other %} + {% if results.other %}
    -

    {% trans "Other results" %}

    +

    {% trans "Other results" %}

      - {% for result in results.other %} -
    1. - {% book_searched result %} -
      2. - {% endfor %} + {% for result in results.other %} +
    2. + {% book_searched result %} +
      3. + {% endfor %}
    - {% endif %} - - - + {% endif %} {% endblock %} diff --git a/src/catalogue/templates/catalogue/search_no_hits.html b/src/catalogue/templates/catalogue/search_no_hits.html index a2c9a63a7..50001f6ec 100644 --- a/src/catalogue/templates/catalogue/search_no_hits.html +++ b/src/catalogue/templates/catalogue/search_no_hits.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load catalogue_tags pagination_tags %} @@ -7,24 +7,25 @@ {% block bodyid %}tagged-object-list{% endblock %} {% block body %} -

    {% trans "Search" %}

    +

    {% trans "Search" %}

    -
    +
    -

    - {% if did_you_mean %} - {% trans "Did you mean" %} {{did_you_mean|lower}}? - {% endif %} +

    + {% if did_you_mean %} + {% trans "Did you mean" %} + {{did_you_mean|lower}}? + {% endif %}

    -

    {% trans "Sorry! Search cirteria did not match any resources." %}

    +

    {% trans "Sorry! Search cirteria did not match any resources." %}

    -

    {% blocktrans %}Search engine supports following criteria: title, author, theme/topic, epoch, kind and genre. - As for now we do not support full text search.{% endblocktrans %}

    - {% include "info/join_us.html" %} -
    +

    {% blocktrans %}Search engine supports following criteria: title, author, theme/topic, epoch, kind and genre. + As for now we do not support full text search.{% endblocktrans %}

    + {% include "info/join_us.html" %}
    +
    -
    - {% include "publishing_suggest.html" %} -
    +
    + {% include "publishing_suggest.html" %} +
    {% endblock %} diff --git a/src/catalogue/templates/catalogue/search_too_short.html b/src/catalogue/templates/catalogue/search_too_short.html index 62d0ad022..253a94b5c 100644 --- a/src/catalogue/templates/catalogue/search_too_short.html +++ b/src/catalogue/templates/catalogue/search_too_short.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load catalogue_tags pagination_tags %} @@ -7,11 +7,10 @@ {% block bodyid %}tagged-object-list{% endblock %} {% block body %} -

    {% trans "Search" %}

    - -
    -

    {% trans "Sorry! Search query must have at least two characters." %}

    - {% include "info/join_us.html" %} -
    +

    {% trans "Search" %}

    +
    +

    {% trans "Sorry! Search query must have at least two characters." %}

    + {% include "info/join_us.html" %} +
    {% endblock %} \ No newline at end of file diff --git a/src/catalogue/templates/catalogue/snippets/audiobook_list.html b/src/catalogue/templates/catalogue/snippets/audiobook_list.html index d7f599274..73f9f6ad3 100755 --- a/src/catalogue/templates/catalogue/snippets/audiobook_list.html +++ b/src/catalogue/templates/catalogue/snippets/audiobook_list.html @@ -2,11 +2,11 @@ {% audiobook_tree orphans books_by_parent %} {% for author, group in books_by_author.items %} - {% if group %} - -
    -

    {{ author }}

    - {% audiobook_tree group books_by_parent %} -
    - {% endif %} + {% if group %} + +
    +

    {{ author }}

    + {% audiobook_tree group books_by_parent %} +
    + {% endif %} {% endfor %} diff --git a/src/catalogue/templates/catalogue/snippets/book_list.html b/src/catalogue/templates/catalogue/snippets/book_list.html index 526dcbbcc..5f1a04fd7 100755 --- a/src/catalogue/templates/catalogue/snippets/book_list.html +++ b/src/catalogue/templates/catalogue/snippets/book_list.html @@ -2,11 +2,11 @@ {% book_tree orphans books_by_parent %} {% for author, group in books_by_author.items %} - {% if group %} - -
    -

    {{ author }}

    - {% book_tree group books_by_parent %} -
    - {% endif %} + {% if group %} + +
    +

    {{ author }}

    + {% book_tree group books_by_parent %} +
    + {% endif %} {% endfor %} diff --git a/src/catalogue/templates/catalogue/snippets/book_list_nav.html b/src/catalogue/templates/catalogue/snippets/book_list_nav.html index 258824df3..a08b6970b 100755 --- a/src/catalogue/templates/catalogue/snippets/book_list_nav.html +++ b/src/catalogue/templates/catalogue/snippets/book_list_nav.html @@ -1,10 +1,12 @@ {% for index, authors in books_nav.items %} - + {% endfor %} diff --git a/src/catalogue/templates/catalogue/snippets/custom_pdf_link_li.html b/src/catalogue/templates/catalogue/snippets/custom_pdf_link_li.html index 1528f3a30..fb381ed6c 100644 --- a/src/catalogue/templates/catalogue/snippets/custom_pdf_link_li.html +++ b/src/catalogue/templates/catalogue/snippets/custom_pdf_link_li.html @@ -1,4 +1,4 @@ {% load i18n %} {% if not NO_CUSTOM_PDF %} - {% trans "Download a custom PDF" %} + {% trans "Download a custom PDF" %} {% endif %} diff --git a/src/catalogue/templates/catalogue/snippets/license_icon.html b/src/catalogue/templates/catalogue/snippets/license_icon.html index 732e3bf92..0dbdad3c6 100755 --- a/src/catalogue/templates/catalogue/snippets/license_icon.html +++ b/src/catalogue/templates/catalogue/snippets/license_icon.html @@ -3,8 +3,7 @@ {% if license_url %} - {% trans + title="{% trans "Free license" %}: {{ license_description }}"> + {% trans {% endif %} diff --git a/src/catalogue/templates/catalogue/snippets/like_button.html b/src/catalogue/templates/catalogue/snippets/like_button.html index aa6969cd6..6f0902e58 100644 --- a/src/catalogue/templates/catalogue/snippets/like_button.html +++ b/src/catalogue/templates/catalogue/snippets/like_button.html @@ -2,13 +2,16 @@ {% load likes_book from social_tags %} {% likes_book book.pk as likes %}
    -
    - ★ -
    -
    -
    - {% ssi_csrf_token %} - -
    -
    +
    + ★ +
    +
    +
    + {% ssi_csrf_token %} + +
    +
    diff --git a/src/catalogue/templates/catalogue/tag_box.html b/src/catalogue/templates/catalogue/tag_box.html index 1398ca9fb..f76df32cb 100644 --- a/src/catalogue/templates/catalogue/tag_box.html +++ b/src/catalogue/templates/catalogue/tag_box.html @@ -1,10 +1,11 @@ {% spaceless %} -{% load i18n %} -{% load catalogue_tags %} -
    -

    {% trans tag.category as c %}{{ c|capfirst }}: {{ tag }}

    - {% if tag.description %} - {{ tag.description|strip_tag:"a"|safe|truncatewords_html:40 }} - {% endif %} -
    + {% load i18n %} + {% load catalogue_tags %} + +
    +

    {% trans tag.category as c %}{{ c|capfirst }}: {{ tag }}

    + {% if tag.description %} + {{ tag.description|strip_tag:"a"|safe|truncatewords_html:40 }} + {% endif %} +
    {% endspaceless %} diff --git a/src/catalogue/templates/catalogue/tag_catalogue.html b/src/catalogue/templates/catalogue/tag_catalogue.html index 22a678f3d..5f7e61b8d 100644 --- a/src/catalogue/templates/catalogue/tag_catalogue.html +++ b/src/catalogue/templates/catalogue/tag_catalogue.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load plain_list from catalogue_tags %} {% load ssi_include from ssify %} @@ -8,16 +8,15 @@ {% block bodyid %}tag-catalogue{% endblock %} {% block body %} -

    {{ title|title }} {% trans "on Wolne Lektury" %}

    +

    {{ title|title }} {% trans "on Wolne Lektury" %}

    -{% for tag in best %} - + {% for tag in best %} + {% ssi_include "catalogue_tag_box" pk=tag.pk %} - -{% endfor %} + + {% endfor %} -

    {{ whole_category }}

    - -{% plain_list tags %} +

    {{ whole_category }}

    + {% plain_list tags %} {% endblock %} diff --git a/src/catalogue/templates/catalogue/tag_list.html b/src/catalogue/templates/catalogue/tag_list.html index 2a7fd6a6b..69ed8a884 100644 --- a/src/catalogue/templates/catalogue/tag_list.html +++ b/src/catalogue/templates/catalogue/tag_list.html @@ -1,21 +1,22 @@ {% spaceless %} -{% load i18n %} -{% load catalogue_tags %} -{% if one_tag %} + {% load i18n %} + {% load catalogue_tags %} + + {% if one_tag %}

    {% trans "See full category" %} {{ one_tag }}

    -{% else %} + {% else %} -{% endif %} + {% endif %} {% endspaceless %} \ No newline at end of file diff --git a/src/catalogue/templates/catalogue/tag_list_split.html b/src/catalogue/templates/catalogue/tag_list_split.html index cb7ab26ec..d4769d126 100644 --- a/src/catalogue/templates/catalogue/tag_list_split.html +++ b/src/catalogue/templates/catalogue/tag_list_split.html @@ -1,10 +1,11 @@ {% load i18n %} + {% if books %} -

    {% trans "Literature" %}:

    -
    {{books|safe}}
    +

    {% trans "Literature" %}:

    +
    {{books|safe}}
    {% endif %} {% if pictures %} -

    {% trans "Gallery" %}:

    -
    {{pictures|safe}}
    +

    {% trans "Gallery" %}:

    +
    {{pictures|safe}}
    {% endif %} diff --git a/src/catalogue/templates/catalogue/tagged_object_list.html b/src/catalogue/templates/catalogue/tagged_object_list.html index 7603d7b97..f83c7d5cd 100644 --- a/src/catalogue/templates/catalogue/tagged_object_list.html +++ b/src/catalogue/templates/catalogue/tagged_object_list.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load catalogue_tags switch_tag social_tags %} {% load ssi_include from ssify %} @@ -8,120 +8,118 @@ {% block bodyid %}tagged-object-list{% endblock %} {% block body %} -
    +

    {% if tags %}{% html_title_from_tags tags %}{% endif %}

    - {% trans "Authors" %} - {% trans "Epochs" %} - {% trans "Genres" %} - {% trans "Kinds" %} - {% if theme_is_set %} - {% trans "Themes" %} - {% endif %} + {% trans "Authors" %} + {% trans "Epochs" %} + {% trans "Genres" %} + {% trans "Kinds" %} + {% if theme_is_set %} + {% trans "Themes" %} + {% endif %}
    -
    +
    -
    +
    - {% inline_tag_list categories.author tags 'author' list_type=list_type %} + {% inline_tag_list categories.author tags 'author' list_type=list_type %}
    - {% inline_tag_list categories.epoch tags 'epoch' list_type=list_type %} + {% inline_tag_list categories.epoch tags 'epoch' list_type=list_type %}
    - {% inline_tag_list categories.genre tags 'genre' list_type=list_type %} + {% inline_tag_list categories.genre tags 'genre' list_type=list_type %}
    - {% inline_tag_list categories.kind tags 'kind' list_type=list_type %} + {% inline_tag_list categories.kind tags 'kind' list_type=list_type %}
    {% if theme_is_set %} -
    - {% inline_tag_list categories.theme tags 'theme' list_type=list_type %} -
    +
    + {% inline_tag_list categories.theme tags 'theme' list_type=list_type %} +
    {% endif %} -
    +
    -{% comment %} -{% if list_type == 'books' and not tags %} + {% comment %} + {% if list_type == 'books' and not tags %}
    -

    {% trans "Recent publications" %}

    - {% for book in last_published %} - {% ssi_include 'catalogue_book_mini' pk=book.pk %} - {% endfor %} - {% trans "More recent publications" %} +

    {% trans "Recent publications" %}

    + {% for book in last_published %} + {% ssi_include 'catalogue_book_mini' pk=book.pk %} + {% endfor %} + {% trans "More recent publications" %}
    -

    {% trans "Most popular books" %}

    - {% for book in most_popular %} - {% ssi_include 'catalogue_book_mini' pk=book.pk %} - {% endfor %} +

    {% trans "Most popular books" %}

    + {% for book in most_popular %} + {% ssi_include 'catalogue_book_mini' pk=book.pk %} + {% endfor %}
    -{% endif %} -{% endcomment %} + {% endif %} + {% endcomment %} -{% if theme_is_set %} + {% if theme_is_set %} {% work_list object_list %} -{% else %} + {% else %}
    - {% if object_list %} - {% work_list best %} - {% if tags %} -

    {% trans "All matching works" %}

    - {% else %} - {% if list_type == 'audiobooks' %} -

    {% trans "Listing of all audiobooks" %}

    - {% else %} -

    {% trans "All works" %}

    - {% endif %} - {% endif %} - {% plain_list object_list by_author=True list_type=list_type %} - {% if daisy %} -

    {% trans "DAISY files" %}

    - {% plain_list daisy by_author=True %} - {% endif %} + {% if object_list %} + {% work_list best %} + {% if tags %} +

    {% trans "All matching works" %}

    {% else %} - {% trans "Sorry! Search cirteria did not match any resources." %} - {% include "info/join_us.html" %} + {% if list_type == 'audiobooks' %} +

    {% trans "Listing of all audiobooks" %}

    + {% else %} +

    {% trans "All works" %}

    + {% endif %} + {% endif %} + {% plain_list object_list by_author=True list_type=list_type %} + {% if daisy %} +

    {% trans "DAISY files" %}

    + {% plain_list daisy by_author=True %} {% endif %} + {% else %} + {% trans "Sorry! Search cirteria did not match any resources." %} + {% include "info/join_us.html" %} + {% endif %}
    {% if categories.theme and list_type != 'audiobooks' %} -

    {% trans "Motifs and themes" %}

    - {% plain_list categories.theme choice=tags list_type=list_type %} +

    {% trans "Motifs and themes" %}

    + {% plain_list categories.theme choice=tags list_type=list_type %} {% endif %} + {% endif %} -{% endif %} - -{% for tag in tags %} + {% for tag in tags %} {% if tag.category != 'set' %} -

    {% trans tag.category as c %}{{ c|capfirst }}: {{ tag }}

    -
    - {% if tag.has_description %} - {{ tag.description|safe }} - {% else %} - {% trans "No description." %} - {% endif %} -
    - - {% if tag.gazeta_link %} -
    - {{ tag }} {% trans "in Lektury.Gazeta.pl" %} -
    - {% endif %} - {% if tag.wiki_link %} -
    - - {{ tag }} {% trans "in Wikipedia" %} -
    - {% endif %} - {% if tag.culturepl_link %} -
    - - {{ tag }} {% trans "in Culture.pl" %} -
    +

    {% trans tag.category as c %}{{ c|capfirst }}: {{ tag }}

    +
    + {% if tag.has_description %} + {{ tag.description|safe }} + {% else %} + {% trans "No description." %} {% endif %} - {% endif %} -{% endfor %} +
    + {% if tag.gazeta_link %} +
    + {{ tag }} {% trans "in Lektury.Gazeta.pl" %} +
    + {% endif %} + {% if tag.wiki_link %} +
    + + {{ tag }} {% trans "in Wikipedia" %} +
    + {% endif %} + {% if tag.culturepl_link %} +
    + + {{ tag }} {% trans "in Culture.pl" %} +
    + {% endif %} + {% endif %} + {% endfor %} {% endblock %} diff --git a/src/catalogue/templates/catalogue/viewer_base.html b/src/catalogue/templates/catalogue/viewer_base.html index 2f2394b37..3a8372a72 100644 --- a/src/catalogue/templates/catalogue/viewer_base.html +++ b/src/catalogue/templates/catalogue/viewer_base.html @@ -4,72 +4,67 @@ {% load pipeline %} {% load piwik_tags %} - - - - {% block title %}{% endblock %} :: {% trans "Wolne Lektury" %} - - {% stylesheet "book_text" %} - {% block extrahead %}{% endblock %} + + + + {% block title %}{% endblock %} :: {% trans "Wolne Lektury" %} + + {% stylesheet "book_text" %} + {% block extrahead %}{% endblock %} + + + - - - - - - - {% block big-pane %} -
    + +
    + {% block big-pane %} {% block main %} -
    +
    {% block main-text %}{% endblock %} -
    +
    {% endblock main %} - {% endblock big-pane %} - - -
    - {% block footer %}{% endblock %} - -
    - - {# template #} -
    -
    {% trans "Close" %}
    -
    -

    * {% trans "Loading" %}

    -
    -
    -
    + {% endblock big-pane %} +
    + {% block footer %}{% endblock %} +
    + {# template #} +
    +
    {% trans "Close" %}
    +
    +

    * {% trans "Loading" %}

    +
    +
    +
    - - {% block js-dependencies %}{% endblock %} - - {% javascript "book_text" %} + + {% block js-dependencies %}{% endblock %} + + {% javascript "book_text" %} - {% tracking_code %} - {% block extrabody %}{% endblock %} - - + {% tracking_code %} + {% block extrabody %}{% endblock %} + + diff --git a/src/catalogue/templates/catalogue/work-list.html b/src/catalogue/templates/catalogue/work-list.html index 30265255a..03833c16f 100755 --- a/src/catalogue/templates/catalogue/work-list.html +++ b/src/catalogue/templates/catalogue/work-list.html @@ -1,19 +1,19 @@ {% spaceless %} -{% load pagination_tags %} -{% load class_name from catalogue_tags %} -{% load ssi_include from ssify %} + {% load pagination_tags %} + {% load class_name from catalogue_tags %} + {% load ssi_include from ssify %} -{% autopaginate object_list 10 %} + {% autopaginate object_list 10 %} -
      -{% for item in object_list %} -
    1. +
        + {% for item in object_list %} +
      1. {% ssi_include item.short_html_url_name pk=item.pk %} -
        2. -{% endfor %} -
      +
      2. + {% endfor %} +
    -{% paginate %} + {% paginate %} {% endspaceless %} diff --git a/src/dictionary/templates/dictionary/note_list.html b/src/dictionary/templates/dictionary/note_list.html index 9428655b0..3083e0479 100755 --- a/src/dictionary/templates/dictionary/note_list.html +++ b/src/dictionary/templates/dictionary/note_list.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n pagination_tags %} {% load set_get from set_get %} @@ -9,108 +9,103 @@ {% block body %} -

    {% trans "Footnotes" %}

    - -
    - -

    -{% trans "By first letter" %}: -{% if letter %} - {% trans "all" %} -{% else %} - {% trans "all" %} -{% endif %} - -{% for let in letters %} - | - {% if let == letter %} - {{ let|upper }} - {% else %} - {{ let|upper }} - {% endif %} -{% endfor %} -

    - -

    -{% trans "By type" %}: -{% if fn_type %} - {% trans "all" %} -{% else %} - {% trans "all" %} -{% endif %} - -{% for fnt, fnt_name in fn_types %} - | - {% if fnt == fn_type %} - {{ fnt_name }} - {% else %} - {{ fnt_name }} - {% endif %} -{% endfor %} -

    - - -

    -{% trans "By qualifier" %}: -{% if qualifier %} - {% trans "all" %} -{% else %} - {% trans "all" %} -{% endif %} - -{% for qual in qualifiers %} - | - {% if qual == qualifier %} - {{ qual }} - {% else %} - {{ qual }} - {% endif %} -{% endfor %} -

    - -

    -{% trans "By language" %}: -{% if language %} - {% trans "all" %} -{% else %} - {% trans "all" %} -{% endif %} - -{% for lang, lang_name in languages %} - | - {% if lang == language %} - {{ lang_name }} - {% else %} - {{ lang_name }} - {% endif %} -{% endfor %} -

    - -
    - -

    -{% blocktrans count object_list.count as c %}{{c}} footnote found{% plural %}{{c}} footnotes found{% endblocktrans %} -

    - -{% if object_list.exists %} - -{% autopaginate object_list 100 %} -{% paginate %} -{% for obj in object_list %} -
    - {{ obj.html|safe }} - {% for note_source in obj.notesource_set.all %} +

    {% trans "Footnotes" %}

    + +
    +

    + {% trans "By first letter" %}: + {% if letter %} + {% trans "all" %} + {% else %} + {% trans "all" %} + {% endif %} + + {% for let in letters %} + | + {% if let == letter %} + {{ let|upper }} + {% else %} + {{ let|upper }} + {% endif %} + {% endfor %} +

    + +

    + {% trans "By type" %}: + {% if fn_type %} + {% trans "all" %} + {% else %} + {% trans "all" %} + {% endif %} + + {% for fnt, fnt_name in fn_types %} + | + {% if fnt == fn_type %} + {{ fnt_name }} + {% else %} + {{ fnt_name }} + {% endif %} + {% endfor %} +

    + + +

    + {% trans "By qualifier" %}: + {% if qualifier %} + {% trans "all" %} + {% else %} + {% trans "all" %} + {% endif %} + + {% for qual in qualifiers %} + | + {% if qual == qualifier %} + {{ qual }} + {% else %} + {{ qual }} + {% endif %} + {% endfor %} +

    + +

    + {% trans "By language" %}: + {% if language %} + {% trans "all" %} + {% else %} + {% trans "all" %} + {% endif %} + + {% for lang, lang_name in languages %} + | + {% if lang == language %} + {{ lang_name }} + {% else %} + {{ lang_name }} + {% endif %} + {% endfor %} +

    + +
    + +

    + {% blocktrans count object_list.count as c %}{{c}} footnote found{% plural %}{{c}} footnotes found{% endblocktrans %} +

    + + {% if object_list.exists %} + {% autopaginate object_list 100 %} + {% paginate %} + {% for obj in object_list %} +
    + {{ obj.html|safe }} + {% for note_source in obj.notesource_set.all %}
    - {{ note_source.book.pretty_title }} - (źródło na Platformie Redakcyjnej) + {{ note_source.book.pretty_title }} + (źródło na Platformie Redakcyjnej)
    - {% endfor %} -
    -{% endfor %} -{% paginate %} - -{% endif %} - -
    - + {% endfor %} +
    + {% endfor %} + {% paginate %} + {% endif %} +
    {% endblock %} diff --git a/src/funding/templates/admin/funding/offer/change_form.html b/src/funding/templates/admin/funding/offer/change_form.html index 292d0dfeb..3a7392e4a 100755 --- a/src/funding/templates/admin/funding/offer/change_form.html +++ b/src/funding/templates/admin/funding/offer/change_form.html @@ -2,30 +2,26 @@ {% load i18n %} {% block extrahead %} -{{ block.super }} - + })(django.jQuery); + {% endblock %} - - {% block pretitle %} - - -↓ {% trans "fundings" %} ↓ - + {{ block.super }} {% endblock %} diff --git a/src/funding/templates/funding/disable_notifications.html b/src/funding/templates/funding/disable_notifications.html index 9123310d9..ed5c3a677 100644 --- a/src/funding/templates/funding/disable_notifications.html +++ b/src/funding/templates/funding/disable_notifications.html @@ -1,34 +1,28 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load fnp_share %} {% block titleextra %}{% trans "Payment failed" %}{% endblock %} {% block body %} - -

    {% trans "Disable notifications" %}

    -
    - -{% if view.object.notifications %} - -

    {% blocktrans with e=view.object.email %}Are you sure you want to disable notifications for address {{e}}?{% endblocktrans %}

    -
    - -
    - -{% else %} - -

    {% blocktrans with e=view.object.email %}Notifications for address {{e}} have been successfully disabled.{% endblocktrans %}

    - -{% endif %} - -{% url 'funding_current' as current %} -

    -{% blocktrans with current=current %}Return to the current fundraiser.{% endblocktrans %} -

    - - -
    - - +

    {% trans "Disable notifications" %}

    +
    + {% if view.object.notifications %} +

    + {% blocktrans with e=view.object.email %}Are you sure you want to disable notifications for address {{e}}?{% endblocktrans %} +

    +
    + +
    + {% else %} +

    + {% blocktrans with e=view.object.email %}Notifications for address {{e}} have been successfully disabled.{% endblocktrans %} +

    + {% endif %} + + {% url 'funding_current' as current %} +

    + {% blocktrans with current=current %}Return to the current fundraiser.{% endblocktrans %} +

    +
    {% endblock %} diff --git a/src/funding/templates/funding/includes/funding.html b/src/funding/templates/funding/includes/funding.html index c8f62d275..3d24b7df2 100644 --- a/src/funding/templates/funding/includes/funding.html +++ b/src/funding/templates/funding/includes/funding.html @@ -1,72 +1,69 @@ {% spaceless %} + {% load i18n %} + {% load time_tags %} -{% load i18n %} -{% load time_tags %} - -{% if offer %} - -
    - {% if closeable %}X{% endif %} - {% if link and is_current %} + {% if offer %} +
    + {% if closeable %}X{% endif %} + {% if link and is_current %}
    - - {% trans "Support!" %} -
    - {% trans "Learn more" %} -
    + + {% trans "Support!" %} + +
    + {% trans "Learn more" %} +
    - {% endif %} -
    - {% if link %}{% endif %} - {% if show_title %} + {% endif %} +
    + {% if link %} + + {% endif %} + {% if show_title %} {% if is_current and show_title_calling %}{% trans "Help free the book!" %}{% endif %} {{ offer }} - {% endif %} + {% endif %} -
    +
    {% if sum %} - {% trans "collected" %}: {{ sum }} zł + {% trans "collected" %}: {{ sum }} zł {% endif %} {% if not is_win %} - {% trans "needed" %}: {{ offer.target }} zł + {% trans "needed" %}: {{ offer.target }} zł {% endif %} {% if is_current %} - {% trans "until fundraiser end" %}: - - + {% trans "until fundraiser end" %}: + + {% else %}
    {% endif %} +
    + {% if link %}    {% endif %} +
    +
    - {% if link %}{% endif %} -
    -
    -
    -{% if closeable %} -
    {% trans "Help free the book!" %}
    - - - -{% endif %} - - -{% endif %} - + {% if closeable %} +
    {% trans "Help free the book!" %}
    + + {% endif %} + {% endif %} {% endspaceless %} diff --git a/src/funding/templates/funding/includes/fundings.html b/src/funding/templates/funding/includes/fundings.html index e13e1ec18..4d4902c84 100644 --- a/src/funding/templates/funding/includes/fundings.html +++ b/src/funding/templates/funding/includes/fundings.html @@ -1,28 +1,26 @@ {% spaceless %} + {% load i18n %} + {% load pagination_tags %} -{% load i18n %} -{% load pagination_tags %} - - - -{% for funding in fundings %} - +
    + {% for funding in fundings %} + -{% endfor %} -
    {{ funding.payed_at.date }} - {% if funding.name %} - {{ funding.name }} - {% else %} - {% trans "Anonymous" %} - {% endif %} + {% if funding.name %} + {{ funding.name }} + {% else %} + {% trans "Anonymous" %} + {% endif %} {{ funding.amount }} zł   - {% for perk in funding.perks.all %} - {{ perk.name }}{% if not forloop.last %},{% endif %} - {% endfor %} + {% for perk in funding.perks.all %} + {{ perk.name }}{% if not forloop.last %},{% endif %} + {% endfor %}
    - -{% endspaceless %}{% paginate %} - + + {% endfor %} + +{% endspaceless %} +{% paginate %} \ No newline at end of file diff --git a/src/funding/templates/funding/includes/offer_status.html b/src/funding/templates/funding/includes/offer_status.html index 4d5ae05ea..ec6e95482 100644 --- a/src/funding/templates/funding/includes/offer_status.html +++ b/src/funding/templates/funding/includes/offer_status.html @@ -1,31 +1,31 @@ {% load i18n %} {% if offer.is_current %} - {% if offer.is_win %} -

    - {% blocktrans with end=offer.end %}The fundraiser - ends on {{ end }}. The full amount has been successfully - raised, but you can still contribute and help liberate - more books.{% endblocktrans %} -

    - {% else %} + {% if offer.is_win %}

    - {% blocktrans with target=offer.target|floatformat:-2 %}We need {{target}} zł to digitize it, - compile it and publish for free in multiple formats.{% endblocktrans %} + {% blocktrans with end=offer.end %}The fundraiser + ends on {{ end }}. The full amount has been successfully + raised, but you can still contribute and help liberate + more books.{% endblocktrans %}

    + {% else %} +

    + {% blocktrans with target=offer.target|floatformat:-2 %}We need {{target}} zł to digitize it, + compile it and publish for free in multiple formats.{% endblocktrans %} +

    +

    + {% blocktrans with end=offer.end %}If we raise enough money before {{end}} we will + publish it and make it available for everyone.{% endblocktrans %} +

    + {% endif %} +{% else %} + {% if offer.is_win %}

    - {% blocktrans with end=offer.end %}If we raise enough money before {{end}} we will - publish it and make it available for everyone.{% endblocktrans %} + {% trans "Full amount was successfully raised!" %}

    - {% endif %} -{% else %} - {% if offer.is_win %} -

    - {% trans "Full amount was successfully raised!" %} -

    - {% else %} -

    - {% trans "The amount needed was not raised." %} -

    - {% endif %} + {% else %} +

    + {% trans "The amount needed was not raised." %} +

    + {% endif %} {% endif %} diff --git a/src/funding/templates/funding/includes/offer_status_more.html b/src/funding/templates/funding/includes/offer_status_more.html index c94c9a801..cca6423b2 100644 --- a/src/funding/templates/funding/includes/offer_status_more.html +++ b/src/funding/templates/funding/includes/offer_status_more.html @@ -1,26 +1,26 @@ {% load i18n %} {% if offer.is_current %} -

    - {% include "funding/snippets/any_remaining.html" %} -

    +

    + {% include "funding/snippets/any_remaining.html" %} +

    {% else %} -

    {% trans "Fundraiser span" %}: {{ offer.start }} – {{ offer.end }}

    - {% if offer.is_win %} -

    - {% if offer.book %} - {% blocktrans with bu=offer.book.get_absolute_url bt=offer.book %}The book - {{ bt }} has been already published.{% endblocktrans %} - {% else %} - {% if offer.redakcja_url %} - {% blocktrans with r=offer.redakcja_url %}You can follow - the work on the Editorial Platform.{% endblocktrans %} - {% endif %} - {% endif %} -

    - {% endif %} +

    {% trans "Fundraiser span" %}: {{ offer.start }} – {{ offer.end }}

    + {% if offer.is_win %} +

    + {% if offer.book %} + {% blocktrans with bu=offer.book.get_absolute_url bt=offer.book %}The book + {{ bt }} has been already published.{% endblocktrans %} + {% else %} + {% if offer.redakcja_url %} + {% blocktrans with r=offer.redakcja_url %}You can follow + the work on the Editorial Platform.{% endblocktrans %} + {% endif %} + {% endif %} +

    + {% endif %} - {% if offer.remaining %} -

    {% include "funding/snippets/any_remaining.html" %}

    - {% endif %} + {% if offer.remaining %} +

    {% include "funding/snippets/any_remaining.html" %}

    + {% endif %} {% endif %} diff --git a/src/funding/templates/funding/no_thanks.html b/src/funding/templates/funding/no_thanks.html index 3c8db166e..b9f25959f 100644 --- a/src/funding/templates/funding/no_thanks.html +++ b/src/funding/templates/funding/no_thanks.html @@ -1,23 +1,16 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load fnp_share %} {% block titleextra %}{% trans "Payment failed" %}{% endblock %} {% block body %} - -

    {% trans "Payment failed" %}

    -
    - -

    {% trans "You're support has not been processed successfully." %}

    - -{% url 'funding_current' as current %} -

    -{% blocktrans with current=current %}Return to the current fundraiser and try again or try to use a different payment method.{% endblocktrans %} -

    - - -
    - - +

    {% trans "Payment failed" %}

    +
    +

    {% trans "You're support has not been processed successfully." %}

    + {% url 'funding_current' as current %} +

    + {% blocktrans with current=current %}Return to the current fundraiser and try again or try to use a different payment method.{% endblocktrans %} +

    +
    {% endblock %} diff --git a/src/funding/templates/funding/offer_detail.html b/src/funding/templates/funding/offer_detail.html index 70930c400..535008123 100644 --- a/src/funding/templates/funding/offer_detail.html +++ b/src/funding/templates/funding/offer_detail.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load url from future %} {% load i18n static %} {% load pagination_tags %} @@ -16,62 +16,56 @@ {% block body %} +

    {{ object }}

    -

    {{ object }}

    - -{% ssi_include 'funding_detail_bar' pk=object.pk %} -
    + {% ssi_include 'funding_detail_bar' pk=object.pk %} +
    - {% if object.cover %} - Cover - {% endif %} -
    + {% if object.cover %} + Cover + {% endif %} +

    {% trans "Help free the book!" %}

    {{ object.description|safe }} {% ssi_include 'funding_status' pk=object.pk %} 1%Możesz też przekazać
    1% podatku na rozwój biblioteki. →     {% ssi_include 'funding_status_more' pk=object.pk %}

    {% trans "Learn more" %}.

    -
    - -
    +
    + +
    {% if object.is_current %} -
    -

    {% trans "Support the publication" %}

    -
    - - {{ form.as_table }} - -
    - -
    -
    -
    - - {% url 'funding_current' object.slug as current %} -

    {% trans "Tell your friends!" %}

    - +
    +

    {% trans "Support the publication" %}

    +
    + + {{ form.as_table }} + + + + +
    + +
    +
    +
    + + {% url 'funding_current' object.slug as current %} +

    {% trans "Tell your friends!" %}

    + {% endif %}

    {% trans "See all fundraisers." %}

    +
    -
    +

    {% trans "Supporters" %}:

    - -

    {% trans "Supporters" %}:

    - -
    +
    {% ssi_include 'funding_fundings' pk=object.pk page=page %} -
    - +
    {% endblock %} diff --git a/src/funding/templates/funding/offer_list.html b/src/funding/templates/funding/offer_list.html index e8088bfa8..85c7b900d 100644 --- a/src/funding/templates/funding/offer_list.html +++ b/src/funding/templates/funding/offer_list.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load url from future %} {% load i18n %} {% load ssi_include from ssify %} @@ -9,39 +9,35 @@ {% block bodyid %}funding-offer-list{% endblock %} {% block body %} -

    {% trans "All fundraisers" %}

    +

    {% trans "All fundraisers" %}

    - -{% autopaginate object_list 10 %} -{% if page_obj.number == 1 %} + {% autopaginate object_list 10 %} + {% if page_obj.number == 1 %}

    {% trans "Current fundraiser:" %}

    -{% endif %} + {% endif %} -{% for offer in object_list %} -{% with is_win=offer.is_win is_current=offer.is_current %} - {% if not is_current and forloop.first and page_obj.number == 1 %} + {% for offer in object_list %} + {% with is_win=offer.is_win is_current=offer.is_current %} + {% if not is_current and forloop.first and page_obj.number == 1 %}

    {% trans "No fundraiser is currently running." %}

    {% trans "Previous fundraisers:" %}

    - {% endif %} + {% endif %} - {% ssi_include 'funding_list_bar' pk=offer.pk %} + {% ssi_include 'funding_list_bar' pk=offer.pk %} -
    +
    {% if is_current %} -

    {% trans "Help free the book!" %}

    - {{ offer.description|safe }} +

    {% trans "Help free the book!" %}

    + {{ offer.description|safe }} {% endif %} {% ssi_include 'funding_status' pk=offer.pk %} {% ssi_include 'funding_status_more' pk=offer.pk %} +
    -
    - - {% if is_current and not forloop.last %} + {% if is_current and not forloop.last %}

    {% trans "Previous fundraisers:" %}

    - {% endif %} - -{% endwith %} -{% endfor %} -{% paginate %} - + {% endif %} + {% endwith %} + {% endfor %} + {% paginate %} {% endblock %} diff --git a/src/funding/templates/funding/snippets/any_remaining.html b/src/funding/templates/funding/snippets/any_remaining.html index d8a5bd675..1888326c4 100644 --- a/src/funding/templates/funding/snippets/any_remaining.html +++ b/src/funding/templates/funding/snippets/any_remaining.html @@ -1,10 +1,8 @@ - {% load i18n %} + {% url 'funding_wlfund' as wlfund %} {% blocktrans %}Any remaining funds will be spent on other books waiting to be published.{% endblocktrans %}

    {% blocktrans %}We will supplement every book with your name as a donor, no matter how big your support will be.{% endblocktrans %} - - diff --git a/src/funding/templates/funding/thanks.html b/src/funding/templates/funding/thanks.html index 676ea487b..c92e3e9e1 100644 --- a/src/funding/templates/funding/thanks.html +++ b/src/funding/templates/funding/thanks.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load fnp_share %} {% load polls_tags %} @@ -6,46 +6,38 @@ {% block titleextra %}{% trans "Thank you for your support!" %}{% endblock %} {% block body %} - -

    {% trans "Thank you!" %}

    -
    - -1%Możesz też przekazać
    1% podatku na rozwój biblioteki. →     - -

    {% trans "Thank you for your support!" %}

    -

    {% blocktrans %}We will contact you if you qualify for perks.{% endblocktrans %}

    - -{% if offer.is_win %} -

    {% trans "Full amount was successfully raised!" %}

    - -

    {% blocktrans with b=offer.title %}Your donation will be spent on digitizing, compiling and - publishing the book {{ b }} in multiple formats.{% endblocktrans %}

    - -{% else %} - -

    {% blocktrans with b=offer.title %}If the full amount needed is raised, - your donation will be spent on digitizing, compiling and - publishing the book {{ b }} in multiple formats.{% endblocktrans %}

    - -{% endif %} - - -

    {% include "funding/snippets/any_remaining.html" %} - -{% trans "Learn more" %}.

    - -{% url 'funding_current' offer.slug as current %} -

    {% trans "Go back to the current fundraiser." %}

    - - -

    {% trans "Tell your friends!" %}

    - - -{% if offer.poll %} -

    {% trans "Vote for a book for the next fundraiser" %}

    - {% poll offer.poll %} -{% endif %} -
    - - +

    {% trans "Thank you!" %}

    +
    + 1%Możesz też przekazać
    1% podatku na rozwój biblioteki. →     + +

    {% trans "Thank you for your support!" %}

    +

    {% blocktrans %}We will contact you if you qualify for perks.{% endblocktrans %}

    + + {% if offer.is_win %} +

    {% trans "Full amount was successfully raised!" %}

    +

    {% blocktrans with b=offer.title %}Your donation will be spent on digitizing, compiling and + publishing the book {{ b }} in multiple formats.{% endblocktrans %}

    + {% else %} +

    {% blocktrans with b=offer.title %}If the full amount needed is raised, + your donation will be spent on digitizing, compiling and + publishing the book {{ b }} in multiple formats.{% endblocktrans %}

    + {% endif %} + +

    + {% include "funding/snippets/any_remaining.html" %} + {% trans "Learn more" %}. +

    + + {% url 'funding_current' offer.slug as current %} +

    {% trans "Go back to the current fundraiser." %}

    + + +

    {% trans "Tell your friends!" %}

    + + + {% if offer.poll %} +

    {% trans "Vote for a book for the next fundraiser" %}

    + {% poll offer.poll %} + {% endif %} +
    {% endblock %} diff --git a/src/funding/templates/funding/widgets/amount.html b/src/funding/templates/funding/widgets/amount.html index 01db675a0..eb3f0f755 100644 --- a/src/funding/templates/funding/widgets/amount.html +++ b/src/funding/templates/funding/widgets/amount.html @@ -1,19 +1,23 @@ {% load i18n %} +
    -{% if perks %} + {% if perks %} {% for perk in perks %} -
    + +
    {% endfor %} - zł -{% else %} - -{% endif %} + zł + {% else %} + + {% endif %}
    diff --git a/src/funding/templates/funding/wlfund.html b/src/funding/templates/funding/wlfund.html index bb8a2bea2..a86735219 100644 --- a/src/funding/templates/funding/wlfund.html +++ b/src/funding/templates/funding/wlfund.html @@ -1,59 +1,63 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% block titleextra %}{% trans "Remaining funds" %}{% endblock %} {% block body %} +

    {% trans "Remaining funds" %}

    -

    {% trans "Remaining funds" %}

    +
    +

    + {% blocktrans with r="http://redakcja.wolnelektury.pl/" %} + If the full amount needed for publishing a book is not raised in time, + the funds are spent on other books waiting for + publication. The same thing happens with any money remaining + from successful fundraisers. + {% endblocktrans %} -

    -

    {% blocktrans with r="http://redakcja.wolnelektury.pl/" %}If -the full amount needed for publishing a book is not raised in time, -the funds are spent on other books waiting for -publication. The same thing happens with any money remaining -from successful fundraisers.{% endblocktrans %} + {% trans "Learn more" %}. +

    -{% trans "Learn more" %}.

    +

    {% trans "Spending these remaining funds is recorded in this table." %}

    +
    -

    {% trans "Spending these remaining funds is recorded in this table." %}

    -
    - - +
    - - - - + + + + {% for tag, entry in log %} - {% if tag == 'spent' %} + {% if tag == 'spent' %} - - - - + + + + - {% else %} + {% else %} - - - - + + + + - {% endif %} + {% endif %} {% empty %} - + + + {% endfor %} -
    {% trans "Date" %}:{% trans "Operation" %}:{% trans "Amount" %}:{% trans "Balance" %}:{% trans "Date" %}:{% trans "Operation" %}:{% trans "Amount" %}:{% trans "Balance" %}:
    {{ entry.timestamp }}{% trans "Money spent on publishing the book" %}: - - {{ entry.book }}-{{ entry.amount }} zł{{ entry.total }} zł{{ entry.timestamp }} + {% trans "Money spent on publishing the book" %}: + {{ entry.book }} + -{{ entry.amount }} zł{{ entry.total }} zł
    {{ entry.end }}{% trans "Money remaining from the fundraiser for" %}: - - {{ entry }}+{{ entry.wlfund }} zł{{ entry.total }} zł{{ entry.end }} + {% trans "Money remaining from the fundraiser for" %}: + {{ entry }} + +{{ entry.wlfund }} zł{{ entry.total }} zł
    - {% trans "There are no previous fundraisers to show yet." %} -
    + {% trans "There are no previous fundraisers to show yet." %} +
    - - + {% endblock %} diff --git a/src/infopages/templates/infopages/infopage.html b/src/infopages/templates/infopages/infopage.html index 75dae0850..d9eab9a8e 100755 --- a/src/infopages/templates/infopages/infopage.html +++ b/src/infopages/templates/infopages/infopage.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% block titleextra %}{{ page.title }}{% endblock %} @@ -6,18 +6,18 @@ {% block metadescription %}{{ left_column|striptags|truncatewords:10 }}{% endblock %} {% block body %} -

    {{ page.title }}

    +

    {{ page.title }}

    - {% autoescape off %} -
    -
    - {{ left_column }} -
    + {% autoescape off %} +
    +
    + {{ left_column }}
    -
    -
    - {{ right_column }} -
    +
    +
    +
    + {{ right_column }}
    - {% endautoescape %} +
    + {% endautoescape %} {% endblock %} diff --git a/src/infopages/templates/infopages/on_main.html b/src/infopages/templates/infopages/on_main.html index 5d80dad57..8ebbea05b 100755 --- a/src/infopages/templates/infopages/on_main.html +++ b/src/infopages/templates/infopages/on_main.html @@ -1,3 +1,3 @@ {% for page in objects %} -
  • {{ page.title }}
    • +
  • {{ page.title }}
    • {% endfor %} diff --git a/src/lesmianator/templates/lesmianator/lesmianator.html b/src/lesmianator/templates/lesmianator/lesmianator.html index cc7decbc7..a6e305fbb 100644 --- a/src/lesmianator/templates/lesmianator/lesmianator.html +++ b/src/lesmianator/templates/lesmianator/lesmianator.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load catalogue_tags %} @@ -9,52 +9,60 @@ {% block bodyid %}lesmianator{% endblock %} {% block body %} -

    Leśmianator

    +

    Leśmianator

    -
    +
    -

    Leśmianator tworzy wierszmiksy – dzięki niemu - napiszesz wiersz jednym kliknięciem. - W nowej odsłonie nowe możliwości zabawy – teraz możesz zdecydować, co wrzucasz do miksera, - a swoimi dziełami podzielić się z przyjaciółmi!

    -

    Przygotowaliśmy kilka propozycji na start – możesz wybrać jedną z nich, - albo ułożyć sobie własną, niepowtarzalną mieszankę.

    -
    +

    + Leśmianator tworzy wierszmiksy – dzięki niemu + napiszesz wiersz jednym kliknięciem. + W nowej odsłonie nowe możliwości zabawy – teraz możesz zdecydować, co wrzucasz do miksera, + a swoimi dziełami podzielić się z przyjaciółmi! +

    +

    + Przygotowaliśmy kilka propozycji na start – możesz wybrać jedną z nich, + albo ułożyć sobie własną, niepowtarzalną mieszankę. +

    +
    +
    -
    +
    -

    Miksuj utwory

    -

    Możesz zmiksować całą lirykę w naszej bibliotece +

    Miksuj utwory

    +

    + Możesz zmiksować całą lirykę w naszej bibliotece albo tylko jeden konkretny utwór. Jak? Wejdź na stronę utworu, - kliknij w link „miksuj ten utwór” – i gotowe!

    + kliknij w link „miksuj ten utwór” – i gotowe! +

    -

    Miksuj półki

    -

    Załóż konto, poukładaj swoje ulubione książki na półkach i miksuj +

    Miksuj półki

    +

    + Załóż konto, poukładaj swoje ulubione książki na półkach i miksuj w dowolnych konfiguracjach. Nic prostszego, niż zmieszać Leśmiana z Tetmajerem, a Żeromskiego z Sienkiewiczem - – wystarczy wrzucić ich utwory na półkę i kliknąć - w link „miksuj utwory z tej półki”.

    - -

    Dziel się z innymi

    -

    Wyszedł Ci wyjątkowo udany wierszmiks? Znajdziesz pod nim link, przy pomocy - którego możesz się nim podzielić z przyjaciółmi.

    + – wystarczy wrzucić ich utwory na półkę i klikną w link „miksuj utwory z tej półki”. +

    -

    Miłej zabawy!

    +

    Dziel się z innymi

    +

    + Wyszedł Ci wyjątkowo udany wierszmiks? Znajdziesz pod nim link, przy pomocy + którego możesz się nim podzielić z przyjaciółmi. +

    +

    Miłej zabawy!

    -
    +
    {% endblock %} diff --git a/src/lesmianator/templates/lesmianator/poem.html b/src/lesmianator/templates/lesmianator/poem.html index 4c4726f0f..458ab21e7 100644 --- a/src/lesmianator/templates/lesmianator/poem.html +++ b/src/lesmianator/templates/lesmianator/poem.html @@ -1,65 +1,68 @@ {% extends "catalogue/viewer_base.html" %} {% load i18n %} - {% block title %}Leśmianator{% endblock %} - {% block menu %} -
  • Wolne Lektury przepuszczone przez mikser.
    • - {% if shelf or not books %} - {# shelf or global mixing #} -
  • Twórzże się jeszcze raz!
    • - {% else %}{% if book %} -
  • Twórzże się jeszcze raz!
    • - {% endif %}{% endif %} +
  • Wolne Lektury przepuszczone przez mikser.
    • + {% if shelf or not books %} + {# shelf or global mixing #} +
  • Twórzże się jeszcze raz!
    • + {% elif book %} +
  • Twórzże się jeszcze raz!
    • + {% endif %} {% endblock menu %} - {% block main-text %} -
    -

    - Leśmianator - *** -

    - {{ poem.text|linebreaksbr }} -
    -

    O utworze

    -

    - Aby pokazać innym ten utwór, użyj linku:
    - -

    -
    - {% if book %} -

    Tekst powstał przez zmiksowanie utworu - {{ book.title }}.
    - Zmiksuj go ponownie - albo zobacz, co jeszcze możesz zamieszać.

    - {% else %}{% if books %} -

    Tekst powstał przez zmiksowanie utworów:

    - - {% if shelf %} -

    - Zmiksuj - półkę {{ shelf.name }} - jeszcze raz, albo - zobacz, co jeszcze możesz zamieszać.

    - {% else %} -

    Zobacz, - jak łatwo możesz stworzyć własny wierszmiks.

    - {% endif %} - {% else %} -

    Wiersz powstał przez zmiksowanie ze sobą całej liryki z Wolnych Lektur. - Spróbuj jeszcze raz, albo - zobacz, co jeszcze możesz zamieszać.

    - {% endif %}{% endif %} -
    -
    -
    +
    +

    + Leśmianator + *** +

    + {{ poem.text|linebreaksbr }} +
    +

    O utworze

    +
    +

    + Aby pokazać innym ten utwór, użyj linku:
    + +

    +
    +
    + {% if book %} +

    + Tekst powstał przez zmiksowanie utworu + {{ book.title }}.
    + Zmiksuj go ponownie + albo zobacz, co jeszcze możesz zamieszać. +

    + {% elif books %} +

    Tekst powstał przez zmiksowanie utworów:

    + + {% if shelf %} +

    + Zmiksuj + półkę {{ shelf.name }} + jeszcze raz, albo + zobacz, co jeszcze możesz zamieszać. +

    + {% else %} +

    + Zobacz, + jak łatwo możesz stworzyć własny wierszmiks. +

    + {% endif %} + {% else %} +

    Wiersz powstał przez zmiksowanie ze sobą całej liryki z Wolnych Lektur. + Spróbuj jeszcze raz, albo + zobacz, co jeszcze możesz zamieszać.

    + {% endif %} +
    +
    {% endblock main-text %} diff --git a/src/libraries/templates/libraries/catalog_view.html b/src/libraries/templates/libraries/catalog_view.html index 5d35fd973..2a022d47b 100644 --- a/src/libraries/templates/libraries/catalog_view.html +++ b/src/libraries/templates/libraries/catalog_view.html @@ -1,19 +1,18 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% block titleextra %}{% trans 'Libraries directory' %}{% endblock %} {% block body %} -

    {{ catalog.name }}

    -
    -
    -
      - {% for library in catalog.libraries.all %} -
    • {{library.name}}
      • - {% endfor %} -
    -
    +

    {{ catalog.name }}

    +
    +
    +
      + {% for library in catalog.libraries.all %} +
    • {{library.name}}
      • + {% endfor %} +
    - +
    {% endblock %} \ No newline at end of file diff --git a/src/libraries/templates/libraries/library_view.html b/src/libraries/templates/libraries/library_view.html index a97282987..283d1c047 100644 --- a/src/libraries/templates/libraries/library_view.html +++ b/src/libraries/templates/libraries/library_view.html @@ -1,13 +1,12 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% block titleextra %}{{ library.name }}{% endblock %} - -{% block body %} -

    {{ library.name }}

    -
    -

    Adres strony www: {{library.url}}

    - {% autoescape off %}{{library.description}}{% endautoescape%} -
    +{% block body %} +

    {{ library.name }}

    +
    +

    Adres strony www: {{library.url}}

    + {% autoescape off %}{{library.description}}{% endautoescape%} +
    {% endblock %} \ No newline at end of file diff --git a/src/libraries/templates/libraries/main_view.html b/src/libraries/templates/libraries/main_view.html index 55e5f0249..3593616a6 100644 --- a/src/libraries/templates/libraries/main_view.html +++ b/src/libraries/templates/libraries/main_view.html @@ -1,19 +1,17 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% block titleextra %}{% trans 'Library directories' %}{% endblock %} - {% block body %} -

    {% trans 'Library directories' %}

    -
    -
    -
      - {% for catalog in catalogs %} -
    • {{catalog}}
      • - {% endfor %} -
    -
    +

    {% trans 'Library directories' %}

    +
    +
    +
      + {% for catalog in catalogs %} +
    • {{catalog}}
      • + {% endfor %} +
    - +
    {% endblock %} \ No newline at end of file diff --git a/src/pdcounter/templates/pdcounter/author_detail.html b/src/pdcounter/templates/pdcounter/author_detail.html index 50eef63fb..98a5fc799 100644 --- a/src/pdcounter/templates/pdcounter/author_detail.html +++ b/src/pdcounter/templates/pdcounter/author_detail.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load time_tags %} @@ -9,48 +9,57 @@ {% block bodyid %}author-detail{% endblock %} {% block body %} - -
    +

    {{ author.name }}

    -
    - {% if author.has_description %} -
    -
    {{ author.description|safe }}
    -
    {{ author.description|safe|truncatewords_html:30 }}
    -
    -
    -

    - {% endif %} - {% if author.gazeta_link %} -

    +

    + {% if author.has_description %} +
    +
    {{ author.description|safe }}
    +
    {{ author.description|safe|truncatewords_html:30 }}
    +
    +
    +

    + {% endif %} + {% if author.gazeta_link %} +

    + {% trans "Read work's study of this author on Lektury.Gazeta.pl" %} -

    - {% endif %} - {% if author.wiki_link %} -

    + +

    + {% endif %} + {% if author.wiki_link %} +

    + {% trans "Read article about this author on Wikipedia" %} -

    - {% endif %} + +

    + {% endif %} - {% if author.alive %} -

    {% trans "This author's works are copyrighted." %} - {% trans "Find out why Internet libraries can't publish this author's works." %}

    + {% if author.alive %} +

    + {% trans "This author's works are copyrighted." %} + {% trans "Find out why Internet libraries can't publish this author's works." %} +

    + {% else %} + {% if author.in_pd %} +

    {% trans "This author's works are in public domain and will be published on Internet library of Wolne Lektury soon." %}

    {% else %} - {% if author.in_pd %} -

    {% trans "This author's works are in public domain and will be published on Internet library of Wolne Lektury soon." %}

    - {% else %} -
    -

    {% trans "This author's works will become part of public domain and will be allowed to be published without restrictions in" %}

    -
    -

    {% trans "Find out why Internet libraries can't publish this author's works." %}

    -
    - {% endif %} +
    +

    + {% trans "This author's works will become part of public domain and will be allowed to be published without restrictions in" %} +

    +
    +

    + {% trans "Find out why Internet libraries can't publish this author's works." %} +

    +
    {% endif %} - {% include "info/join_us.html" %} -
    + {% endif %} + {% include "info/join_us.html" %}
    +
    -
    - {% include "publishing_suggest.html" %} -
    +
    + {% include "publishing_suggest.html" %} +
    {% endblock %} diff --git a/src/pdcounter/templates/pdcounter/book_stub_detail.html b/src/pdcounter/templates/pdcounter/book_stub_detail.html index 640d68ebe..db1a2997a 100644 --- a/src/pdcounter/templates/pdcounter/book_stub_detail.html +++ b/src/pdcounter/templates/pdcounter/book_stub_detail.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load time_tags %} @@ -9,27 +9,32 @@ {% block bodyid %}book-stub-detail{% endblock %} {% block body %} -
    +

    {{ book.author }}, {{ book.title }}

    -
    - - {% if book.in_pd %} -

    {% trans "This work is in public domain and will be published on Internet library of Wolne Lektury soon." %}

    - {% else %} - {% if book.pd %} -

    {% trans "This work will become part of public domain and will be allowed to be published without restrictions in" %}

    -
    -

    {% trans "Find out why Internet libraries can't publish this work." %}

    - {% else %} -

    {% trans "This work is copyrighted." %} - {% trans "Find out why Internet libraries can't publish this work." %}

    - {% endif %} - {% endif %} - {% include "info/join_us.html" %} -
    +
    + {% if book.in_pd %} +

    {% trans "This work is in public domain and will be published on Internet library of Wolne Lektury soon." %}

    + {% else %} + {% if book.pd %} +

    + {% trans "This work will become part of public domain and will be allowed to be published without restrictions in" %} +

    +
    +

    + {% trans "Find out why Internet libraries can't publish this work." %} +

    + {% else %} +

    + {% trans "This work is copyrighted." %} + {% trans "Find out why Internet libraries can't publish this work." %} +

    + {% endif %} + {% endif %} + {% include "info/join_us.html" %}
    +
    -
    - {% include "publishing_suggest.html" %} -
    +
    + {% include "publishing_suggest.html" %} +
    {% endblock %} diff --git a/src/picture/templates/admin/picture/picture/change_list.html b/src/picture/templates/admin/picture/picture/change_list.html index 05566c0ab..564b26db4 100755 --- a/src/picture/templates/admin/picture/picture/change_list.html +++ b/src/picture/templates/admin/picture/picture/change_list.html @@ -2,11 +2,13 @@ {% load i18n %} {% block content %} -
    - {% csrf_token %} -

    XML:
    - {% trans "Image" %}:
    -

    -
    - {{ block.super }} +
    + {% csrf_token %} +

    + XML:
    + {% trans "Image" %}:
    + +

    +
    + {{ block.super }} {% endblock content %} diff --git a/src/picture/templates/picture/collection.html b/src/picture/templates/picture/collection.html index f794fbfeb..3c48fa194 100644 --- a/src/picture/templates/picture/collection.html +++ b/src/picture/templates/picture/collection.html @@ -6,5 +6,5 @@ {% block book_list_header %}{{ context.collection.title }}{% endblock %} {% block book_list_info %} -{{ context.collection.description|safe }} + {{ context.collection.description|safe }} {% endblock %} diff --git a/src/picture/templates/picture/picture_detail.html b/src/picture/templates/picture/picture_detail.html index 514f8c3e8..6505c48ff 100644 --- a/src/picture/templates/picture/picture_detail.html +++ b/src/picture/templates/picture/picture_detail.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load picture_tags catalogue_tags pagination_tags %} {% load thumbnail %} @@ -14,13 +14,10 @@ {% block body %} {% picture_wide picture %} - -{% spaceless %} - -
    -

    {% trans "See also" %}:

    -{% related_books picture %} -
    -{% endspaceless %} - + {% spaceless %} +
    +

    {% trans "See also" %}:

    + {% related_books picture %} +
    + {% endspaceless %} {% endblock %} diff --git a/src/picture/templates/picture/picture_info.html b/src/picture/templates/picture/picture_info.html index c2d2c9aaa..79c3043b9 100644 --- a/src/picture/templates/picture/picture_info.html +++ b/src/picture/templates/picture/picture_info.html @@ -1,17 +1,15 @@ -
    -
    +
    - diff --git a/src/picture/templates/picture/picture_list_thumb.html b/src/picture/templates/picture/picture_list_thumb.html index a38efa517..3c1dd8cc1 100644 --- a/src/picture/templates/picture/picture_list_thumb.html +++ b/src/picture/templates/picture/picture_list_thumb.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load catalogue_tags %} {% load static %} @@ -10,16 +10,17 @@ {% block body %} -

    {% block book_list_header %}{% trans "Listing of all works" context "gallery" %}{% endblock %}

    +

    {% block book_list_header %}{% trans "Listing of all works" context "gallery" %}{% endblock %}

    -
    - {% block book_list_info %} - {% ssi_include 'chunk' key='picture-list' %} - {% endblock %} -
    +
    +
    + {% block book_list_info %} + {% ssi_include 'chunk' key='picture-list' %} + {% endblock %} +
    +
    -
    - -{% work_list picture_list %} +
    + {% work_list picture_list %} {% endblock %} diff --git a/src/picture/templates/picture/picture_mini_box.html b/src/picture/templates/picture/picture_mini_box.html index 1ad2accb4..132f8fcc9 100644 --- a/src/picture/templates/picture/picture_mini_box.html +++ b/src/picture/templates/picture/picture_mini_box.html @@ -1,23 +1,20 @@ {% spaceless %} - -{% load thumbnail %} -
    + {% load thumbnail %} +
    - {% if with_link %} - - {% endif %} + {% if with_link %} + + {% endif %} {% if picture.image_file %} - {{ author }} – {{ picture.title }} + {{ author }} – {{ picture.title }} {% endif %}
    - {{ author }} - {{ picture.title }} + {{ author }} + {{ picture.title }}
    - {% if with_link %} -     - {% endif %} + {% if with_link %} + + {% endif %}
    -
    - - +
    {% endspaceless %} \ No newline at end of file diff --git a/src/picture/templates/picture/picture_short.html b/src/picture/templates/picture/picture_short.html index 35fba77b0..05a0398ad 100644 --- a/src/picture/templates/picture/picture_short.html +++ b/src/picture/templates/picture/picture_short.html @@ -2,69 +2,67 @@ {% load thumbnail %} {% load catalogue_tags social_tags %} {% load picture_tags %} -
    -
    - -
    - -
    -
    - {% for tag in tags.author %} - {{ tag }}{% if not forloop.last %}, - {% endif %}{% endfor %} -
    -
    - {% if main_link %}{% endif %} - {{ picture.title }} - {% if main_link %}{% endif %} -
    -
    - - -
    - {% block picture-view %} - {% if main_link %}{% endif %} - {% thumbnail picture.image_file "216x288" crop="center" as thumb %} - - {% endthumbnail %} - {% if main_link %}{% endif %} - {% endblock %} - {# what about licensing icons here #} -
    +
    +
    +
    +
    +
    + {% for tag in tags.author %} + {{ tag }}{% if not forloop.last %}, + {% endif %}{% endfor %} +
    +
    + {% if main_link %}{% endif %} + {{ picture.title }} + {% if main_link %}{% endif %} +
    +
    -
    - {% spaceless %} +
    + {% block picture-view %} + {% if main_link %}{% endif %} + {% thumbnail picture.image_file "216x288" crop="center" as thumb %} + + {% endthumbnail %} + {% if main_link %}{% endif %} + {% endblock %} + {# what about licensing icons here #} +
    - +
    + {% spaceless %} + {% trans "Epoch" %}:  - {% for tag in tags.epoch %} - {{ tag }} - {% if not forloop.last %}, {% endif %} - {% endfor %} - + {% for tag in tags.epoch %} + {{ tag }} + {% if not forloop.last %}, {% endif %} + {% endfor %} + + - + {% trans "Kind" %}:  - {% for tag in tags.kind %} - {{ tag }} - {% if not forloop.last %}, {% endif %} - {% endfor %} - + {% for tag in tags.kind %} + {{ tag }} + {% if not forloop.last %}, {% endif %} + {% endfor %} + + - + {% trans "Genre" %}:  - {% for tag in tags.genre %} - {{ tag }} - {% if not forloop.last %}, {% endif %} - {% endfor %} - - - {% block extra_categories %} - {% endblock %} + {% for tag in tags.genre %} + {{ tag }} + {% if not forloop.last %}, {% endif %} + {% endfor %} + + - {% endspaceless %} -
    + {% block extra_categories %} + {% endblock %} + {% endspaceless %} +
    • @@ -75,10 +73,8 @@
    {% block book-box-extra-info %}{% endblock %} - {% block box-append %} - {% endblock %} - {% block right-column %} - {% endblock %} + {% block box-append %}{% endblock %} + {% block right-column %}{% endblock %}
    -
    +
    diff --git a/src/picture/templates/picture/picture_viewer.html b/src/picture/templates/picture/picture_viewer.html index 937ef689f..75be359bf 100644 --- a/src/picture/templates/picture/picture_viewer.html +++ b/src/picture/templates/picture/picture_viewer.html @@ -13,88 +13,92 @@ {% block js-dependencies %} - + {% endblock %} {% block no-menu-extra %} -
  • +
  • -
    • +
  • +
    • +
  • -
    • {% endblock %} {% block menu %} -
  • +-
    • - -{% spaceless %} -
  • - {% with picture.get_previous as prev %} +
  • + + + - +
    • + + {% spaceless %} +
  • + {% with picture.get_previous as prev %} {% if prev %}<{%endif %} - {% endwith %} - {% with picture.get_next as next %} + {% endwith %} + {% with picture.get_next as next %} {% if next %}>{% endif %} - {% endwith %} -
    • -{% endspaceless %} - - -
  • - {{ picture.pretty_title }} -
    • - - -
  • {% trans "Objects" %}
    • -
  • {% trans "Themes" %}
    • - - - - -
  • + {% endwith %} +
    • + {% endspaceless %} + +
  • + + {{ picture.pretty_title }} + +
    • + +
  • {% trans "Objects" %}
    • +
  • {% trans "Themes" %}
    • + + + +
  • {% for sponsor in sponsors %} - {% thumbnail sponsor.logo "80x200" as logo %} - {{ sponsor.name }} - {% endthumbnail %} + {% thumbnail sponsor.logo "80x200" as logo %} + {{ sponsor.name }} + {% endthumbnail %} {% endfor %} -
    • - + {% endblock %} {% block main %} -
    - {% thumbnail picture.image_file "700x500" as pic %} -
    + {% thumbnail picture.image_file "700x500" as pic %} +
    -
    - {% endthumbnail %} -
    + data-width="{{pic.width}}" data-height="{{pic.height}}" style="background-image: url('{{pic.url}}'); width: {{pic.width}}px; height: {{pic.height}}px;"> +
    + {% endthumbnail %} +
    {% endblock %} {% block footer %} -{{ picture.html_file.read|safe }} - -
    -
    - Wolne Lektury - - {% for sponsor in sponsors %} - {% thumbnail sponsor.logo "220x220" as logo %} - {{ sponsor.name }} - {% endthumbnail %} - {% endfor %} -
    + {{ picture.html_file.read|safe }} + +
    +
    + + Wolne Lektury + + {% for sponsor in sponsors %} + {% thumbnail sponsor.logo "220x220" as logo %} + {{ sponsor.name }} + {% endthumbnail %} + {% endfor %} +
    {% book_info picture %} -
    +
    -
    +
    {% ssi_include 'picture_short' pk=picture.pk %} -
    - +
    {% endblock %} diff --git a/src/picture/templates/picture/picture_wide.html b/src/picture/templates/picture/picture_wide.html index 00260f55f..3ca7afe89 100644 --- a/src/picture/templates/picture/picture_wide.html +++ b/src/picture/templates/picture/picture_wide.html @@ -6,92 +6,97 @@ {% block box-class %}book-wide-box{% endblock %} {% block picture-view %} - -{% thumbnail picture.image_file "535" upscale=0 as thumb %} - -{% endthumbnail %} + + {% thumbnail picture.image_file "535" upscale=0 as thumb %} + + {% endthumbnail %} + {% endblock %} {% block extra_categories %} -{% if picture.extra_info.styles %} - - {% trans "Style" %}:  - {% for tag in picture.extra_info.styles %} - {{ tag }} - {% if not forloop.last %}, {% endif %} - {% endfor %} - -{% endif %} + {% if picture.extra_info.styles %} + + {% trans "Style" %}:  + {% for tag in picture.extra_info.styles %} + {{ tag }} + {% if not forloop.last %}, {% endif %} + {% endfor %} + + + {% endif %} -{% if picture.extra_info.medium %} - - {% trans "Medium" %}:  - {{ picture.extra_info.medium }} - -{% endif %} + {% if picture.extra_info.medium %} + + {% trans "Medium" %}:  + {{ picture.extra_info.medium }} + + + {% endif %} -{% if picture.extra_info.original_dimensions %} - - {% trans "Dimensions" %}:  - {{ picture.extra_info.original_dimensions }} - -{% endif %} - - - {% trans "Date" %}:  - {{ picture.extra_info.created_at }} - + {% if picture.extra_info.original_dimensions %} + + {% trans "Dimensions" %}:  + {{ picture.extra_info.original_dimensions }} + + + {% endif %} + + {% trans "Date" %}:  + {{ picture.extra_info.created_at }} + + {% endblock %} {% block book-box-extra-info %} -{% if themes or things%} + {% if themes or things%}
    -

    {% trans "Motifs, themes and objects" %}

    -
    - {% if themes %} -

    {% trans "Motifs and themes" %}

    +

    + {% trans "Motifs, themes and objects" %} +

    +
    + {% if themes %} +

    {% trans "Motifs and themes" %}

      {% for theme in themes %} -
    • {{ theme }}
      • - {% endfor %} -
    - {% endif %} - {% if things %} -

    {% trans "Objects" %}

    +
  • {{ theme }}
    • + {% endfor %} + + {% endif %} + {% if things %} +

    {% trans "Objects" %}

    - {% endif %} -
    + {% endif %} +
    -{% else %} -

     

    -{% endif %} + {% else %} +

     

    + {% endif %} {% endblock %} {% block right-column %} -
    -
    -

    {% trans "See" %}

    - +
    +
    +

    {% trans "See" %}

    + +
    -
    {% endblock %} diff --git a/src/picture/templates/picture/picturearea_short.html b/src/picture/templates/picture/picturearea_short.html index 4fa97817d..59aa73643 100644 --- a/src/picture/templates/picture/picturearea_short.html +++ b/src/picture/templates/picture/picturearea_short.html @@ -4,14 +4,16 @@
    - + + +
    {% with area.picture as picture %} -
    -
    - {% book_title_html picture %} -
    -
    -
    +
    +
    + {% book_title_html picture %} +
    +
    +
    {% endwith %}
    diff --git a/src/polls/templates/polls/poll.html b/src/polls/templates/polls/poll.html index edb14cf7b..e57d9cd50 100644 --- a/src/polls/templates/polls/poll.html +++ b/src/polls/templates/polls/poll.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load polls_tags %} @@ -6,10 +6,10 @@ {% block body %} -
    - {% if voted_already %} -

    {% trans "Thanks for voting! You can see current results below." %}

    - {% endif %} - {% poll poll %} -
    +
    + {% if voted_already %} +

    {% trans "Thanks for voting! You can see current results below." %}

    + {% endif %} + {% poll poll %} +
    {% endblock %} \ No newline at end of file diff --git a/src/reporting/templates/reporting/main.html b/src/reporting/templates/reporting/main.html index 46d49c9ea..bae491e32 100755 --- a/src/reporting/templates/reporting/main.html +++ b/src/reporting/templates/reporting/main.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load reporting_stats catalogue_tags %} @@ -8,41 +8,39 @@ {% block body %} -

    Statystyka

    - -
    +

    Statystyka

    +

    Audiobooki

    - - - - - - - - {% for mt in media_types %} - - - - - - {% endfor %} + + + + + + + + {% for mt in media_types %} + + + + + + + {% endfor %}
    Utwory
    Utwory:{% count_books %}
    Niezależne książki:{% count_books_root %}
    Utwory nadrzędne:{% count_books_parent %}
    Wszystkie utwory:{% count_books_all %}
    MediaLiczbaRozmiarDo wymiany
    {{ mt.type }}:{{ mt.count }}{{ mt.size|filesizeformat }}{{ mt.deprecated }} - {% for m in mt.deprecated_files %} -
    {% book_title m.book %}: {{ m }} - {% endfor %} -
    Utwory
    Utwory:{% count_books %}
    Niezależne książki:{% count_books_root %}
    Utwory nadrzędne:{% count_books_parent %}
    Wszystkie utwory:{% count_books_all %}
    MediaLiczbaRozmiarDo wymiany
    {{ mt.type }}:{{ mt.count }}{{ mt.size|filesizeformat }} + {{ mt.deprecated }} + {% for m in mt.deprecated_files %} +
    {% book_title m.book %}: {{ m }} + {% endfor %} +

    Licencje

      - {% for license, license_description in licenses %} + {% for license, license_description in licenses %}
    • {{ license }} ({{ license_description }})
      • - {% endfor %} + {% endfor %}
    - - -
    - +
    {% endblock %} diff --git a/src/search/templates/newsearch/search.html b/src/search/templates/newsearch/search.html index 0b0fad49d..881e85136 100644 --- a/src/search/templates/newsearch/search.html +++ b/src/search/templates/newsearch/search.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load catalogue_tags %} @@ -9,50 +9,51 @@ {% block bodyid %}newsearch{% endblock %} {% block body %} -

    Search

    -
    -

    - - -
    - fuzzy. -

    -
    - {% if did_you_mean %} +

    Search

    +
    +

    + + +
    + fuzzy. +

    +
    + {% if did_you_mean %} Czy miałeś na mysli {{did_you_mean}}? - {% endif %} + {% endif %} - -
    -
      +
      +
        {% for result in results %} -
      1. -

        {{result.book.pretty_title}} (id: {{result.book_id}}, score: {{result.score}})

        -
          - {% for snip in hit.snippets %} -
        • - {{snip|safe}}
          -
          • - {% endfor %} - - {% for part in result.parts %} - {% if part.header %} -
        • W {{part.header}} nr {{part.position}}
          • - {% else %} - {% if part.fragment %} -
        • -
          Tagi/Motywy: {% for tag in part.fragment.tags %}{{tag.name}} {% endfor %}
          - {{part.fragment.short_html|safe}} -
          • - {% endif %} - {% endif %} - {% endfor %} -
        -
        2. +
      2. +

        + {{result.book.pretty_title}} + (id: {{result.book_id}}, score: {{result.score}}) +

        +
          + {% for snip in hit.snippets %} +
        • + {{snip|safe}}
          +
          • + {% endfor %} + + {% for part in result.parts %} + {% if part.header %} +
        • W {{part.header}} nr {{part.position}}
          • + {% else %} + {% if part.fragment %} +
        • +
          Tagi/Motywy: {% for tag in part.fragment.tags %}{{tag.name}} {% endfor %}
          + {{part.fragment.short_html|safe}} +
          • + {% endif %} + {% endif %} + {% endfor %} +
        +
        3. {% empty %} -

        No results.

        +

        No results.

        {% endfor %} -
      -
      - +
    +
    {% endblock %} diff --git a/src/social/templates/social/cite_info.html b/src/social/templates/social/cite_info.html index 8f8e16d11..1f75c18e3 100644 --- a/src/social/templates/social/cite_info.html +++ b/src/social/templates/social/cite_info.html @@ -1,19 +1,17 @@ {% spaceless %} - -{% if cite.image %} + {% if cite.image %} {% if cite.image_link %}{% endif %} {% if cite.image_title %} - {{ cite.image_title }}{% else %} - untitled{% endif %}{% if cite.image_link %}{% endif %}{% if cite.image_author %}, - {{ cite.image_author }}{% endif %}{% if cite.image_license %}, - {% if cite.image_license_link %}{% endif %} - {{ cite.image_license }} - {% if cite.image_license_link %}{% endif %} + {{ cite.image_title }}{% else %} + untitled{% endif %}{% if cite.image_link %}{% endif %}{% if cite.image_author %}, + {{ cite.image_author }}{% endif %}{% if cite.image_license %}, + {% if cite.image_license_link %}{% endif %} + {{ cite.image_license }} + {% if cite.image_license_link %}{% endif %} {% endif %} -{% else %} + {% else %} books about architecture, saikofish@Flickr, CC BY NC SA. -{% endif %} - + {% endif %} {% endspaceless %} diff --git a/src/social/templates/social/cite_promo.html b/src/social/templates/social/cite_promo.html index 15786cf3b..546e07087 100755 --- a/src/social/templates/social/cite_promo.html +++ b/src/social/templates/social/cite_promo.html @@ -1,30 +1,25 @@ {% spaceless %} + {% load i18n %} -{% load i18n %} - -{% if main %} + {% if main %}
    -{% endif %} - -{% if cite %} + {% endif %} - - {% if cite.vip %} + {% if cite %} + + {% if cite.vip %}

    {{ cite.vip }} {% trans "recommends" %}:

    - {% endif %} -
    + {% endif %} +
    {{ cite.text|linebreaksbr|safe }} -
    - {% if cite.book %} -

    {{ cite.book.pretty_title }}

    - {% endif %} -     - -{% endif %} - - -{% if main %} +
    + {% if cite.book %} +

    {{ cite.book.pretty_title }}

    + {% endif %} + + {% endif %} + + {% if main %}
    -{% endif %} - + {% endif %} {% endspaceless %} \ No newline at end of file diff --git a/src/social/templates/social/my_shelf.html b/src/social/templates/social/my_shelf.html index f448ad220..140551201 100755 --- a/src/social/templates/social/my_shelf.html +++ b/src/social/templates/social/my_shelf.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load catalogue_tags %} @@ -7,13 +7,11 @@ {% block logout %}/{% endblock %} {% block body %} +

    {% trans "My shelf" %}

    -

    {% trans "My shelf" %}

    + {% work_list books %} - {% work_list books %} - - {% if not books %} + {% if not books %} {% trans "Add works to your shelf by clicking on the star on the page of the work. The work will then show up on My shelf page." %} - {# trans "Aby dodać pozycję do swojej półki, należy zaznaczyć gwiazdkę znajdującą się na stronie utworu. Po jej zaznaczeniu publikacja pojawi się w zakładce Moja półka" #} - {% endif %} + {% endif %} {% endblock %} diff --git a/src/social/templates/social/sets_form.html b/src/social/templates/social/sets_form.html index 5974a2a71..05f8e4361 100755 --- a/src/social/templates/social/sets_form.html +++ b/src/social/templates/social/sets_form.html @@ -3,17 +3,17 @@

    {{ title }}

    -{% ssi_csrf_token %} - + class="cuteform{% if placeholdize %} hidelabels{% endif %}"> + {% ssi_csrf_token %} +
    -{% ssi_csrf_token %} -
      + class="cuteform{% if placeholdize %} hidelabels{% endif %}"> + {% ssi_csrf_token %} +
        {{ form.as_ul }}
        2. -
      +
    diff --git a/src/social/templates/social/shelf_tags.html b/src/social/templates/social/shelf_tags.html index 2baa0f007..47e0b0a17 100755 --- a/src/social/templates/social/shelf_tags.html +++ b/src/social/templates/social/shelf_tags.html @@ -1,9 +1,7 @@ {% spaceless %} - - {% endspaceless %} \ No newline at end of file diff --git a/src/sponsors/templates/sponsors/page.html b/src/sponsors/templates/sponsors/page.html index 5a3b38ec2..c94f3d40c 100644 --- a/src/sponsors/templates/sponsors/page.html +++ b/src/sponsors/templates/sponsors/page.html @@ -1,16 +1,16 @@ {% spaceless %} - -
    + +
    {% for column in sponsors %} -
    -

    {{ column.name|default:" " }}

    - +
    +

    {{ column.name|default:" " }}

    + +
    {% endfor %}
    -
    +
    {% endspaceless %} diff --git a/src/suggest/templates/publishing_suggest.html b/src/suggest/templates/publishing_suggest.html index 33f95a531..16c70a49b 100755 --- a/src/suggest/templates/publishing_suggest.html +++ b/src/suggest/templates/publishing_suggest.html @@ -5,19 +5,31 @@

    {% trans "Didn't find a book? Make a suggestion." %}

    -{% ssi_csrf_token %} -{% render_honeypot_field %} -
      -
    1. {{ form.contact.errors }} {{ form.contact }}
      2. + {% ssi_csrf_token %} + {% render_honeypot_field %} +
        +
      1. + {{ form.contact.errors }} + + {{ form.contact }} +
      2. {% trans "I'd like to find in WolneLektury.pl these…" %}
      3. {{ form.books }}
        4. -
      4. {{ form.ebook.errors }} {{ form.ebook }}
        5. -
      5. {{ form.audiobook.errors }} {{ form.audiobook }}
        6. +
      6. + {{ form.ebook.errors }} + + {{ form.ebook }} +
        7. +
      7. + {{ form.audiobook.errors }} + + {{ form.audiobook }} +
      9. {% trans "Remember that we can only publish books in public domain, ie. 70 years after the death of the author!" %}
        10. -
      +
    diff --git a/src/waiter/templates/waiter/wait.html b/src/waiter/templates/waiter/wait.html index 6ef1b7751..0a0fb0d17 100644 --- a/src/waiter/templates/waiter/wait.html +++ b/src/waiter/templates/waiter/wait.html @@ -1,93 +1,100 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% load static from staticfiles %} {% block titleextra %} -{% if file_url %} + {% if file_url %} {% trans "The file is ready for download!" %} -{% else %} + {% else %} {% if waiting %} - {% trans "Your file is being prepared, please wait." %} + {% trans "Your file is being prepared, please wait." %} {% else %} - {% trans "Something went wrong." %} + {% trans "Something went wrong." %} {% endif %} -{% endif %} + {% endif %} {% endblock %} {% block extrahead %} -{% if file_url %} + {% if file_url %} -{% else %} + {% else %} {% if waiting %} - + {% endif %} -{% endif %} + {% endif %} {% endblock %} {% block body %} -{% if file_url %} + {% if file_url %}

    {% trans "The file is ready for download!" %}

    -

    {% blocktrans %}Your file is ready! - If the download doesn't start in a few seconds, - feel free to use this direct link.{% endblocktrans %}

    +

    + {% blocktrans %}Your file is ready! + If the download doesn't start in a few seconds, + feel free to use this direct link.{% endblocktrans %} +

    -{% else %} - {% if waiting %} -

    {% trans 'Please wait' %} - {% trans "Your file is being prepared, please wait." %}

    + {% else %} + {% if waiting %} +

    + {% trans 'Please wait' %} + {% trans "Your file is being prepared, please wait." %} +

    -
    -

    {% blocktrans with d=waiting.description %}The file you requested was: {{d}}.{% endblocktrans %}

    +
    +

    {% blocktrans with d=waiting.description %}The file you requested was: {{d}}.{% endblocktrans %}

    -

    {% blocktrans %}Be aware: Generating the file can take a while. - Please be patient, or bookmark this page and come back later.

    {% endblocktrans %} -
    - {% else %} -

    {% trans "Something went wrong." %}

    +

    + {% blocktrans %}Be aware: Generating the file can take a while. + Please be patient, or bookmark this page and come back later.{% endblocktrans %} +

    +
    + {% else %} +

    {% trans "Something went wrong." %}

    -
    - {% url 'suggest' as s %} -

    {% blocktrans %}Something seems to have gone wrong while generating your file. - Please order it again or complain to us about it.{% endblocktrans %}

    -
    - {% endif %} -{% endif %} - +
    + {% url 'suggest' as s %} +

    + {% blocktrans %}Something seems to have gone wrong while generating your file. + Please order it again or complain to us about it.{% endblocktrans %} +

    +
    + {% endif %} + {% endif %} {% endblock %} {% block extrabody %} -{% if waiting %} - -{% endif %} + }); + })(jQuery); + //--> + + {% endif %} {% endblock %} diff --git a/src/wolnelektury/static/js/base.js b/src/wolnelektury/static/js/base.js index eee31f914..1dde3221c 100644 --- a/src/wolnelektury/static/js/base.js +++ b/src/wolnelektury/static/js/base.js @@ -1,29 +1,29 @@ (function($) { $(function() { $.fn.toggle_slide = function(p) { - cont = $(this); - short_el = p['short_el'] || $(':first-child', this); - long_el = p['long_el'] || short_el.next(); - button = p['button']; - short_text = p['short_text'], - long_text = p['long_text']; + var cont = $(this); + var short_el = p['short_el'] || $(':first-child', this); + var long_el = p['long_el'] || short_el.next(); + var button = p['button']; + var short_text = p['short_text']; + var long_text = p['long_text']; var toggle_fun = function(cont, short_el, long_el, button, short_text, long_text) { - var toggle = function() { + return function () { if (cont.hasClass('short')) { - cont.animate({"height": long_el.attr("cont_h")+'px'}, {duration: "fast" }).removeClass('short'); + cont.animate({"height": long_el.attr("cont_h") + 'px'}, {duration: "fast"}) + .removeClass('short'); short_el.hide(); long_el.show(); if (button && long_text) button.html(long_text); } else { - cont.animate({"height": short_el.attr("cont_h")+'px'}, {duration: "fast" }).addClass('short'); + cont.animate({"height": short_el.attr("cont_h") + 'px'}, {duration: "fast"}).addClass('short'); long_el.hide(); short_el.show(); if (button && short_text) button.html(short_text); } return false; }; - return toggle; }; if (long_el.html().length <= short_el.html().length) return; @@ -34,8 +34,10 @@ short_el.show().attr("cont_h", $(this).height()); $(this).addClass('short'); - if (button && short_text) button.html(short_text); - if (button) button.click(toggle_fun(cont, short_el, long_el, button, short_text, long_text)); + if (button && short_text) + button.html(short_text); + if (button) + button.click(toggle_fun(cont, short_el, long_el, button, short_text, long_text)); }; @@ -57,24 +59,24 @@ - (function() { - var $current = null; + (function() { + var $current = null; var menu_loaded = false; - $('.hidden-box-wrapper').each(function() { - var $hidden = $('.hidden-box', this); - $('.hidden-box-trigger', this).click(function(event) { - event.preventDefault(); - if ($current == $hidden) { - $current = null; - $hidden.hide('fast'); - } else { - $current && $current.hide('fast'); - $hidden.show('fast'); - $current = $hidden; + $('.hidden-box-wrapper').each(function() { + var $hidden = $('.hidden-box', this); + $('.hidden-box-trigger', this).click(function(event) { + event.preventDefault(); + if ($current == $hidden) { + $current = null; + $hidden.hide('fast'); + } else { + $current && $current.hide('fast'); + $hidden.show('fast'); + $current = $hidden; if ($(this).hasClass('load-menu') && !menu_loaded) { $.ajax({ url: '/katalog/' + LANGUAGE_CODE + '.json', - dataType: "json", + dataType: "json" }).done(function(data) { $.each(data, function(index, value) { var $menuitem = $('#menu-' + index); @@ -86,7 +88,8 @@ $("li", $menuitem).each(function() { if ($("a", this).text().toLowerCase().indexOf(s) != -1) $(this).show(); - else $(this).hide(); + else + $(this).hide(); }); } else { @@ -98,133 +101,134 @@ menu_loaded = true; }); } - } - }); - }); - /* this kinda breaks the whole page. */ - $('body').click(function(e) { - if ($current == null) return; - var p = $(e.target); - while (p.length) { - if (p == $current) - return; - if (p.hasClass('hidden-box-trigger') - || p.hasClass('simple-toggler') + } + }); + }); + /* this kinda breaks the whole page. */ + $('body').click(function(e) { + if ($current == null) return; + var p = $(e.target); + while (p.length) { + if (p == $current) + return; + if (p.hasClass('hidden-box-trigger') + || p.hasClass('simple-toggler') || p.hasClass('mini-search')) - return; - p = p.parent(); - } - $current.hide('fast'); - $current = null; - }); - })(); + return; + p = p.parent(); + } + $current.hide('fast'); + $current = null; + }); + })(); -$('#show-menu').click(function(event) { - event.preventDefault(); - //$('#menu').toggle('slow'); - $('body').toggleClass('menu-on'); -}); + $('#show-menu').click(function(event) { + event.preventDefault(); + //$('#menu').toggle('fast'); + $('body').toggleClass('menu-on'); + }); -$('#book-list-nav h2').click(function(event) { - event.preventDefault(); - $('#book-list-nav-index').toggle(); -}); + $('#book-list-nav').find('h2').click(function(event) { + event.preventDefault(); + $('#book-list-nav-index').toggle(); + }); -$('#themes-list-toggle').click(function(event) { - event.preventDefault(); - $('#themes-list').toggle('slow'); -}); + $('#themes-list-toggle').click(function(event) { + event.preventDefault(); + $('#themes-list').toggle('fast'); + }); $('.book-list-index').click(function(){ - $('.book-list-show-index').hide('slow'); - if($(this).parent().next('ul:not(:hidden)').length == 0){ - $(this).parent().next('ul').toggle('slow'); - } + $('.book-list-show-index').hide('fast'); + var books_ul = $(this).parent().next().children().first(); + if(books_ul.first().is(':hidden')){ + books_ul.toggle('fast'); + } return false; }); - $('.hoverclick').click(function() {$(this).closest('.hoverget').toggleClass('hover');}); - - $(function(){ - $("#search").search();}); - - $('body').on('click', '.simple-toggler' , function(ev) { - ev.preventDefault(); - var scope = $(this).closest('.simple-toggler-scope'); - scope.find('.simple-hidden-box').each(function(){ - var $this = $(this); - if ($this.is(':hidden')) { - $this.show(); - } else { - $this.hide(); - } - }); - }); - - - $('.tabbed-filter').each(function() { - var tf = this; - $('.tab').click(function() { - if ($(this).hasClass('active')) { - $(this).removeClass('active'); - $('#' + $(this).attr('data-id')).hide(); - } - else { - var $active = $('.active', tf); - $active.removeClass('active'); - $('#' + $active.attr('data-id')).hide(); - $(this).addClass('active'); - $('#' + $(this).attr('data-id')).show(); - } + $('.hoverclick').click(function() {$(this).closest('.hoverget').toggleClass('hover');}); + + $(function(){ + $("#search").search(); }); - }); + $('body').on('click', '.simple-toggler' , function(ev) { + ev.preventDefault(); + var scope = $(this).closest('.simple-toggler-scope'); + scope.find('.simple-hidden-box').each(function() { + var $this = $(this); + if ($this.is(':hidden')) { + $this.show(); + } else { + $this.hide(); + } + }); + }); - $('.plain-list-paged').each(function() { - // should change on resize? - var $plc = $(this); - var $pl = $('.plain-list', this); - - var $items = $('p', $pl); - - if ($items.length > 40) { - $items.hide(); - var prev = [0, 0]; - - $('.pager', $plc).paging($items.length, { - format: '[< ncnnn >]', // define how the navigation should look like and in which order onFormat() get's called - perpage: 40, - lapping: 0, // don't overlap pages for the moment - page: 1, // start at page, can also be "null" or negative - onSelect: function (page) { - var data = this.slice; - $items.slice(prev[0], prev[1]).hide(); - $items.slice(data[0], data[1]).show(); - prev = data; - }, - onFormat: function (type) { - switch (type) { - case 'block': // n and c - return '
  • ' + this.value + '
    • '; - case 'next': // > - return '
  • ›
    • '; - case 'prev': // < - return '
  • ‹
    • '; - case 'first': // [ - return '
  • «
    • '; - case 'last': // ] - return '
  • »
    • '; - } + + $('.tabbed-filter').each(function() { + var tf = this; + $('.tab').click(function() { + if ($(this).hasClass('active')) { + $(this).removeClass('active'); + $('#' + $(this).attr('data-id')).hide(); + } + else { + var $active = $('.active', tf); + $active.removeClass('active'); + $('#' + $active.attr('data-id')).hide(); + $(this).addClass('active'); + $('#' + $(this).attr('data-id')).show(); } }); - } - }); + }); + $('.plain-list-paged').each(function() { + // should change on resize? + var $plc = $(this); + var $pl = $('.plain-list', this); + + var $items = $('p', $pl); + + if ($items.length > 40) { + $items.hide(); + var prev = [0, 0]; + + $('.pager', $plc).paging($items.length, { + format: '[< ncnnn >]', // define how the navigation should look like and in which order onFormat() get's called + perpage: 40, + lapping: 0, // don't overlap pages for the moment + page: 1, // start at page, can also be "null" or negative + onSelect: function (page) { + var data = this.slice; + $items.slice(prev[0], prev[1]).hide(); + $items.slice(data[0], data[1]).show(); + prev = data; + }, + onFormat: function (type) { + switch (type) { + case 'block': // n and c + return '
  • ' + + this.value + '
    • '; + case 'next': // > + return '
  • ›
    • '; + case 'prev': // < + return '
  • ‹
    • '; + case 'first': // [ + return '
  • «
    • '; + case 'last': // ] + return '
  • »
    • '; + } + } + }); + } + }); }); })(jQuery); diff --git a/src/wolnelektury/static/scss/main/book_box.scss b/src/wolnelektury/static/scss/main/book_box.scss index 592f8efe7..23575ce99 100755 --- a/src/wolnelektury/static/scss/main/book_box.scss +++ b/src/wolnelektury/static/scss/main/book_box.scss @@ -488,6 +488,7 @@ #book-detail .see-also, #picture-detail .see-also { + display: inline-block; h1 { @include size(height, 32px); margin: 0; diff --git a/src/wolnelektury/templates/404.html b/src/wolnelektury/templates/404.html index f3846aac4..63d3cacb6 100644 --- a/src/wolnelektury/templates/404.html +++ b/src/wolnelektury/templates/404.html @@ -1,19 +1,14 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} - -{% block titleextra %}404 - {% trans "Page does not exist" %}{% endblock %} +{% block titleextra %}404 – {% trans "Page does not exist" %}{% endblock %} {% block body %} +

    {% trans "Page not found" %}

    -

    {% trans "Page not found" %}

    - - -

    -{% trans "We are sorry, but this page does not exist. Please check if you entered correct address or go to "%} {% trans "main page" %}. -

    - - - +

    + {% trans "We are sorry, but this page does not exist. Please check if you entered correct address or go to "%} + {% trans "main page" %}. +

    {% endblock body %} diff --git a/src/wolnelektury/templates/500.html b/src/wolnelektury/templates/500.html index df74fe42d..6ce3a2ae7 100644 --- a/src/wolnelektury/templates/500.html +++ b/src/wolnelektury/templates/500.html @@ -1,24 +1,24 @@ {% load i18n %} - - - Wolne Lektury :: 500 - {% trans "Server error" %} - - -
    -
    - -
    -
    + + + Wolne Lektury :: 500 – {% trans "Server error" %} + + +
    +
    + +
    +
    -
    -
    -

    {% trans "Server error" %}

    +
    +
    +

    {% trans "Server error" %}

    -{% trans "

    The Wolnelektury.pl site is currently unavailable. Meanwhile, visit our blog.

    Inform our administrators about the error.

    " %} + {% trans "

    The Wolnelektury.pl site is currently unavailable. Meanwhile, visit our blog.

    Inform our administrators about the error.

    " %} -
    -
    - +
    +
    + \ No newline at end of file diff --git a/src/wolnelektury/templates/503.html b/src/wolnelektury/templates/503.html index 47689d122..2319f0d13 100644 --- a/src/wolnelektury/templates/503.html +++ b/src/wolnelektury/templates/503.html @@ -1,24 +1,24 @@ {% load i18n %} - - - Wolne Lektury :: 503 - {% trans "Service unavailable" %} - - -
    -
    - -
    -
    + + + Wolne Lektury :: 503 – {% trans "Service unavailable" %} + + +
    +
    + +
    +
    -
    -
    -

    {% trans "Service unavailable" %}

    -

    -{% trans "The Wolnelektury.pl site is currently unavailable due to maintainance." %} -

    -
    -
    - +
    +
    +

    {% trans "Service unavailable" %}

    +

    + {% trans "The Wolnelektury.pl site is currently unavailable due to maintainance." %} +

    +
    +
    + diff --git a/src/wolnelektury/templates/account/base.html b/src/wolnelektury/templates/account/base.html index ebd628603..a2ddbe685 100755 --- a/src/wolnelektury/templates/account/base.html +++ b/src/wolnelektury/templates/account/base.html @@ -1,12 +1,11 @@ {% extends "site_base.html" %} {% block body %} -
    -{% block content %} {% endblock %} -
    +
    + {% block content %}{% endblock %} +
    {% endblock %} {% block extrabody %} -{% block extra_body %} -{% endblock %} + {% block extra_body %}{% endblock %} {% endblock %} diff --git a/src/wolnelektury/templates/admin/base_site.html b/src/wolnelektury/templates/admin/base_site.html index ff381b554..c4b16b482 100644 --- a/src/wolnelektury/templates/admin/base_site.html +++ b/src/wolnelektury/templates/admin/base_site.html @@ -4,8 +4,8 @@ {% block title %}{{ title }} | {% trans "Site administration" %} - WolneLektury.pl{% endblock %} {% block branding %} -

    {% trans "Site administration" %} - WolneLektury.pl

    -

    +

    {% trans "Site administration" %} - WolneLektury.pl

    +

    promobox | cytaty | @@ -16,7 +16,7 @@ licznik domeny | sponsorzy | sugestie -

    +

    {% endblock %} {% block nav-global %}{% endblock %} \ No newline at end of file diff --git a/src/wolnelektury/templates/admin/catalogue/book/change_form.html b/src/wolnelektury/templates/admin/catalogue/book/change_form.html index 819ab62fc..5282ebe01 100644 --- a/src/wolnelektury/templates/admin/catalogue/book/change_form.html +++ b/src/wolnelektury/templates/admin/catalogue/book/change_form.html @@ -2,45 +2,43 @@ {% load i18n %} {% block content_title %} - {% if change and 'advanced' in request.GET %} -

    {{ title }} — {% trans "advanced" %}

    - {% else %} - {{ block.super }} - {% endif %} + {% if change and 'advanced' in request.GET %} +

    {{ title }} — {% trans "advanced" %}

    + {% else %} + {{ block.super }} + {% endif %} {% endblock %} {# add an "Advanced" button to tools #} {% block extrastyle %} - {% if change and not is_popup %} - {{ block.super }} - - {% else %} - {{ block.super }} - {% endif %} + {% if change and not is_popup %} + {{ block.super }} + + {% else %} + {{ block.super }} + {% endif %} {% endblock %} {% block object-tools %} - {% if change and not is_popup %} -
    - {{ block.super }} -
    • - {% if 'advanced' in request.GET %} + {% if change and not is_popup %} +
      + {{ block.super }} + -
      - {% else %} - {{ block.super }} - {% endif %} + {% endif %} +
      • +
    +
    + {% else %} + {{ block.super }} + {% endif %} {% endblock %} - - - - diff --git a/src/wolnelektury/templates/admin/catalogue/book/change_list.html b/src/wolnelektury/templates/admin/catalogue/book/change_list.html index 9f1b8cbf4..131250a3a 100644 --- a/src/wolnelektury/templates/admin/catalogue/book/change_list.html +++ b/src/wolnelektury/templates/admin/catalogue/book/change_list.html @@ -2,9 +2,12 @@ {% load i18n %} {% block content %} -
    + {% csrf_token %} -

    -
    - {{ block.super }} +

    + + +

    + + {{ block.super }} {% endblock content %} diff --git a/src/wolnelektury/templates/annoy.html b/src/wolnelektury/templates/annoy.html index 890b62d91..a5b34a29a 100755 --- a/src/wolnelektury/templates/annoy.html +++ b/src/wolnelektury/templates/annoy.html @@ -1,18 +1,21 @@ {% load static %} 1% -
    +
    - Logo akcji 1% + Logo akcji 1% +

    Droga użytkowniczko, drogi użytkowniku!

    -

    Czy wiesz, że biblioteka internetowa Wolne Lektury to jeden z projektów - fundacji Nowoczesna Polska – - organizacji pożytku publicznego działającej na rzecz wolności korzystania - z dóbr kultury? Wesprzyj nasze działania, przeznaczając na nie 1% swojego podatku. - Możesz to zrobić, wpisując w zeznaniu podatkowym numer - KRS 0000070056.

    +

    + Czy wiesz, że biblioteka internetowa Wolne Lektury to jeden z projektów + fundacji Nowoczesna Polska – + organizacji pożytku publicznego działającej na rzecz wolności korzystania + z dóbr kultury? Wesprzyj nasze działania, przeznaczając na nie 1% swojego podatku. + Możesz to zrobić, wpisując w zeznaniu podatkowym numer + KRS 0000070056. +

    Dowiedz się więcej

    - + x
    diff --git a/src/wolnelektury/templates/auth/login.html b/src/wolnelektury/templates/auth/login.html index 756b8ad31..8509b4cf9 100644 --- a/src/wolnelektury/templates/auth/login.html +++ b/src/wolnelektury/templates/auth/login.html @@ -4,20 +4,20 @@

    {{ title }}

    -{% ssi_csrf_token %} -
      + class="cuteform{% if placeholdize %} hidelabels{% endif %}"> + {% ssi_csrf_token %} +
        {{ form.as_ul }}
      1. {% trans "Forgot Password?" %}
        3. -
      +

    {% trans "Sign in using:" %}

      -{% include "socialaccount/snippets/provider_list.html" %} + {% include "socialaccount/snippets/provider_list.html" %}
    {% include "socialaccount/snippets/login_extra.html" %} diff --git a/src/wolnelektury/templates/auth/login_register.html b/src/wolnelektury/templates/auth/login_register.html index 80d3d232a..31d137cdc 100755 --- a/src/wolnelektury/templates/auth/login_register.html +++ b/src/wolnelektury/templates/auth/login_register.html @@ -4,21 +4,18 @@ {% load ssi_csrf_token from ssify %} {% block extra %} + {{ block.super }} -{{ block.super }} - -

    {% trans "or register" %}:

    - -
    -{% ssi_csrf_token %} -{% render_honeypot_field %} -
      -
      - {{ register_form.as_ul }} -
      2. -
    -
    - +

    {% trans "or register" %}:

    +
    + {% ssi_csrf_token %} + {% render_honeypot_field %} +
      +
      + {{ register_form.as_ul }} +
      2. +
    +
    {% endblock %} diff --git a/src/wolnelektury/templates/auth/register.html b/src/wolnelektury/templates/auth/register.html index 9d2c28363..3252caeb8 100644 --- a/src/wolnelektury/templates/auth/register.html +++ b/src/wolnelektury/templates/auth/register.html @@ -7,7 +7,7 @@

    {% trans "Sign in using:" %}

      -{% include "socialaccount/snippets/provider_list.html" %} + {% include "socialaccount/snippets/provider_list.html" %}
    {% include "socialaccount/snippets/login_extra.html" %} diff --git a/src/wolnelektury/templates/base.html b/src/wolnelektury/templates/base/base.html similarity index 70% rename from src/wolnelektury/templates/base.html rename to src/wolnelektury/templates/base/base.html index 345b80f15..600ec9225 100644 --- a/src/wolnelektury/templates/base.html +++ b/src/wolnelektury/templates/base/base.html @@ -1,4 +1,4 @@ -{% extends "superbase.html" %} +{% extends "base/superbase.html" %} {% block ogtitle %}{% block titleextra %}{{ page_title }}{% endblock %}{% endblock %} diff --git a/src/wolnelektury/templates/base/superbase.html b/src/wolnelektury/templates/base/superbase.html new file mode 100644 index 000000000..ec523e568 --- /dev/null +++ b/src/wolnelektury/templates/base/superbase.html @@ -0,0 +1,178 @@ + +{% spaceless %} + + {% load pipeline i18n %} + {% load static from staticfiles %} + {% load catalogue_tags funding_tags reporting_stats %} + {% load piwik_tags %} + {% load ssi_include ssi_csrf_token from ssify %} + {% load user_username user_is_staff from common_tags %} + + + + + + + + + + {% block ogextra %}{% endblock %} + + + {% block title %}{% block titleextra %}{{ page_title }}{% endblock %} :: {% trans "Wolne Lektury" %}{% endblock %} + + + + {% stylesheet "main" %} + {% block extrahead %}{% endblock %} + + + + {% block bodycontent %} + + {% if not funding_no_show_current %} + {% current_offer as current_offer %} + {{ current_offer.if }} + {% ssi_include 'funding_top_bar' pk=current_offer %} + {{ current_offer.endif }} + {% endif %} + +
    +
    +
    + + +

    + {% url 'book_list' as b %} + {% url 'infopage' 'prawa' as r %} + {% count_books book_count %} + {% blocktrans count book_count as c %} + {{ c }} free reading you have right to + {% plural %} + {{ c }} free readings you have right to + {% endblocktrans %} +

    + +
    + + ⚐ + {% trans "Language" %} + +
    + {% for lang in LANGUAGES %} +
    + {% ssi_csrf_token %} + + +
    + {% endfor %} +
    +
    + + + +
    +
    + + {{ search_form.q }} +
    + +
    +
    +
    +
    + +
    +
    + + Wesprzyj działalność Nowoczesnej Polski + +
    + {% block body %} + {% endblock %} +
    +
    + + + + {# template #} +
    +
    {% trans "Close" %}
    +
    +

    * {% trans "Loading" %}

    +
    +
    + {% endblock bodycontent %} + + + + {% javascript "base" %} + + {% tracking_code %} + + {% block extrabody %}{% endblock %} + + + + +{% endspaceless %} diff --git a/src/wolnelektury/templates/info/join_us.html b/src/wolnelektury/templates/info/join_us.html index 3853b0251..32bb676a8 100644 --- a/src/wolnelektury/templates/info/join_us.html +++ b/src/wolnelektury/templates/info/join_us.html @@ -3,20 +3,23 @@ {% count_books book_count %}

    -{% blocktrans count book_count as c %} -We have {{c}} work published in Wolne Lektury! -Help us expand the library and set new readings free by -making a donation -or transferring 1% of your income tax. -{% plural %} -We have {{c}} works published in Wolne Lektury! -Help us expand the library and set new readings free by -making a donation -or transferring 1% of your income tax. -{% endblocktrans %} -{% comment %}{% trans "More..." %}{% endcomment %}

    + {% blocktrans count book_count as c %} + We have {{c}} work published in Wolne Lektury! + Help us expand the library and set new readings free by + making a donation + or transferring 1% of your income tax. + {% plural %} + We have {{c}} works published in Wolne Lektury! + Help us expand the library and set new readings free by + making a donation + or transferring 1% of your income tax. + {% endblocktrans %} + {% comment %}{% trans "More..." %}{% endcomment %} +

    -

    {% blocktrans %}Become an editor of Wolne Lektury! Find out if -we're currently working on a reading you're looking for and prepare -a publication by yourself by logging into the Editorial Platform.{% endblocktrans %} -{% trans "More..." %}

    +

    + {% blocktrans %}Become an editor of Wolne Lektury! Find out if + we're currently working on a reading you're looking for and prepare + a publication by yourself by logging into the Editorial Platform.{% endblocktrans %} + {% trans "More..." %} +

    diff --git a/src/wolnelektury/templates/latest_blog_posts.html b/src/wolnelektury/templates/latest_blog_posts.html index 24d486ef1..af7d256c5 100644 --- a/src/wolnelektury/templates/latest_blog_posts.html +++ b/src/wolnelektury/templates/latest_blog_posts.html @@ -1,9 +1,7 @@ {% spaceless %} - -
      -{% for post in posts %} -
    1. {{ post.title }}
      2. -{% endfor %} -
    - +
      + {% for post in posts %} +
    1. {{ post.title }}
      2. + {% endfor %} +
    {% endspaceless %} \ No newline at end of file diff --git a/src/wolnelektury/templates/main_page.html b/src/wolnelektury/templates/main_page.html index 591984c11..deea0a53c 100755 --- a/src/wolnelektury/templates/main_page.html +++ b/src/wolnelektury/templates/main_page.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load static from staticfiles %} {% load i18n catalogue_tags infopages_tags social_tags %} {% load ssi_include from ssify %} @@ -8,153 +8,153 @@ {% block title %}{% trans "Wolne Lektury internet library" %}{% endblock %} {% block ogtitle %}{% trans "Wolne Lektury internet library" %}{% endblock %} -{% block body %}{% spaceless %} - - {% choose_cite as cite_pk %} - {{ cite_pk.if }} - {% ssi_include 'social_cite_main' pk=cite_pk %} - {{ cite_pk.endif }} +{% block body %} + {% spaceless %} + {% choose_cite as cite_pk %} + {{ cite_pk.if }} + {% ssi_include 'social_cite_main' pk=cite_pk %} + {{ cite_pk.endif }} + +
    +

    W naszej cyfrowej bibliotece znajdziesz

    +
    +
    + {% for book in best %} + {% cache 86400 book_mini_box book.pk %} + {% include 'catalogue/book_mini_box.html' %} + {% endcache %} + {#% ssi_include 'catalogue_book_mini' pk=b.pk %#} + {% endfor %} +
    + +
    + i wiele innych książek, wierszy, obrazów, audiobooków… +
    +     +
    +
    -
    -

    W naszej cyfrowej bibliotece znajdziesz

    -
    -
    - {% for book in best %} +
    +

    Motywy i tematy

    +
    +

    {% trans "Theme" %}: {{ theme }}

    +

    Utwory, w których występuje ten motyw:

    + {% for book in theme_books %} {% cache 86400 book_mini_box book.pk %} {% include 'catalogue/book_mini_box.html' %} {% endcache %} - {#% ssi_include 'catalogue_book_mini' pk=b.pk %#} + {#% ssi_include 'catalogue_book_mini' pk=book.pk %#} {% endfor %} + {% if theme_fragment %} + {% ssi_include 'catalogue_fragment_promo' pk=theme_fragment.pk %} + {% endif %}
    - -
    - i wiele innych książek, wierszy, obrazów, audiobooków… -
    +     Zobacz katalog motywów +
    + + {% comment %} +
    +

    Autorzy

    + + {% ssi_include "catalogue_tag_box" pk=author.pk %} -
    -
    - -
    -

    Motywy i tematy

    -
    -

    {% trans "Theme" %}: {{ theme }}

    -

    Utwory, w których występuje ten motyw:

    - {% for book in theme_books %} - {% cache 86400 book_mini_box book.pk %} - {% include 'catalogue/book_mini_box.html' %} - {% endcache %} - {#% ssi_include 'catalogue_book_mini' pk=book.pk %#} - {% endfor %} - {% if theme_fragment %} - {% ssi_include 'catalogue_fragment_promo' pk=theme_fragment.pk %} - {% endif %} -
    - Zobacz katalog motywów -
    - - {% comment %} -
    -

    Autorzy

    - - {% ssi_include "catalogue_tag_box" pk=author.pk %} - - Zobacz katalog autorów -
    - -
    -

    Gatunki

    - - {% ssi_include "catalogue_tag_box" pk=genre.pk %} - - Zobacz katalog gatunków -
    - -
    -

    Rodzaje

    - - {% ssi_include "catalogue_tag_box" pk=kind.pk %} - - Zobacz katalog rodzajów -
    - -
    -

    Epoki

    - - {% ssi_include "catalogue_tag_box" pk=epoch.pk %} - - Zobacz katalog epok -
    - {% endcomment %} - - {% if collection %} -
    -

    Kolekcje

    - {% ssi_include 'catalogue_collection_box' pk=collection.pk %} - Zobacz katalog kolekcji + Zobacz katalog autorów
    - {% endif %} - -
    -

    {% trans "Recent publications" %}

    - {% for book in last_published %} - {% cache 86400 book_mini_box book.pk %} - {% include 'catalogue/book_mini_box.html' %} - {% endcache %} - {#% ssi_include 'catalogue_book_mini' pk=book.pk %#} - {% endfor %} - {% trans "More recent publications" %} -
    - -
    - -
    -

    {% trans "News" %}

    - {% ssi_include 'latest_blog_posts' %} -
    - - -
    -

    {% trans "Utilities" %}

    - - -
    - - -
    -

    {% trans "Information" %}

    - - - -
    + Zobacz katalog epok + + {% endcomment %} + + {% if collection %} +
    +

    Kolekcje

    + {% ssi_include 'catalogue_collection_box' pk=collection.pk %} + Zobacz katalog kolekcji +
    + {% endif %} + +
    +

    {% trans "Recent publications" %}

    + {% for book in last_published %} + {% cache 86400 book_mini_box book.pk %} + {% include 'catalogue/book_mini_box.html' %} + {% endcache %} + {#% ssi_include 'catalogue_book_mini' pk=book.pk %#} + {% endfor %} + {% trans "More recent publications" %} +
    -{% endspaceless %}{% endblock %} +
    +
    +

    {% trans "News" %}

    + {% ssi_include 'latest_blog_posts' %} +
    -{% block add_footer %}{% spaceless %} - {{ cite_pk.if }} -

    {% trans "Image used:" %} - {% ssi_include 'social_cite_info' pk=cite_pk %} -

    - {{ cite_pk.endif }} -{% endspaceless %}{% endblock %} +
    +

    {% trans "Utilities" %}

    + + +
    + +
    +

    {% trans "Information" %}

    + + + +
    + {% endspaceless %} +{% endblock %} + + +{% block add_footer %} + {% spaceless %} + {{ cite_pk.if }} +

    {% trans "Image used:" %} + {% ssi_include 'social_cite_info' pk=cite_pk %} +

    + {{ cite_pk.endif }} + {% endspaceless %} +{% endblock %} diff --git a/src/wolnelektury/templates/openid/login.html b/src/wolnelektury/templates/openid/login.html index 41eafa479..f9b4b34ba 100644 --- a/src/wolnelektury/templates/openid/login.html +++ b/src/wolnelektury/templates/openid/login.html @@ -6,28 +6,22 @@ {% block head_title %}{% trans "OpenID Sign In" %}{% endblock %} {% block body %} - -

    {% trans 'OpenID Sign In' %}

    -
    - - - -
    +

    {% trans 'OpenID Sign In' %}

    +
    + +
    {% endblock %} diff --git a/src/wolnelektury/templates/pagination/pagination.html b/src/wolnelektury/templates/pagination/pagination.html index 432cf6954..9f3375a7d 100644 --- a/src/wolnelektury/templates/pagination/pagination.html +++ b/src/wolnelektury/templates/pagination/pagination.html @@ -1,26 +1,27 @@ {% load i18n %} + {% if is_paginated %} - {% endif %} diff --git a/src/wolnelektury/templates/piston/authorize_token.html b/src/wolnelektury/templates/piston/authorize_token.html index 87450a20c..a76823843 100755 --- a/src/wolnelektury/templates/piston/authorize_token.html +++ b/src/wolnelektury/templates/piston/authorize_token.html @@ -1,18 +1,20 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% block titleextra %}{% trans "Authorize access to Wolne Lektury" %}{% endblock %} {% block body %} -

    {% trans "Authorize access to Wolne Lektury" %}

    +

    {% trans "Authorize access to Wolne Lektury" %}

    -
    -

    {% blocktrans %}Confirm to authorize access to Wolne Lektury as user {{ user}}.{% endblocktrans %}

    +
    +

    + {% blocktrans %}Confirm to authorize access to Wolne Lektury as user {{ user}}.{% endblocktrans %} +

    - {% csrf_token %} + {% csrf_token %} {{ form.as_p }}
    -
    +
    {% endblock %} diff --git a/src/wolnelektury/templates/publish_plan.html b/src/wolnelektury/templates/publish_plan.html index c4c3d6e6a..ffc11501e 100755 --- a/src/wolnelektury/templates/publish_plan.html +++ b/src/wolnelektury/templates/publish_plan.html @@ -1,16 +1,15 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% block titleextra %}{% trans "Publishing plan" %}{% endblock titleextra %} {% block body %} -

    {% trans "Publishing plan" %}

    - - +

    {% trans "Publishing plan" %}

    + {% endblock %} diff --git a/src/wolnelektury/templates/site_base.html b/src/wolnelektury/templates/site_base.html index b0c2ca524..3982fc4ca 100644 --- a/src/wolnelektury/templates/site_base.html +++ b/src/wolnelektury/templates/site_base.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {# This is for allauth templates. #} {% block bodyid %}auth-page{% endblock %} diff --git a/src/wolnelektury/templates/socialaccount/login_cancelled.html b/src/wolnelektury/templates/socialaccount/login_cancelled.html index bee55649a..eed32128a 100644 --- a/src/wolnelektury/templates/socialaccount/login_cancelled.html +++ b/src/wolnelektury/templates/socialaccount/login_cancelled.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} diff --git a/src/wolnelektury/templates/superbase.html b/src/wolnelektury/templates/superbase.html deleted file mode 100644 index d3abd31f2..000000000 --- a/src/wolnelektury/templates/superbase.html +++ /dev/null @@ -1,194 +0,0 @@ - -{% spaceless %} - - {% load pipeline i18n %} - {% load static from staticfiles %} - {% load catalogue_tags funding_tags reporting_stats %} - {% load piwik_tags %} - {% load ssi_include ssi_csrf_token from ssify %} - {% load user_username user_is_staff from common_tags %} - - - - - - - - - - {% block ogextra %}{% endblock %} - - - {% block title %}{% block titleextra %}{{ page_title }}{% endblock %} :: {% trans "Wolne Lektury" %}{% endblock %} - - - {% stylesheet "main" %} - {% block extrahead %} - {% endblock %} - - - - {% block bodycontent %} - - {% if not funding_no_show_current %} - {% current_offer as current_offer %} - {{ current_offer.if }} - {% ssi_include 'funding_top_bar' pk=current_offer %} - {{ current_offer.endif }} - {% endif %} - -
    -
    -
    - - - -

    - {% url 'book_list' as b %} - {% url 'infopage' 'prawa' as r %} - {% count_books book_count %} - {% blocktrans count book_count as c %} - {{ c }} free reading you have right to - {% plural %} - {{ c }} free readings you have right to - {% endblocktrans %} -

    - -
    - - ⚐ - {% trans "Language" %} - -
    - {% for lang in LANGUAGES %} -
    - {% ssi_csrf_token %} - - -
    - {% endfor %} -
    -
    - - - - -
    -
    - - {{ search_form.q }} -
    - -
    - -
    -
    -
    - - - -
    -
    - - Wesprzyj działalność Nowoczesnej Polski - -
    - {% block body %} - {% endblock %} -
    -
    - - - - - - - {# template #} -
    -
    {% trans "Close" %}
    -
    -

    * {% trans "Loading" %}

    -
    -
    - - - {% endblock bodycontent %} - - - - - {% javascript "base" %} - - {% tracking_code %} - - {% block extrabody %} - {% endblock %} - - - - -{% endspaceless %} diff --git a/src/wolnelektury/templates/user.html b/src/wolnelektury/templates/user.html index fa2f66035..f7491badd 100644 --- a/src/wolnelektury/templates/user.html +++ b/src/wolnelektury/templates/user.html @@ -1,18 +1,15 @@ -{% extends "base.html" %} +{% extends "base/base.html" %} {% load i18n %} {% block titleextra %}{% trans "User" %}{% endblock %} {% block body %} +
    +

    {% trans "User" %}

    -
    - -

    {% trans "User" %}

    - -

    {% trans "Password" %}

    -

    {% trans "E-mail" %}

    -

    {% trans "Social accounts" %}

    -
    - +

    {% trans "Password" %}

    +

    {% trans "E-mail" %}

    +

    {% trans "Social accounts" %}

    +
    {% endblock %} diff --git a/src/wolnelektury/templates/widget.html b/src/wolnelektury/templates/widget.html index 444f466ab..1103641f6 100644 --- a/src/wolnelektury/templates/widget.html +++ b/src/wolnelektury/templates/widget.html @@ -1,37 +1,30 @@ {% spaceless %} - -{% load static from staticfiles %} -{% load pipeline %} - - - - - - - Widget Wolnych Lektur - {% stylesheet 'widget' %} - - -
    - - - - - -
    - - -
    - -
    - -{% javascript 'widget' %} - - - - + {% load static from staticfiles %} + {% load pipeline %} + + + + + + + Widget Wolnych Lektur + {% stylesheet 'widget' %} + + +
    + + + +
    + + +
    +
    + {% javascript 'widget' %} + + {% endspaceless %} -- 2.20.1