From: Radek Czajka Date: Wed, 16 Jun 2010 14:54:40 +0000 (+0200) Subject: pretty book descriptions and don't hide short descriptions X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/847fe6bcff6dc95e389656d78ba02372b5686b86?ds=inline;hp=-c pretty book descriptions and don't hide short descriptions --- 847fe6bcff6dc95e389656d78ba02372b5686b86 diff --git a/wolnelektury/static/js/catalogue.js b/wolnelektury/static/js/catalogue.js index 6e0f562fb..55ecef674 100644 --- a/wolnelektury/static/js/catalogue.js +++ b/wolnelektury/static/js/catalogue.js @@ -312,42 +312,45 @@ function serverTime() { location.href = $('h2 a', this).attr('href'); }); - function toggled_by_slide(cont, short_el, long_el, button, short_text, long_text) { - function toggle(cont, short_el, long_el, button, short_text, long_text) { - if (cont.hasClass('short')) { - cont.animate({"height": long_el.attr("cont_h")+'px'}, {duration: "fast" }).removeClass('short'); - short_el.hide(); - long_el.show(); - button.html(long_text); - } else { - cont.animate({"height": short_el.attr("cont_h")+'px'}, {duration: "fast" }).addClass('short'); - long_el.hide(); - short_el.show(); - button.html(short_text); - } - } + function toggled_by_slide(cont, short_el, long_el, button, short_text, long_text) { + function toggle(cont, short_el, long_el, button, short_text, long_text) { + if (cont.hasClass('short')) { + cont.animate({"height": long_el.attr("cont_h")+'px'}, {duration: "fast" }).removeClass('short'); + short_el.hide(); + long_el.show(); + button.html(long_text); + } else { + cont.animate({"height": short_el.attr("cont_h")+'px'}, {duration: "fast" }).addClass('short'); + long_el.hide(); + short_el.show(); + button.html(short_text); + } + } + if (long_el.html().length <= short_el.html().length) + return; + long_el.attr("cont_h", cont.height()).hide(); short_el.show().attr("cont_h", cont.height()); - cont.addClass('short'); - button.html(short_text); - button.hover( + cont.addClass('short'); + button.html(short_text); + button.hover( function() { $(this).css({background: '#F3F3F3', cursor: 'pointer'}); }, function() { $(this).css({background: '#EEE'}); } - ).click(function(){ - toggle(cont, short_el, long_el, button, short_text, long_text) - }); - cont.hover( + ).click(function(){ + toggle(cont, short_el, long_el, button, short_text, long_text) + }); + cont.hover( function() { $(this).css({background: '#F3F3F3', cursor: 'pointer'}); }, function() { $(this).css({background: '#FFF'}); } ).click(function(){ toggle(cont, short_el, long_el, button, short_text, long_text) }) - } + } toggled_by_slide($('#description'), $('#description-short'), $('#description-long'), $('#toggle-description p'), LOCALE_TEXTS[LANGUAGE_CODE]['EXPAND_DESCRIPTION']+' ▼', - LOCALE_TEXTS[LANGUAGE_CODE]['HIDE_DESCRIPTION'] + ' ▲' - ); + LOCALE_TEXTS[LANGUAGE_CODE]['HIDE_DESCRIPTION'] + ' ▲' + ); $('#toggle-share-shelf').hover( function() { $(this).css({background: '#F3F3F3', cursor: 'pointer'}); }, diff --git a/wolnelektury/templates/catalogue/book_detail.html b/wolnelektury/templates/catalogue/book_detail.html index 60284d6a4..27f2e7287 100644 --- a/wolnelektury/templates/catalogue/book_detail.html +++ b/wolnelektury/templates/catalogue/book_detail.html @@ -19,9 +19,10 @@

{% trans "Based on" %}: {{ extra_info.source_name }}

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

{% trans "Hide description" %} ▲

+

{% endif %}

{% trans "Put a book" %} {% trans "on the shelf!" %}