Merge branch 'master' of http://github.com/fnp/wolnelektury

diff --combined wolnelektury/static/css/master.css
index 98a96c0,893fb53..669aeb1
--- 1/wolnelektury/static/css/master.css
--- 2/wolnelektury/static/css/master.css
+++ b/wolnelektury/static/css/master.css
@@@ -354,6 -354,9 +354,9 @@@ div.shown-tags p, div.all-tags p 
      text-align: justify;
      overflow: hidden;
  }
+ #description-short {
+       display:none;
+ }
  
  #description .meta {
      margin: 0.5em;
@@@ -875,6 -878,3 +878,6 @@@
      color: #FFF;
      text-decoration: none;
  }
 +#createNewShelf {
 +display: none;
 +}

diff --combined wolnelektury/static/js/catalogue.js
index 3aad7b4,ff95df5..dc4c07d
--- 1/wolnelektury/static/js/catalogue.js
--- 2/wolnelektury/static/js/catalogue.js
+++ b/wolnelektury/static/js/catalogue.js
@@@ -107,7 -107,6 +107,7 @@@ function serverTime() 
  
  (function($) {
      $(function() {
 +      
          $('form input').labelify({labelledClass: 'blur'});
          
          target = $('#login-register-window div.target');
@@@ -311,19 -310,43 +311,43 @@@
          ).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'}); },
@@@ -348,18 -371,9 +372,18 @@@
                  target.html('<p><img src="/static/img/indicator.gif" />'+LOCALE_TEXTS[LANGUAGE_CODE]['DELETE_SHELF']+'</p>');
                  hash.w.css({position: 'absolute', left: offset.left, top: offset.top}).show() },
              onLoad: function(hash) { 
 +              try {
 +                      $('#createShelfTrigger').click(function(){
 +                              $('#createNewShelf').show();
 +                      });
 +              } catch (e){}
 +
                  $('form', hash.w).ajaxForm({
                      target: target,
 -                    success: function() { setTimeout(function() { $('#set-window').jqmHide() }, 1000) }
 +                    success: function() { 
 +                      setTimeout(function() { 
 +                                      $('#set-window').jqmHide();
 +                                 }, 1000)}
                  });
              }
          });
@@@ -371,10 -385,6 +395,6 @@@
                  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();});