From 1a798a8611063ff9abc2b8cd9104e45580f7bffd Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Thu, 14 Feb 2013 15:15:10 +0100 Subject: [PATCH] add editable chunk --- .../lesson/appendix/lesson_detail.html | 19 +++++ .../lesson/course/lesson_detail.html | 23 ++++++ .../catalogue/{ => lesson}/lesson_detail.html | 38 +-------- .../lesson/synthetic/lesson_detail.html | 19 +++++ .../templates/catalogue/section_list.html | 2 +- catalogue/urls.py | 6 +- catalogue/views.py | 12 +++ chunks/__init__.py | 0 chunks/admin.py | 17 ++++ chunks/fixtures/chunks.json | 41 ++++++++++ chunks/locale/de/LC_MESSAGES/django.mo | Bin 0 -> 850 bytes chunks/locale/de/LC_MESSAGES/django.po | 74 ++++++++++++++++++ chunks/locale/en/LC_MESSAGES/django.mo | Bin 0 -> 814 bytes chunks/locale/en/LC_MESSAGES/django.po | 53 +++++++++++++ chunks/locale/es/LC_MESSAGES/django.mo | Bin 0 -> 876 bytes chunks/locale/es/LC_MESSAGES/django.po | 53 +++++++++++++ chunks/locale/fr/LC_MESSAGES/django.mo | Bin 0 -> 855 bytes chunks/locale/fr/LC_MESSAGES/django.po | 53 +++++++++++++ chunks/locale/it/LC_MESSAGES/django.mo | Bin 0 -> 846 bytes chunks/locale/it/LC_MESSAGES/django.po | 54 +++++++++++++ chunks/locale/jp/LC_MESSAGES/django.mo | Bin 0 -> 378 bytes chunks/locale/jp/LC_MESSAGES/django.po | 54 +++++++++++++ chunks/locale/lt/LC_MESSAGES/django.mo | Bin 0 -> 847 bytes chunks/locale/lt/LC_MESSAGES/django.po | 54 +++++++++++++ chunks/locale/pl/LC_MESSAGES/django.mo | Bin 0 -> 892 bytes chunks/locale/pl/LC_MESSAGES/django.po | 54 +++++++++++++ chunks/locale/ru/LC_MESSAGES/django.mo | Bin 0 -> 958 bytes chunks/locale/ru/LC_MESSAGES/django.po | 53 +++++++++++++ chunks/locale/uk/LC_MESSAGES/django.mo | Bin 0 -> 906 bytes chunks/locale/uk/LC_MESSAGES/django.po | 53 +++++++++++++ chunks/models.py | 42 ++++++++++ chunks/templatetags/__init__.py | 0 chunks/templatetags/chunks.py | 63 +++++++++++++++ edumed/settings.d/30-apps.py | 1 + edumed/static/css/main.css | 2 + edumed/static/css/main.scss | 3 + edumed/templates/home.html | 16 ++-- edumed/urls.py | 6 +- edumed/views.py | 12 +++ 39 files changed, 821 insertions(+), 56 deletions(-) create mode 100755 catalogue/templates/catalogue/lesson/appendix/lesson_detail.html create mode 100755 catalogue/templates/catalogue/lesson/course/lesson_detail.html rename catalogue/templates/catalogue/{ => lesson}/lesson_detail.html (65%) create mode 100755 catalogue/templates/catalogue/lesson/synthetic/lesson_detail.html create mode 100644 chunks/__init__.py create mode 100644 chunks/admin.py create mode 100644 chunks/fixtures/chunks.json create mode 100644 chunks/locale/de/LC_MESSAGES/django.mo create mode 100644 chunks/locale/de/LC_MESSAGES/django.po create mode 100644 chunks/locale/en/LC_MESSAGES/django.mo create mode 100644 chunks/locale/en/LC_MESSAGES/django.po create mode 100644 chunks/locale/es/LC_MESSAGES/django.mo create mode 100644 chunks/locale/es/LC_MESSAGES/django.po create mode 100644 chunks/locale/fr/LC_MESSAGES/django.mo create mode 100644 chunks/locale/fr/LC_MESSAGES/django.po create mode 100644 chunks/locale/it/LC_MESSAGES/django.mo create mode 100644 chunks/locale/it/LC_MESSAGES/django.po create mode 100644 chunks/locale/jp/LC_MESSAGES/django.mo create mode 100644 chunks/locale/jp/LC_MESSAGES/django.po create mode 100644 chunks/locale/lt/LC_MESSAGES/django.mo create mode 100644 chunks/locale/lt/LC_MESSAGES/django.po create mode 100644 chunks/locale/pl/LC_MESSAGES/django.mo create mode 100644 chunks/locale/pl/LC_MESSAGES/django.po create mode 100644 chunks/locale/ru/LC_MESSAGES/django.mo create mode 100644 chunks/locale/ru/LC_MESSAGES/django.po create mode 100644 chunks/locale/uk/LC_MESSAGES/django.mo create mode 100644 chunks/locale/uk/LC_MESSAGES/django.po create mode 100644 chunks/models.py create mode 100644 chunks/templatetags/__init__.py create mode 100644 chunks/templatetags/chunks.py diff --git a/catalogue/templates/catalogue/lesson/appendix/lesson_detail.html b/catalogue/templates/catalogue/lesson/appendix/lesson_detail.html new file mode 100755 index 0000000..b4bbc94 --- /dev/null +++ b/catalogue/templates/catalogue/lesson/appendix/lesson_detail.html @@ -0,0 +1,19 @@ +{% extends "catalogue/lesson/lesson_detail.html" %} +{% load url from future %} + +{% block sidebar-top %} + +
+

Zebrane dla wszystkich tematów

+ +

To jest materiał wspólny dla wszystkich lekcji + edukacji medialnej{% if object.level.slug = "liceum" %} + (na poziomie zaawansowanym) + {% endif %}. + Zobacz też + pełny kurs + z podziałem na poszczególne tematy. +

+
+ +{% endblock %} diff --git a/catalogue/templates/catalogue/lesson/course/lesson_detail.html b/catalogue/templates/catalogue/lesson/course/lesson_detail.html new file mode 100755 index 0000000..cc22b39 --- /dev/null +++ b/catalogue/templates/catalogue/lesson/course/lesson_detail.html @@ -0,0 +1,23 @@ +{% extends "catalogue/lesson/lesson_detail.html" %} +{% load url from future %} + +{% block sidebar-top %} + +
+

Realizacja i czas lekcji

+

Ta lekcja jest częścią tematu + {{ object.section }}{% if object.level.slug = "liceum" %} + (na poziomie zaawansowanym) + {% endif %}. + {% with object.get_syntetic as synth %} + {% if synth %} + Dostępna jest również + lekcja syntetyczna + dla tego tematu. + {% endif %} + {% endwith %} +

+

Czas trwania: 45 minut.

+
+ +{% endblock %} diff --git a/catalogue/templates/catalogue/lesson_detail.html b/catalogue/templates/catalogue/lesson/lesson_detail.html similarity index 65% rename from catalogue/templates/catalogue/lesson_detail.html rename to catalogue/templates/catalogue/lesson/lesson_detail.html index ef20d0e..8eec0da 100755 --- a/catalogue/templates/catalogue/lesson_detail.html +++ b/catalogue/templates/catalogue/lesson/lesson_detail.html @@ -10,43 +10,7 @@