fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:fnp/wolnelektury
[wolnelektury.git]
/
apps
/
catalogue
/
templatetags
/
catalogue_tags.py
diff --git
a/apps/catalogue/templatetags/catalogue_tags.py
b/apps/catalogue/templatetags/catalogue_tags.py
index
ac783c0
..
e433b8e
100644
(file)
--- a/
apps/catalogue/templatetags/catalogue_tags.py
+++ b/
apps/catalogue/templatetags/catalogue_tags.py
@@
-14,6
+14,8
@@
from django.db.models import Q
from django.conf import settings
from django.utils.translation import ugettext as _
from django.conf import settings
from django.utils.translation import ugettext as _
+from catalogue.forms import SearchForm
+
register = template.Library()
register = template.Library()
@@
-166,9
+168,12
@@
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):
@register.inclusion_tag('catalogue/breadcrumbs.html')
def breadcrumbs(tags, search_form=True):
- from catalogue.forms import SearchForm
context = {'tag_list': tags}
try:
max_tag_list = settings.MAX_TAG_LIST
context = {'tag_list': tags}
try:
max_tag_list = settings.MAX_TAG_LIST
@@
-260,7
+265,7
@@
def tag_list(tags, choices=None):
@register.inclusion_tag('catalogue/folded_tag_list.html')
@register.inclusion_tag('catalogue/folded_tag_list.html')
-def folded_tag_list(tags, choices=None):
+def folded_tag_list(tags,
title='',
choices=None):
tags = [tag for tag in tags if tag.count]
if choices is None:
choices = []
tags = [tag for tag in tags if tag.count]
if choices is None:
choices = []
@@
-275,3
+280,7
@@
def folded_tag_list(tags, choices=None):
some_tags_hidden = True
return locals()
some_tags_hidden = True
return locals()
+
+@register.inclusion_tag('catalogue/book_info.html')
+def book_info(book):
+ return locals()