remove some old around-search stuff

diff --git a/apps/ajaxable/templates/ajaxable/form_on_page.html b/apps/ajaxable/templates/ajaxable/form_on_page.html
index e54231d..61175d5 100755 (executable)
--- a/apps/ajaxable/templates/ajaxable/form_on_page.html
+++ b/apps/ajaxable/templates/ajaxable/form_on_page.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
 {% extends "base.html" %}
 {% load i18n %}
 

-{% block titleextra %}:: {{ title }}{% endblock %}
+{% block titleextra %}{{ title }}{% endblock %}

 
 {% block body %}
 
 
 {% block body %}
 

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index 0e74f8f..0ba4476 100644 (file)
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -184,22 +184,6 @@ def authentication_form():
     return LoginForm(prefix='login').as_ul()
 
 
     return LoginForm(prefix='login').as_ul()
 
 

-@register.inclusion_tag('catalogue/search_form.html')
-def search_form():
-    return {"form": SearchForm()}
-
-@register.inclusion_tag('catalogue/breadcrumbs.html')
-def breadcrumbs(tags, search_form=True):
-    context = {'tag_list': tags}
-    try:
-        max_tag_list = settings.MAX_TAG_LIST
-    except AttributeError:
-        max_tag_list = -1
-    if search_form and (max_tag_list == -1 or len(tags) < max_tag_list):
-        context['search_form'] = SearchForm(tags=tags)
-    return context
-
-

 @register.tag
 def catalogue_url(parser, token):
     bits = token.split_contents()
 @register.tag
 def catalogue_url(parser, token):
     bits = token.split_contents()

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 8bf5681..57a4975 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -46,7 +46,6 @@ def catalogue(request):
     categories = split_tags(tags)
     fragment_tags = categories.get('theme', [])
 
     categories = split_tags(tags)
     fragment_tags = categories.get('theme', [])
 

-    form = forms.SearchForm()

     return render_to_response('catalogue/catalogue.html', locals(),
         context_instance=RequestContext(request))
 
     return render_to_response('catalogue/catalogue.html', locals(),
         context_instance=RequestContext(request))
 


@@ -54,8 +53,6 @@ def catalogue(request):
 def book_list(request, filter=None, template_name='catalogue/book_list.html'):
     """ generates a listing of all books, optionally filtered with a test function """
 
 def book_list(request, filter=None, template_name='catalogue/book_list.html'):
     """ generates a listing of all books, optionally filtered with a test function """
 

-    form = forms.SearchForm()
-

     books_by_author, orphans, books_by_parent = models.Book.book_list(filter)
     books_nav = SortedDict()
     for tag in books_by_author:
     books_by_author, orphans, books_by_parent = models.Book.book_list(filter)
     books_nav = SortedDict()
     for tag in books_by_author:


@@ -194,7 +191,6 @@ def book_fragments(request, book, theme_slug):
     theme = get_object_or_404(models.Tag, slug=theme_slug, category='theme')
     fragments = models.Fragment.tagged.with_all([book_tag, theme])
 
     theme = get_object_or_404(models.Tag, slug=theme_slug, category='theme')
     fragments = models.Fragment.tagged.with_all([book_tag, theme])
 

-    form = forms.SearchForm()

     return render_to_response('catalogue/book_fragments.html', locals(),
         context_instance=RequestContext(request))
 
     return render_to_response('catalogue/book_fragments.html', locals(),
         context_instance=RequestContext(request))
 


@@ -240,7 +236,6 @@ def book_detail(request, book):
         projects.add((project, meta.get('funded_by', '')))
     projects = sorted(projects)
 
         projects.add((project, meta.get('funded_by', '')))
     projects = sorted(projects)
 

-    form = forms.SearchForm()

     custom_pdf_form = forms.CustomPDFForm()
     return render_to_response('catalogue/book_detail.html', locals(),
         context_instance=RequestContext(request))
     custom_pdf_form = forms.CustomPDFForm()
     return render_to_response('catalogue/book_detail.html', locals(),
         context_instance=RequestContext(request))

diff --git a/apps/dictionary/templates/dictionary/note_list.html b/apps/dictionary/templates/dictionary/note_list.html
index fc4ad66..cd88c17 100755 (executable)
--- a/apps/dictionary/templates/dictionary/note_list.html
+++ b/apps/dictionary/templates/dictionary/note_list.html
@@ -1,16 +1,14 @@
 {% extends "base.html" %}
 {% load i18n pagination_tags %}
 {% extends "base.html" %}
 {% load i18n pagination_tags %}

-{% load catalogue_tags %}

 
 
 {% block bodyid %}footnotes{% endblock %}
 
 
 
 {% block bodyid %}footnotes{% endblock %}
 

-{% block title %}{% trans "Footnotes on WolneLektury.pl" %}{% endblock %}
+{% block titleextra %}{% trans "Footnotes" %}{% endblock %}

 
 
 {% block body %}
     <h1>{% trans "Footnotes" %}</h1>
 
 
 {% block body %}
     <h1>{% trans "Footnotes" %}</h1>

-    {% search_form %}

 
 
 <p>
 
 
 <p>

diff --git a/apps/dictionary/views.py b/apps/dictionary/views.py
index e120063..7b9cd53 100755 (executable)
--- a/apps/dictionary/views.py
+++ b/apps/dictionary/views.py
@@ -7,7 +7,6 @@ from catalogue.forms import SearchForm
 from dictionary.models import Note
 
 def letter_notes(request, letter=None):
 from dictionary.models import Note
 
 def letter_notes(request, letter=None):

-    form = SearchForm()

     letters = ["0-9"] + [chr(a) for a in range(ord('a'), ord('z')+1)]
     objects = Note.objects.all()
     if letter == "0-9":
     letters = ["0-9"] + [chr(a) for a in range(ord('a'), ord('z')+1)]
     objects = Note.objects.all()
     if letter == "0-9":

diff --git a/apps/infopages/templates/infopages/infopage.html b/apps/infopages/templates/infopages/infopage.html
index 2d00d5d..dc9efe1 100755 (executable)
--- a/apps/infopages/templates/infopages/infopage.html
+++ b/apps/infopages/templates/infopages/infopage.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load chunks %}
 
 {% load i18n %}
 {% load chunks %}
 

-{% block titleextra %}:: {{ page.title }}{% endblock %}
+{% block titleextra %}{{ page.title }}{% endblock %}

 
 {% block metadescription %}{{ left_column|striptags|truncatewords:10 }}{% endblock %}
 
 
 {% block metadescription %}{{ left_column|striptags|truncatewords:10 }}{% endblock %}
 

diff --git a/apps/lesmianator/views.py b/apps/lesmianator/views.py
index cebcf8b..28cb32a 100644 (file)
--- a/apps/lesmianator/views.py
+++ b/apps/lesmianator/views.py
@@ -8,17 +8,15 @@ from django.views.decorators import cache
 
 from catalogue.utils import get_random_hash
 from catalogue.models import Book, Tag
 
 from catalogue.utils import get_random_hash
 from catalogue.models import Book, Tag

-from catalogue import forms

 from lesmianator.models import Poem, Continuations
 
 
 def main_page(request):
     last = Poem.objects.all().order_by('-created_at')[:10]
 from lesmianator.models import Poem, Continuations
 
 
 def main_page(request):
     last = Poem.objects.all().order_by('-created_at')[:10]

-    form = forms.SearchForm()

     shelves = Tag.objects.filter(user__username='lesmianator')
 
     return render_to_response('lesmianator/lesmianator.html', 
     shelves = Tag.objects.filter(user__username='lesmianator')
 
     return render_to_response('lesmianator/lesmianator.html', 

-                {"last": last, "form": form, "shelves": shelves},
+                {"last": last, "shelves": shelves},

                 context_instance=RequestContext(request))
 
 
                 context_instance=RequestContext(request))
 
 

diff --git a/apps/lessons/views.py b/apps/lessons/views.py
index 242526d..9314d1c 100644 (file)
--- a/apps/lessons/views.py
+++ b/apps/lessons/views.py
@@ -3,7 +3,6 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.views.generic.list_detail import object_detail
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.views.generic.list_detail import object_detail

-from catalogue import forms

 from lessons import models
 
 
 from lessons import models
 
 


@@ -17,6 +16,4 @@ def document_detail(request, slug):
         slug_field='slug',
         queryset=models.Document.objects.all(),
         template_name=template_name,
         slug_field='slug',
         queryset=models.Document.objects.all(),
         template_name=template_name,

-        extra_context={
-            'form': forms.SearchForm(),
-        })
+    )

diff --git a/apps/picture/views.py b/apps/picture/views.py
index 105f6b8..c5be3be 100644 (file)
--- a/apps/picture/views.py
+++ b/apps/picture/views.py
@@ -1,4 +1,3 @@
-from catalogue import forms

 from picture.models import Picture
 from django.utils.datastructures import SortedDict
 from django.shortcuts import render_to_response, get_object_or_404
 from picture.models import Picture
 from django.utils.datastructures import SortedDict
 from django.shortcuts import render_to_response, get_object_or_404


@@ -8,8 +7,6 @@ from django.template import RequestContext
 def picture_list(request, filter=None, template_name='catalogue/picture_list.html'):
     """ generates a listing of all books, optionally filtered with a test function """
 
 def picture_list(request, filter=None, template_name='catalogue/picture_list.html'):
     """ generates a listing of all books, optionally filtered with a test function """
 

-    form = forms.SearchForm()
-

     pictures_by_author, orphans = Picture.picture_list()
     books_nav = SortedDict()
     for tag in pictures_by_author:
     pictures_by_author, orphans = Picture.picture_list()
     books_nav = SortedDict()
     for tag in pictures_by_author:


@@ -22,7 +19,6 @@ def picture_list(request, filter=None, template_name='catalogue/picture_list.htm
 
 
 def picture_detail(request, picture):
 
 
 def picture_detail(request, picture):

-    form = forms.SearchForm()

     picture = get_object_or_404(Picture, slug=picture)
 
     categories = SortedDict()
     picture = get_object_or_404(Picture, slug=picture)
 
     categories = SortedDict()

diff --git a/apps/reporting/templates/reporting/main.html b/apps/reporting/templates/reporting/main.html
index bbfca99..c629f10 100755 (executable)
--- a/apps/reporting/templates/reporting/main.html
+++ b/apps/reporting/templates/reporting/main.html
@@ -2,14 +2,13 @@
 {% load i18n %}
 {% load reporting_stats catalogue_tags %}
 
 {% load i18n %}
 {% load reporting_stats catalogue_tags %}
 

-{% block title %}Statystyka w  WolneLektury.pl{% endblock %}
+{% block titleextra %}{% trans "Reports" %}{% endblock %}

 
 {% block bodyid %}reports-stats{% endblock %}
 
 
 {% block body %}
     <h1>Statystyka</h1>
 
 {% block bodyid %}reports-stats{% endblock %}
 
 
 {% block body %}
     <h1>Statystyka</h1>

-    {% search_form %}

 
     <p><a href="{% url reporting_catalogue_pdf %}">Katalog biblioteki w formacie PDF.</a></p>
 
 
     <p><a href="{% url reporting_catalogue_pdf %}">Katalog biblioteki w formacie PDF.</a></p>
 

diff --git a/wolnelektury/templates/base.html b/wolnelektury/templates/base.html
index b53bab7..19c808a 100644 (file)
--- a/wolnelektury/templates/base.html
+++ b/wolnelektury/templates/base.html
@@ -7,7 +7,7 @@
         <meta http-equiv="Content-Style-Type" content="text/css" />
         <meta name="description" 
             content="{% block metadescription %}Darmowe opracowane, pełne teksty lektur, e-booki, audiobooki i pliki DAISY na wolnej licencji.{% endblock %}" />
         <meta http-equiv="Content-Style-Type" content="text/css" />
         <meta name="description" 
             content="{% block metadescription %}Darmowe opracowane, pełne teksty lektur, e-booki, audiobooki i pliki DAISY na wolnej licencji.{% endblock %}" />

-        <title>{% trans "Wolne Lektury internet library" %}
+        <title>{% trans "Wolne Lektury" %} :: 

             {% block titleextra %}{% endblock %}</title>
         <link rel="icon" href="{{ STATIC_URL }}img/favicon.png" type="image/png" />
         <link rel="search" type="application/opensearchdescription+xml" title="Wolne Lektury" href="{{ STATIC_URL }}opensearch.xml" />
             {% block titleextra %}{% endblock %}</title>
         <link rel="icon" href="{{ STATIC_URL }}img/favicon.png" type="image/png" />
         <link rel="search" type="application/opensearchdescription+xml" title="Wolne Lektury" href="{{ STATIC_URL }}opensearch.xml" />

diff --git a/wolnelektury/templates/catalogue/audiobook_list.html b/wolnelektury/templates/catalogue/audiobook_list.html
index a9b8ba0..d794cd9 100644 (file)
--- a/wolnelektury/templates/catalogue/audiobook_list.html
+++ b/wolnelektury/templates/catalogue/audiobook_list.html
@@ -3,7 +3,7 @@
 
 {% block bodyid %}book-a-list{% endblock %}
 
 
 {% block bodyid %}book-a-list{% endblock %}
 

-{% block title %}{% trans "Listing of all audiobooks on WolneLektury.pl" %}{% endblock %}
+{% block titleextra %}{% trans "Listing of all audiobooks" %}{% endblock %}

 
 {% block metadescription %}Darmowe audiobooki na wolnej licencji. Lektury czytane przez znanych aktorów.{% endblock %}
 
 
 {% block metadescription %}Darmowe audiobooki na wolnej licencji. Lektury czytane przez znanych aktorów.{% endblock %}
 

diff --git a/wolnelektury/templates/catalogue/book_detail.html b/wolnelektury/templates/catalogue/book_detail.html
index c47e217..5c0a047 100644 (file)
--- a/wolnelektury/templates/catalogue/book_detail.html
+++ b/wolnelektury/templates/catalogue/book_detail.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load catalogue_tags pagination_tags %}
 
 {% load i18n %}
 {% load catalogue_tags pagination_tags %}
 

-{% block title %}{{ book.title }} {% trans "on WolneLektury.pl" %}{% endblock %}
+{% block titleextra %}{{ book.title }}{% endblock %}

 
 {% block metadescription %}{% book_title book %}. {{ block.super }}{% endblock %}
 
 
 {% block metadescription %}{% book_title book %}. {{ block.super }}{% endblock %}
 


@@ -10,9 +10,6 @@
 
 {% block body %}
     <h1>{% book_title book %}</h1>
 
 {% block body %}
     <h1>{% book_title book %}</h1>

-    <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">
-        <p>{{ form.q }} <input type="submit" value="{% trans "Search" %}" /> <strong>{% trans "or" %}</strong> <a href="{% url main_page %}">{% trans "return to main page" %}</a></p>
-    </form>

 
     <div id="books-list">
         <div id='breadcrumbs'>
 
     <div id="books-list">
         <div id='breadcrumbs'>

diff --git a/wolnelektury/templates/catalogue/book_fragments.html b/wolnelektury/templates/catalogue/book_fragments.html
index e71a190..6f5f8c8 100644 (file)
--- a/wolnelektury/templates/catalogue/book_fragments.html
+++ b/wolnelektury/templates/catalogue/book_fragments.html
@@ -2,15 +2,12 @@
 {% load i18n %}
 {% load catalogue_tags pagination_tags %}
 
 {% load i18n %}
 {% load catalogue_tags pagination_tags %}
 

-{% block title %}{% trans "Theme" %} {{ theme }} {% trans "in work " %} {{ book }} {% trans "on" %} WolneLektury.pl{% endblock %}
+{% block titleextra %}{% trans "Theme" %} {{ theme }} {% trans "in work " %} {{ book }}{% endblock %}

 
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
     <h1>{% trans "Theme" %} {{ theme }} {% trans "in work " %} {{ book }} </h1>
 
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
     <h1>{% trans "Theme" %} {{ theme }} {% trans "in work " %} {{ book }} </h1>

-    <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">
-        <p>{{ form.q }} <input type="submit" value="{% trans "Search" %}" /> <strong>{% trans "or" %}</strong> <a href="{{ book.get_absolute_url }}">{% trans "return to book's page" %}</a></p>
-    </form>

 
     {% autopaginate fragments 10 %}
     <div id="books-list">
 
     {% autopaginate fragments 10 %}
     <div id="books-list">

diff --git a/wolnelektury/templates/catalogue/book_list.html b/wolnelektury/templates/catalogue/book_list.html
index ec6aae8..b4336d3 100644 (file)
--- a/wolnelektury/templates/catalogue/book_list.html
+++ b/wolnelektury/templates/catalogue/book_list.html
@@ -4,19 +4,11 @@
 
 {% block bodyid %}book-a-list{% endblock %}
 
 
 {% block bodyid %}book-a-list{% endblock %}
 

-{% block title %}{% trans "Listing of all works on WolneLektury.pl" %}{% endblock %}
+{% block titleextra %}{% trans "Listing of all works" %}{% endblock %}

 
 {% block body %}
     <h1>{% block book_list_header %}{% trans "Listing of all works" %}{% endblock %}</h1>
 
 {% block body %}
     <h1>{% block book_list_header %}{% trans "Listing of all works" %}{% endblock %}</h1>

-    <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">
-        <p>{{ form.q }} {{ form.tags }} <input type="submit" value="{% trans "Search" %}" />
-            <strong>{% trans "or" %}</strong> {% trans "see" %}: 
-            <span class='collections'>
-                <a href="{% url catalogue.views.book_list %}">{% trans "all books" %}</a>
-                <a href="{% url catalogue.views.audiobook_list %}">{% trans "audiobooks" %}</a>
-                <a href="{% url catalogue.views.daisy_list %}">{% trans "DAISY" %}</a>
-            </span></p>
-    </form>
+

     <div class="column-left">{% block book_list_info %}{% endblock %}</div><div style='clear:both;'></div>
     <a name="top">
     <div id="book-list-nav">
     <div class="column-left">{% block book_list_info %}{% endblock %}</div><div style='clear:both;'></div>
     <a name="top">
     <div id="book-list-nav">

diff --git a/wolnelektury/templates/catalogue/breadcrumbs.html b/wolnelektury/templates/catalogue/breadcrumbs.html
deleted file mode 100644 (file)
index 5aafeb9..0000000
--- a/wolnelektury/templates/catalogue/breadcrumbs.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% load i18n %}
-{% load catalogue_tags %}
-<div id="searchContainer">
-    <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">
-    <ul class="facelist-selections" style="float:left;">
-        {% for tag in tag_list %}
-        <li class="facelist-selection-item">
-               <span style="margin-left: 5px;">
-               <a href="{% catalogue_url tag %}">{{ tag }}</a>
-               <a class="facelist-close" href="{% catalogue_url tag_list -tag %}">x</a>
-               </span>
-           </li>
-        {% empty %}
-            <li class="facelist-selection-item">
-            </li>
-        {% endfor %}
-        {% if search_form %}
-            <li>{{ search_form.q }} {{ search_form.tags }}</li>
-        {% endif %}
-    </ul>
-    <input type="submit" value="{% trans "Search" %}" id="searchSubmit"/>
-    </form>
-</div>    
-<div class="clearboth"></div>

diff --git a/wolnelektury/templates/catalogue/catalogue.html b/wolnelektury/templates/catalogue/catalogue.html
index b6ca053..1423577 100644 (file)
--- a/wolnelektury/templates/catalogue/catalogue.html
+++ b/wolnelektury/templates/catalogue/catalogue.html
@@ -3,9 +3,13 @@
 {% load catalogue_tags %}
 
 
 {% load catalogue_tags %}
 
 

+{% block titleextra %}{% trans "Catalogue" %}{% endblock %}
+

 {% block bodyid %}catalogue-catalogue{% endblock %}
 
 {% block body %}
 {% block bodyid %}catalogue-catalogue{% endblock %}
 
 {% block body %}

+    <h1>{% trans "Catalogue" %}</h1>
+

     <h2></a>{% trans "Authors" %}<a name="autorzy"></a></h2>
     {% tag_list categories.author %}
 
     <h2></a>{% trans "Authors" %}<a name="autorzy"></a></h2>
     {% tag_list categories.author %}
 

diff --git a/wolnelektury/templates/catalogue/daisy_list.html b/wolnelektury/templates/catalogue/daisy_list.html
index b637bed..88e95a4 100644 (file)
--- a/wolnelektury/templates/catalogue/daisy_list.html
+++ b/wolnelektury/templates/catalogue/daisy_list.html
@@ -3,7 +3,7 @@
 
 {% block bodyid %}book-a-list{% endblock %}
 
 
 {% block bodyid %}book-a-list{% endblock %}
 

-{% block title %}{% trans "Listing of all DAISY files on WolneLektury.pl" %}{% endblock %}
+{% block titleextra %}{% trans "Listing of all DAISY files" %}{% endblock %}

 
 {% block extrahead %}
     <link rel="alternate" type="application/atom+xml" title="{% trans "Latest DAISY audiobooks" %}" href="{% url audiobook_feed 'daisy' %}" />
 
 {% block extrahead %}
     <link rel="alternate" type="application/atom+xml" title="{% trans "Latest DAISY audiobooks" %}" href="{% url audiobook_feed 'daisy' %}" />

diff --git a/wolnelektury/templates/catalogue/differentiate_tags.html b/wolnelektury/templates/catalogue/differentiate_tags.html
index 1e7a1a7..b40d3fe 100644 (file)
--- a/wolnelektury/templates/catalogue/differentiate_tags.html
+++ b/wolnelektury/templates/catalogue/differentiate_tags.html
@@ -2,13 +2,12 @@
 {% load i18n %}
 {% load catalogue_tags %}
 
 {% load i18n %}
 {% load catalogue_tags %}
 

-{% block title %}{% title_from_tags tags %} w WolneLektury.pl{% endblock %}
+{% block titleextra %}{% title_from_tags tags %}{% endblock %}

 
 {% block bodyid %}differentiate_tags{% endblock %}
 
 {% block body %}
     <h1>{% title_from_tags tags %}</h1>
 
 {% block bodyid %}differentiate_tags{% endblock %}
 
 {% block body %}
     <h1>{% title_from_tags tags %}</h1>

-    {% breadcrumbs tags %}

 
        <p>{% trans "The criteria are ambiguous. Please select one of the following options:" %}</p>
     <div id="books-list">
 
        <p>{% trans "The criteria are ambiguous. Please select one of the following options:" %}</p>
     <div id="books-list">

diff --git a/wolnelektury/templates/catalogue/picture_detail.html b/wolnelektury/templates/catalogue/picture_detail.html
index dbea337..f4aabb4 100644 (file)
--- a/wolnelektury/templates/catalogue/picture_detail.html
+++ b/wolnelektury/templates/catalogue/picture_detail.html
@@ -4,15 +4,12 @@
 {% load thumbnail %}
 
 
 {% load thumbnail %}
 
 

-{% block title %}{{ picture.title }} {% trans "on WolneLektury.pl" %}{% endblock %}
+{% block titleextra %}{{ picture.title }}{% endblock %}

 
 {% block bodyid %}picture-detail{% endblock %}
 
 {% block body %}
     <h1>{{picture.title}}</h1>
 
 {% block bodyid %}picture-detail{% endblock %}
 
 {% block body %}
     <h1>{{picture.title}}</h1>

-    <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">
-        <p>{{ form.q }} <input type="submit" value="{% trans "Search" %}" /> <strong>{% trans "or" %}</strong> <a href="{% url main_page %}">{% trans "return to main page" %}</a></p>
-    </form>

 
     <div id="books-list">
         <div id='breadcrumbs'>
 
     <div id="books-list">
         <div id='breadcrumbs'>

diff --git a/wolnelektury/templates/catalogue/picture_list.html b/wolnelektury/templates/catalogue/picture_list.html
index c4edda8..a17d987 100644 (file)
--- a/wolnelektury/templates/catalogue/picture_list.html
+++ b/wolnelektury/templates/catalogue/picture_list.html
@@ -5,7 +5,7 @@
 
 {% block bodyid %}picture-list{% endblock %}
 
 
 {% block bodyid %}picture-list{% endblock %}
 

-{% block title %}{% trans "Listing of all pictures on WolneLektury.pl" %}{% endblock %}
+{% block titleextra %}{% trans "Listing of all pictures" %}{% endblock %}

 
 {% block picture_list_header %}{% trans "Listing of all pictures" %}{% endblock %}
 
 
 {% block picture_list_header %}{% trans "Listing of all pictures" %}{% endblock %}
 

diff --git a/wolnelektury/templates/catalogue/search_form.html b/wolnelektury/templates/catalogue/search_form.html
deleted file mode 100755 (executable)
index 4535226..0000000
--- a/wolnelektury/templates/catalogue/search_form.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% load i18n %}
-<form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">
-    <p>{{ form.q }} <input type="submit" value="{% trans "Search" %}" /> <strong>{%trans "or" %}</strong> <a href="{% url main_page %}">{% trans "return to the main page" %}</a></p>
-</form>

diff --git a/wolnelektury/templates/catalogue/search_multiple_hits.html b/wolnelektury/templates/catalogue/search_multiple_hits.html
index b569e7d..1eea6fc 100644 (file)
--- a/wolnelektury/templates/catalogue/search_multiple_hits.html
+++ b/wolnelektury/templates/catalogue/search_multiple_hits.html
@@ -2,13 +2,12 @@
 {% load i18n %}
 {% load catalogue_tags pagination_tags %}
 
 {% load i18n %}
 {% load catalogue_tags pagination_tags %}
 

-{% block title %}{% trans "Searching in" %} WolneLektury.pl{% endblock %}
+{% block titleextra %}{% trans "Search" %}{% endblock %}

 
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
 
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}

-    <h1>{% title_from_tags tags %}</h1>
-    {% breadcrumbs tags %}
+    <h1>{% trans "Search" %}</h1>

 
     <div id="books-list">
         <p>{% trans "More than one result matching the criteria found." %}</p>
 
     <div id="books-list">
         <p>{% trans "More than one result matching the criteria found." %}</p>


@@ -25,10 +24,4 @@
         </ul>
     </div>
 
         </ul>
     </div>
 

-    <div id="set-window">
-        <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
-        <div class="target">
-            <p><img src="{{ STATIC_URL }}img/indicator.gif" alt="*"/> {% trans "Loading" %}</p>
-        </div>
-    </div>

 {% endblock %}
\ No newline at end of file
 {% endblock %}
\ No newline at end of file

diff --git a/wolnelektury/templates/catalogue/search_no_hits.html b/wolnelektury/templates/catalogue/search_no_hits.html
index bffefe3..3f51559 100644 (file)
--- a/wolnelektury/templates/catalogue/search_no_hits.html
+++ b/wolnelektury/templates/catalogue/search_no_hits.html
@@ -2,13 +2,12 @@
 {% load i18n %}
 {% load catalogue_tags pagination_tags %}
 
 {% load i18n %}
 {% load catalogue_tags pagination_tags %}
 

-{% block title %}{% trans "Search in WolneLektury.pl" %}{% endblock %}
+{% block titleextra %}{% trans "Search" %}{% endblock %}

 
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
 
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}

-    <h1>{% title_from_tags tags %}</h1>
-    {% breadcrumbs tags %}
+    <h1>{% trans "Search" %}</h1>

 
     <div id="books-list">
         <p>{% trans "Sorry! Search cirteria did not match any resources." %}</p>
 
     <div id="books-list">
         <p>{% trans "Sorry! Search cirteria did not match any resources." %}</p>

diff --git a/wolnelektury/templates/catalogue/search_too_short.html b/wolnelektury/templates/catalogue/search_too_short.html
index e10ddc2..62d0ad0 100644 (file)
--- a/wolnelektury/templates/catalogue/search_too_short.html
+++ b/wolnelektury/templates/catalogue/search_too_short.html
@@ -2,23 +2,16 @@
 {% load i18n %}
 {% load catalogue_tags pagination_tags %}
 
 {% load i18n %}
 {% load catalogue_tags pagination_tags %}
 

-{% block title %}{% trans "Searching in" %} WolneLektury.pl{% endblock %}
+{% block titleextra %}{% trans "Search" %}{% endblock %}

 
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
 
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}

-    <h1>{% title_from_tags tags %}</h1>
-    {% breadcrumbs tags %}
+    <h1>{% trans "Search" %}</h1>

 
     <div id="books-list">
         <p>{% trans "Sorry! Search query must have at least two characters." %}</p>
         {% include "info/join_us.html" %}
     </div>
 
 
     <div id="books-list">
         <p>{% trans "Sorry! Search query must have at least two characters." %}</p>
         {% include "info/join_us.html" %}
     </div>
 

-    <div id="set-window">
-        <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
-        <div class="target">
-            <p><img src="{{ STATIC_URL }}img/indicator.gif" alt="*"/> {% trans "Loading" %}</p>
-        </div>
-    </div>

 {% endblock %}
\ No newline at end of file
 {% endblock %}
\ No newline at end of file

diff --git a/wolnelektury/templates/catalogue/tagged_object_list.html b/wolnelektury/templates/catalogue/tagged_object_list.html
index f845c62..bff9374 100644 (file)
--- a/wolnelektury/templates/catalogue/tagged_object_list.html
+++ b/wolnelektury/templates/catalogue/tagged_object_list.html
@@ -2,13 +2,12 @@
 {% load i18n %}
 {% load catalogue_tags pagination_tags switch_tag %}
 
 {% load i18n %}
 {% load catalogue_tags pagination_tags switch_tag %}
 

-{% block title %}{% title_from_tags tags %} w WolneLektury.pl{% endblock %}
+{% block titleextra %}{% title_from_tags tags %}{% endblock %}

 
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
     <h1>{% title_from_tags tags %}</h1>
 
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
     <h1>{% title_from_tags tags %}</h1>

-    {% breadcrumbs tags %}

 
     {% if only_shelf and not object_list %}
     <div id="books-list">
 
     {% if only_shelf and not object_list %}
     <div id="books-list">

diff --git a/wolnelektury/templates/lesmianator/lesmianator.html b/wolnelektury/templates/lesmianator/lesmianator.html
index 5c8490c..90e96f6 100644 (file)
--- a/wolnelektury/templates/lesmianator/lesmianator.html
+++ b/wolnelektury/templates/lesmianator/lesmianator.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load catalogue_tags %}
 
 {% load i18n %}
 {% load catalogue_tags %}
 

-{% block title %}Leśmianator w WolneLektury.pl{% endblock %}
+{% block titleextra %}Leśmianator{% endblock %}

 
 {% block metadescription %}Stwórz własny wierszmiks z utworów znajdujących się na Wolnych Lekturach.{% endblock %}
 
 
 {% block metadescription %}Stwórz własny wierszmiks z utworów znajdujących się na Wolnych Lekturach.{% endblock %}
 


@@ -10,9 +10,6 @@
 
 {% block body %}
     <h1>Leśmianator</h1>
 
 {% block body %}
     <h1>Leśmianator</h1>

-    <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">
-        <p>{{ form.q }} <input type="submit" value="{% trans "Search" %}" /> <strong>{% trans "or" %}</strong> <a href="{% url main_page %}">{% trans "return to main page" %}</a></p>
-    </form>

 
     <div id="books-list">
         <p>Leśmianator tworzy wierszmiksy – dzięki niemu
 
     <div id="books-list">
         <p>Leśmianator tworzy wierszmiksy – dzięki niemu

diff --git a/wolnelektury/templates/lessons/document_list.html b/wolnelektury/templates/lessons/document_list.html
index 511bbfc..b4e44e2 100644 (file)
--- a/wolnelektury/templates/lessons/document_list.html
+++ b/wolnelektury/templates/lessons/document_list.html
@@ -4,7 +4,7 @@
 
 {% block bodyid %}document-list-body{% endblock %}
 
 
 {% block bodyid %}document-list-body{% endblock %}
 

-{% block title %}{% trans "Hand-outs for teachers on " %}WolneLektury.pl{% endblock %}
+{% block titleextra %}{% trans "Hand-outs for teachers" %}{% endblock %}

 
 {% block metadescription %}Scenariusze lekcji. Materiały dla nauczycieli na wolnej licencji.{% endblock %}
 
 
 {% block metadescription %}Scenariusze lekcji. Materiały dla nauczycieli na wolnej licencji.{% endblock %}
 


@@ -30,9 +30,7 @@
 {% endblock extrahead %}
 {% block body %}
     <h1>{% trans "Hand-outs for teachers" %}</h1>
 {% endblock extrahead %}
 {% block body %}
     <h1>{% trans "Hand-outs for teachers" %}</h1>

-    <form action="{% url search %}" method="GET" accept-charset="utf-8" id="search-form">
-        <p>{{ form.q }} <input type="submit" value="{% trans "Search" %}" /> <strong>{% trans "or" %}</strong> <a href="{% url main_page %}">{% trans "return to main page" %}</a></p>
-    </form>
+

     <div id="document-list">
         {% chunk "document-list" %}
     </div>
     <div id="document-list">
         {% chunk "document-list" %}
     </div>

diff --git a/wolnelektury/templates/main_page.html b/wolnelektury/templates/main_page.html
index 4ac5c84..ddb90fa 100755 (executable)
--- a/wolnelektury/templates/main_page.html
+++ b/wolnelektury/templates/main_page.html
@@ -2,6 +2,8 @@
 {% load cache i18n catalogue_tags infopages_tags %}
 
 
 {% load cache i18n catalogue_tags infopages_tags %}
 
 

+{% block title %}{% trans "Wolne Lektury internet library" %}{% endblock %}
+

 {% block body %}
 
     <blockquote id="big-cite">
 {% block body %}
 
     <blockquote id="big-cite">

diff --git a/wolnelektury/templates/pdcounter/author_detail.html b/wolnelektury/templates/pdcounter/author_detail.html
index aa51718..7cdcf2a 100644 (file)
--- a/wolnelektury/templates/pdcounter/author_detail.html
+++ b/wolnelektury/templates/pdcounter/author_detail.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
 {% extends "base.html" %}
 {% load i18n %}
 

-{% block titleextra %}:: {{ author.name }}{% endblock %}
+{% block titleextra %}{{ author.name }}{% endblock %}

 
 {% block metadescription %}Licznik domeny publicznej: {{author.name}}.{% endblock %}
 
 
 {% block metadescription %}Licznik domeny publicznej: {{author.name}}.{% endblock %}
 

diff --git a/wolnelektury/templates/pdcounter/book_stub_detail.html b/wolnelektury/templates/pdcounter/book_stub_detail.html
index 30a6911..6e77a78 100644 (file)
--- a/wolnelektury/templates/pdcounter/book_stub_detail.html
+++ b/wolnelektury/templates/pdcounter/book_stub_detail.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
 {% extends "base.html" %}
 {% load i18n %}
 

-{% block titleextra %}:: {{ book.title }}{% endblock %}
+{% block titleextra %}{{ book.title }}{% endblock %}

 
 {% block metadescription %}Licznik domeny publicznej: {{ book.title }}.{% endblock %}
 
 
 {% block metadescription %}Licznik domeny publicznej: {{ book.title }}.{% endblock %}