From: Radek Czajka Date: Tue, 15 Jun 2010 08:42:00 +0000 (+0200) Subject: Merge branch 'master' of git+ssh://github.com/fnp/wolnelektury X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/032889045439986dc8506267cbb68643473970ff?hp=41e79f5deff58b34f185c8c7426f505793c1d9c7 Merge branch 'master' of git+ssh://github.com/fnp/wolnelektury --- diff --git a/wolnelektury/static/css/master.css b/wolnelektury/static/css/master.css index 0c9128d70..893fb534d 100644 --- a/wolnelektury/static/css/master.css +++ b/wolnelektury/static/css/master.css @@ -354,6 +354,9 @@ div.shown-tags p, div.all-tags p { text-align: justify; overflow: hidden; } +#description-short { + display:none; +} #description .meta { margin: 0.5em; diff --git a/wolnelektury/static/js/catalogue.js b/wolnelektury/static/js/catalogue.js index a76215aa5..ff95df5cc 100644 --- a/wolnelektury/static/js/catalogue.js +++ b/wolnelektury/static/js/catalogue.js @@ -310,19 +310,43 @@ function serverTime() { ).click(function() { location.href = $('h2 a', this).attr('href'); }); - - $('#toggle-description').hover( - function() { $(this).css({background: '#F3F3F3', cursor: 'pointer'}); }, - function() { $(this).css({background: '#EEE'}); } - ).click(function() { - if ($('#description').hasClass('hidden')) { - $('#description').animate({"height": $('#description').attr("box_h")+'px'}, {duration: "fast" }).removeClass('hidden'); - $('p', this).html(LOCALE_TEXTS[LANGUAGE_CODE]['HIDE_DESCRIPTION'] + ' ▲'); - } else { - $('#description').animate({"height": '4em'}, {duration: "fast" }).addClass('hidden'); - $('p', this).html(LOCALE_TEXTS[LANGUAGE_CODE]['EXPAND_DESCRIPTION'] + ' ▼'); - } - }); + + 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); + } + } + 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( + 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( + 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'] + ' ▲' + ); $('#toggle-share-shelf').hover( function() { $(this).css({background: '#F3F3F3', cursor: 'pointer'}); }, @@ -361,10 +385,6 @@ function serverTime() { link.parent().remove(); }); }); - - $('#description').attr("box_h", $('#description').height()); - $('#description').css("height", '4em').addClass('hidden'); - $('#toggle-description p').html(LOCALE_TEXTS[LANGUAGE_CODE]['EXPAND_DESCRIPTION']+' ▼'); $('#share-shelf').hide().addClass('hidden'); $('#share-shelf input').focus(function(){this.select();}); diff --git a/wolnelektury/templates/catalogue/tagged_object_list.html b/wolnelektury/templates/catalogue/tagged_object_list.html index 07fda03ad..5f7d69fe6 100644 --- a/wolnelektury/templates/catalogue/tagged_object_list.html +++ b/wolnelektury/templates/catalogue/tagged_object_list.html @@ -21,10 +21,11 @@ {% with tags|last as last_tag %} {% if last_tag.has_description %}
- {{ last_tag.description|safe }} +
{{ last_tag.description|safe }}
+
{{ last_tag.description|safe|truncatewords_html:30 }}
-

{% trans "Hide description" %} ▲

+

{% endif %} {% if shelf_is_set %}