From 1a798a8611063ff9abc2b8cd9104e45580f7bffd Mon Sep 17 00:00:00 2001
From: Radek Czajka
Date: Thu, 14 Feb 2013 15:15:10 +0100
Subject: [PATCH 1/1] 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 @@
\r\n\r\nZach\u0119camy wszystkich nauczycieli i wszystkie nauczycielki do tworzenia materia\u0142\u00f3w edukacyjnych i publikowania ich na naszej stronie! Warto zapozna\u0107 si\u0119 z instrukcj\u0105 dotycz\u0105c\u0105 pisania scenariuszy lekcji i schematem przyk\u0142adowego scenariusza lekcji, a gotowe materia\u0142y przes\u0142a\u0107 na adres fundacja@nowoczesnapolska.org.pl.
",
+ "description": ""
+ }
+ },
+ {
+ "pk": "footer-map",
+ "model": "chunks.chunk",
+ "fields": {
+ "content": "",
+ "description": ""
+ }
+ },
+ {
+ "pk": "site-description",
+ "model": "chunks.chunk",
+ "fields": {
+ "content": "",
+ "description": ""
+ }
+ },
+ {
+ "pk": "top-message",
+ "model": "chunks.chunk",
+ "fields": {
+ "content": "",
+ "description": ""
+ }
+ },
+ {
+ "pk": "footer-img",
+ "model": "chunks.attachment",
+ "fields": {
+ "attachment": "chunks/attachment/footer.png"
+ }
+ }
+]
diff --git a/chunks/locale/de/LC_MESSAGES/django.mo b/chunks/locale/de/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..be5f8ae0ebfa0e0671a8b3482bf4660bec197078
GIT binary patch
literal 850
zcma)(-)_?|7{v{Ye*tbl+<|0n-~zlQ>3}H(MAvmwwT)F>n7Bh;>Ly+ir`XQM_8vS0
z@6fwF1vfkcyaC5eN8tjAPdfhjOOB7e#NY2OeIY0hdH@yB9cT)<`T;$HenL;6dzTt-
z8@z>n6TAuz!E4|L@H+T${yqh-pf_Luoj@z-zg{M!4SoZi|2|ANz=xpAdkng~XLGi|
z+vp?E&AJ65irj>jAhf^Bopa@K5kJdyXIw7n&|1k)wV;ZZf{rUqZ6*!n*777Pg|h#0
zBw4L;T8(K^DeHWH99e7)nfaO(&D=W@CedSi11Pe5))7Xc$J%Uo^fQZY+y6SEk^$(h=R}r7Y;H{D|j8omVF&mv7UO
z%VIgH$~WE)S82^t!D7Kn40O?ByW8LGEj}n%_PuWN16X`I!Jt-rwkwl@OVy@H#2f=B-273VgRzAWX1W^7*UX4NNC)5
literal 0
HcmV?d00001
diff --git a/chunks/locale/de/LC_MESSAGES/django.po b/chunks/locale/de/LC_MESSAGES/django.po
new file mode 100644
index 0000000..7fbf84e
--- /dev/null
+++ b/chunks/locale/de/LC_MESSAGES/django.po
@@ -0,0 +1,74 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-19 11:39+0200\n"
+"PO-Revision-Date: 2012-04-11 22:56+0100\n"
+"Last-Translator: Kamil \n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: models.py:11 models.py:33
+msgid "key"
+msgstr "Schlüssel"
+
+#: models.py:11
+msgid "A unique name for this chunk of content"
+msgstr "Die einzigartige Bezeichnung für dieses Chunk von Inhalten"
+
+#: models.py:12
+msgid "description"
+msgstr "Beschreibung"
+
+#: models.py:13
+msgid "content"
+msgstr "Inhalt"
+
+#: models.py:17
+msgid "chunk"
+msgstr "Chunk"
+
+#: models.py:18
+msgid "chunks"
+msgstr "Chunks"
+
+#: models.py:33
+msgid "A unique name for this attachment"
+msgstr "Die einzigartige Bezeichnung für diese Beilage"
+
+#: models.py:38
+msgid "attachment"
+msgstr "Beilage"
+
+#: models.py:38
+msgid "attachments"
+msgstr "Beilagen"
+
+#~ msgid "title"
+#~ msgstr "Titel"
+
+#~ msgid "slug"
+#~ msgstr "Slug"
+
+#~ msgid "file"
+#~ msgstr "Datei"
+
+#~ msgid "author"
+#~ msgstr "Autor"
+
+#~ msgid "slideshare ID"
+#~ msgstr "Dia-ID"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "document"
+#~ msgstr "Dokument"
diff --git a/chunks/locale/en/LC_MESSAGES/django.mo b/chunks/locale/en/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..a81e430a792d5e7e9792e8865732ce3983d3abd7
GIT binary patch
literal 814
zcma)3(QeZ)6g4my3qnXB@r01~gaq<%x*?5hAWG?`igc?=Ht~kM)J?s$cCa1jK7@bZ
zBlrS7f^PuckvMLKf{-e4m2*$7eeUs1{O$J2CxVE8d%zU9348%Ud{!s1bWv6^>;lq0!(lV;w6+@M5oomkDk0xW)J;i(53_
zOtzjr;xXqCvZ4H-g84r>zJ->AKdE)8aGqsWXg3w!*o4mKbGnQ4JW7QwDp5$5Nij=k
z+CJDn3M1~O>5Hk_Ft%tk7_Hyycbo5tH+a;kzn^92CFb;U?jM&^q4W;TC&D`EpB-g;
rY`f8gF~-ueuFlO!=^~-qC(1|5E~WYL%M_)Ox%`i7Tj, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-19 11:39+0200\n"
+"PO-Revision-Date: 2012-03-04 20:05+0100\n"
+"Last-Translator: xxx \n"
+"Language-Team: LANGUAGE \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: models.py:11 models.py:33
+msgid "key"
+msgstr "key"
+
+#: models.py:11
+msgid "A unique name for this chunk of content"
+msgstr "A unique name for this piece of content"
+
+#: models.py:12
+msgid "description"
+msgstr "description"
+
+#: models.py:13
+msgid "content"
+msgstr "content"
+
+#: models.py:17
+msgid "chunk"
+msgstr "piece"
+
+#: models.py:18
+msgid "chunks"
+msgstr "pieces"
+
+#: models.py:33
+msgid "A unique name for this attachment"
+msgstr "A unique name for this attachment"
+
+#: models.py:38
+msgid "attachment"
+msgstr "attachment"
+
+#: models.py:38
+msgid "attachments"
+msgstr "attachments"
diff --git a/chunks/locale/es/LC_MESSAGES/django.mo b/chunks/locale/es/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..83f03fb4dcd119d11aa9963b3ee86a9e3ff93c63
GIT binary patch
literal 876
zcmaKq&u-H|5XKFZe+Gnr8{#mWkcu|g4ib?YP(yI5K+;sft>9E`*BfV3d)Mr40(}sk
zgd2iW--9zpcmrk=w*e$r>GN;L{$@Pu@weM+A3a>K>{<-9UXox%C5eAN3RU0Cnfw
z(z}7YhVd5iB65VhgnWa%j6A5H=g12f8)Sldk6Oq0>v_)$k>8Owk$2H_3%QQGf@~wN
zB9od!LN%3yRLDG`LSZS~mVSrjo
z*`(ys{>#B8GkFAR3`|Mue7~ivw#HldmRAgFZ^jMNqOw9s?}#6JyIM^-v!s`ieXb4O
zj$yacebw1cU_TkX?hSYR5wDcCWMFcUk>|7AkW|Is?+#Pa)ttIoB*n+Sb2hq~kr^b?0Q)vonm5!k!C54x&s-R7!pi|s!
z<|P$HgQ@bF-={L4(VUZ%(=vvBXJ>oQ_1*6GHw)2FI$wFP-$8GXtPUAA0>8WbC?q|u
zuzAZr*hf`Ch1>u(q1tf!bT8c^t(DL9Hs+cnlBrC{Jcibxu)dcRAXRy&Ih=f!f+?t|
zrofHmKsB3)xdNI^XVR+wS$Vu<^5fuj`3GnmNedJ;@ReO-Y&hKI1?wI
Kq{j+6=iV>iY36eP
literal 0
HcmV?d00001
diff --git a/chunks/locale/es/LC_MESSAGES/django.po b/chunks/locale/es/LC_MESSAGES/django.po
new file mode 100644
index 0000000..4130ea1
--- /dev/null
+++ b/chunks/locale/es/LC_MESSAGES/django.po
@@ -0,0 +1,53 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-19 11:39+0200\n"
+"PO-Revision-Date: 2012-02-18 13:02+0100\n"
+"Last-Translator: Anna Jopp \n"
+"Language-Team: LANGUAGE \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: models.py:11 models.py:33
+msgid "key"
+msgstr "clave"
+
+#: models.py:11
+msgid "A unique name for this chunk of content"
+msgstr "El nombre único para este elemento del contenido"
+
+#: models.py:12
+msgid "description"
+msgstr "descripción"
+
+#: models.py:13
+msgid "content"
+msgstr "contenido"
+
+#: models.py:17
+msgid "chunk"
+msgstr "elemento"
+
+#: models.py:18
+msgid "chunks"
+msgstr "elementos"
+
+#: models.py:33
+msgid "A unique name for this attachment"
+msgstr "El nombre único para este archivo adjunto"
+
+#: models.py:38
+msgid "attachment"
+msgstr "archivo adjunto"
+
+#: models.py:38
+msgid "attachments"
+msgstr "archivos adjuntos"
diff --git a/chunks/locale/fr/LC_MESSAGES/django.mo b/chunks/locale/fr/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..1ef6af2864abe18a3e54109574511be48f65d526
GIT binary patch
literal 855
zcmZ{h-)_?|6vhLLe?=1#T*AfS281S;G~1++jcKLprb4?_C7ZZIUh1aaQajiVV-LbR
zz&q@2@4*c(0B^wO{#iE(EPeU;B;Pqc&iVOh;ah-Jfu2G+vhJZ@eX(!?16W{kKkSK)AV}=-a>4_ZRiwwj`;j$5WEC`f&RQjm>z;pz*)fxCf%t*yCe_m&^Czm(N4_aXo)O-)BQpwMyAjL<52HKDtN=w{1o(@Ms
zx&JxRVX00?4=B~jdEb?k`PK$w-{gs4>g@}g8d*50Rd6ECg09iWB6Y0QXNSUAypE|`
zZ@jPXHtDe0`_S6otMo*njbj~~$v%5qW|k#7rb>4|VGSd=uf?{x6EQ_$En?v^t3^~>
zj#pkUg|#q*k@dtE>5E_UMJ$St60b%RUz=OU62q0vxzi@5X3psySK4vf;3IBio=dyB
zby`%5e6!N#Dl2&=SR(i+rgnXA_rSNk(Qa?$vZ_rs_n_TQtJ9p{u~rQ$jmbY@$ytHk
zo%rfr6*-q`ozfvUR=76@$qrka`+REyVOUe8x-V50)7p`AmEb^;(xcft3tbvYg>!-m
xdGS3JbgU&N^=}&u4A1, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-19 11:39+0200\n"
+"PO-Revision-Date: 2012-02-22 20:52+0100\n"
+"Last-Translator: Ela Janota \n"
+"Language-Team: LANGUAGE \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: models.py:11 models.py:33
+msgid "key"
+msgstr "clé"
+
+#: models.py:11
+msgid "A unique name for this chunk of content"
+msgstr "Un nom unique pour ce fragment du contenu"
+
+#: models.py:12
+msgid "description"
+msgstr "description"
+
+#: models.py:13
+msgid "content"
+msgstr "contenu"
+
+#: models.py:17
+msgid "chunk"
+msgstr "fragment"
+
+#: models.py:18
+msgid "chunks"
+msgstr "fragments"
+
+#: models.py:33
+msgid "A unique name for this attachment"
+msgstr "Un nom unique pour cette pièce jointe"
+
+#: models.py:38
+msgid "attachment"
+msgstr "pièce jointe"
+
+#: models.py:38
+msgid "attachments"
+msgstr "pièces jointes"
diff --git a/chunks/locale/it/LC_MESSAGES/django.mo b/chunks/locale/it/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..a07410f3e807f92ead7d558a25bcc518601eee1b
GIT binary patch
literal 846
zcmaix-;NS76vjtg|BW#*dS&9p!5iI}t_%sf4q`+ELWEs{vm5VBcPK;Mp~bedvc89J
z<0JSCK7!FV@GC>Wm>5sypd7jheT97dgeuT4=mB)+Lg{UQ
zH;{M1%itKi0=@&Ug74S+8F&e~1rz8KR6+jjV#y!iHRQKo^1KWBI`=_eXBWH_}+SQXDRit2Iw>7!~?
zt-{F0;!OJDfB9+=MNi^-t@I7Jbu2Ml*_=CVVp=Yj;ee~G;F(~F;PaRUt%Kf?Z|?bE
z@G_Ts+GH;_9yB%V4?EkNM0?e+UEZ7}=L>Y`#L_)pv|!BlU%2%E-{nqi54hU&h#@ruL#;R$, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-19 11:39+0200\n"
+"PO-Revision-Date: 2012-02-21 16:52+0100\n"
+"Last-Translator: xxx\n"
+"Language-Team: LANGUAGE \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: models.py:11 models.py:33
+msgid "key"
+msgstr "Chiave"
+
+#: models.py:11
+msgid "A unique name for this chunk of content"
+msgstr "un nome unico per questo allegato"
+
+#: models.py:12
+msgid "description"
+msgstr "descrizione"
+
+#: models.py:13
+msgid "content"
+msgstr "contenuto"
+
+#: models.py:17
+msgid "chunk"
+msgstr "blocco"
+
+#: models.py:18
+msgid "chunks"
+msgstr "blocchi"
+
+#: models.py:33
+msgid "A unique name for this attachment"
+msgstr "Un nome unico per questo allegato"
+
+#: models.py:38
+msgid "attachment"
+msgstr "allegato"
+
+#: models.py:38
+msgid "attachments"
+msgstr "allegati"
diff --git a/chunks/locale/jp/LC_MESSAGES/django.mo b/chunks/locale/jp/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..ad2faa7ae531da84be2bb0022dc78d2241d88ab8
GIT binary patch
literal 378
zcmYL^K~KUk7=|%=+R?Lz9=zd)9mI$g4V4vKTsJZXiQX#IIfL!e6{A1Izvpl9TVmu*
zp7hY?Yv1qZ_~^TXIY3U3Q{)giL)r|HFRvWn6l?@b@kzk$`FmYOW9D+!B%}AeyeV_xN7bF}odfBBRr6@wK
zKdSceKkrfS9ApL&C-)hXarY@pMUbe*L*bNZw#r+_$aI+`B;`_&k&rx2#ypC0u~^)q
zYRa7|H56LCGm`Lhwrnepl4QKCde)VD2dm0hiv50Jj|LNKyf*mVSB<^B{`BYdR#oPj
htY4LDw7*#vQyA{Ow$_VwAk5lsDpN8te6D=Z`2|k7W;_4@
literal 0
HcmV?d00001
diff --git a/chunks/locale/jp/LC_MESSAGES/django.po b/chunks/locale/jp/LC_MESSAGES/django.po
new file mode 100644
index 0000000..dcc303c
--- /dev/null
+++ b/chunks/locale/jp/LC_MESSAGES/django.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-19 11:39+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: models.py:11 models.py:33
+msgid "key"
+msgstr ""
+
+#: models.py:11
+msgid "A unique name for this chunk of content"
+msgstr ""
+
+#: models.py:12
+msgid "description"
+msgstr ""
+
+#: models.py:13
+msgid "content"
+msgstr ""
+
+#: models.py:17
+msgid "chunk"
+msgstr ""
+
+#: models.py:18
+msgid "chunks"
+msgstr ""
+
+#: models.py:33
+msgid "A unique name for this attachment"
+msgstr ""
+
+#: models.py:38
+msgid "attachment"
+msgstr ""
+
+#: models.py:38
+msgid "attachments"
+msgstr ""
diff --git a/chunks/locale/lt/LC_MESSAGES/django.mo b/chunks/locale/lt/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..6131fd5170b25ea597424b3d556ea126b60f1a5c
GIT binary patch
literal 847
zcmZ{f&2G~`6on0xKO;6Eb|8iYVu2>u4MoMJh!D~ek+e}rs_v>=d*V!!%!HY7ArHa>
z^gY;i$t&;%Nbm-niK7H6G1Bqp>wE6?nICu7z6LlUbRQZ+x1n#4KfjZnXsvmQzx|wMq(Cpj6M;mnyG&&tE=`
z;wXZVcg3mn%P;t%n8h!WxLW#JWF7ArQg%#En}pSra1^#kK&uIAT#{qf!lnzLFyv7nYr$NzJB4iVUDr
v%9Natz0h}skqW+?j%oalZ$1fsNg2!?s7uOVJ~^`iO%0u&&HQRZBM1BeAJf_l
literal 0
HcmV?d00001
diff --git a/chunks/locale/lt/LC_MESSAGES/django.po b/chunks/locale/lt/LC_MESSAGES/django.po
new file mode 100644
index 0000000..a78804a
--- /dev/null
+++ b/chunks/locale/lt/LC_MESSAGES/django.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-19 11:39+0200\n"
+"PO-Revision-Date: 2012-03-01 16:13+0100\n"
+"Last-Translator: Aneta\n"
+"Language-Team: LANGUAGE \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Translated-Using: django-rosetta 0.5.3\n"
+
+#: models.py:11 models.py:33
+msgid "key"
+msgstr "raktas"
+
+#: models.py:11
+msgid "A unique name for this chunk of content"
+msgstr "Unikalus Å¡io turinio gabalo pavadnimas"
+
+#: models.py:12
+msgid "description"
+msgstr "aprašymas"
+
+#: models.py:13
+msgid "content"
+msgstr "turinys"
+
+#: models.py:17
+msgid "chunk"
+msgstr "gabalas"
+
+#: models.py:18
+msgid "chunks"
+msgstr "gabalai"
+
+#: models.py:33
+msgid "A unique name for this attachment"
+msgstr "Unikalus Å¡io priedo pavadnimas"
+
+#: models.py:38
+msgid "attachment"
+msgstr "priedas"
+
+#: models.py:38
+msgid "attachments"
+msgstr "priedai"
diff --git a/chunks/locale/pl/LC_MESSAGES/django.mo b/chunks/locale/pl/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..a26b41c1f2fa4e29fab4af32d8383e32a6c15dd2
GIT binary patch
literal 892
zcmZ{h&2AGh6on0xzX2A&mW7d!Ktc{PEk(_=poWlE5$TW8r0N0*nHhKD%*3ABPD8Uq
zLOcPhz6#6cHFyFR@CF<=QPWK=oqWE&=U!iDem`3HNw5Ow2~397%7ea;gt$qLuT$OC|HICFj2BFM^pj6*e)lbW$slixaYIbYCQnHB+`PjKy(G
zcWd>Jwao_IZ?yNCJKI59l-fA9Wiy$w_ruJxj*e-tyVGHHBe?IyK5!>ux)?@_EL>vI
zB8`^f*VUI{6oxRewm6o)`P>(>aG6C_8oi05YS7}=v5w)&7TjqQ(>23WjbKzs#=M{N
zb)`o-84Ig;sSBI)iZ)rLEZ(71Wka3`))9OV(^hSJv+Ji{Yqi!3>1}flrrv69HRex^
zDq&Ec{xz&~QsN0te08tNf=jhZlO8u#xVPQT23wi?{FsNru!c%>DpeNKl`ql-2Nw?z
zDeKzvMB2x6ni-8Yj?=KRTv-Z8SIL|gisRFdN1Ubw$F-TJV?OzI_B|Q<^p&QZk6_DD
nV#MS$k>pa<<-H_Rr^siU+*?Q7I6XN%`$2RmEy;^vGA924w?^?q
literal 0
HcmV?d00001
diff --git a/chunks/locale/pl/LC_MESSAGES/django.po b/chunks/locale/pl/LC_MESSAGES/django.po
new file mode 100644
index 0000000..c562232
--- /dev/null
+++ b/chunks/locale/pl/LC_MESSAGES/django.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-19 11:39+0200\n"
+"PO-Revision-Date: 2010-05-19 16:19\n"
+"Last-Translator: \n"
+"Language-Team: LANGUAGE \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Translated-Using: django-rosetta 0.5.3\n"
+
+#: models.py:11 models.py:33
+msgid "key"
+msgstr "klucz"
+
+#: models.py:11
+msgid "A unique name for this chunk of content"
+msgstr "Unikalna nazwa dla tego kawaÅka treÅci"
+
+#: models.py:12
+msgid "description"
+msgstr "opis"
+
+#: models.py:13
+msgid "content"
+msgstr "zawartoÅÄ"
+
+#: models.py:17
+msgid "chunk"
+msgstr "kawaÅek"
+
+#: models.py:18
+msgid "chunks"
+msgstr "kawaÅki"
+
+#: models.py:33
+msgid "A unique name for this attachment"
+msgstr "Unikalna nazwa dla tego zaÅÄ
cznika"
+
+#: models.py:38
+msgid "attachment"
+msgstr "zaÅÄ
cznik"
+
+#: models.py:38
+msgid "attachments"
+msgstr "zaÅÄ
czniki"
diff --git a/chunks/locale/ru/LC_MESSAGES/django.mo b/chunks/locale/ru/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..e1d650c7fc5026f4aa713af3cfd96bb9fedd4459
GIT binary patch
literal 958
zcmb7<&2G~`6om&Ue?~~Cuw*f;SfD9(+C^~-A`NL3k+e~8B6etSCXPvB2YUjk#DXFu
z7W`zz6TpIHB$^7fA$^7M3-AJL;0-v_LQBcBDTCj^OJEu%
z%?fw{Y=E=ivq`@<>3;;zpg#Z+Mb1Jq5X#?6&!Lx|1Mvrb{XRV>Nz+c?Kkf(`@Rp#p
zFru>V$COLS-Fiy|@?Q?O-U%8stWh@%r1t%BWcnME1K;?IV&bie*p2+Q^uvHO#3m_5
z;UnQnmaDRgh+?#DT1;o|rq{Bxk}ciKZLAw5(GDZY3bE%`*-FQYnG@R7C~i0`6A7-f
z*c~o~O;e_oV&*)vQq-Ea7j9fLEz^XNmBbTYhad8p3pACoEpzP4^H?$`;z8WxGK_56
z?RM!hKDUfK54;Zd1aky$*)*SCUn}bom-G4CO@A(oyr~DH6>^2_^gY&`X=KLlXU=9D
zb4t;b*V|3*2TRng^C%YbX4zR~i&LK-qb4Gj4cxHm2cAtAANtZD>Vx{KzNlT*S9{4D
z{EyUtqA^T*RBfZzqsiOk1=^q0h^qbMIX3rD?x=x2ne_fMB6*33KGKFd0LgutY$0!3
t4Y09;tx4*UtJHw}_5Q<&, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-19 11:39+0200\n"
+"PO-Revision-Date: 2012-03-04 22:10+0100\n"
+"Last-Translator: xxx \n"
+"Language-Team: LANGUAGE \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: models.py:11 models.py:33
+msgid "key"
+msgstr "клÑÑ"
+
+#: models.py:11
+msgid "A unique name for this chunk of content"
+msgstr "УникалÑное Ð¸Ð¼Ñ Ð´Ð»Ñ ÑÑого ÑÑагменÑа ÑодеÑжаниÑ"
+
+#: models.py:12
+msgid "description"
+msgstr "опиÑание"
+
+#: models.py:13
+msgid "content"
+msgstr "ÑодеÑжание"
+
+#: models.py:17
+msgid "chunk"
+msgstr "ÑÑагменÑ"
+
+#: models.py:18
+msgid "chunks"
+msgstr "ÑÑагменÑÑ"
+
+#: models.py:33
+msgid "A unique name for this attachment"
+msgstr "УникалÑное Ð¸Ð¼Ñ Ð´Ð»Ñ ÑÑого пÑиложениÑ"
+
+#: models.py:38
+msgid "attachment"
+msgstr "пÑиложение"
+
+#: models.py:38
+msgid "attachments"
+msgstr "пÑиложениÑ"
diff --git a/chunks/locale/uk/LC_MESSAGES/django.mo b/chunks/locale/uk/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..7c5388e7ca96d40ddfc17d0678946c3afb01ffb8
GIT binary patch
literal 906
zcma)%&2G~`6om&Ue@3u?EsJ5r0!^{gN-b`w8bVq{q)imuiWO*ZCXQ)h2YUkPG9b|n
zf(?WRV8b#3B%-tpuP}ZAwrt@IIMYP9MXJO|XFlJVbFa_*xIFcqU>VR=r~zGs_8`4}
zLD!()&~@m_iLrM9ynuQIJPlUBGvEX8Ecj@0?}4XK$Dj#4hn7%(I!Q8}BG4-l~Y*$ZttM49J$)Cgmu6B3#J|
zRkkUj7{@j(XLI+mt9iPauiP(`){Tm2g^^@yvFBIWowgS8_o)wPklN@O++joxM9@~Je$rx_N778N41~y)KK-+Zt_~~t3K76
z`ldeXyRrOOsc)8mTX8q)$drKY5{s$;Z|9V;8Lh{9{1zlf9&;5A>vT
j@JJ00mqRrmM>_jQ%K=FT5v2RB21%FTNxR9LWQY6#=g2nU
literal 0
HcmV?d00001
diff --git a/chunks/locale/uk/LC_MESSAGES/django.po b/chunks/locale/uk/LC_MESSAGES/django.po
new file mode 100644
index 0000000..edb9b06
--- /dev/null
+++ b/chunks/locale/uk/LC_MESSAGES/django.po
@@ -0,0 +1,53 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-19 11:39+0200\n"
+"PO-Revision-Date: 2012-03-04 17:29+0100\n"
+"Last-Translator: xxx \n"
+"Language-Team: LANGUAGE \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: models.py:11 models.py:33
+msgid "key"
+msgstr "клÑÑ"
+
+#: models.py:11
+msgid "A unique name for this chunk of content"
+msgstr "УнÑкалÑна назва Ð´Ð»Ñ ÑÑÑÑ ÑаÑÑини змÑÑÑÑ"
+
+#: models.py:12
+msgid "description"
+msgstr "опиÑ"
+
+#: models.py:13
+msgid "content"
+msgstr "змÑÑÑ"
+
+#: models.py:17
+msgid "chunk"
+msgstr "ÑаÑÑина"
+
+#: models.py:18
+msgid "chunks"
+msgstr "ÑаÑÑини"
+
+#: models.py:33
+msgid "A unique name for this attachment"
+msgstr "УнÑкалÑна назва Ð´Ð»Ñ ÑÑого додаÑкÑ"
+
+#: models.py:38
+msgid "attachment"
+msgstr "додаÑок"
+
+#: models.py:38
+msgid "attachments"
+msgstr "додаÑки"
diff --git a/chunks/models.py b/chunks/models.py
new file mode 100644
index 0000000..ef244eb
--- /dev/null
+++ b/chunks/models.py
@@ -0,0 +1,42 @@
+from django.core.cache import cache
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+
+
+class Chunk(models.Model):
+ """
+ A Chunk is a piece of content associated with a unique key that can be inserted into
+ any template with the use of a special template tag.
+ """
+ key = models.CharField(_('key'), help_text=_('A unique name for this chunk of content'), primary_key=True, max_length=255)
+ description = models.CharField(_('description'), blank=True, max_length=255)
+ content = models.TextField(_('content'), blank=True)
+
+ class Meta:
+ ordering = ('key',)
+ verbose_name = _('chunk')
+ verbose_name_plural = _('chunks')
+
+ def __unicode__(self):
+ return self.key
+
+ def cache_key(self):
+ return 'chunk_' + self.key
+
+ def save(self, *args, **kwargs):
+ ret = super(Chunk, self).save(*args, **kwargs)
+ cache.delete(self.cache_key())
+ return ret
+
+
+class Attachment(models.Model):
+ key = models.CharField(_('key'), help_text=_('A unique name for this attachment'), primary_key=True, max_length=255)
+ attachment = models.FileField(upload_to='chunks/attachment')
+
+ class Meta:
+ ordering = ('key',)
+ verbose_name, verbose_name_plural = _('attachment'), _('attachments')
+
+ def __unicode__(self):
+ return self.key
+
diff --git a/chunks/templatetags/__init__.py b/chunks/templatetags/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/chunks/templatetags/chunks.py b/chunks/templatetags/chunks.py
new file mode 100644
index 0000000..083c48a
--- /dev/null
+++ b/chunks/templatetags/chunks.py
@@ -0,0 +1,63 @@
+from django import template
+from django.db import models
+from django.core.cache import cache
+
+
+register = template.Library()
+
+Chunk = models.get_model('chunks', 'chunk')
+Attachment = models.get_model('chunks', 'attachment')
+
+
+def do_get_chunk(parser, token):
+ # split_contents() knows not to split quoted strings.
+ tokens = token.split_contents()
+ if len(tokens) < 2 or len(tokens) > 3:
+ raise template.TemplateSyntaxError, "%r tag should have either 2 or 3 arguments" % (tokens[0],)
+ if len(tokens) == 2:
+ tag_name, key = tokens
+ cache_time = 0
+ if len(tokens) == 3:
+ tag_name, key, cache_time = tokens
+ # Check to see if the key is properly double/single quoted
+ if not (key[0] == key[-1] and key[0] in ('"', "'")):
+ raise template.TemplateSyntaxError, "%r tag's argument should be in quotes" % tag_name
+ # Send key without quotes and caching time
+ return ChunkNode(key[1:-1], cache_time)
+
+
+class ChunkNode(template.Node):
+ def __init__(self, key, cache_time=0):
+ self.key = key
+ self.cache_time = cache_time
+
+ def render(self, context):
+ try:
+ cache_key = 'chunk_' + self.key
+ c = cache.get(cache_key)
+ if c is None:
+ c = Chunk.objects.get(key=self.key)
+ cache.set(cache_key, c, int(self.cache_time))
+ content = c.content
+ except Chunk.DoesNotExist:
+ n = Chunk(key=self.key)
+ n.save()
+ return ''
+ return content
+
+register.tag('chunk', do_get_chunk)
+
+
+def attachment(key, cache_time=0):
+ try:
+ cache_key = 'attachment_' + key
+ c = cache.get(cache_key)
+ if c is None:
+ c = Attachment.objects.get(key=key)
+ cache.set(cache_key, c, int(cache_time))
+ return c.attachment.url
+ except Attachment.DoesNotExist:
+ return ''
+
+register.simple_tag(attachment)
+
diff --git a/edumed/settings.d/30-apps.py b/edumed/settings.d/30-apps.py
index 10c6c12..0ba0726 100644
--- a/edumed/settings.d/30-apps.py
+++ b/edumed/settings.d/30-apps.py
@@ -12,6 +12,7 @@ INSTALLED_APPS = (
'django_cas',
'sponsors',
'haystack',
+ 'chunks',
'django.contrib.auth',
diff --git a/edumed/static/css/main.css b/edumed/static/css/main.css
index 974aa37..4fecbb1 100644
--- a/edumed/static/css/main.css
+++ b/edumed/static/css/main.css
@@ -5,6 +5,8 @@
padding: 1.5em 1.25em;
width: 11.25em;
height: 11.688em; }
+ #main-promobox a {
+ display: block; }
#main-promobox h1 {
color: white;
margin: 0;
diff --git a/edumed/static/css/main.scss b/edumed/static/css/main.scss
index a37de9e..e956c81 100755
--- a/edumed/static/css/main.scss
+++ b/edumed/static/css/main.scss
@@ -10,6 +10,9 @@ $px: .0625em;
width: 220*$px - 2 * 20*$px;
height: 235*$px - 2 * 1.5em;
+ a {
+ display: block;
+ }
h1 {
color: white;
margin: 0;
diff --git a/edumed/templates/home.html b/edumed/templates/home.html
index 7be0b3e..759e72c 100755
--- a/edumed/templates/home.html
+++ b/edumed/templates/home.html
@@ -1,6 +1,7 @@
{% extends "base.html" %}
{% load catalogue_tags %}
{% load course_boxes_toc from curriculum_tags %}
+{% load chunk from chunks %}
{% block full_title %}Edukacja medialna{% endblock %}
@@ -11,16 +12,7 @@
Co nowego?
-TytuÅ informacji pierwszej
-
-Boks na informacje powinien pomieÅciÄ do dwóch krótkich zdaÅ uÅożonych
-w trzech, a możeâ¦
-
-TytuÅ informacji drugiej
-
-Boks na informacje powinien pomieÅciÄ do dwóch krótkich zdaÅ uÅożonych
-w trzech wierszach?
-{#% chunk "promobox" %#}
+{% chunk "promobox" %}
@@ -44,6 +36,10 @@ w trzech wierszach?
diff --git a/edumed/urls.py b/edumed/urls.py
index d988610..303e011 100644
--- a/edumed/urls.py
+++ b/edumed/urls.py
@@ -1,12 +1,10 @@
from django.conf.urls import patterns, include, url
from django.conf import settings
-from django.views.generic import TemplateView
+from .views import HomeView
urlpatterns = patterns('',
- # Examples:
- # url(r'^$', 'edumed.views.home', name='home'),
- url(r'^$', TemplateView.as_view(template_name="home.html"), name="home"),
+ url(r'^$', HomeView.as_view(), name="home"),
url(r'^kompetencje/', include('curriculum.urls')),
url(r'^lekcje/', include('catalogue.urls')),
# url(r'^i/', include('django.contrib.flatpages.urls')),
diff --git a/edumed/views.py b/edumed/views.py
index e69de29..b497716 100755
--- a/edumed/views.py
+++ b/edumed/views.py
@@ -0,0 +1,12 @@
+import os.path
+from django.conf import settings
+from django.views.generic import TemplateView
+
+class HomeView(TemplateView):
+ template_name="home.html"
+
+ def get_context_data(self, **kwargs):
+ context = super(HomeView, self).get_context_data(**kwargs)
+ context['package_url'] = os.path.join(settings.MEDIA_URL, settings.CATALOGUE_PACKAGE)
+ context['package_student_url'] = os.path.join(settings.MEDIA_URL, settings.CATALOGUE_PACKAGE_STUDENT)
+ return context
--
2.20.1