fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work list: don't care about types of objects on other pages.
[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
6a30a9c
..
bbd9f07
100644
(file)
--- a/
apps/catalogue/templatetags/catalogue_tags.py
+++ b/
apps/catalogue/templatetags/catalogue_tags.py
@@
-14,7
+14,7
@@
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
related_tag_name as _related_tag_name
from catalogue.models import Book, BookMedia, Fragment, Tag
from catalogue.constants import LICENSES
from catalogue.models import Book, BookMedia, Fragment, Tag
from catalogue.constants import LICENSES
@@
-55,7
+55,7
@@
def html_title_from_tags(tags):
template = Template("{{ category }}: <a href='{{ tag.get_absolute_url }}'>{{ tag.name }}</a>")
return capfirst(",<br/>".join(
template.render(Context({'tag': tag, 'category': _(tag.category)})) for tag in tags))
template = Template("{{ category }}: <a href='{{ tag.get_absolute_url }}'>{{ tag.name }}</a>")
return capfirst(",<br/>".join(
template.render(Context({'tag': tag, 'category': _(tag.category)})) for tag in tags))
-
+
def simple_title(tags):
title = []
def simple_title(tags):
title = []
@@
-186,12
+186,12
@@
def book_tree_csv(author, book_list, books_by_parent, depth=1, max_depth=3, deli
return '"%s"' % s
except ValueError:
return s
return '"%s"' % s
except ValueError:
return s
-
+
return "".join("""%(author)s%(d)s%(preindent)s%(title)s%(d)s%(postindent)s%(audiences)s%(d)s%(audiobook)s
%(children)s""" % {
"d": delimeter,
"preindent": delimeter * (depth - 1),
return "".join("""%(author)s%(d)s%(preindent)s%(title)s%(d)s%(postindent)s%(audiences)s%(d)s%(audiobook)s
%(children)s""" % {
"d": delimeter,
"preindent": delimeter * (depth - 1),
- "postindent": delimeter * (max_depth - depth),
+ "postindent": delimeter * (max_depth - depth),
"depth": depth,
"author": quote_if_necessary(author.name),
"title": quote_if_necessary(book.title),
"depth": depth,
"author": quote_if_necessary(author.name),
"title": quote_if_necessary(book.title),
@@
-284,8
+284,8
@@
def latest_blog_posts(feed_url, posts_to_show=5):
feed = feedparser.parse(str(feed_url))
posts = []
for i in range(posts_to_show):
feed = feedparser.parse(str(feed_url))
posts = []
for i in range(posts_to_show):
- pub_date = feed['entries'][i].
updat
ed_parsed
- published = datetime.date(pub_date[0], pub_date[1], pub_date[2]
)
+ pub_date = feed['entries'][i].
publish
ed_parsed
+ published = datetime.date(pub_date[0], pub_date[1], pub_date[2])
posts.append({
'title': feed['entries'][i].title,
'summary': feed['entries'][i].summary,
posts.append({
'title': feed['entries'][i].title,
'summary': feed['entries'][i].summary,
@@
-335,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,
}
}
@@
-345,24
+346,25
@@
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):
- author_str = ", ".join(
name
- for
name, url in book.related_info()['tags']['author']
)
+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,
'author_str': author_str,
return {
'book': book,
'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__
return locals()
return locals()
@@
-383,17
+385,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(
@@
-416,7
+415,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'),
]}
]}
@@
-463,3
+462,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.filter
+def class_name(obj):
+ return obj.__class__.__name__
+