From: Radek Czajka Date: Mon, 14 Jun 2010 14:58:58 +0000 (+0200) Subject: changed tag description display X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/fa0414cf62aaa1e72c02b1b12567dddfcfcd12d2?ds=sidebyside;hp=-c changed tag description display --- fa0414cf62aaa1e72c02b1b12567dddfcfcd12d2 diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py index db1131aea..0237281e7 100644 --- a/wolnelektury/settings.py +++ b/wolnelektury/settings.py @@ -159,7 +159,7 @@ COMPRESS_JS = { 'js/jquery.countdown-es.js', 'js/jquery.countdown-lt.js', 'js/jquery.countdown-ru.js', 'js/jquery.countdown-fr.js', 'js/jquery.jqmodal.js', 'js/jquery.labelify.js', 'js/catalogue.js', - 'js/jquery.cookie.js',), + ), 'output_filename': 'js/all?.min.js', }, 'book': { diff --git a/wolnelektury/static/css/master.css b/wolnelektury/static/css/master.css index 06c5e3447..ff502264e 100644 --- a/wolnelektury/static/css/master.css +++ b/wolnelektury/static/css/master.css @@ -351,6 +351,7 @@ div.shown-tags p, div.all-tags p { #description { margin-top: 0.5em; text-align: justify; + overflow: hidden; } #description .meta { diff --git a/wolnelektury/static/js/catalogue.js b/wolnelektury/static/js/catalogue.js index c038e2421..a76215aa5 100644 --- a/wolnelektury/static/js/catalogue.js +++ b/wolnelektury/static/js/catalogue.js @@ -316,12 +316,10 @@ function serverTime() { function() { $(this).css({background: '#EEE'}); } ).click(function() { if ($('#description').hasClass('hidden')) { - $('#description').slideDown('fast').removeClass('hidden'); - $.cookie('description-state', 'opened', {path: '/', expires: 30}); + $('#description').animate({"height": $('#description').attr("box_h")+'px'}, {duration: "fast" }).removeClass('hidden'); $('p', this).html(LOCALE_TEXTS[LANGUAGE_CODE]['HIDE_DESCRIPTION'] + ' ▲'); } else { - $('#description').slideUp('fast').addClass('hidden'); - $.cookie('description-state', 'closed', {path: '/', expires: 30}); + $('#description').animate({"height": '4em'}, {duration: "fast" }).addClass('hidden'); $('p', this).html(LOCALE_TEXTS[LANGUAGE_CODE]['EXPAND_DESCRIPTION'] + ' ▼'); } }); @@ -364,10 +362,9 @@ function serverTime() { }); }); - if ($.cookie('description-state') == 'closed') { - $('#description').hide().addClass('hidden'); - $('#toggle-description p').html(LOCALE_TEXTS[LANGUAGE_CODE]['EXPAND_DESCRIPTION']+' ▼'); - } + $('#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/static/js/jquery.cookie.js b/wolnelektury/static/js/jquery.cookie.js deleted file mode 100644 index 6df1faca2..000000000 --- a/wolnelektury/static/js/jquery.cookie.js +++ /dev/null @@ -1,96 +0,0 @@ -/** - * Cookie plugin - * - * Copyright (c) 2006 Klaus Hartl (stilbuero.de) - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * - */ - -/** - * Create a cookie with the given name and value and other optional parameters. - * - * @example $.cookie('the_cookie', 'the_value'); - * @desc Set the value of a cookie. - * @example $.cookie('the_cookie', 'the_value', { expires: 7, path: '/', domain: 'jquery.com', secure: true }); - * @desc Create a cookie with all available options. - * @example $.cookie('the_cookie', 'the_value'); - * @desc Create a session cookie. - * @example $.cookie('the_cookie', null); - * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain - * used when the cookie was set. - * - * @param String name The name of the cookie. - * @param String value The value of the cookie. - * @param Object options An object literal containing key/value pairs to provide optional cookie attributes. - * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object. - * If a negative value is specified (e.g. a date in the past), the cookie will be deleted. - * If set to null or omitted, the cookie will be a session cookie and will not be retained - * when the the browser exits. - * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie). - * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie). - * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will - * require a secure protocol (like HTTPS). - * @type undefined - * - * @name $.cookie - * @cat Plugins/Cookie - * @author Klaus Hartl/klaus.hartl@stilbuero.de - */ - -/** - * Get the value of a cookie with the given name. - * - * @example $.cookie('the_cookie'); - * @desc Get the value of a cookie. - * - * @param String name The name of the cookie. - * @return The value of the cookie. - * @type String - * - * @name $.cookie - * @cat Plugins/Cookie - * @author Klaus Hartl/klaus.hartl@stilbuero.de - */ -jQuery.cookie = function(name, value, options) { - if (typeof value != 'undefined') { // name and value given, set cookie - options = options || {}; - if (value === null) { - value = ''; - options.expires = -1; - } - var expires = ''; - if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) { - var date; - if (typeof options.expires == 'number') { - date = new Date(); - date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000)); - } else { - date = options.expires; - } - expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE - } - // CAUTION: Needed to parenthesize options.path and options.domain - // in the following expressions, otherwise they evaluate to undefined - // in the packed version for some reason... - var path = options.path ? '; path=' + (options.path) : ''; - var domain = options.domain ? '; domain=' + (options.domain) : ''; - var secure = options.secure ? '; secure' : ''; - document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join(''); - } else { // only name given, get cookie - var cookieValue = null; - if (document.cookie && document.cookie != '') { - var cookies = document.cookie.split(';'); - for (var i = 0; i < cookies.length; i++) { - var cookie = jQuery.trim(cookies[i]); - // Does this cookie string begin with the name we want? - if (cookie.substring(0, name.length + 1) == (name + '=')) { - cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); - break; - } - } - } - return cookieValue; - } -}; \ No newline at end of file