fnp
/
edumed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fa95e6e
)
Fixes #2908: projects.
author
Radek Czajka
<radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 30 Jul 2013 14:13:48 +0000
(16:13 +0200)
committer
Radek Czajka
<radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 30 Jul 2013 14:15:44 +0000
(16:15 +0200)
catalogue/management/commands/repackage.py
patch
|
blob
|
history
catalogue/templates/catalogue/lesson/project/lesson_detail.html
patch
|
blob
|
history
catalogue/templatetags/catalogue_tags.py
patch
|
blob
|
history
diff --git
a/catalogue/management/commands/repackage.py
b/catalogue/management/commands/repackage.py
index
eed8576
..
3946e82
100755
(executable)
--- a/
catalogue/management/commands/repackage.py
+++ b/
catalogue/management/commands/repackage.py
@@
-42,6
+42,9
@@
class Command(BaseCommand):
elif lesson.type == 'synthetic':
prefix = "%s/%s (synteza)/" % (
section_dir, lesson.slug)
elif lesson.type == 'synthetic':
prefix = "%s/%s (synteza)/" % (
section_dir, lesson.slug)
+ elif lesson.type == 'project':
+ prefix = "%s/%s (projekt)/" % (
+ section_dir, lesson.slug)
else:
prefix = "%s/%s/" % (
section_dir, lesson.slug)
else:
prefix = "%s/%s/" % (
section_dir, lesson.slug)
diff --git
a/catalogue/templates/catalogue/lesson/project/lesson_detail.html
b/catalogue/templates/catalogue/lesson/project/lesson_detail.html
index
d4336ec
..
ed36341
100755
(executable)
--- a/
catalogue/templates/catalogue/lesson/project/lesson_detail.html
+++ b/
catalogue/templates/catalogue/lesson/project/lesson_detail.html
@@
-15,7
+15,7
@@
</section>
{% if object.package %}
</section>
{% if object.package %}
- <section class="box-button"><a href="{{ object.package.url }}" class="dl-button">Pobierz cał
ą lekcję
</a></section>
+ <section class="box-button"><a href="{{ object.package.url }}" class="dl-button">Pobierz cał
y projekt
</a></section>
{% endif %}
{% endblock %}
{% endif %}
{% endblock %}
diff --git
a/catalogue/templatetags/catalogue_tags.py
b/catalogue/templatetags/catalogue_tags.py
index
c642f18
..
4485e18
100755
(executable)
--- a/
catalogue/templatetags/catalogue_tags.py
+++ b/
catalogue/templatetags/catalogue_tags.py
@@
-49,7
+49,7
@@
def section_box(section):
@register.inclusion_tag("catalogue/snippets/lesson_nav.html")
def lesson_nav(lesson):
@register.inclusion_tag("catalogue/snippets/lesson_nav.html")
def lesson_nav(lesson):
- if lesson.type
== 'course'
:
+ if lesson.type
in ('course', 'project')
:
root = lesson.section
siblings = Lesson.objects.filter(type='course', level=lesson.level, section=root)
mark_level = False
root = lesson.section
siblings = Lesson.objects.filter(type='course', level=lesson.level, section=root)
mark_level = False