X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/b80f646690239d9a90d708d57780f328328b26d5..2335f0fb136da38009654cc798cb8582cdfada22:/wolnelektury/templates/catalogue/search_multiple_hits.html diff --git a/wolnelektury/templates/catalogue/search_multiple_hits.html b/wolnelektury/templates/catalogue/search_multiple_hits.html index 23d1a59d4..70988f395 100644 --- a/wolnelektury/templates/catalogue/search_multiple_hits.html +++ b/wolnelektury/templates/catalogue/search_multiple_hits.html @@ -1,72 +1,115 @@ {% extends "base.html" %} {% load i18n %} -{% load catalogue_tags pagination_tags %} +{% load catalogue_tags search_tags pagination_tags %} -{% block title %}{% trans "Searching in" %} WolneLektury.pl{% endblock %} +{% block titleextra %}{% trans "Search" %}{% endblock %} {% block bodyid %}tagged-object-list{% endblock %} {% block body %} - <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> + {% if did_you_mean %} + <span class="did_you_mean">{% trans "Did you mean" %} <a href="{% url search %}?q={{did_you_mean|urlencode}}">{{did_you_mean|lower}}</a>?</span> + {% endif %} + <!-- tu pójdÄ trafienia w tagi: Autorzy - z description oraz motywy i rodzaje (z book_count) --> + <div class="inline-tag-lists top-tag-list"> + {% if tags.author %} + <div> + <div class="mono inline-header">{% trans "Authors" %}:</div> + <div class="inline-body"> + {% inline_tag_list tags.author %} + </div> + </div> + {% endif %} + {% if tags.kind %} + <div> + <div class="mono inline-header">{% trans "Kinds" %}:</div> + <div class="inline-body"> + {% inline_tag_list tags.kind %} + </div> + </div> + {% endif %} + {% if tags.genre %} + <div> + <div class="mono inline-header">{% trans "Genres" %}:</div> + <div class="inline-body"> + {% inline_tag_list tags.genre %} + </div> + </div> + {% endif %} + {% if tags.epoch %} + <div class="inline-tag-list"> + <div class="mono inline-header">{% trans "Epochs" %}:</div> + <div class="inline-body"> + {% inline_tag_list tags.epoch %} + </div> + </div> + {% endif %} + </div> - <div id="results"> - <ol> - {% for result in results %} - <li> - <p><a href="{{result.book.get_absolute_url}}">{{result.book.pretty_title}}</a> (id: {{result.book_id}}, score: {{result.score}})</p> - <ul> - {% for hit in result.hits %} - <li> - {% for snip in hit.3.snippets %} - {{snip|safe}}<br/> - {% endfor %} - </li> - {% endfor %} - {% for part in result.parts %} - {% if part.header %} - <li>W {{part.header}} nr {{part.position}}</li> - {% else %} - {% if part.fragment %} - <li> - <div style="">Tagi/Motywy: {% for tag in part.fragment.tags %}{{tag.name}} {% endfor %}</div> - {{part.fragment.short_html|safe}} - </li> - {% endif %} - {% endif %} - {% endfor %} - </ul> - </li> - {% empty %} - <p>No results.</p> - {% endfor %} + + {% if results.author %} + <div class="book-list-header"> + <div class="book-box-inner"> + <p>{% trans "Results by authors" %}</p> + </div> + </div> + <div> + <ol class="work-list"> + {% for author in results.author %}<li class="Book-item">{% book_short author.book %}</li>{% endfor %} </ol> </div> + {% endif %} + {% if results.title %} + <div class="book-list-header"> + <div class="book-box-inner"> + <p>{% trans "Results by title" %}</p> + </div> + </div> + <div> + <ol class="work-list"> + {% for result in results.title %}<li class="Book-item"> + {% book_short result.book %} + </li>{% endfor %} + </ol> + </div> + {% endif %} -{% comment %} - <div id="books-list"> - <p>{% trans "More than one result matching the criteria found." %}</p> - <ul class='matches'> - {% for match, link, type in results %} - <li>{% trans type %}: <a href='{{ link }}'> - {% ifequal type "book" %} - {% book_title match %} - {% else %} - {{ match.name }} - {% endifequal %} - </a></li> - {% endfor %} - </ul> + {% if results.content %} + <div class="book-list-header"> + <div class="book-box-inner"> + <p>{% trans "Results in text" %}</p> + </div> + </div> + <div> + <ol class="work-list"> + {% for result in results.content %} + <li class="Book-item"> + {% book_searched result %} + </li> + {% endfor %} + </ol> </div> -{% endcomment %} + {% endif %} - <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> + {% if results.other %} + <div class="book-list-header"> + <div class="book-box-inner"> + <p>{% trans "Other results" %}</p> + </div> </div> + <div> + <ol class="work-list"> + {% for result in results.other %} + <li class="Book-item"> + {% book_searched result %} + </li> + {% endfor %} + </ol> + </div> + {% endif %} + + + {% endblock %}