fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix menu Themes link.
[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
8cf3acf
..
c9bf3dd
100644
(file)
--- a/
apps/catalogue/templatetags/catalogue_tags.py
+++ b/
apps/catalogue/templatetags/catalogue_tags.py
@@
-14,9
+14,9
@@
from django.core.urlresolvers import reverse
from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
from django.utils.translation import ugettext as _
from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
from django.utils.translation import ugettext as _
-from catalogue.utils import split_tags
+from catalogue.utils import split_tags
, related_tag_name as _related_tag_name
from catalogue.models import Book, BookMedia, Fragment, Tag
from catalogue.models import Book, BookMedia, Fragment, Tag
-from catalogue.constants import LICENSES
+from catalogue.constants import LICENSES
, LANGUAGES_3TO2
register = template.Library()
register = template.Library()
@@
-311,6
+311,11
@@
def inline_tag_list(tags, choices=None):
return tag_list(tags, choices)
return tag_list(tags, choices)
+@register.inclusion_tag('catalogue/collection_list.html')
+def collection_list(collections):
+ return locals()
+
+
@register.inclusion_tag('catalogue/book_info.html')
def book_info(book):
return locals()
@register.inclusion_tag('catalogue/book_info.html')
def book_info(book):
return locals()
@@
-330,6
+335,7
@@
def book_wide(context, book):
'hide_about': hide_about,
'themes': book_themes,
'request': context.get('request'),
'hide_about': hide_about,
'themes': book_themes,
'request': context.get('request'),
+ 'show_lang': book.language_code() != settings.LANGUAGE_CODE,
}
}
@@
-340,22
+346,28
@@
def book_short(context, book):
'main_link': book.get_absolute_url(),
'related': book.related_info(),
'request': context.get('request'),
'main_link': book.get_absolute_url(),
'related': book.related_info(),
'request': context.get('request'),
+ 'show_lang': book.language_code() != settings.LANGUAGE_CODE,
}
@register.inclusion_tag('catalogue/book_mini_box.html')
}
@register.inclusion_tag('catalogue/book_mini_box.html')
-def book_mini(book):
+def book_mini(book, with_link=True):
+ author_str = ", ".join(related_tag_name(tag)
+ for tag in book.related_info()['tags'].get('author', ()))
return {
'book': book,
return {
'book': book,
- 'related': book.related_info(),
+ 'author_str': author_str,
+ 'with_link': with_link,
+ 'show_lang': book.language_code() != settings.LANGUAGE_CODE,
}
@register.inclusion_tag('catalogue/work-list.html', takes_context=True)
def work_list(context, object_list):
request = context.get('request')
}
@register.inclusion_tag('catalogue/work-list.html', takes_context=True)
def work_list(context, object_list):
request = context.get('request')
- if object_list:
- object_type = type(object_list[0]).__name__
+ for obj in object_list:
+ obj.object_type = type(obj).__name__
+
return locals()
return locals()
@@
-376,17
+388,14
@@
def fragment_promo(arg=None):
@register.inclusion_tag('catalogue/related_books.html')
@register.inclusion_tag('catalogue/related_books.html')
-def related_books(book, limit=6, random=1):
+def related_books(book, limit=6, random=1, taken=0):
+ limit = limit - taken
cache_key = "catalogue.related_books.%d.%d" % (book.id, limit - random)
related = cache.get(cache_key)
if related is None:
cache_key = "catalogue.related_books.%d.%d" % (book.id, limit - random)
related = cache.get(cache_key)
if related is None:
- related = list(Book.objects.filter(
- common_slug=book.common_slug).exclude(pk=book.pk)[:limit])
- limit -= len(related)
- if limit > random:
- related += Book.tagged.related_to(book,
- Book.objects.exclude(common_slug=book.common_slug),
- ignore_by_tag=book.book_tag())[:limit-random]
+ related = Book.tagged.related_to(book,
+ Book.objects.exclude(common_slug=book.common_slug),
+ ignore_by_tag=book.book_tag())[:limit-random]
cache.set(cache_key, related, 1800)
if random:
random_books = Book.objects.exclude(
cache.set(cache_key, related, 1800)
if random:
random_books = Book.objects.exclude(
@@
-409,7
+418,7
@@
def catalogue_menu():
('genre', _('Genres'), 'gatunki'),
('kind', _('Kinds'), 'rodzaje'),
('epoch', _('Epochs'), 'epoki'),
('genre', _('Genres'), 'gatunki'),
('kind', _('Kinds'), 'rodzaje'),
('epoch', _('Epochs'), 'epoki'),
- ('theme', _('Themes'), '
autorz
y'),
+ ('theme', _('Themes'), '
motyw
y'),
]}
]}
@@
-456,3
+465,14
@@
def license_icon(license_url):
"icon": "img/licenses/%s.png" % known['icon'],
"license_description": known['description'],
}
"icon": "img/licenses/%s.png" % known['icon'],
"license_description": known['description'],
}
+
+
+@register.simple_tag
+def related_tag_name(tag, lang=None):
+ return _related_tag_name(tag, lang)
+
+
+@register.simple_tag
+def class_name(obj):
+ return obj.__class__.__name__
+