merge wyszukiwania.

Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

Conflicts:
	lib/librarian
	wolnelektury/templates/base.html

diff --cc apps/catalogue/models.py
Simple merge

diff --cc apps/catalogue/urls.py
Simple merge

diff --cc wolnelektury/settings.py
index fe25729,18e8d75..f01ab18
--- 1/wolnelektury/settings.py
--- 2/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@@ -206,10 -201,9 +207,11 @@@ COMPRESS_JS = 
              'js/locale.js',
              'js/dialogs.js',
              'js/sponsors.js',
+             'js/base.js',
              'js/pdcounter.js',
  
 +            'js/search.js',
 +
              #~ 'js/jquery.autocomplete.js',
              #~ 'js/jquery.labelify.js', 'js/catalogue.js',
              ),

diff --cc wolnelektury/static/js/search.js
index e58d372,0000000..c41a672
mode 100644,000000..100644
--- 1/wolnelektury/static/js/search.js
--- /dev/null
+++ b/wolnelektury/static/js/search.js
@@@ -1,49 -1,0 +1,49 @@@
-       $("#search input[name=q]").search();
 +
 +var __bind = function (self, fn) {
 +    return function() { fn.apply(self, arguments); };
 +};
 +
 +(function($){
 +    $.widget("wl.search", {
 +      options: {
 +          minLength: 0,
 +        },
 +
 +      _create: function() {
 +          var opts = { 
 +              minLength: this.options.minLength,
 +              select: __bind(this, this.enter),
 +              focus: function() { return false; },
 +              source: this.element.data('source'),
 +          };
 +          this.element.autocomplete(opts).data("autocomplete")._renderItem = __bind(this, this.render_item);
 +      },
 +
 +      enter: function(event, ui) {
 +          if (ui.item.url != undefined) {
 +              location.href = ui.item.url;
 +          } else {
 +              this.element.closest('form').submit();
 +          }
 +      },
 +   
 +      render_item: function (ul, item) {
 +          return $("<li></li>").data('item.autocomplete', item)
 +              .append('<a href="'+item.url+'">'+item.label+ ' ('+item.category+')</a>')
 +              .appendTo(ul);
 +      },
 +
 +      destroy: function() {
 +
 +      },
 +      
 +
 +
 +      });
 +
 +    $(function() {
++      $("#search-area input[name=q]").search();
 +      
 +    });
 +
 +})(jQuery);

diff --cc wolnelektury/templates/base.html
index d1bf19e,4409486..48f13ad
--- 1/wolnelektury/templates/base.html
--- 2/wolnelektury/templates/base.html
+++ b/wolnelektury/templates/base.html
@@@ -62,10 -72,10 +72,10 @@@
  
  
  
-             <form id="search" action="/fullsearch/">
 -            <form id="search-area">
++            <form id="search-area" action="/fullsearch/">
                  
 -                <span id="search-field">
 -                    <input title="np. Leśmian" name="q" autocomplete="off">
 +                <span id="search-field" class="grid-line">
 +                    <input title="np. Leśmian" name="q" autocomplete="off" data-source="/fullsearch/hint/">
                  </span><span id="search-button">
                      <button type='submit'><span class="mono">{% trans "Search" %}</span></button>
                  </span>

diff --cc wolnelektury/urls.py
Simple merge