From 1d5891fb132659113423705d8d8c982144ef7a8c Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Wed, 13 Dec 2017 16:22:36 +0100 Subject: [PATCH 1/1] fix player placement in search results --- .../templates/catalogue/book_searched.html | 25 ++++++------------- .../templates/catalogue/book_short.html | 2 +- .../catalogue/search_multiple_hits.html | 4 ++- .../static/scss/main/book_box.scss | 6 ++--- src/wolnelektury/static/scss/main/search.scss | 5 ++-- 5 files changed, 16 insertions(+), 26 deletions(-) diff --git a/src/catalogue/templates/catalogue/book_searched.html b/src/catalogue/templates/catalogue/book_searched.html index 06bb4fde0..4e914328c 100644 --- a/src/catalogue/templates/catalogue/book_searched.html +++ b/src/catalogue/templates/catalogue/book_searched.html @@ -1,14 +1,8 @@ -{% spaceless %} - {% load i18n %} - {% load inline_tag_list from catalogue_tags %} - {% load ssi_include from ssify %} - {% load cache %} - -
- {% cache 86400 catalogue_book_short book.pk %} - {% include 'catalogue/book_short.html' %} - {% endcache %} +{% extends "catalogue/book_short.html" %} +{% load inline_tag_list from catalogue_tags %} +{% block right-column %} +
{% endif %} {% endfor %}
- -
+ {% include 'catalogue/snippets/jplayer.html' %}
-{% endspaceless %} \ No newline at end of file +{% endblock %} diff --git a/src/catalogue/templates/catalogue/book_short.html b/src/catalogue/templates/catalogue/book_short.html index 24d93d068..70aaed3ab 100644 --- a/src/catalogue/templates/catalogue/book_short.html +++ b/src/catalogue/templates/catalogue/book_short.html @@ -131,7 +131,7 @@ {% block right-column %} {% if audiobooks %} -
+
{% include 'catalogue/snippets/jplayer.html' %}
{% endif %} diff --git a/src/catalogue/templates/catalogue/search_multiple_hits.html b/src/catalogue/templates/catalogue/search_multiple_hits.html index b3f522b0b..ce43bf9a7 100644 --- a/src/catalogue/templates/catalogue/search_multiple_hits.html +++ b/src/catalogue/templates/catalogue/search_multiple_hits.html @@ -30,7 +30,9 @@ diff --git a/src/wolnelektury/static/scss/main/book_box.scss b/src/wolnelektury/static/scss/main/book_box.scss index 44a59557b..0e9061159 100755 --- a/src/wolnelektury/static/scss/main/book_box.scss +++ b/src/wolnelektury/static/scss/main/book_box.scss @@ -131,7 +131,7 @@ } } -.audiobook-box { +.audiobook-box, .search-result .book-box { .book-left-column { @media screen and (min-width: 1024px) { display: inline-block; @@ -139,9 +139,10 @@ } } - .audiobook-right-column { + .book-right-column { @media screen and (min-width: 1024px) { float: right; + @include size(padding-top, 15px); @include size(width, 360px); } } @@ -151,7 +152,6 @@ @media screen and (min-width: 1024px) { float: right; - margin-top: 48px; } } } diff --git a/src/wolnelektury/static/scss/main/search.scss b/src/wolnelektury/static/scss/main/search.scss index f77e84e33..14d8f0d92 100755 --- a/src/wolnelektury/static/scss/main/search.scss +++ b/src/wolnelektury/static/scss/main/search.scss @@ -26,8 +26,7 @@ @include size(margin-bottom, 16px); } - -.search-result { +/*.search-result { @include size(border, 1px solid #ddd); @include size(box-shadow, 2px 2px 2px #ddd); @include size(margin, 1px); @@ -55,7 +54,7 @@ margin: 0; } } -} +}*/ -- 2.20.1