Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
55 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<header class="b-header"> | ||
<div class="l-wrapper"> | ||
<form action="/search" method="get" class="b-search"> | ||
{% for field in search_form.visible_fields %} | ||
{{ field }} | ||
{% endfor %} | ||
<input type="submit" class="b-search__sumbit" value="Search" /> | ||
</form> | ||
<nav class="b-version"> | ||
{% for version in avaliable_versions %} | ||
<a class="b-version__link | ||
g-systemlink{% if version.selected %} b-version__link_active{% endif %}" href="">{{ version }}</a> | ||
{% endfor %} | ||
</nav> | ||
</div> | ||
</header> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{% extends 'livedocs/layout/layout.html' %} | ||
|
||
{% block results %} | ||
Search for {{ query }}.<br/> | ||
Found {{ found_count }} items: | ||
|
||
<h1 class="b-results__header">Search results</h1> | ||
|
||
<nav class="b-results__nav"> | ||
{% for item in items %} | ||
<article class="b-results__item"> | ||
<div class="b-results__breadcrumbs"> | ||
{% for crumb in item.get_breadcrumbs %} | ||
<span class="b-results__breadcrumbs-item">{{ crumb.title }}</span> | ||
{% if not forloop.last %} | ||
<span class="b-results__breadcrumbs-separator">></span> | ||
{% endif %} | ||
{% endfor %} | ||
</div> | ||
<a class="b-results__link" href="{{ item.get_absolute_url }}">{{ item.title }}</a> | ||
</article> | ||
{% endfor %} | ||
</nav> | ||
|
||
{% endblock %} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,25 @@ | ||
from annoying.decorators import render_to | ||
from django.db.models.query_utils import Q | ||
from forms import SearchForm | ||
from models import Item | ||
from models import Item, Version | ||
|
||
@render_to('livedocs/search.html') | ||
def search(request): | ||
def search(request, current_version): | ||
""" Backend url for searching items""" | ||
search_form = SearchForm(request.GET) | ||
if search_form.is_valid(): | ||
query = search_form.cleaned_data['query'] | ||
|
||
items = Item.objects.filter(Q(title__icontains=query) | Q(content__icontains=query)) | ||
|
||
avaliable_versions = Version.objects.all().order_by('name') | ||
for version in avaliable_versions: | ||
if version.name == current_version: | ||
version.selected = True | ||
|
||
return {'search_form': search_form, | ||
'version': version, | ||
'avaliable_versions': avaliable_versions, | ||
'query': query, | ||
'items': items, | ||
'found_count': len(items)} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters