fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor fix
[edumed.git]
/
catalogue
/
templatetags
/
catalogue_tags.py
diff --git
a/catalogue/templatetags/catalogue_tags.py
b/catalogue/templatetags/catalogue_tags.py
index
09113d9
..
7003dfe
100755
(executable)
--- a/
catalogue/templatetags/catalogue_tags.py
+++ b/
catalogue/templatetags/catalogue_tags.py
@@
-8,8
+8,12
@@
register = template.Library()
@register.inclusion_tag("catalogue/snippets/carousel.html")
def catalogue_carousel():
@register.inclusion_tag("catalogue/snippets/carousel.html")
def catalogue_carousel():
- return {
- }
+ lessons_count = Lesson.objects.filter(type__in=('course', 'synthetic')).count()
+ if 1 < lessons_count % 10 < 5 and lessons_count / 10 % 10 != 1:
+ lessons_desc = u'kompletne lekcje'
+ else:
+ lessons_desc = u'kompletnych lekcji'
+ return locals()
@register.inclusion_tag("catalogue/snippets/section_buttons.html")
def catalogue_section_buttons():
@register.inclusion_tag("catalogue/snippets/section_buttons.html")
def catalogue_section_buttons():
@@
-30,6
+34,7
@@
def section_box(section):
lessons[lesson.level][lesson.type] = []
lessons[lesson.level][lesson.type].append(lesson)
return {
lessons[lesson.level][lesson.type] = []
lessons[lesson.level][lesson.type].append(lesson)
return {
+ "section": section,
"lessons": lessons,
}
"lessons": lessons,
}
@@
-37,19
+42,25
@@
def section_box(section):
def lesson_nav(lesson):
if lesson.type == 'course':
root = lesson.section
def lesson_nav(lesson):
if lesson.type == 'course':
root = lesson.section
- siblings = root.lesson_set.filter(type='course')
+ siblings = Lesson.objects.filter(type='course', level=lesson.level, section=root)
+ mark_level = False
else:
root = None
siblings = Lesson.objects.filter(type=lesson.type)
else:
root = None
siblings = Lesson.objects.filter(type=lesson.type)
+ mark_level = True
return {
"lesson": lesson,
"root": root,
"siblings": siblings,
return {
"lesson": lesson,
"root": root,
"siblings": siblings,
+ "mark_level": mark_level
}
@register.inclusion_tag("catalogue/snippets/lesson_link.html")
def lesson_link(uri):
}
@register.inclusion_tag("catalogue/snippets/lesson_link.html")
def lesson_link(uri):
- return {'lesson': Lesson.objects.get(slug=WLURI(uri).slug)}
+ try:
+ return {'lesson': Lesson.objects.get(slug=WLURI(uri).slug)}
+ except Lesson.DoesNotExist:
+ return {}
@register.filter
def person_list(persons):
@register.filter
def person_list(persons):