From 433c2681ac4fea560f5b1ac3dc372353907a50b0 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Thu, 26 Oct 2017 12:13:25 +0200 Subject: [PATCH 01/16] thread-safe random --- wtem/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wtem/models.py b/wtem/models.py index 6440e70..fbf0928 100644 --- a/wtem/models.py +++ b/wtem/models.py @@ -96,8 +96,8 @@ class Submission(models.Model): def shuffled_exercise_ids(self): exercise_ids = [e['id'] for e in exercises] - random.seed(self.random_seed) - random.shuffle(exercise_ids) + seeded_random = random.Random(self.random_seed) + seeded_random.shuffle(exercise_ids) return exercise_ids def current_exercise(self): -- 2.20.1 From c047053dab0ec7d125fd5b2540a01045e64dd3fa Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Thu, 26 Oct 2017 17:22:19 +0200 Subject: [PATCH 02/16] archive last year's test --- wtem/fixtures/exercises-2016.json | 476 ++++++++++++++++++++++++++++++ 1 file changed, 476 insertions(+) create mode 100644 wtem/fixtures/exercises-2016.json diff --git a/wtem/fixtures/exercises-2016.json b/wtem/fixtures/exercises-2016.json new file mode 100644 index 0000000..eaea02f --- /dev/null +++ b/wtem/fixtures/exercises-2016.json @@ -0,0 +1,476 @@ +[ +{ + "id": 1, + "type": "edumed_wybor", + "description": ["Booksprint to:"], + "options": [ + {"id": 1, "text": "publikacja elektroniczna, książka elektroniczna,"}, + {"id": 2, "text": "zapis aktualnego obrazu wyświetlanego na monitorze,"}, + {"id": 3, "text": "pisanie książki metodą medialabową,"}, + {"id": 4, "text": "nagranie dźwiękowe zawierające odczytany przez lektora tekst publikacji książkowej."} + ], + "answer": [3], + "points": 1 +}, + +{ + "id": 2, + "type": "edumed_wybor", + "description": ["Emotikony to rodzaj języka/pisma:"], + "options": [ + {"id": 1, "text": "obrazkowego,"}, + {"id": 2, "text": "migowego,"}, + {"id": 3, "text": "służbowego,"}, + {"id": 4, "text": "urzędowego."} + ], + "answer": [1], + "points": 1 +}, + +{ + "id": 3, + "type": "edumed_wybor", + "description": ["Śledzenie zmian w programie Word znajduje się w zakładce:"], + "options": [ + {"id": 1, "text": "widok,"}, + {"id": 2, "text": "korespondencja,"}, + {"id": 3, "text": "recenzja,"}, + {"id": 4, "text": "wstawianie."} + ], + "answer": [3], + "points": 1 +}, + +{ + "id": 4, + "type": "edumed_wybor", + "description": ["Przepustowość łącza podawana jest w:"], + "options": [ + {"id": 1, "text": "bajtach na sekundę i jego wielokrotnościach,"}, + {"id": 2, "text": "megabajtach i jego wielokrotnościach,"}, + {"id": 3, "text": "kilobajtach i jego wielokrotnościach,"}, + {"id": 4, "text": "bitach na sekundę i jego wielokrotnościach."} + ], + "answer": [4], + "points": 1 +}, + +{ + "id": 5, + "type": "edumed_przyporzadkuj", + "description": ["Dopasuj definicje do pojęć:"], + "buckets": [ + {"id": 1, "title": "protokół HTTPS"}, + {"id": 2, "title": "LAN"}, + {"id": 3, "title": "serwer pośredniczący (proxy)"}, + {"id": 4, "title": "router"}, + {"id": 5, "title": "adres IP"} + ], + "buckets_name": "pojęcia", + "items": [ + {"id": 1, "text": "1", "desc": "Jeden z protokołów umożliwiający przesyłanie w sieci zaszyfrowanych informacji, dzięki czemu dostęp do treści mają jedynie nadawca oraz odbiorca komunikatu."}, + {"id": 2, "text": "2", "desc": "Liczba nadawana interfejsowi sieciowemu, grupie interfejsów, bądź całej sieci komputerowej w protokole IP, służąca identyfikacji elementów sieci."}, + {"id": 3, "text": "3", "desc": "Oprogramowanie lub serwer z odpowiednim oprogramowaniem, które dokonuje pewnych operacji (zwykle nawiązuje połączenia) w imieniu użytkownika."}, + {"id": 4, "text": "4", "desc": "Sieć komputerowa łącząca komputery na określonym obszarze takim jak blok, szkoła, biuro."}, + {"id": 5, "text": "5", "desc": "Urządzenie sieciowe służące do łączenia różnych sieci komputerowych, pełni rolę węzła komunikacyjnego."} + ], + "items_name": "definicje", + "answer": { + "1": [1], + "2": [4], + "3": [3], + "4": [5], + "5": [2] + }, + "points_per_hit": 0.5 +}, + +{ + "id": 6, + "type": "edumed_prawdafalsz", + "description": ["Oznacz poniższe zdania jako prawdziwe lub fałszywe."], + "statements": [ + ["Algorytmy przewidują reakcje emocjonalne człowieka.", false], + ["Algorytm to sposób przetworzenia danych wyjściowych tak, aby otrzymać określone dane wyjściowe.", "ignore"], + ["Algorytmy mają zastosowanie na portalach społecznościowych i w wyszukiwarkach połączeń tramwajowych.", true], + ["Algorytm to skończony ciąg jasno zdefiniowanych czynności.", true], + ["Algorytm nie może zostać zaimplementowany w postaci programu komputerowego.", false] + ], + "points_per_hit": 0.5 +}, + +{ + "id": 7, + "type": "edumed_przyporzadkuj", + "description": ["Dopasuj nazwę wtyczki do jej działania."], + "buckets": [ + {"id": 1, "title": "Adobe Flash Player"}, + {"id": 2, "title": "Adblock"}, + {"id": 3, "title": "Java"}, + {"id": 4, "title": "Quicktime"} + ], + "buckets_name": "wtyczki", + "items": [ + {"id": 1, "text": "1", "desc": "Odtwarzacz multimedialny do odgrywania muzyki i pokazywania filmów, grafik jak i VR."}, + {"id": 2, "text": "2", "desc": "Niezbędna do uruchamiania aplikacji i apletów (na przykład gier, czatów itp.)"}, + {"id": 3, "text": "3", "desc": "Wtyczka multimedialna przeznaczona do instalacji w przeglądarkach internetowych (m.in. Chrome, Firefox, Internet Explorer i Opera), która służy do wyświetlania animacji i filmów wykonanych w tej technologii."}, + {"id": 4, "text": "4", "desc": "Dodatek po zainstalowaniu i skonfigurowaniu usunie z witryn internetowych uporczywe reklamy (ang. ads) spowalniające pracę komputera i przeglądarki oraz blokujące wygodny dostęp do pożądanej przez użytkownika treści."} + ], + "items_name": "działania", + "answer": { + "1": [3], + "2": [4], + "3": [2], + "4": [1] + }, + "points_per_hit": 0.5 +}, + +{ + "id": 8, + "type": "edumed_wybor", + "description": ["Nawyki higieny informacyjnej to:"], + "options": [ + {"id": 1, "text": "blokowanie reklam i skryptów w czasie korzystania z sieci,"}, + {"id": 2, "text": "czyszczenie regularne komputera z kurzu,"}, + {"id": 3, "text": "blokowanie albo regularne kasowanie „ciasteczek” w przeglądarkach internetowych,"}, + {"id": 4, "text": "ograniczenie korzystania z „usług w chmurze”,"}, + {"id": 5, "text": "porządkowanie danych w plikach i folderach,"}, + {"id": 6, "text": "tworzenie kopii zapasowych informacji, na których nam zależy."} + ], + "answer": [1, 3, 4, 5, 6], + "answer_mode": "all_or_nothing", + "points": 2 +}, + +{ + "id": 9, + "type": "edumed_wybor", + "description": ["Wskaż prawidłowe zasady ergonomii pracy z komputerem"], + "options": [ + {"id": 1, "text": "Blat biurka powinien znajdować się na takiej wysokości, aby oparte o niego przedramiona tworzyły względem ramion kąt 120°."}, + {"id": 2, "text": "Górna krawędź monitora powinna znajdować się na poziomie twojego wzroku."}, + {"id": 3, "text": "Krzesło powinno pozwalać ci na wygodne oparcie stóp o podłogę i utrzymanie kąta 90° pomiędzy łydkami a udami."}, + {"id": 4, "text": "Światło powinno padać z tyłu, aby zminimalizować odblaski na monitorze."}, + {"id": 5, "text": "Monitor powinien być oddalony od ciebie na odległość wyciągniętej dłoni."}, + {"id": 6, "text": "Plecy powinny wygodnie przylegać do oparcia krzesła."} + ], + "answer": [2, 3, 6], + "answer_mode": "all_or_nothing", + "points": 2 +}, + +{ + "id": 10, + "type": "edumed_wybor", + "description": ["Pluralizm mediów sprzyja:"], + "options": [ + {"id": 1, "text": "brakowi konkurencji między mediami,"}, + {"id": 2, "text": "koncentracji mediów,"}, + {"id": 3, "text": "monopolizacji informacji,"}, + {"id": 4, "text": "wolności słowa."} + ], + "answer": [4], + "points": 1 +}, + +{ + "id": 11, + "type": "edumed_wybor", + "description": ["Śledzone przez firmę zachowanie internauty w internecie:"], + "options": [ + {"id": 1, "text": "zdradzać może preferencje internauty,"}, + {"id": 2, "text": "zdradzać może cechy osobowości internauty,"}, + {"id": 3, "text": "możliwe jest dzięki programom komputerowym,"}, + {"id": 4, "text": "pozwala emitować wstępnie dopasowane oferty na ekranie komputera internauty,"}, + {"id": 5, "text": "pozwala badać reakcję na reklamy,"}, + {"id": 6, "text": "żadna z powyższych odpowiedzi nie jest prawdziwa."} + ], + "answer": [1, 2, 3, 4, 5], + "answer_mode": "all_or_nothing", + "points": 2 +}, + +{ + "id": 12, + "type": "edumed_wybor", + "description": ["W przypadku, gdy informacje o sprzęcie w sklepie internetowym są niepełne, a sprzedawca konsekwentnie wprowadza klientów indywidualnych w błąd, gdzie warto kierować się po pomoc?"], + "options": [ + {"id": 1, "text": "Urząd Ochrony Konkurencji i Konsumentów,"}, + {"id": 2, "text": "Urząd Kontroli Skarbowej,"}, + {"id": 3, "text": "Rzecznik Praw Obywatelskich,"}, + {"id": 4, "text": "Agencja Bezpieczeństwa Wewnętrznego."} + ], + "answer": [1], + "points": 1 +}, + +{ + "id": 13, + "type": "edumed_wybor", + "description": ["Kolega, który nie ma własnego komputera, poprosił Cię o przysłanie e-mailem dwudziestu zdjęć z wakacji w jednym pliku. Jakimi sposobami możesz tego efektywnie dokonać?"], + "options": [ + {"id": 1, "text": "spakuję obrazki do pliku w formacie zip,"}, + {"id": 2, "text": "spakuję obrazki do pliku w formacie rar,"}, + {"id": 3, "text": "spakuję obrazki do pliku w formacie jpg,"}, + {"id": 4, "text": "spakuję obrazki do pliku w formacie xls,"}, + {"id": 5, "text": "spakuję obrazki do pliku w formacie mp4,"}, + {"id": 6, "text": "spakuję obrazki do pliku w formacie sav."} + ], + "answer": [1, 2], + "answer_mode": "all_or_nothing", + "points": 2 +}, + +{ + "id": 14, + "type": "edumed_wybor", + "description": ["W ostatnich miesiącach urodziła się Twoja nowa siostrzyczka. Bardzo się z tego cieszysz i chciałbyś zamieścić jej zdjęcie na swoim profilu w portalu społecznościowym. Co powinieneś koniecznie zrobić zanim opublikujesz zdjęcie?"], + "options": [ + {"id": 1, "text": "Zapytać rodziców, czy wyrażają zgodę na umieszczenia zdjęcia siostry na portalu społecznościowym."}, + {"id": 2, "text": "Przerobić zdjęcie siostry na zabawny mem."}, + {"id": 3, "text": "Napisać z prośbą o pisemną zgodę do administratorów portalu."}, + {"id": 4, "text": "Wybrać zdjęcie, na którym siostra nie znajduje się w sytuacjach naruszających jej intymność (np. podczas karmienia)."}, + {"id": 5, "text": "Namówić rodziców, aby cała rodzina wybrała się do profesjonalnego fotografa."}, + {"id": 6, "text": "Wybrać zdjęcie, na którym siostra nie jest nago (np. podczas kąpieli)."} + ], + "answer": [1, 4, 6], + "answer_mode": "all_or_nothing", + "points": 2 +}, + +{ + "id": 15, + "type": "edumed_wybor", + "description": ["Który adres mailowy jest najbardziej odpowiedni w komunikacji ucznia z nauczycielem lub pracownika z pracodawcą?"], + "options": [ + {"id": 1, "text": "hotkicia@hotmail.com,"}, + {"id": 2, "text": "olazczwartejlawkipodoknemwsali3nadrugimpietrze@gmail.com,"}, + {"id": 3, "text": "xxx666@portal.pl,"}, + {"id": 4, "text": "adam.kowalski@net.pl."} + ], + "answer": [4], + "points": 1 +}, + +{ + "id": 16, + "type": "edumed_wybor", + "description": [ + "Twoja ciocia jest początkującym użytkownikiem internetu. Wraz z koleżanką wybiera się na wycieczkę do Krakowa. Nocleg chciałyby zamówić na portalu booking.com.", + "Twoim zadaniem jest doradzenie cioci, co podnosi wiarygodność oferenta usługi turystycznej i na jakie elementy powinna zwrócić uwagę. Z poniższych elementów wybierz ten, który NIE wiąże się bezpośrednio z wiarygodnością oferenta."], + "options": [ + {"id": 1, "text": "Średnia ocen innych użytkowników/gości w obiekcie."}, + {"id": 2, "text": "Liczba wystawionych ocen przez dotychczasowych użytkowników/gości w obiekcie."}, + {"id": 3, "text": "Zdjęcia obiektu i oferowanego pokoju."}, + {"id": 4, "text": "Odległość obiektu od centrum miasta."} + ], + "answer": [4], + "points": 1 +}, + +{ + "id": 17, + "type": "edumed_wybor", + "description": ["Chcesz wyszukać w wyszukiwarce internetowej Google.com informacje na temat wizyty papieża Franciszka w Częstochowie w 2016 r. Która z poniższych instrukcji wyszukiwania NIE jest prawidłowa?"], + "options": [ + {"id": 1, "text": "Franciszek AND (Częstochowa OR 2016),"}, + {"id": 2, "text": "papież* AND Franciszek* AND Częstochowa,"}, + {"id": 3, "text": "papież* AND Franciszek* AND (Częstochowa OR „Światowe Dni Młodzieży”),"}, + {"id": 4, "text": "papież* AND Franciszek* OR (Częstochowa AND „Światowe Dni Młodzieży”),"}, + {"id": 5, "text": "papież* OR Franciszek* OR (Częstochowa AND „Światowe Dni Młodzieży”)."} + ], + "answer": [1, 4, 5], + "answer_mode": "all_or_nothing", + "points": 2 +}, + +{ + "id": 18, + "type": "edumed_wybor", + "description": ["Jaki jest symbol klasyfikacji bibliotecznej książki Jana van Dijka “Społeczne aspekty nowych mediów : analiza społeczeństwa sieci” wydanej w 2010 przez PWN w zbiorach Biblioteki Uniwersyteckiej w Warszawie?"], + "options": [ + {"id": 1, "text": "P96.T42 D55165 2010,"}, + {"id": 2, "text": "HD6053 .W6684 2010,"}, + {"id": 3, "text": "DT73.M5 D55 1993,"}, + {"id": 4, "text": "HF5415 .H85165 2010."} + ], + "answer": [1], + "points": 1 +}, + +{ + "id": 19, + "type": "edumed_wybor", + "description": ["W jakim mieście możesz dojechać tramwajem linii nr 5 z Dworca Zachodniego do Ronda Kaponiera?"], + "options": [ + {"id": 1, "text": "Poznaniu,"}, + {"id": 2, "text": "Krakowie,"}, + {"id": 3, "text": "Warszawie,"}, + {"id": 4, "text": "Łodzi."} + ], + "answer": [1], + "points": 1 +}, + +{ + "id": 20, + "type": "edumed_wybor", + "description": ["Zostałeś/aś poproszony/a o pomoc przy budowie strony internetowej twojej szkoły, którą mają odwiedzać nie tylko jej uczniowie, ale również rodzice, potencjalni kandydaci i inne osoby. W jaki sposób zadbasz o to, by strona była dostępna technologicznie dla osób z zaburzeniami wzroku, słuchu lub chorych na epilepsję?"], + "options": [ + {"id": 1, "text": "Użyjesz dużo filmów i dźwięku, które zastąpią tekst."}, + {"id": 2, "text": "Użyjesz automatycznie uruchamiających się animacji, o szybko zmieniających się kolorach."}, + {"id": 3, "text": "Opiszesz wszystkie elementy strony za pomocą tekstu, również nawigację i multimedia, oraz umożliwisz łatwą zmianę wielkości czcionki i kontrastu."}, + {"id": 4, "text": "Umieścisz na stronie zeskanowane dokumenty szkoły w formie zdjęć."} + ], + "answer": [3], + "points": 1 +}, + +{ + "id": 21, + "type": "edumed_wybor", + "description": ["Natrafiasz w sieci na wideo na mało znane wideo, w którym ktoś nęka i wyśmiewa osobę niepełnosprawną intelektualnie, nieświadomą bycia nagrywaną. Która z czynności nie będzie pogarszać sytuacji osoby na wideo?"], + "options": [ + {"id": 1, "text": "Zgłoszenie wideo administratorom portalu."}, + {"id": 2, "text": "Przesłanie linku znajomym."}, + {"id": 3, "text": "Podanie danych osobowych bohatera filmu w komentarzu, jeśli są ci znane."}, + {"id": 4, "text": "Pobranie wideo i umieszczenie go ponownie z krytycznym komentarzem."} + ], + "answer": [1], + "points": 1 +}, + +{ + "id": 22, + "type": "edumed_wybor", + "description": ["Hasła przestają być wystarczającym zabezpieczeniem dostępu do stron i usług cyfrowych. Wskaż przyczyny:"], + "options": [ + {"id": 1, "text": "Takie same hasła są powszechnie używane w wielu miejscach w sieci."}, + {"id": 2, "text": "Nie jest możliwe skuteczne zaszyfrowanie i przesłanie hasła."}, + {"id": 3, "text": "Coraz powszechniejsze są wycieki baz danych z hasłami do serwisów i usług w sieci."}, + {"id": 4, "text": "Złośliwe oprogramowanie, tzw. keylogger, może zarejestrować nasze hasło podczas wpisywania go na klawiaturze."}, + {"id": 5, "text": "Powszechnie używane w hasłach słowa i nazwy własne komputer może złamać za pomocą tzw. ataku słownikowego."}, + {"id": 6, "text": "Każde hasło można odgadnąć."} + ], + "answer": [1, 3, 4, 5], + "answer_mode": "all_or_nothing", + "points": 2 +}, + +{ + "id": 23, + "type": "edumed_wybor", + "description": ["Przed czym może uchronić cię szyfrowanie dysku twojego smartphone’a?"], + "options": [ + {"id": 1, "text": "Przed śledzeniem jego lokalizacji."}, + {"id": 2, "text": "Przed niepożądanym dostępem aplikacji do treści na dysku, np. zrobionych zdjęć?"}, + {"id": 3, "text": "Przed niepożądanym odtworzeniem danych w przypadku utraty urządzenia."}, + {"id": 4, "text": "Przed złośliwym oprogramowaniem."} + ], + "answer": [3], + "points": 1 +}, + +{ + "id": 24, + "type": "edumed_wybor", + "description": ["Statystyki stron fanowskich na Facebooku lub narzędzia w rodzaju Google Analytics:"], + "options": [ + {"id": 1, "text": "przyczyniają się do lepszego zrozumienia prezentowanych tekstów przez odbiorców,"}, + {"id": 2, "text": "ułatwiają śledzenie losów odbioru prezentowanych treści,"}, + {"id": 3, "text": "ułatwiają publikację treści z blogów w serwisach z plikami wideo,"}, + {"id": 4, "text": "pozwalają autorom na awans w hierarchii wspólnoty blogerskiej."} + ], + "answer": [2], + "points": 1 +}, + +{ + "id": 25, + "type": "edumed_wybor", + "description": ["Aby przygotować dopracowaną i interesującą dla odbiorców prezentację multimedialną, warto:"], + "options": [ + {"id": 1, "text": "wykorzystać jak najwięcej gifów i zrezygnować w prezentacji z jakiegokolwiek tekstu,"}, + {"id": 2, "text": "tworzyć slajdy w oparciu o przygotowany wcześniej scenariusz i dobrej jakości zasoby wizualne (zdjęcia, grafiki, gify, memy itp.),"}, + {"id": 3, "text": "używać w prezentacji jak najwięcej tekstu, dzięki czemu w trakcie wystąpienia będzie można czytać z ekranu,"}, + {"id": 4, "text": "tworzyć prezentację składającą się tylko z zdjęć, grafik, gifów, ewentualnie uzupełnić slajdy o podkład dźwiękowy."} + ], + "answer": [2], + "points": 1 +}, + +{ + "id": 26, + "type": "edumed_wybor", + "description": ["Które z wymienionych narzędzi można użyć do digitalizacji?"], + "options": [ + {"id": 1, "text": "aparat cyfrowy, skaner, aplikacje w smartfonie (np. aparat fotograficzny, skaner itp.),"}, + {"id": 2, "text": "kserokopiarka, magnetofon kasetowy,"}, + {"id": 3, "text": "odtwarzacz płyt CD lub DVD,"}, + {"id": 4, "text": "konsola do gier, do której podłączone są gogle VR."} + ], + "answer": [1], + "points": 1 +}, + +{ + "id": 27, + "type": "edumed_wybor", + "description": ["Podczas wspólnej pracy zapośredniczonej przez cyfrowe narzędzia warto:"], + "options": [ + {"id": 1, "text": "dzielić się obowiązkami,"}, + {"id": 2, "text": "ustalić, kto będzie liderem projektu i będzie koordynował działania,"}, + {"id": 3, "text": "zebrać pieniądze na zakup profesjonalnego oprogramowania,"}, + {"id": 4, "text": "pracować spontanicznie, bez jasno określonego celu (ten wyłoni się sam w trakcie pracy),"}, + {"id": 5, "text": "ustalić, za pomocą jakiej platformy grupa będzie się komunikować i gdzie gromadzić wspólne pliki,"}, + {"id": 6, "text": "zrezygnować z dyskusji na trudne tematy i ustalić, kto ma decydujący i ostateczny głos w trakcie sporu, bez względu na argumenty stron."} + ], + "answer": [1, 2, 5], + "answer_mode": "all_or_nothing", + "points": 2 +}, + +{ + "id": 28, + "type": "edumed_wybor", + "description": ["Jesteś dziennikarzem dużej gazety. Pewnego dnia na twoją skrzynkę e-mail docierają z anonimowego źródła kopie dokumentów kompromitujących wysoko postawionego polityka. Przygotowujesz artykuł do publikacji."], + "options": [ + {"id": 1, "text": "Publikujesz wszystkie otrzymane dokumenty opisując sposób ich pozyskania zgodnie z zasadą pełnej jawności warsztatu."}, + {"id": 2, "text": "Usiłujesz ustalić, czy dokumenty są prawdziwe. Jeśli nie udaje ci się tego potwierdzić, wstrzymujesz publikację, żeby nie zrobić krzywdy potencjalnie niewinnej osobie."}, + {"id": 3, "text": "Piszesz felieton, w którym wspominasz o posiadaniu kompromitujących dokumentów, ale nie ujawniasz ich treści."}, + {"id": 4, "text": "Wysyłasz do polityka pytania dotyczące sprawy opisanej w dokumentach z prośbą o odniesienie się do tych informacji."} + ], + "answer": [2, 4], + "answer_mode": "all_or_nothing", + "points": 2 +}, + +{ + "id": 29, + "type": "edumed_wybor", + "description": ["Kultura hakerska to:"], + "options": [ + {"id": 1, "text": "p154n13 l3375p34k13m,"}, + {"id": 2, "text": "zbiór wartości i norm, które ukształtowały się w grupie programistów komputerowych,"}, + {"id": 3, "text": "włamywanie się na cudze komputery,"}, + {"id": 4, "text": "nowy gatunek bakterii wykrytych po raz pierwszy na układach scalonych."} + ], + "answer": [2], + "points": 1 +}, + +{ + "id": 30, + "type": "edumed_wybor", + "description": ["Napisałeś wiersz, który opublikowała lokalna gazeta. Twoi koledzy stworzyli zabawną parodię tego wiersza i także wysłali swój tekst do gazety. Na gruncie prawa autorskiego:"], + "options": [ + {"id": 1, "text": "ze względu na naruszenie twoich praw autorskich możesz zażądać od wydawcy gazety odrzucenia tego tekstu, wolność słowa nie sięga tak daleko,"}, + {"id": 2, "text": "prawo autorskie chroni wolność słowa, ale możesz zażądać zapłaty należnego ci wynagrodzenia w przypadku publikacji parodii twojego tekstu,"}, + {"id": 3, "text": "prawo autorskie chroni integralność dzieła, więc możesz zażądać wprowadzenia zmian i poprawek do tekstu parodii,"}, + {"id": 4, "text": "nic nie możesz w tej sprawie zrobić, prawo autorskie chroni wolność słowa w przypadku parodii."} + ], + "answer": [4], + "points": 1 +} +] -- 2.20.1 From 9d6c41a8d4518ba851c9de7426abe49de0660077 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Fri, 27 Oct 2017 14:15:41 +0200 Subject: [PATCH 03/16] various fixes and updates --- .gitignore | 1 + catalogue/static/catalogue/css/layout.css | 86 -------------- catalogue/static/catalogue/css/layout.scss | 112 ------------------ edumed/static/catalogue/css/layout.css | 6 +- edumed/static/catalogue/css/layout.scss | 5 +- edumed/static/css/base.css | 18 ++- edumed/static/css/base.scss | 16 +++ wtem/forms.py | 14 ++- wtem/templates/wtem/email_key.txt | 16 +-- .../wtem/exercises/edumed_wybor.html | 14 +-- .../wtem/exercises/edumed_wybor_auto.html | 46 +++++++ .../templates/wtem/exercises/exercise_no.html | 2 +- wtem/templates/wtem/main_before.html | 8 +- wtem/templates/wtem/single.html | 41 ++----- wtem/templates/wtem/start.html | 20 ++++ wtem/templates/wtem/thanks_single.html | 4 +- wtem/urls.py | 4 +- wtem/views.py | 52 ++++++-- 18 files changed, 192 insertions(+), 273 deletions(-) delete mode 100644 catalogue/static/catalogue/css/layout.css delete mode 100755 catalogue/static/catalogue/css/layout.scss create mode 100644 wtem/templates/wtem/exercises/edumed_wybor_auto.html create mode 100644 wtem/templates/wtem/start.html diff --git a/.gitignore b/.gitignore index d4d845a..7bbaa41 100644 --- a/.gitignore +++ b/.gitignore @@ -39,5 +39,6 @@ TAGS media search_index .sass-cache +*.css.map exercises.json \ No newline at end of file diff --git a/catalogue/static/catalogue/css/layout.css b/catalogue/static/catalogue/css/layout.css deleted file mode 100644 index acf699d..0000000 --- a/catalogue/static/catalogue/css/layout.css +++ /dev/null @@ -1,86 +0,0 @@ -@charset "UTF-8"; -.box-button { - background-color: #ed7831; - border-radius: 0.9375em; } - .box-button .dl-button { - color: white; - padding: 1.0625em 0.75em 1.0625em 0.75em; } - -.dl-button { - color: #363a3e; - display: block; - font-weight: bold; - text-align: center; - text-transform: uppercase; - font-size: .9em; } - -.dl-button:after { - content: " ↓"; } - -#main-bar section.button { - margin-bottom: 1.0625em; } - -#sidebar { - position: absolute; - right: 0; - top: 0; - width: 13.75em; - color: #363a3e; } - #sidebar section { - margin-bottom: 1.0625em; } - #sidebar section h1 { - margin: 0; } - #sidebar section h1.realisation { - font-weight: normal; } - #sidebar .section { - border-top: 1px solid #c9ccce; - padding-top: 1.0625em; } - #sidebar .section-minor { - border-top: 1px solid #c9ccce; - padding-top: 1.0625em; } - #sidebar .section-minor h1 { - font-weight: normal; - font-size: 1em; } - #sidebar .section-micro { - font-size: .8em; - color: #888; - border-top: 1px solid #c9ccce; - padding-top: 1.0625em; } - #sidebar .section-micro h1 { - font-weight: normal; - font-size: 1em; } - #sidebar .section-micro .link-list a { - color: #888; } - #sidebar section:first-child { - border-top: 0; - padding-top: 0; } - -#main-bar { - width: 40em; } - #main-bar .top-link { - float: right; } - #main-bar .box { - background-color: #d4d6d8; - border-radius: 0.9375em; - padding: 1.0625em; } - #main-bar .box h1 { - font-size: 1em; - text-transform: uppercase; } - #main-bar .box p { - margin: 0; } - #main-bar .box .box-icon { - margin: -.2em 0 -.2em 1em; - float: right; - text-align: center; } - -.lesson-footer { - clear: both; - border-top: 1px solid #777; - margin-top: 2em; - padding-top: 1em; } - .lesson-footer .section-info { - text-align: center; } - .lesson-footer .previous-lesson { - float: left; } - .lesson-footer .next-lesson { - float: right; } diff --git a/catalogue/static/catalogue/css/layout.scss b/catalogue/static/catalogue/css/layout.scss deleted file mode 100755 index 230e4aa..0000000 --- a/catalogue/static/catalogue/css/layout.scss +++ /dev/null @@ -1,112 +0,0 @@ -$px: .0625em; -$new_black: #363a3e; - -.box-button { - background-color: #ed7831; - border-radius: 15*$px; - .dl-button { - color: white; - padding: 17*$px 12*$px 17*$px 12*$px; - } -} -.dl-button { - color: $new_black; - display: block; - font-weight: bold; - text-align: center; - text-transform: uppercase; - font-size: .9em; -} -.dl-button:after { - content: " ↓"; -} - -#main-bar section.button { - margin-bottom: 17*$px; -} - -#sidebar { - position: absolute; - right: 0; - top: 0; - width: 220*$px; - color: $new_black; - - section { - margin-bottom: 17*$px; - h1 { - margin: 0; - } - h1.realisation { - font-weight: normal; - } - } - - .section { - border-top: 1px solid #c9ccce; - padding-top: 17*$px; - } - .section-minor { - border-top: 1px solid #c9ccce; - padding-top: 17*$px; - h1 { - font-weight: normal; - font-size: 1em; - } - } - .section-micro { - font-size: .8em; - color: #888; - border-top: 1px solid #c9ccce; - padding-top: 17*$px; - h1 { - font-weight: normal; - font-size: 1em; - } - .link-list a { - color: #888; - } - } - section:first-child { - border-top: 0; - padding-top: 0; - } -} -#main-bar { - width: 640*$px; - - .top-link { - float:right; - } - - .box { - background-color: #d4d6d8; - border-radius: 15*$px; - padding: 17*$px; - h1 { - font-size: 1em; - text-transform: uppercase; - } - p { - margin: 0; - } - .box-icon { - margin: -.2em 0 -.2em 1em; - float: right; - text-align: center; - } - } -} - -.lesson-footer { - clear: both; - border-top: 1px solid #777; - margin-top: 2em; - padding-top: 1em; - - .section-info { - text-align: center; - } - .previous-lesson {float: left;} - .next-lesson {float: right;} -} diff --git a/edumed/static/catalogue/css/layout.css b/edumed/static/catalogue/css/layout.css index acf699d..6a0746d 100644 --- a/edumed/static/catalogue/css/layout.css +++ b/edumed/static/catalogue/css/layout.css @@ -2,11 +2,11 @@ .box-button { background-color: #ed7831; border-radius: 0.9375em; } - .box-button .dl-button { + .box-button .dl-button, .box-button .nice-button { color: white; padding: 1.0625em 0.75em 1.0625em 0.75em; } -.dl-button { +.dl-button, .nice-button { color: #363a3e; display: block; font-weight: bold; @@ -84,3 +84,5 @@ float: left; } .lesson-footer .next-lesson { float: right; } + +/*# sourceMappingURL=layout.css.map */ diff --git a/edumed/static/catalogue/css/layout.scss b/edumed/static/catalogue/css/layout.scss index 230e4aa..671e9f0 100755 --- a/edumed/static/catalogue/css/layout.scss +++ b/edumed/static/catalogue/css/layout.scss @@ -1,15 +1,14 @@ $px: .0625em; $new_black: #363a3e; - .box-button { background-color: #ed7831; border-radius: 15*$px; - .dl-button { + .dl-button, .nice-button { color: white; padding: 17*$px 12*$px 17*$px 12*$px; } } -.dl-button { +.dl-button, .nice-button { color: $new_black; display: block; font-weight: bold; diff --git a/edumed/static/css/base.css b/edumed/static/css/base.css index 99182a2..292a122 100644 --- a/edumed/static/css/base.css +++ b/edumed/static/css/base.css @@ -250,5 +250,21 @@ footer.main { margin: 1em 0; } .flatpage img { - border: 0.3125em solid #eeeeee; + border: 0.3125em solid #eee; margin: 1.3em; } + +ul.messages { + list-style: none; } + +.messages .error { + top: 20px; + left: 20px; + border: 1px solid black; + background: red; + border-radius: 0.938em; + padding: 5px 2px; + color: white; + text-align: center; + font-weight: bold; } + +/*# sourceMappingURL=base.css.map */ diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss index 88d2033..d40f461 100644 --- a/edumed/static/css/base.scss +++ b/edumed/static/css/base.scss @@ -279,3 +279,19 @@ footer.main { margin: 1.3em; } } + +ul.messages { + list-style: none; +} + +.messages .error { + top: 20px; + left: 20px; + border: 1px solid black; + background: red; + border-radius: 0.938em; + padding: 5px 2px; + color: white; + text-align: center; + font-weight: bold; +} diff --git a/wtem/forms.py b/wtem/forms.py index 15c6503..a434854 100644 --- a/wtem/forms.py +++ b/wtem/forms.py @@ -49,11 +49,17 @@ class WTEMSingleForm(forms.ModelForm): submission = self.instance answers = submission.get_answers() posted_answers = json.loads(self.cleaned_data['answers']) - assert type(posted_answers) == dict, 'answers not dict' - assert len(posted_answers) == 1, 'answers not single' - exercise_id = posted_answers.keys()[0] + if type(posted_answers) != dict: + raise ValueError('answers not dict') + if len(posted_answers) != 1: + raise ValueError('answers not single') + exercise_id, answer = posted_answers.items()[0] + # multipost + if answers.get(exercise_id) == answer: + return i, exercise = submission.current_exercise() - assert exercise_id == str(exercise['id']), 'wrong exercise id' + if exercise_id != str(exercise['id']): + raise ValueError('wrong exercise id') for answer in posted_answers.values(): answers[exercise_id] = answer submission.answers = json.dumps(answers) diff --git a/wtem/templates/wtem/email_key.txt b/wtem/templates/wtem/email_key.txt index aaa86ca..76e629a 100644 --- a/wtem/templates/wtem/email_key.txt +++ b/wtem/templates/wtem/email_key.txt @@ -1,16 +1,16 @@ -Poniżej znajduje się wygenerowany specjalnie dla Ciebie link, pod którym będziesz mógł/mogła rozwiązać zadania I etapu Olimpiady Cyfrowej: +Dzień dobry, +Poniżej znajduje się wygenerowany specjalnie dla Ciebie link, pod którym znajdziesz zadania I etapu Olimpiady Cyfrowej: -https://olimpiadacyfrowa.pl{% url 'form_single' submission_id=submission.id key=submission.key %} +https://olimpiadacyfrowa.pl{% url 'wtem_start' submission_id=submission.id key=submission.key %} -I etap Olimpiady odbędzie się we wtorek 15 listopada o godz. 10:00 w sali wyznaczonej przez Komisję Szkolną. Na rozwiązanie testu będziesz mieć ok. 90 min. Aby rozwiązać test, potrzebny Ci będzie komputer ze stabilnym łączem internetowym oraz zainstalowaną i zaktualizowaną przeglądarką. +I etap Olimpiady odbędzie się w czwartek 23 listopada o godz. 10:00 w sali wyznaczonej przez Twoją Komisję Szkolną. Test będzie się składał z 50 pytań, które otrzymasz w losowej kolejności. Po udzieleniu odpowiedzi na dane pytanie nie ma możliwości powrotu do niego i zmiany odpowiedzi. Na rozwiązanie całego testu będziesz mieć 60 minut. -Każdy uczestnik otrzymał indywidualny link, pod którym może rozwiązywać zadania samodzielnie. Wszelkie działania mogące świadczyć o tym, że uczestnik nie rozwiązuje testu samodzielnie, np. wchodzenie na stronę z zadaniami przez więcej niż jedną osobę, będą przez nas śledzone i poskutkują dyskwalifikacją. +Aby rozwiązać test, potrzebny Ci będzie komputer ze stabilnym łączem internetowym oraz zainstalowaną i zaktualizowaną przeglądarką. -W razie dodatkowych pytań możesz kontaktować się z nami pod adresem olimpiada@nowoczesnapolska.org.pl lub numerem telefonu +48 515-502-666. +Każdy uczestnik i uczestniczka otrzymuje indywidualny link, pod którym znajdzie zadania I etapu Olimpiady Cyfrowej. Przypominamy, że zgodnie z Regulaminem, każdy zobowiązany jest do samodzielnego rozwiązania testu. Wszelkie działania świadczące o niesamodzielnej pracy poskutkują dyskwalifikacją. -Przypominamy, że główną nagrodą w Olimpiadzie Cyfrowej jest indeks Collegium Civitas na dowolny kierunek studiów licencjackich oraz zwolnienie z opłat czesnego przez rok. +W razie dodatkowych pytań możesz kontaktować się z nami pod adresem olimpiada@nowoczesnapolska.org.pl lub numerem telefonu +48 22 465 15 35. Powodzenia! - Zespół Olimpiady Cyfrowej -fundacja Nowoczesna Polska \ No newline at end of file +Fundacja Nowoczesna Polska \ No newline at end of file diff --git a/wtem/templates/wtem/exercises/edumed_wybor.html b/wtem/templates/wtem/exercises/edumed_wybor.html index edd9dad..2ac1e2c 100644 --- a/wtem/templates/wtem/exercises/edumed_wybor.html +++ b/wtem/templates/wtem/exercises/edumed_wybor.html @@ -8,22 +8,16 @@ {{para}}

{% endfor %} - {% if exercise.points %} - - {% if exercise.answer|length == 1 %} - Tylko jedna odpowiedź jest prawidłowa. - {% else %} - Zaznacz wszystkie prawidłowe odpowiedzi. - {% endif %} - - {% endif %} + + Zaznacz każdą prawidłową odpowiedź (jedną lub więcej). + {% endautoescape %}
    {% for option in exercise.options %}
  1. - +
    2. {% endfor %} diff --git a/wtem/templates/wtem/exercises/edumed_wybor_auto.html b/wtem/templates/wtem/exercises/edumed_wybor_auto.html new file mode 100644 index 0000000..edd9dad --- /dev/null +++ b/wtem/templates/wtem/exercises/edumed_wybor_auto.html @@ -0,0 +1,46 @@ +
    + + {% include "wtem/exercises/exercise_no.html" %} + {% autoescape off %} +
    + {% for para in exercise.description %} +

    + {{para}} +

    + {% endfor %} + {% if exercise.points %} + + {% if exercise.answer|length == 1 %} + Tylko jedna odpowiedź jest prawidłowa. + {% else %} + Zaznacz wszystkie prawidłowe odpowiedzi. + {% endif %} + + {% endif %} +
    + {% endautoescape %} +
    +
      + {% for option in exercise.options %} +
    1. + + +
      2. + {% endfor %} +
    +
    + + {% if exercise.open_part %} +
    +
    + {% for para in exercise.open_part %} +

    + {{para}} +

    + {% endfor %} +
    + +
    + {% endif %} + +
    diff --git a/wtem/templates/wtem/exercises/exercise_no.html b/wtem/templates/wtem/exercises/exercise_no.html index aecdd2b..0bd9c6d 100644 --- a/wtem/templates/wtem/exercises/exercise_no.html +++ b/wtem/templates/wtem/exercises/exercise_no.html @@ -1,3 +1,3 @@ {% if not exercise.continuation %} -

    Zadanie {{ no }}{# {{exercise.id_show|default:exercise.id}} #}{# ({{ exercise.max_points }} pkt)#}

    +

    Zadanie {{ no }}/{{ exercise_count }}{# {{exercise.id_show|default:exercise.id}} #}{# ({{ exercise.max_points }} pkt)#}

    {% endif %} \ No newline at end of file diff --git a/wtem/templates/wtem/main_before.html b/wtem/templates/wtem/main_before.html index 4ede52b..b3c2b23 100644 --- a/wtem/templates/wtem/main_before.html +++ b/wtem/templates/wtem/main_before.html @@ -4,6 +4,12 @@

    {% include "wtem/title.html" %}

    -

    I etap: 15 listopada, 10:00. Czas trwania: ok. 90 minut.

    +

    Witamy w I etapie Olimpiady Cyfrowej.

    +

    Test składa z 50 pytań, które otrzymasz w losowej kolejności. Po udzieleniu odpowiedzi na dane pytanie nie ma możliwości powrotu do niego i zmiany odpowiedzi. Uwaga: część pytań ma jedną, a część kilka poprawnych odpowiedzi.

    +

    Test rozpocznie się 23 listopada o godzinie 10:00 i potrwa do 11:00.

    + +

    Powodzenia!

    +

    Zespół Olimpiady Cyfrowej
    +Fundacja Nowoczesna Polska

    {% endblock %} \ No newline at end of file diff --git a/wtem/templates/wtem/single.html b/wtem/templates/wtem/single.html index f4b9c19..3380145 100644 --- a/wtem/templates/wtem/single.html +++ b/wtem/templates/wtem/single.html @@ -8,7 +8,6 @@ {% endblock %} - {% block body %} -

    {% include "wtem/title.html" %}

    -
    Rozwiązania można wysyłać do godziny {{end_time|default:"11:30"}}. Nie czekaj na ostatnią chwilę!
    +{% if messages %} +
      + {% for message in messages %} + {{ message }} + {% endfor %} +
    +{% endif %} -

    Witamy w I etapie Olimpiady Cyfrowej. Na rozwiązanie zadań masz czas do godz. {{end_time|default:"11:30"}}. Test składa się z 30 pytań.

    - -

    Wszelkie aktualności dotyczące Olimpiady możesz znaleźć tutaj.

    - -

    Powodzenia!
    -Zespół Olimpiady Cyfrowej, fundacja Nowoczesna Polska

    +

    {% include "wtem/title.html" %}

    -
    + {% cache 300 wtem exercise.id %} {% with 'wtem/exercises/'|add:exercise.type|add:'.html' as template_name %} @@ -63,18 +50,16 @@ Zespół Olimpiady Cyfrowej, fundacja Nowoczesna Polska

    -

    Sprawdź jeszcze raz wszystkie swoje odpowiedzi, a następnie wyślij je do nas, klikając w poniższy przycisk:

    - +

    +

    -
    Rozwiązania można wysyłać do godziny {{end_time|default:"11:30"}}. Nie czekaj na ostatnią chwilę!
    -
    {% endblock %} diff --git a/wtem/templates/wtem/start.html b/wtem/templates/wtem/start.html new file mode 100644 index 0000000..c938b76 --- /dev/null +++ b/wtem/templates/wtem/start.html @@ -0,0 +1,20 @@ +{% extends 'base_super.html' %} + +{% block body %} + +

    {% include "wtem/title.html" %}

    + +

    Witamy w I etapie Olimpiady Cyfrowej.

    + +

    Test składa z {{ exercise_count }} pytań, które otrzymasz w losowej kolejności. + Po udzieleniu odpowiedzi na dane pytanie nie ma możliwości powrotu do niego i zmiany odpowiedzi. + Uwaga: część pytań ma jedną, a część kilka poprawnych odpowiedzi.

    +

    Test rozpoczyna się o godzinie 10:00 i trwa do 11:00.

    + +

    Powodzenia!

    +

    Zespół Olimpiady Cyfrowej
    + Fundacja Nowoczesna Polska

    + +

    Start

    + +{% endblock %} diff --git a/wtem/templates/wtem/thanks_single.html b/wtem/templates/wtem/thanks_single.html index b403ae3..14ce51c 100644 --- a/wtem/templates/wtem/thanks_single.html +++ b/wtem/templates/wtem/thanks_single.html @@ -7,9 +7,9 @@

    Dziękujemy za udział w I etapie Olimpiady Cyfrowej. Twoja praca została wysłana i poprawnie przyjęta przez system.

    -

    Do końca listopada otrzymasz e-mail z wynikami I etapu. Informacja o uzyskanych przez Ciebie punktach zostanie również przesłana do osoby, która zgłosiła Twój udział w Olimpiadzie.

    +

    Do końca listopada otrzymasz e-mail z wynikami I etapu. Informacja o uzyskanych przez Ciebie punktach zostanie również przesłana do Przewodniczącego Komisji Szkolnej, który zgłosił Twój udział w Olimpiadzie.

    -

    Aktualności związane z Olimpiadą możesz sprawdzać tutaj. W razie dodatkowych pytań możesz kontaktować się z nami pod adresem olimpiada@nowoczesnapolska.org.pl lub numerem telefonu +48 515-502-666.

    +

    Aktualności związane z Olimpiadą możesz sprawdzać tutaj. W razie dodatkowych pytań możesz kontaktować się z nami pod adresem olimpiada@nowoczesnapolska.org.pl lub numerem telefonu +48 22 465 15 35.

    Zespół Olimpiady Cyfrowej
    fundacja Nowoczesna Polska

    diff --git a/wtem/urls.py b/wtem/urls.py index f7a5e99..e498743 100644 --- a/wtem/urls.py +++ b/wtem/urls.py @@ -6,6 +6,6 @@ urlpatterns = patterns( '', url(r'^potwierdzenie/(?P.*)/(?P.*)/$', views.confirmation, name='student_confirmation'), url(r'^_test/(?P.*)/$', views.form_during), - # url(r'^(?P.*)/$', views.form, name='wtem_form'), - url(r'^(?P.*)/(?P.*)/$', views.form_single, name='form_single'), + url(r'^(?P[^/]*)/(?P[^/]*)/$', views.form, name='wtem_form'), + url(r'^(?P[^/]*)/(?P[^/]*)/start/$', views.start, name='wtem_start'), ) diff --git a/wtem/views.py b/wtem/views.py index 6366e53..d47a2be 100644 --- a/wtem/views.py +++ b/wtem/views.py @@ -3,6 +3,7 @@ import json from copy import deepcopy from django.conf import settings +from django.contrib import messages from django.core.urlresolvers import reverse from django.http import HttpResponseForbidden from django.http.response import HttpResponseRedirect @@ -14,24 +15,24 @@ from wtem.models import Confirmation from .forms import WTEMForm, WTEMSingleForm from .models import Submission, DEBUG_KEY, exercises, CompetitionState -WTEM_CONTEST_STAGE = getattr(settings, 'WTEM_CONTEST_STAGE', 'before') - @csrf_exempt -def form(request, key): - return globals()['form_' + WTEM_CONTEST_STAGE](request, key) +def form(request, submission_id, key): + state = CompetitionState.get_state() + if state == CompetitionState.DURING: + state = 'single' + return globals()['form_' + state](request, submission_id, key) -def form_before(request, key): - try: - Submission.objects.get(key=key) - except Submission.DoesNotExist: +def form_before(request, submission_id, key): + submission = Submission.objects.get(id=submission_id) + if submission.key != key: return render(request, 'wtem/key_not_found_before.html') else: return render(request, 'wtem/main_before.html') -def form_after(request, key): +def form_after(request, submission_id, key): return render(request, 'wtem/main_after.html') @@ -39,7 +40,7 @@ def form_after(request, key): @csrf_exempt def form_during(request, key): - if WTEM_CONTEST_STAGE != 'during': + if CompetitionState.get_state() != CompetitionState.DURING: if request.META['REMOTE_ADDR'] not in getattr(settings, 'WTEM_CONTEST_IP_ALLOW', []): return HttpResponseForbidden('Not allowed') @@ -86,20 +87,45 @@ def form_single(request, submission_id, key): i, exercise = submission.current_exercise() + exercise_count = len(exercises) + if not exercise: return render(request, 'wtem/thanks_single.html') if request.method == 'GET': - return render(request, 'wtem/single.html', {'exercise': exercise, 'no': i}) + return render(request, 'wtem/single.html', {'exercise': exercise, 'no': i, 'exercise_count': exercise_count}) elif request.method == 'POST': form = WTEMSingleForm(request.POST, request.FILES, instance=submission) if form.is_valid(): - form.save() - return HttpResponseRedirect(reverse('form_single', kwargs={'submission_id': submission_id, 'key': key})) + try: + form.save() + except ValueError as e: + if e.message == 'wrong exercise id': + messages.error(request, u'Próba wysłania odpowiedzi ponownie lub poza kolejnością') + print 'wysyłam redirect', i + return HttpResponseRedirect(reverse('wtem_form', kwargs={'submission_id': submission_id, 'key': key})) else: raise Exception +@never_cache +@csrf_exempt +def start(request, submission_id, key): + state = CompetitionState.get_state() + if state in (CompetitionState.BEFORE, CompetitionState.AFTER): + return globals()['form_' + state](request, submission_id, key) + + submission = Submission.objects.get(id=submission_id) + if submission.key != key: + return render(request, 'wtem/key_not_found.html') + + i, exercise = submission.current_exercise() + if not exercise: + return render(request, 'wtem/thanks_single.html') + + return render(request, 'wtem/start.html', {'exercise_count': len(exercises), 'submission': submission}) + + def confirmation(request, id, key): conf = get_object_or_404(Confirmation, id=id, key=key) was_confirmed = conf.confirmed -- 2.20.1 From 3ca90d4aed87ed8b39c4984a290de6a3b898a7bd Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Fri, 27 Oct 2017 16:52:38 +0200 Subject: [PATCH 04/16] add command to notify teachers about unconfirmed students --- wtem/management/commands/notify_teachers.py | 45 +++++++++++++++++++ wtem/templates/wtem/notify_unconfirmed.txt | 13 ++++++ .../wtem/notify_unconfirmed_subject.txt | 1 + 3 files changed, 59 insertions(+) create mode 100644 wtem/management/commands/notify_teachers.py create mode 100644 wtem/templates/wtem/notify_unconfirmed.txt create mode 100644 wtem/templates/wtem/notify_unconfirmed_subject.txt diff --git a/wtem/management/commands/notify_teachers.py b/wtem/management/commands/notify_teachers.py new file mode 100644 index 0000000..354ab43 --- /dev/null +++ b/wtem/management/commands/notify_teachers.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- +from datetime import timedelta +from django.core.management.base import BaseCommand +from django.template.loader import render_to_string +from django.utils import timezone + +from contact.models import Contact +from wtem.management.commands import send_mail +from wtem.models import Confirmation + + +class Command(BaseCommand): + def handle(self, *args, **options): + sent = 0 + failed = 0 + + query = Contact.objects.filter(form_tag='olimpiada').order_by('contact').distinct('contact') + template_name = 'notify_unconfirmed' + message_template = 'wtem/' + template_name + '.txt' + subject = render_to_string('wtem/' + template_name + '_subject.txt') + + threshold = timezone.now() - timedelta(4) + + for contact in query: + unconfirmed = [] + for similar_contact in Contact.objects.filter(contact=contact.contact): + unconfirmed += list(Confirmation.objects.filter( + contact=similar_contact, confirmed=False, contact__created_at__lt=threshold)) + if not unconfirmed: + continue + message = render_to_string(message_template, {'unconfirmed': unconfirmed}) + try: + self.send_message(message, subject, contact.contact) + except Exception as e: + failed += 1 + self.stdout.write('failed sending to: ' + contact.contact + ' - ' + str(e)) + else: + sent += 1 + self.stdout.write('message sent to: ' + contact.contact) + + self.stdout.write('sent: %s, failed: %s' % (sent, failed)) + + def send_message(self, message, subject, email): + self.stdout.write('>>> sending to %s' % email) + send_mail(subject=subject, body=message, to=[email]) diff --git a/wtem/templates/wtem/notify_unconfirmed.txt b/wtem/templates/wtem/notify_unconfirmed.txt new file mode 100644 index 0000000..7fc8fb7 --- /dev/null +++ b/wtem/templates/wtem/notify_unconfirmed.txt @@ -0,0 +1,13 @@ +Dzień dobry, +Dziękujemy za zarejestrowanie uczniów do udziału w Olimpiadzie Cyfrowej. + +Sprawdziliśmy, że nie mamy potwierdzenia rejestracji od kilku Pani/Pana uczniów (tzn. nie kliknęli w link, który otrzymali na maila): +{% for confirmation in unconfirmed %} +{{ confirmation.first_name }} {{ confirmation.last_name}} – {{ confirmation.email }}{% endfor %} + +Może to oznaczać, że podczas rejestracji zostały podane nieprawidłowe adresy, albo że mail od nas wpadł uczniom do spamu. Prosimy o sprawdzenie tego i przypomnienie uczniom o konieczności kliknięcia w link z maila. + +Pozdrawiamy, + +zespół Olimpiady Cyfrowej +fundacja Nowoczesna Polska \ No newline at end of file diff --git a/wtem/templates/wtem/notify_unconfirmed_subject.txt b/wtem/templates/wtem/notify_unconfirmed_subject.txt new file mode 100644 index 0000000..d5bf64d --- /dev/null +++ b/wtem/templates/wtem/notify_unconfirmed_subject.txt @@ -0,0 +1 @@ +Olimpiada Cyfrowa – brak potwierdzenia zgłoszeń przez uczniów \ No newline at end of file -- 2.20.1 From d2e2fc529f15b60a8fa6a1da0e45b70003011fb5 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Thu, 9 Nov 2017 16:49:04 +0100 Subject: [PATCH 05/16] time-based competition state + smart cache --- edumed/settings/custom.py | 3 +++ edumed/settings/locale.py | 2 +- requirements.txt | 4 +++- wtem/models.py | 22 +++++++++++++++++++++- wtem/views.py | 20 +++++++++++++++++++- 5 files changed, 47 insertions(+), 4 deletions(-) diff --git a/edumed/settings/custom.py b/edumed/settings/custom.py index fc95db1..3be9e89 100644 --- a/edumed/settings/custom.py +++ b/edumed/settings/custom.py @@ -3,3 +3,6 @@ CONTACT_FORMS_MODULE = 'edumed.contact_forms' MAX_UPLOAD_SIZE = 20 * 1024 * 1024 + +OLIMPIADA_START = (2017, 11, 23, 10) +OLIMPIADA_END = (2017, 11, 23, 11) diff --git a/edumed/settings/locale.py b/edumed/settings/locale.py index cfe4cc1..6aa42c7 100644 --- a/edumed/settings/locale.py +++ b/edumed/settings/locale.py @@ -15,7 +15,7 @@ LANGUAGES = ( # timezone as the operating system. # If running in a Windows environment this must be set to the same as your # system time zone. -TIME_ZONE = None +TIME_ZONE = 'Europe/Warsaw' # Language code for this installation. All choices can be found here: # http://www.i18nguy.com/unicode/language-identifiers.html diff --git a/requirements.txt b/requirements.txt index 2a776b2..d1fde75 100644 --- a/requirements.txt +++ b/requirements.txt @@ -39,4 +39,6 @@ pyyaml django-subdomains>=2.0.4,<2.1 -unidecode \ No newline at end of file +unidecode + +pytz \ No newline at end of file diff --git a/wtem/models.py b/wtem/models.py index fbf0928..390687f 100644 --- a/wtem/models.py +++ b/wtem/models.py @@ -4,6 +4,10 @@ import string import os import json +from datetime import datetime + +import pytz as pytz +from django.conf import settings from django.core.validators import validate_email from django.db import models from django.contrib.auth.models import User @@ -23,6 +27,8 @@ f.close() DEBUG_KEY = 'smerfetka159' +tz = pytz.timezone(settings.TIME_ZONE) + def get_exercise_by_id(exercise_id): return [e for e in exercises if str(e['id']) == str(exercise_id)][0] @@ -34,6 +40,10 @@ def make_key(length): for i in range(length)) +def tuple2dt(time_tuple): + return tz.localize(datetime(*time_tuple)) + + class CompetitionState(models.Model): """singleton""" BEFORE = 'before' @@ -46,9 +56,19 @@ class CompetitionState(models.Model): ) state = models.CharField(choices=STATE_CHOICES, max_length=16) + start = tuple2dt(settings.OLIMPIADA_START) + end = tuple2dt(settings.OLIMPIADA_END) + @classmethod def get_state(cls): - return cls.objects.get().state + now = timezone.now() + if now < cls.start: + return cls.BEFORE + elif now < cls.end: + return cls.DURING + else: + return cls.AFTER + # return cls.objects.get().state class Submission(models.Model): diff --git a/wtem/views.py b/wtem/views.py index d47a2be..a532732 100644 --- a/wtem/views.py +++ b/wtem/views.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import json from copy import deepcopy +from functools import wraps from django.conf import settings from django.contrib import messages @@ -8,6 +9,8 @@ from django.core.urlresolvers import reverse from django.http import HttpResponseForbidden from django.http.response import HttpResponseRedirect from django.shortcuts import render, get_object_or_404 +from django.utils import timezone +from django.utils.cache import patch_cache_control, add_never_cache_headers from django.views.decorators.cache import never_cache from django.views.decorators.csrf import csrf_exempt @@ -16,6 +19,20 @@ from .forms import WTEMForm, WTEMSingleForm from .models import Submission, DEBUG_KEY, exercises, CompetitionState +def cache_until_start(view_func): + @wraps(view_func) + def _wrapped_view_func(request, *args, **kwargs): + response = view_func(request, *args, **kwargs) + max_age = max(int((CompetitionState.start - timezone.now()).total_seconds()) + 1, 0) + if max_age: + patch_cache_control(response, max_age=max_age) + else: + add_never_cache_headers(response) + return response + + return _wrapped_view_func + + @csrf_exempt def form(request, submission_id, key): state = CompetitionState.get_state() @@ -24,6 +41,7 @@ def form(request, submission_id, key): return globals()['form_' + state](request, submission_id, key) +@cache_until_start def form_before(request, submission_id, key): submission = Submission.objects.get(id=submission_id) if submission.key != key: @@ -108,7 +126,7 @@ def form_single(request, submission_id, key): raise Exception -@never_cache +@cache_until_start @csrf_exempt def start(request, submission_id, key): state = CompetitionState.get_state() -- 2.20.1 From 560e0675b6de7796c83701974b2333dcdf589fed Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Thu, 16 Nov 2017 12:05:58 +0100 Subject: [PATCH 06/16] fix numbering bug --- wtem/templates/wtem/exercises/edumed_prawdafalsz.html | 4 +++- wtem/templates/wtem/exercises/edumed_przyporzadkuj.html | 4 +++- wtem/templates/wtem/exercises/edumed_uporzadkuj.html | 4 +++- wtem/templates/wtem/exercises/edumed_wybor.html | 5 ++++- wtem/templates/wtem/exercises/edumed_wybor_auto.html | 4 +++- wtem/templates/wtem/exercises/file_upload.html | 4 +++- wtem/templates/wtem/exercises/open.html | 4 +++- wtem/templates/wtem/single.html | 3 ++- 8 files changed, 24 insertions(+), 8 deletions(-) diff --git a/wtem/templates/wtem/exercises/edumed_prawdafalsz.html b/wtem/templates/wtem/exercises/edumed_prawdafalsz.html index 67bf0ae..2b1802b 100644 --- a/wtem/templates/wtem/exercises/edumed_prawdafalsz.html +++ b/wtem/templates/wtem/exercises/edumed_prawdafalsz.html @@ -1,6 +1,8 @@
    - {% include "wtem/exercises/exercise_no.html" %} + {% if no %} + {% include "wtem/exercises/exercise_no.html" %} + {% endif %}
    diff --git a/wtem/templates/wtem/exercises/edumed_przyporzadkuj.html b/wtem/templates/wtem/exercises/edumed_przyporzadkuj.html index bdb17af..6f6ac21 100644 --- a/wtem/templates/wtem/exercises/edumed_przyporzadkuj.html +++ b/wtem/templates/wtem/exercises/edumed_przyporzadkuj.html @@ -1,6 +1,8 @@
    - {% include "wtem/exercises/exercise_no.html" %} + {% if no %} + {% include "wtem/exercises/exercise_no.html" %} + {% endif %}
    diff --git a/wtem/templates/wtem/exercises/edumed_uporzadkuj.html b/wtem/templates/wtem/exercises/edumed_uporzadkuj.html index 200271e..ba05c50 100644 --- a/wtem/templates/wtem/exercises/edumed_uporzadkuj.html +++ b/wtem/templates/wtem/exercises/edumed_uporzadkuj.html @@ -1,6 +1,8 @@
    - {% include "wtem/exercises/exercise_no.html" %} + {% if no %} + {% include "wtem/exercises/exercise_no.html" %} + {% endif %}
    diff --git a/wtem/templates/wtem/exercises/edumed_wybor.html b/wtem/templates/wtem/exercises/edumed_wybor.html index 2ac1e2c..0a87aca 100644 --- a/wtem/templates/wtem/exercises/edumed_wybor.html +++ b/wtem/templates/wtem/exercises/edumed_wybor.html @@ -1,6 +1,9 @@
    - {% include "wtem/exercises/exercise_no.html" %} + {% if no %} + {% include "wtem/exercises/exercise_no.html" %} + {% endif %} + {% autoescape off %}
    {% for para in exercise.description %} diff --git a/wtem/templates/wtem/exercises/edumed_wybor_auto.html b/wtem/templates/wtem/exercises/edumed_wybor_auto.html index edd9dad..0cd51f0 100644 --- a/wtem/templates/wtem/exercises/edumed_wybor_auto.html +++ b/wtem/templates/wtem/exercises/edumed_wybor_auto.html @@ -1,6 +1,8 @@
    - {% include "wtem/exercises/exercise_no.html" %} + {% if no %} + {% include "wtem/exercises/exercise_no.html" %} + {% endif %} {% autoescape off %}
    {% for para in exercise.description %} diff --git a/wtem/templates/wtem/exercises/file_upload.html b/wtem/templates/wtem/exercises/file_upload.html index b452070..a5c3782 100644 --- a/wtem/templates/wtem/exercises/file_upload.html +++ b/wtem/templates/wtem/exercises/file_upload.html @@ -1,6 +1,8 @@
    - {% include "wtem/exercises/exercise_no.html" %} + {% if no %} + {% include "wtem/exercises/exercise_no.html" %} + {% endif %}
    {% for para in exercise.description %} diff --git a/wtem/templates/wtem/exercises/open.html b/wtem/templates/wtem/exercises/open.html index c30a5b0..3f771fb 100644 --- a/wtem/templates/wtem/exercises/open.html +++ b/wtem/templates/wtem/exercises/open.html @@ -1,6 +1,8 @@
    - {% include "wtem/exercises/exercise_no.html" %} + {% if no %} + {% include "wtem/exercises/exercise_no.html" %} + {% endif %}
    {% autoescape off %} diff --git a/wtem/templates/wtem/single.html b/wtem/templates/wtem/single.html index 3380145..8bb12bd 100644 --- a/wtem/templates/wtem/single.html +++ b/wtem/templates/wtem/single.html @@ -40,9 +40,10 @@
    +{% include 'wtem/exercises/exercise_no.html' %} {% cache 300 wtem exercise.id %} {% with 'wtem/exercises/'|add:exercise.type|add:'.html' as template_name %} -{% include template_name with exercise=exercise %} +{% include template_name with exercise=exercise no='' %} {% endwith %} {% endcache %} -- 2.20.1 From 73fdcfae51e18d4ee8b84214fb44dad3d58ba49a Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Thu, 16 Nov 2017 12:06:51 +0100 Subject: [PATCH 07/16] update messages --- wtem/management/commands/wtem_send_keys.py | 2 +- wtem/templates/wtem/email_key.txt | 2 +- wtem/templates/wtem/main_before.html | 2 +- wtem/templates/wtem/start.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wtem/management/commands/wtem_send_keys.py b/wtem/management/commands/wtem_send_keys.py index 8e26624..9d14a26 100644 --- a/wtem/management/commands/wtem_send_keys.py +++ b/wtem/management/commands/wtem_send_keys.py @@ -64,6 +64,6 @@ class Command(BaseCommand): def send_key(self, submission): self.stdout.write('>>> sending to ' + submission.email) send_mail( - subject="Olimpiada Cyfrowa - Twój link do egzaminu", + subject="Olimpiada Cyfrowa - Twój link do zadań I etapu", body=render_to_string('wtem/email_key.txt', dict(submission=submission)), to=[submission.email]) diff --git a/wtem/templates/wtem/email_key.txt b/wtem/templates/wtem/email_key.txt index 76e629a..811d50b 100644 --- a/wtem/templates/wtem/email_key.txt +++ b/wtem/templates/wtem/email_key.txt @@ -5,7 +5,7 @@ https://olimpiadacyfrowa.pl{% url 'wtem_start' submission_id=submission.id key=s I etap Olimpiady odbędzie się w czwartek 23 listopada o godz. 10:00 w sali wyznaczonej przez Twoją Komisję Szkolną. Test będzie się składał z 50 pytań, które otrzymasz w losowej kolejności. Po udzieleniu odpowiedzi na dane pytanie nie ma możliwości powrotu do niego i zmiany odpowiedzi. Na rozwiązanie całego testu będziesz mieć 60 minut. -Aby rozwiązać test, potrzebny Ci będzie komputer ze stabilnym łączem internetowym oraz zainstalowaną i zaktualizowaną przeglądarką. +Aby rozwiązać test, potrzebny Ci będzie komputer ze stabilnym łączem internetowym oraz zainstalowaną i zaktualizowaną przeglądarką lub urządzenie mobilne (np. telefon lub tablet) z dostępem do internetu. Każdy uczestnik i uczestniczka otrzymuje indywidualny link, pod którym znajdzie zadania I etapu Olimpiady Cyfrowej. Przypominamy, że zgodnie z Regulaminem, każdy zobowiązany jest do samodzielnego rozwiązania testu. Wszelkie działania świadczące o niesamodzielnej pracy poskutkują dyskwalifikacją. diff --git a/wtem/templates/wtem/main_before.html b/wtem/templates/wtem/main_before.html index b3c2b23..77eef09 100644 --- a/wtem/templates/wtem/main_before.html +++ b/wtem/templates/wtem/main_before.html @@ -6,7 +6,7 @@

    Witamy w I etapie Olimpiady Cyfrowej.

    Test składa z 50 pytań, które otrzymasz w losowej kolejności. Po udzieleniu odpowiedzi na dane pytanie nie ma możliwości powrotu do niego i zmiany odpowiedzi. Uwaga: część pytań ma jedną, a część kilka poprawnych odpowiedzi.

    -

    Test rozpocznie się 23 listopada o godzinie 10:00 i potrwa do 11:00.

    +

    Test rozpocznie się w czwartek 23 listopada o godzinie 10:00 i będzie trwał do godziny 11:00.

    Powodzenia!

    Zespół Olimpiady Cyfrowej
    diff --git a/wtem/templates/wtem/start.html b/wtem/templates/wtem/start.html index c938b76..d0f5b4d 100644 --- a/wtem/templates/wtem/start.html +++ b/wtem/templates/wtem/start.html @@ -9,7 +9,7 @@

    Test składa z {{ exercise_count }} pytań, które otrzymasz w losowej kolejności. Po udzieleniu odpowiedzi na dane pytanie nie ma możliwości powrotu do niego i zmiany odpowiedzi. Uwaga: część pytań ma jedną, a część kilka poprawnych odpowiedzi.

    -

    Test rozpoczyna się o godzinie 10:00 i trwa do 11:00.

    +

    Test rozpoczął się o godzinie 10:00 i trwa do godziny 11:00.

    Powodzenia!

    Zespół Olimpiady Cyfrowej
    -- 2.20.1 From fa2bc70331278decaf3e525607f10bb1bbd92908 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Thu, 16 Nov 2017 14:18:30 +0100 Subject: [PATCH 08/16] cleanup contact forms --- edumed/contact_forms.py | 518 +--------------------------------------- 1 file changed, 1 insertion(+), 517 deletions(-) diff --git a/edumed/contact_forms.py b/edumed/contact_forms.py index 196e5e4..5ee5892 100644 --- a/edumed/contact_forms.py +++ b/edumed/contact_forms.py @@ -1,13 +1,8 @@ # -*- coding: utf-8 -*- from django import forms from django.forms.formsets import BaseFormSet -from django.utils.safestring import mark_safe from contact.forms import ContactForm -from django.core.mail import send_mail -from django.core.exceptions import ValidationError -from django.core.validators import validate_email -from django.template.loader import render_to_string from django.utils.translation import ugettext_lazy as _ WOJEWODZTWA = ( @@ -32,96 +27,6 @@ WOJEWODZTWA = ( WOJEWODZTWO_CHOICES = [(u'', u'(wybierz)')] + [(w, w) for w in WOJEWODZTWA] -class RegistrationForm(ContactForm): - form_tag = 'sugestie' - form_title = u"Zgłoś sugestię" - admin_list = ['podpis', 'contact', 'temat'] - - contact = forms.EmailField(label=u'E-mail', max_length=128, required=False) - podpis = forms.CharField(label=u'Podpis', max_length=128, required=False) - temat = forms.CharField(label=u'Temat zgłoszenia', max_length=255) - tresc = forms.CharField(label=u'Treść', widget=forms.Textarea, max_length=1800) - - -class CooperateForm(ContactForm): - form_tag = 'wspolpraca' - form_title = u"Bądź z nami w kontakcie" - admin_list = ['podpis', 'contact'] - - podpis = forms.CharField(label=u'Imię i nazwisko', max_length=128) - contact = forms.EmailField(label=u'E-mail', max_length=128) - instytucja = forms.CharField( - label=u'Instytucja (nazwa, adres)', widget=forms.Textarea, max_length=1000, required=False) - uwagi = forms.CharField(label=u'Uwagi', widget=forms.Textarea, max_length=1800, required=False) - - zajecia_przedszkole = forms.BooleanField(label=u'Prowadzę zajęcia z dziećmi w wieku przedszkolnym', required=False) - zajecia_sp13 = forms.BooleanField(label=u'Prowadzę zajęcia z dziećmi z SP kl. 1-3', required=False) - zajecia_sp46 = forms.BooleanField(label=u'Prowadzę zajęcia z dziećmi z SP kl. 4-6', required=False) - zajecia_gimnazjum = forms.BooleanField(label=u'Prowadzę zajęcia z młodzieżą w wieku gimnazjalnym', required=False) - zajecia_ponadgimnazjalne = forms.BooleanField( - label=u'Prowadzę zajęcia z młodzieżą ze szkół ponadgimnazjalnych', required=False) - zajecia_wyzsze = forms.BooleanField(label=u'Prowadzę zajęcia w szkole wyższej', required=False) - zajecia_dorosli = forms.BooleanField(label=u'Prowadzę zajęcia dla dorosłych', required=False) - zajecia_seniorzy = forms.BooleanField(label=u'Prowadzę zajęcia dla seniorów', required=False) - zgoda_dane = forms.BooleanField( - label=u'Oświadczam, że wyrażam zgodę na przetwarzanie moich danych osobowych zawartych ' - u'w niniejszym formularzu zgłoszeniowym przez Fundację Nowoczesna Polska ' - u'(administratora danych) z siedzibą w Warszawie (00-514) przy ul. Marszałkowskiej 84/92 ' - u'lok. 125 w celu otrzymywania newslettera Edukacja medialna. Jednocześnie oświadczam, ' - u'że zostałam/em poinformowana/y o tym, że mam prawo wglądu w treść swoich danych ' - u'i możliwość ich poprawiania oraz że ich podanie jest dobrowolne, ale niezbędne ' - u'do dokonania zgłoszenia.') - - -class ContestForm(ContactForm): - form_tag = 'konkurs' - form_title = u"Zgłoś się do konkursu" - admin_list = ['nazwisko', 'instytucja', 'tytul'] - - nazwisko = forms.CharField(label=u'Imię i nazwisko', max_length=128) - contact = forms.EmailField(label=u'Adres e-mail', max_length=128) - instytucja = forms.CharField(label=u'Instytucja (nazwa, adres)', widget=forms.Textarea, max_length=1000) - tytul = forms.CharField( - label=u'Tytuł przeprowadzonej lekcji', - help_text=u'proszę wymienić wszystkie, jeśli zostały przeprowadzone więcej niż jedne zajęcia', - widget=forms.Textarea, max_length=1000) - uczestnicy = forms.CharField(label=u'Liczba uczestników', max_length=64) - trudnosci = forms.CharField( - label=u'Czy w trakcie zajęć pojawiły się jakieś trudności? Jeśli tak, to jakie?', - widget=forms.Textarea, max_length=2000) - pomocne = forms.CharField( - label=u'Co w materiałach okazało się najbardziej pomocne w przygotowaniu i prowadzeniu lekcji?', - widget=forms.Textarea, max_length=2000) - nieprzydatne = forms.CharField( - label=u'Co w materiałach okazało się nieprzydatne w przygotowaniu i prowadzeniu lekcji?', - widget=forms.Textarea, max_length=2000) - poprawic = forms.CharField( - label=u'Jak możemy poprawić serwis edukacjamedialna.edu.pl?', - widget=forms.Textarea, max_length=2000, required=False) - inne = forms.CharField(label=u'Inne uwagi i komentarze', widget=forms.Textarea, max_length=2000, required=False) - zgoda_regulamin = forms.BooleanField( - label=u'Znam i akceptuję regulamin konkursu Medialog.', - help_text=u'Zobacz ' - u'regulamin konkursu MediaLog.') - zgoda_informacje = forms.BooleanField( - label=u'Wyrażam zgodę na otrzymywanie informacji od Fundacji Nowoczesna Polska związanych z edukacją medialną.', - required=False - ) - - -class UdzialForm(ContactForm): - form_tag = 'udzial' - form_title = u"Udział" - admin_list = ['nazwisko', 'miejscowosc', 'instytucja'] - - nazwisko = forms.CharField(label=u'Imię i nazwisko', max_length=128) - miejscowosc = forms.CharField(label=u'Miejscowość', max_length=128) - instytucja = forms.CharField(label=u'Nazwa organizacji/instytucji', max_length=128) - contact = forms.EmailField(label=u'Adres e-mail', max_length=128) - telefon = forms.CharField(label=u'Telefon', max_length=32) - uczestnicy = forms.IntegerField(label=u'Przewidywana liczba uczestników zajęć') - - class WTEMStudentForm(forms.Form): first_name = forms.CharField(label=u'Imię', max_length=128) last_name = forms.CharField(label=u'Nazwisko', max_length=128) @@ -140,98 +45,6 @@ class NonEmptyBaseFormSet(BaseFormSet): forms.ValidationError(u"Proszę podać dane przynajmniej jednej osoby.") -class WTEMForm(ContactForm): - disabled = True - disabled_template = 'wtem/disabled_contact_form.html' - form_tag = "wtem" - form_title = u"WTEM - rejestracja uczestników" - submit_label = u"Wyślij zgłoszenie" - admin_list = ['imie', 'nazwisko', 'institution'] - form_formsets = { - 'student': forms.formsets.formset_factory( - WTEMStudentForm, formset=NonEmptyBaseFormSet, max_num=5, validate_max=True, extra=5), - } - - contact = forms.EmailField(label=u'Adres e-mail opiekuna/opiekunki', max_length=128) - imie = forms.CharField(label=u'Imię', max_length=128) - nazwisko = forms.CharField(label=u'Nazwisko', max_length=128) - function = forms.CharField(label=u'Pełniona funkcja', max_length=255) - institution = forms.CharField(label=u'Nazwa instytucji', max_length=255) - institution_address = forms.CharField(label=u'Adres instytucji', widget=forms.Textarea, max_length=1000) - institution_email = forms.EmailField(label=u'Adres e-mail instytucji', max_length=128) - institution_phone = forms.CharField(label=u'Telefon do instytucji', max_length=32) - institution_www = forms.URLField(label=u'Strona WWW instytucji', max_length=255, required=False) - - zgoda_regulamin = forms.BooleanField( - label=u'Znam i akceptuję regulamin Wielkiego Turnieju Edukacji Medialnej.', - help_text=u'Zobacz ' - u'regulamin Wielkiego Turnieju Edukacji Medialnej.' - ) - zgoda_dane = forms.BooleanField( - label=u'Wyrażam zgodę na przetwarzanie moich danych osobowych oraz danych osobowych moich podopiecznych.', - # help_text=u'Zobacz ' - # 'pełną treść oświadczenia.' - ) - - potw_uczniowie = forms.BooleanField( - label=u'Potwierdzam, że zgłoszeni Uczestnicy/Uczestniczki w chwili rejestracji są ' - u'uczniami/uczennicami szkoły ponadgimnazjalnej.', - ) - zgoda_informacje = forms.BooleanField( - label=u'Wyrażam zgodę na otrzymywanie informacji od Fundacji Nowoczesna Polska ' - u'związanych z edukacją medialną.', - required=False - ) - - extract_types = (dict(slug='extended', label=_('extended')),) - - @staticmethod - def get_extract_fields(contact, extract_type_slug): - fields = contact.body.keys() - fields.pop(fields.index('student')) - fields.extend(['contact', 'student_first_name', 'student_last_name', 'student_email']) - return fields - - @staticmethod - def get_extract_records(keys, contact, extract_type_slug): - toret = [dict()] - for field_name in keys: - if field_name.startswith('student_'): - continue - if field_name == 'contact': - val = contact.contact - else: - val = contact.body[field_name] - toret[0][field_name] = val - - current = toret[0] - for student in contact.body['student']: - for attr in ('first_name', 'last_name', 'email'): - current['student_' + attr] = student[attr] - if current not in toret: - toret.append(current) - current = dict() - return toret - - def save(self, request, formsets=None): - contact = super(WTEMForm, self).save(request, formsets) - - mail_subject = render_to_string('contact/wtem/student_mail_subject.html').strip() - mail_body = render_to_string('contact/wtem/student_mail_body.html') - for formset in formsets or []: - for f in formset.forms: - email = f.cleaned_data.get('email', None) - try: - validate_email(email) - except ValidationError: - pass - else: - send_mail(mail_subject, mail_body, 'olimpiada@nowoczesnapolska.org.pl', [email], - fail_silently=True) - - return contact - - class CommissionForm(forms.Form): name = forms.CharField(label=u'Imię i nazwisko Członka Komisji', max_length=128) form_tag = "commission" @@ -246,7 +59,7 @@ class OlimpiadaForm(ContactForm): admin_list = ['nazwisko', 'school'] form_formsets = { 'student': forms.formsets.formset_factory(WTEMStudentForm, formset=NonEmptyBaseFormSet), - 'commission': forms.formsets.formset_factory(CommissionForm, formset=BaseFormSet), + 'commission': forms.formsets.formset_factory(CommissionForm), } contact = forms.EmailField(label=u'Adres e-mail Przewodniczącego/Przewodniczącej', max_length=128) @@ -324,332 +137,3 @@ class OlimpiadaForm(ContactForm): first_name=first_name, last_name=last_name, email=email, contact=contact) confirmation.send_mail() return contact - - -class MILForm(ContactForm): - form_tag = 'mil' - form_title = _('Share your thoughts on the "Media and information literacy competencies catalogue"') - submit_label = _('Submit') - base_template = 'base_mil.html' - site_name = site_domain = 'katalog.nowoczesnapolska.org.pl' - - name = forms.CharField(label=_('Name and Surname'), max_length=255) - contact = forms.EmailField(label=_('E-mail'), max_length=255) - - institution = forms.CharField(label=_('Institution'), widget=forms.Textarea, max_length=8192) - - question_stages = forms.CharField( - label=_('What do you think about the proposed educational stages classification?'), - widget=forms.Textarea, - max_length=255, - required=False) - - question_fields = forms.CharField( - label=_('What do you think about the proposed thematic fields?'), - widget=forms.Textarea, - max_length=255, - required=False) - - question_left_out = forms.CharField( - label=_('What important areas of media and information literacy have been left out?'), - widget=forms.Textarea, - max_length=255, - required=False) - - other = forms.CharField( - label=_('Other suggestions and comments'), - widget=forms.Textarea, - max_length=255, - required=False) - - -class TEMForm(ContactForm): - form_tag = 'tem' - form_title = u"TEM - szkolenie dla trenerów edukacji medialnej" - admin_list = ['imie', 'nazwisko', 'instytucja', 'contact'] - - imie = forms.CharField(label=u'Imię', max_length=128) - nazwisko = forms.CharField(label=u'Nazwisko', max_length=128) - contact = forms.EmailField(label=u'E-mail', max_length=128) - telefon = forms.CharField(label=u'Tel. kontaktowy', max_length=128) - instytucja = forms.CharField(label=u'Instytucja', max_length=256) - adres = forms.CharField(label=u'Adres', widget=forms.Textarea, max_length=1000) - stanowisko = forms.CharField(label=u'Stanowisko', max_length=256) - doswiadczenie = forms.CharField( - label=u'Jakie jest Pani/Pana doświadczenie w zakresie edukacji medialnej?', - widget=forms.Textarea, max_length=500, help_text=u'(max 500 znaków)') - dlaczego = forms.CharField( - label=u'Dlaczego chce Pani/Pan wziąć udział w szkoleniu?', - widget=forms.Textarea, max_length=500, help_text=u'(max 500 znaków)') - jak_wykorzystac = forms.CharField( - label=u'Jak zamierza Pan/Pani wykorzystać wiedzę zdobytą w czasie szkolenia?', - widget=forms.Textarea, max_length=500, help_text=u'(max 500 znaków)') - - zajecia = forms.BooleanField( - label=u'W okresie wrzesień-październik 2015 r. przeprowadzę min. 2 godziny zajęć edukacji medialnej ' - u'z wybraną grupą dzieci lub młodzieży.', required=True) - zgoda_informacje = forms.BooleanField( - label=u'Wyrażam zgodę na otrzymywanie informacji od Fundacji Nowoczesna Polska ' - u'związanych z edukacją medialną.', required=False) - - -class SuperwizjaForm(ContactForm): - form_tag = 'superwizja' - form_title = u"Informacje o zajęciach" - admin_list = ['nazwisko', 'contact', 'skype', 'temat'] - submit_label = u'Wyślij' - - nazwisko = forms.CharField(label=u'Imię i nazwisko', max_length=1024) - contact = forms.CharField(label=u'E-mail kontaktowy', required=False) - skype = forms.CharField(label=u'Nazwa użytkownika Skype', max_length=255) - temat = forms.CharField(label=u'Temat zajęć', max_length=1024) - termin = forms.CharField(label=u'Termin zajęć', max_length=1024) - czas_trwania = forms.CharField(label=u'Czas trwania zajęć', max_length=1024) - miejsce = forms.CharField(label=u'Miejsce prowadzenia zajęć', max_length=1024) - rodzaj = forms.ChoiceField( - label=u'Rodzaj zajęć', widget=forms.RadioSelect, - choices=[('jednorazowe', 'jednorazowe'), ('w ramach cyklu', 'w ramach cyklu')]) - cykl = forms.CharField(label=u'Jeśli w ramach cyklu, to podaj jego temat i czas trwania', required=False) - sposob = forms.ChoiceField( - label=u'Sposób prowadzenia zajęć', widget=forms.RadioSelect, - choices=[('samodzielnie', 'samodzielnie'), (u'z drugą osobą', 'z drugą osobą')]) - wrazenia = forms.CharField( - label=u'Opisz Twoje ogólne wrażenia po warsztacie.', widget=forms.Textarea, max_length=4096) - opiekun = forms.CharField( - label=u'Czy opiekun grupy był obecny podczas zajęć? Jeśli tak, opisz krótko jego rolę.', - widget=forms.Textarea, max_length=4096) - grupa = forms.CharField( - label=u'Opisz krótko grupę uczestników zajęć (wiek, liczba osób, czy to pierwszy kontakt z grupą).', - widget=forms.Textarea, max_length=4096) - cel = forms.CharField( - label=u'Jaki był założony cel zajęć? Dlaczego wybrałaś/eś taki cel?', widget=forms.Textarea, max_length=4096) - ewaluacja = forms.CharField( - label=u'W jaki sposób sprawdziłeś/aś, czy cel zajęć został zrealizowany? Opisz krótko efekty zajęć.', - widget=forms.Textarea, max_length=4096) - # header - przygotowania = forms.CharField( - label=u'Opisz w punktach proces przygotowania się do zajęć.', widget=forms.Textarea, max_length=4096) - przygotowania_trudnosci = forms.CharField( - label=u'Co na etapie przygotowań sprawiło Ci największą trudność?', widget=forms.Textarea, max_length=4096) - przygotowania_pomoc = forms.CharField( - label=u'Co było pomocne w przygotowaniu zajęć? ' - u'(Czy korzystałaś/eś z materiałów z serwisu edukacjamedialna.edu.pl? Jeśli tak, to jakich?)', - widget=forms.Textarea, max_length=4096) - narzedzia = forms.CharField( - label=u'Jakie narzędzie/a planowałaś/eś wykorzystać, a jakie wykorzystałaś/eś?', - widget=forms.Textarea, max_length=4096) - struktura = forms.CharField( - label=u'Opisz w punktach strukturę zajęć. ' - u'Zaznacz ile czasu planowałaś/eś na każdą część, a ile czasu faktycznie Ci to zajęło.', - widget=forms.Textarea, max_length=4096) - prowadzenie_trudnosci = forms.CharField( - label=u'Co sprawiało Ci trudność w prowadzeniu zajęć?', widget=forms.Textarea, max_length=4096) - prowadzenie_pomoc = forms.CharField( - label=u'Co było pomocne w prowadzeniu zajęć?', widget=forms.Textarea, max_length=4096) - kontrakt = forms.CharField( - label=u'W jakiej formie został zawarty kontrakt z uczestnikami? Jakie zasady zostały przyjęte? ' - u'Czy w trakcie zajęć Ty bądź uczestnicy odwoływaliście się do kontraktu?', - widget=forms.Textarea, max_length=4096) - trudne_sytuacje = forms.CharField( - label=u'Czy podczas zajęć miały miejsce tzw. „trudne sytuacje”. ' - u'Jak na nie zareagowałaś/eś? Czy potrzebowałabyś/łbyś czegoś w związku z nimi?', - widget=forms.Textarea, max_length=4096) - informacje_zwrotne = forms.CharField( - label=u'Czy zbierałaś/eś informacje zwrotne od uczestników? Jeśli tak, na co zwrócili uwagę? ' - u'W jaki sposób zbierałaś/eś informacje zwrotne?', widget=forms.Textarea, max_length=4096) - - mocne_strony = forms.CharField( - label=u'Opisz w punktach mocne strony przeprowadzonych zajęć.', widget=forms.Textarea, max_length=4096) - zmiany = forms.CharField( - label=u'Opisz w punktach, co byś zmienił(a) na przyszłość.', widget=forms.Textarea, max_length=4096) - potrzeby = forms.CharField( - label=u'Czy potrzebowałbyś/łbyś czegoś przed następnymi zajęciami?', widget=forms.Textarea, max_length=4096) - uwagi = forms.CharField(label=u'Inne uwagi', widget=forms.Textarea, max_length=4096, required=False) - - -class CybernauciForm(ContactForm): - disabled = True - disabled_template = 'contact/disabled_contact_form.html' - form_tag = 'trenerzy-cybernauci' - form_title = u"Cybernauci – szkolenie dla trenerów" - admin_list = ['nazwisko', 'instytucja', 'contact'] - submit_label = u'Wyślij' - - nazwisko = forms.CharField(label=u'Imię i nazwisko', max_length=1024) - contact = forms.CharField(label=u'E-mail kontaktowy') - telefon = forms.CharField(label=u'Telefon', max_length=32) - wojewodztwo = forms.ChoiceField(label=u'Województwo', choices=WOJEWODZTWO_CHOICES) - dlaczego = forms.CharField( - label=u'Proszę opisać, dlaczego chce Pan/Pani zostać Emisariuszem Bezpiecznego Internetu.', - widget=forms.Textarea, max_length=4096) - grupy = forms.MultipleChoiceField( - label=u'Proszę wskazać, dla których grup realizował Pan/ realizowała Pani zajęcia warsztatowe', - widget=forms.CheckboxSelectMultiple, - choices=[ - ('Uczniowie klas 1-3', 'Uczniowie klas 1-3'), - ('Uczniowie klas 4-6', 'Uczniowie klas 4-6'), - ('Uczniowie szkół gimnazjalnych', 'Uczniowie szkół gimnazjalnych'), - ('Uczniowie szkół ponadgimnazjalnych', 'Uczniowie szkół ponadgimnazjalnych'), - ('Nauczyciele', 'Nauczyciele'), - ('Rodzice', 'Rodzice'), - ]) - doswiadczenie_grupy = forms.CharField( - label=u'Proszę opisać swoje doświadczenie w pracy warsztatowej z grupami docelowymi Projektu ' - u'(dziećmi, młodzieżą, osobami dorosłymi: nauczycielami, rodzicami).', - widget=forms.Textarea, max_length=4096) - doswiadczenie_edumed = forms.CharField( - label=u'Jakie jest Pana/Pani doświadczenie w zakresie edukacji medialnej,' - u'zwłaszcza w zakresie bezpieczeństwa w Internecie i korzystania z TIK?' - u' Skąd czerpie Pan/Pani wiedzę w tym zakresie? W jakich projektach brał' - u' Pan/brała Pani udział dotychczas?', - widget=forms.Textarea, max_length=4096) - szkolenia = forms.CharField( - label=u'Proszę wymienić studia, szkolenia albo kursy (maks. 5 najważniejszych) ' - u'powiązane z tematyką Projektu, w których Pan/Pani uczestniczył/ła, ' - u'w tym dane na temat instytucji czy osoby prowadzącej (z JEDNOZDANIOWYM ' - u'omówieniem i terminami, w których się odbyły).', - widget=forms.Textarea, max_length=4096) - realizacje = forms.CharField( - label=u'Proszę opisać swoje doświadczenie w zakresie realizacji działań w lokalnym środowisku ' - u'szkolnym (np. na terenie gminy/powiatu/województwa).', - widget=forms.Textarea, max_length=4096) - cel = forms.CharField( - label=u'Proszę opisać, jaką wiedzę i umiejętności chce Pan/Pani zdobyć ' - u'lub doskonalić poprzez uczestnictwo w Szkoleniu trenerskim.', - widget=forms.Textarea, max_length=4096) - zgoda_regulamin = forms.BooleanField( - label=u'Oświadczam, że zapoznałem/zapoznałam się z Regulaminem Rekrutacji ' - u'i Uczestnictwa w Projekcie „Cybernauci – kompleksowy projekt ' - u'kształtowania bezpiecznych zachowań w sieci” i akceptuję jego warunki.', - help_text=u'Zobacz regulamin.') - zgoda_dane = forms.BooleanField( - label=u'Wyrażam zgodę na przetwarzanie moich danych osobowych zawartych ' - u'w niniejszym dokumencie dla potrzeb niezbędnych do realizacji Projektu ' - u'„Cybernauci – kompleksowy projekt kształtowania bezpiecznych zachowań ' - u'w sieci” zgodnie z ustawą z dnia 29.08.1997 roku o Ochronie Danych ' - u'Osobowych (Dz. U. z 2002 r. Nr 101, poz. 926 z późniejszymi zmianami).') - zgoda_niekaralnosc = forms.BooleanField( - label=u'W przypadku zakwalifikowania się na kurs zobowiązuję się ' - u'do dostarczenia świadectwa o niekaralności – najpóźniej w dniu rozpoczęcia Szkolenia.') - cv = forms.FileField( - label=u'Wgraj plik CV.', - help_text=u'Prosimy o nazwanie pliku swoim imieniem i nazwiskiem. Preferowany format: PDF.') - - -class WLEMForm(ContactForm): - disabled = True - form_tag = 'wlem' - form_title = u"WLEM - szkolenie dla warszawskich liderów edukacji medialnej" - admin_list = ['nazwisko', 'instytucja', 'contact'] - submit_label = u'Wyślij' - - nazwisko = forms.CharField(label=u'Imię i nazwisko', max_length=128) - contact = forms.CharField(label=u'Adres e-mail') - telefon = forms.CharField(label=u'Tel. kontaktowy', max_length=32) - instytucja = forms.CharField(label=u'Instytucja', max_length=128) - instytucja_adres = forms.CharField(label=u'Adres (instytucji)', max_length=1024) - stanowisko = forms.CharField(label=u'Stanowisko', max_length=256) - doswiadczenie = forms.CharField( - label=u'Jakie jest Pani/Pana doświadczenie w zakresie edukacji medialnej?', - widget=forms.Textarea, max_length=4096) - dlaczego = forms.CharField( - label=u'Dlaczego chce Pani/Pan wziąć udział w szkoleniu?', - widget=forms.Textarea, max_length=4096) - cel = forms.CharField( - label=u'Jaką wiedzę i umiejętności chce Pan/Pani zdobyć lub doskonalić poprzez uczestnictwo w szkoleniu?', - widget=forms.Textarea, max_length=4096) - jak_wykorzystac = forms.CharField( - label=u'Jak zamierza Pan/Pani wykorzystać wiedzę i umiejętności zdobyte w czasie szkolenia?', - widget=forms.Textarea, max_length=4096) - zgoda_zajecia = forms.BooleanField( - label=u'W okresie lipiec-październik 2016 r. przeprowadzę min. 2 godziny zajęć ' - u'edukacji medialnej z grupą warszawiaków.') - zgoda_dane = forms.BooleanField( - label=u'Wyrażam zgodę na przetwarzanie moich danych osobowych zawartych ' - u'w niniejszym dokumencie dla potrzeb niezbędnych do realizacji Projektu ' - u'„Warszawscy Liderzy Edukacji Medialnej” zgodnie z ustawą z dnia 29.08.1997 ' - u'roku o Ochronie Danych Osobowych (Dz. U. z 2002 r. Nr 101, poz. 926 ' - u'z późniejszymi zmianami).') - zgoda_newsletter = forms.BooleanField( - required=False, - label=u'Wyrażam zgodę na otrzymywanie informacji od Fundacji Nowoczesna Polska ' - u'związanych z edukacją medialną.') - - -def textarea_field(label, max_length=500): - return forms.CharField(label=label, widget=forms.Textarea, max_length=max_length) - - -def ordered_textarea_field(start, pre_label=u'', label=u'', max_length=500): - return textarea_field( - mark_safe(u'%s

    1. %s (max. %s znaków)
    ' % ( - pre_label, start, label, max_length))) - - -def simple_choices(*choices): - return tuple((choice, choice) for choice in choices) - - -class CybernauciAnkietaForm(ContactForm): - def __init__(self, *args, **kwargs): - super(CybernauciAnkietaForm, self).__init__(*args, **kwargs) - self.label_suffix = '' - - form_tag = 'cybernauci-ankieta-trenera' - form_title = u"Cybernauci – ankieta trenerska" - nazwisko = forms.CharField(label=u'Imię i nazwisko', max_length=128) - contact = forms.CharField(label=u'Adres e-mail') - pyt1a = ordered_textarea_field( - 1, pre_label=u'1. W kontekście planowanego szkolenia jakie są Twoje oczekiwania w zakresie:', - label=u'przekazywanej wiedzy') - pyt1b = ordered_textarea_field(2, label=u'tematyki szkoleń z bezpieczeństwa w sieci') - pyt1c = ordered_textarea_field(3, label=u'materiałów dydaktycznych') - pyt1d = ordered_textarea_field(4, label=u'organizacji i prowadzenia szkoleń w projekcie') - pyt1e = ordered_textarea_field(5, label=u'umiejętności trenerskich') - pyt1f = ordered_textarea_field(6, label=u'inne, jakie?') - pyt2 = textarea_field(u'2. W których tematach z obszaru bezpieczeństwa w sieci czujesz się najpewniej? ' - u'Dlaczego? (max. 500 znaków)') - pyt3 = textarea_field(u'3. Które z tematów znasz słabej lub których nie znasz zupełnie? (max. 500 znaków)') - pyt4 = textarea_field(u'4. Jakie są Twoje mocne strony jako osoby prowadzącej warsztaty? (max. 500 znaków)') - pyt5 = textarea_field(u'5. Nad jakimi elementami pracy trenerskiej chciałbyś/chciałabyś popracować? ' - u'(max. 500 znaków)') - pyt6 = textarea_field(u'6. Co jest dla Ciebie najważniejsze w pracy z grupą? ' - u'Na co zwracasz uwagę w tym obszarze jako osoba prowadząca warsztaty? (max. 500 znaków)') - pyt7 = textarea_field(u'7. Opisz najtrudniejszą Twoim zdaniem sytuację, której doświadczyłeś/doświadczyłaś ' - u'podczas prowadzenia zajęć w grupie z młodzieżą, rodzicami lub nauczycielami? ' - u'(max. 500 znaków)') - pyt8 = forms.MultipleChoiceField( - label=u'8. W jaki sposób poradzisz sobie z niespodziewaną sytuacją skrócenia czasu zajęć? ' - u'Na które z poniższych punktów przeznaczysz w takiej sytuacji najmniej czasu?', - widget=forms.CheckboxSelectMultiple, - choices=simple_choices( - u'Przedstawienie się prowadzących i uczestników', - u'Poznanie oczekiwań i dostosowanie do nich programu zajęć', - u'Integracja', - u'Poprowadzenie kolejnych elementów zajęć (teoria-ćwiczenia)', - u'Podsumowanie - sprawdzenie efektów warsztatu', - u'Zaplanowanie dalszych prac', - u'Ewaluacja')) - pyt8a = textarea_field(label=u'Dlaczego? (max. 1000 znaków)', max_length=1000) - pyt9 = textarea_field( - label=u'9. Jeden z uczestników przeszkadza podczas warsztatów: ' - u'głośno żartuje, nie wykonuje zleconych zadań. Co robisz? (max. 500 znaków)') - pyt10 = textarea_field( - u'10. Z całej grupy tylko trzy osoby odpowiadają na każde zadane przez Ciebie pytanie. ' - u'Co robisz? (max. 500 znaków)') - pyt11 = textarea_field( - u'11. Jakie są Twoje największe obawy wobec realizacji szkoleń w placówkach oświatowych? (max. 500 znaków)') - pyt12a = ordered_textarea_field( - 1, pre_label=u'12. Opisz szczegółowo doświadczenie z różnymi grupami:', label=u'rodzice') - pyt12b = ordered_textarea_field(2, label=u'nauczyciele') - pyt12c = ordered_textarea_field(3, label=u'młodzież ponadgimnazjalna') - pyt12d = ordered_textarea_field(4, label=u'młodzież gimnazjalna') - pyt12e = ordered_textarea_field(5, label=u'dzieci i młodzież szkół podstawowych') - pyt13 = textarea_field( - u'13. Z jakimi grupami wiekowymi najlepiej Ci się współpracuje? ' - u'Umiejętności w zakresie pracy z którą grupą najbardziej chciałabyś/chciałbyś zdobyć/doskonalić? ' - u'(max. 500 znaków)') - pyt14 = textarea_field( - u'14. W jaki sposób na co dzień dbasz o swój rozwój jako trenera/trenerki, ' - u'osoby prowadzącej warsztaty czy inne formy szkoleniowe? (max. 500 znaków)') -- 2.20.1 From f9f1b488caf738a20f0a3590d89b77fb1c5c7b3d Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Thu, 16 Nov 2017 14:29:25 +0100 Subject: [PATCH 09/16] update messages --- wtem/templates/wtem/email_key.txt | 2 +- wtem/templates/wtem/main_before.html | 1 + wtem/templates/wtem/start.html | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wtem/templates/wtem/email_key.txt b/wtem/templates/wtem/email_key.txt index 811d50b..2a6ee87 100644 --- a/wtem/templates/wtem/email_key.txt +++ b/wtem/templates/wtem/email_key.txt @@ -5,7 +5,7 @@ https://olimpiadacyfrowa.pl{% url 'wtem_start' submission_id=submission.id key=s I etap Olimpiady odbędzie się w czwartek 23 listopada o godz. 10:00 w sali wyznaczonej przez Twoją Komisję Szkolną. Test będzie się składał z 50 pytań, które otrzymasz w losowej kolejności. Po udzieleniu odpowiedzi na dane pytanie nie ma możliwości powrotu do niego i zmiany odpowiedzi. Na rozwiązanie całego testu będziesz mieć 60 minut. -Aby rozwiązać test, potrzebny Ci będzie komputer ze stabilnym łączem internetowym oraz zainstalowaną i zaktualizowaną przeglądarką lub urządzenie mobilne (np. telefon lub tablet) z dostępem do internetu. +Aby rozwiązać test, potrzebny Ci będzie komputer ze stabilnym łączem internetowym oraz zainstalowaną i zaktualizowaną przeglądarką lub urządzenie mobilne (np. telefon lub tablet) z dostępem do internetu. Podczas rozwiązywania testu możesz korzystać z internetu. Każdy uczestnik i uczestniczka otrzymuje indywidualny link, pod którym znajdzie zadania I etapu Olimpiady Cyfrowej. Przypominamy, że zgodnie z Regulaminem, każdy zobowiązany jest do samodzielnego rozwiązania testu. Wszelkie działania świadczące o niesamodzielnej pracy poskutkują dyskwalifikacją. diff --git a/wtem/templates/wtem/main_before.html b/wtem/templates/wtem/main_before.html index 77eef09..5b3cd00 100644 --- a/wtem/templates/wtem/main_before.html +++ b/wtem/templates/wtem/main_before.html @@ -6,6 +6,7 @@

    Witamy w I etapie Olimpiady Cyfrowej.

    Test składa z 50 pytań, które otrzymasz w losowej kolejności. Po udzieleniu odpowiedzi na dane pytanie nie ma możliwości powrotu do niego i zmiany odpowiedzi. Uwaga: część pytań ma jedną, a część kilka poprawnych odpowiedzi.

    +

    Podczas rozwiązywania testu możesz korzystać z internetu.

    Test rozpocznie się w czwartek 23 listopada o godzinie 10:00 i będzie trwał do godziny 11:00.

    Powodzenia!

    diff --git a/wtem/templates/wtem/start.html b/wtem/templates/wtem/start.html index d0f5b4d..ff6b240 100644 --- a/wtem/templates/wtem/start.html +++ b/wtem/templates/wtem/start.html @@ -9,6 +9,7 @@

    Test składa z {{ exercise_count }} pytań, które otrzymasz w losowej kolejności. Po udzieleniu odpowiedzi na dane pytanie nie ma możliwości powrotu do niego i zmiany odpowiedzi. Uwaga: część pytań ma jedną, a część kilka poprawnych odpowiedzi.

    +

    Podczas rozwiązywania testu możesz korzystać z internetu.

    Test rozpoczął się o godzinie 10:00 i trwa do godziny 11:00.

    Powodzenia!

    -- 2.20.1 From 469775ecf6cef4426cd6a89a84889a9c007b9d01 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Thu, 16 Nov 2017 14:33:20 +0100 Subject: [PATCH 10/16] add option to disable contact form after given datetime --- contact/views.py | 21 +++++++++++++++------ edumed/contact_forms.py | 2 +- edumed/utils.py | 13 ++++++++++++- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/contact/views.py b/contact/views.py index 5a2f2ae..84578dc 100644 --- a/contact/views.py +++ b/contact/views.py @@ -1,28 +1,37 @@ # -*- coding: utf-8 -*- from urllib import unquote +from datetime import datetime from django.contrib.auth.decorators import permission_required from django.http import Http404 from django.shortcuts import get_object_or_404, redirect, render +from django.utils import timezone +from django.views.decorators.cache import never_cache from fnpdjango.utils.views import serve_file from honeypot.decorators import check_honeypot +from edumed.utils import localtime_to_utc from .forms import contact_forms from .models import Attachment @check_honeypot +@never_cache def form(request, form_tag, force_enabled=False): try: form_class = contact_forms[form_tag] except KeyError: raise Http404 - if (getattr(form_class, 'disabled', False) and - not (force_enabled and request.user.is_superuser)): - template = getattr(form_class, 'disabled_template', None) - if template: - return render(request, template, {'title': form_class.form_title}) - raise Http404 + if not (force_enabled and request.user.is_superuser): + disabled = getattr(form_class, 'disabled', False) + end_tuple = getattr(form_class, 'ends_on') + end_time = localtime_to_utc(datetime(*end_tuple)) if end_tuple else None + expired = end_time and end_time < timezone.now() + if disabled or expired: + template = getattr(form_class, 'disabled_template', None) + if template: + return render(request, template, {'title': form_class.form_title}) + raise Http404 if request.method == 'POST': form = form_class(request.POST, request.FILES) else: diff --git a/edumed/contact_forms.py b/edumed/contact_forms.py index 5ee5892..e5ceff2 100644 --- a/edumed/contact_forms.py +++ b/edumed/contact_forms.py @@ -51,7 +51,7 @@ class CommissionForm(forms.Form): class OlimpiadaForm(ContactForm): - disabled = False + ends_on = (2017, 11, 17, 0, 5) disabled_template = 'wtem/disabled_contact_form.html' form_tag = "olimpiada" form_title = u"Olimpiada Cyfrowa - Elektroniczny System Zgłoszeń" diff --git a/edumed/utils.py b/edumed/utils.py index 2dce875..0683476 100644 --- a/edumed/utils.py +++ b/edumed/utils.py @@ -3,6 +3,10 @@ import codecs import csv import cStringIO +import pytz +from django.conf import settings +from django.utils import timezone + from settings.apps import INSTALLED_APPS @@ -41,4 +45,11 @@ def process_app_deps(list_with_deps): return tuple( (x[0] if type(x) == tuple else x) for x in list_with_deps - if type(x) != tuple or x[1] in INSTALLED_APPS) \ No newline at end of file + if type(x) != tuple or x[1] in INSTALLED_APPS) + + +def localtime_to_utc(localtime): + tz = pytz.timezone(settings.TIME_ZONE) + return timezone.utc.normalize( + tz.localize(localtime) + ) -- 2.20.1 From b58642415e284ebf397f3577bfe70277e84f6993 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Thu, 16 Nov 2017 15:20:52 +0100 Subject: [PATCH 11/16] filter and extra column in confirmation admin --- wtem/admin.py | 6 ++++-- wtem/models.py | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/wtem/admin.py b/wtem/admin.py index 4621f5f..efaf253 100644 --- a/wtem/admin.py +++ b/wtem/admin.py @@ -240,8 +240,10 @@ def report_view(request): class ConfirmationAdmin(admin.ModelAdmin): - list_display = ('email', 'first_name', 'last_name', 'readable_contact', 'readable_age', 'confirmed') - readonly_fields = ('contact', 'readable_contact', 'readable_age', 'key', 'confirmed') + list_display = ('email', 'first_name', 'last_name', 'readable_contact', 'school_phone', 'readable_age', 'confirmed') + readonly_fields = ('contact', 'readable_contact', 'readable_age', 'school_phone', 'key', 'confirmed') + list_filter = ('confirmed',) + list_select_related = ('contact',) def resend_mail(self, request, queryset): for confirmation in queryset: diff --git a/wtem/models.py b/wtem/models.py index 390687f..5a7e221 100644 --- a/wtem/models.py +++ b/wtem/models.py @@ -278,6 +278,9 @@ class Confirmation(models.Model): def readable_contact(self): return '%s <%s>' % (self.contact.body.get('przewodniczacy'), self.contact.contact) + def school_phone(self): + return '%s, tel. %s' % (self.contact.body.get('school'), self.contact.body.get('school_phone')) + def age(self): return timezone.now() - self.contact.created_at -- 2.20.1 From 334d0b5148de69b0509e001631154aa3ec788d36 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Thu, 16 Nov 2017 15:57:04 +0100 Subject: [PATCH 12/16] mark submissions with opened links --- ..._auto__add_field_submission_opened_link.py | 115 ++++++++++++++++++ wtem/models.py | 1 + wtem/views.py | 5 + 3 files changed, 121 insertions(+) create mode 100644 wtem/migrations/0012_auto__add_field_submission_opened_link.py diff --git a/wtem/migrations/0012_auto__add_field_submission_opened_link.py b/wtem/migrations/0012_auto__add_field_submission_opened_link.py new file mode 100644 index 0000000..14da213 --- /dev/null +++ b/wtem/migrations/0012_auto__add_field_submission_opened_link.py @@ -0,0 +1,115 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'Submission.opened_link' + db.add_column(u'wtem_submission', 'opened_link', + self.gf('django.db.models.fields.BooleanField')(default=False), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Submission.opened_link' + db.delete_column(u'wtem_submission', 'opened_link') + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contact.contact': { + 'Meta': {'ordering': "('-created_at',)", 'object_name': 'Contact'}, + 'body': ('jsonfield.fields.JSONField', [], {}), + 'contact': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'form_tag': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'wtem.assignment': { + 'Meta': {'object_name': 'Assignment'}, + 'exercises': ('jsonfield.fields.JSONField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'unique': 'True'}) + }, + u'wtem.attachment': { + 'Meta': {'object_name': 'Attachment'}, + 'exercise_id': ('django.db.models.fields.IntegerField', [], {}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'submission': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['wtem.Submission']"}), + 'tag': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}) + }, + u'wtem.competitionstate': { + 'Meta': {'object_name': 'CompetitionState'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'state': ('django.db.models.fields.CharField', [], {'max_length': '16'}) + }, + u'wtem.confirmation': { + 'Meta': {'ordering': "['contact__contact']", 'object_name': 'Confirmation'}, + 'confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contact.Contact']", 'null': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '100'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'key': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'wtem.submission': { + 'Meta': {'object_name': 'Submission'}, + 'answers': ('django.db.models.fields.CharField', [], {'max_length': '65536', 'null': 'True', 'blank': 'True'}), + 'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contact.Contact']", 'null': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '100'}), + 'end_time': ('django.db.models.fields.CharField', [], {'max_length': '5', 'null': 'True', 'blank': 'True'}), + 'examiners': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}), + 'key_sent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'marks': ('jsonfield.fields.JSONField', [], {'default': '{}'}), + 'opened_link': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'random_seed': ('django.db.models.fields.IntegerField', [], {}) + } + } + + complete_apps = ['wtem'] \ No newline at end of file diff --git a/wtem/models.py b/wtem/models.py index 5a7e221..ccbf67f 100644 --- a/wtem/models.py +++ b/wtem/models.py @@ -79,6 +79,7 @@ class Submission(models.Model): email = models.EmailField(max_length=100, unique=True) answers = models.CharField(max_length=65536, null=True, blank=True) key_sent = models.BooleanField(default=False) + opened_link = models.BooleanField(default=False) marks = JSONField(default={}) examiners = models.ManyToManyField(User, null=True, blank=True) end_time = models.CharField(max_length=5, null=True, blank=True) diff --git a/wtem/views.py b/wtem/views.py index a532732..465b11b 100644 --- a/wtem/views.py +++ b/wtem/views.py @@ -47,6 +47,8 @@ def form_before(request, submission_id, key): if submission.key != key: return render(request, 'wtem/key_not_found_before.html') else: + submission.opened_link = True + submission.save() return render(request, 'wtem/main_before.html') @@ -137,6 +139,9 @@ def start(request, submission_id, key): if submission.key != key: return render(request, 'wtem/key_not_found.html') + submission.opened_link = True + submission.save() + i, exercise = submission.current_exercise() if not exercise: return render(request, 'wtem/thanks_single.html') -- 2.20.1 From f393f3067f3d9f1e63e3076f78a78d8d779691fb Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Fri, 17 Nov 2017 16:29:02 +0100 Subject: [PATCH 13/16] remove edumed clutter --- api/__init__.py | 0 api/admin.py | 3 - api/handlers.py | 62 - api/helpers.py | 9 - api/models.py | 3 - api/templates/oauth/challenge.html | 0 api/templates/piston/authorize_token.html | 20 - api/tests.py | 3 - api/urls.py | 31 - api/views.py | 3 - catalogue/__init__.py | 0 catalogue/admin.py | 17 - catalogue/forms.py | 35 - catalogue/management/__init__.py | 0 catalogue/management/commands/__init__.py | 0 .../management/commands/importlessons.py | 144 - catalogue/management/commands/repackage.py | 15 - catalogue/migrations/0001_initial.py | 74 - .../0002_auto__add_field_section_slug.py | 53 - ...__chg_field_lesson_student_package__chg.py | 81 - ..._add_field_lesson_pdf__add_field_lesson.py | 99 - .../0005_auto__add_field_lesson_dc.py | 69 - ...__add_field_attachment_ext__add_unique_.py | 85 - ...d_lesson_type__chg_field_lesson_section.py | 96 - .../0008_auto__del_field_lesson_depth.py | 72 - .../0009_auto__add_field_section_xml_file.py | 73 - catalogue/migrations/0010_auto.py | 83 - ...__chg_field_lesson_student_pdf__chg_fie.py | 127 - .../migrations/0012_auto__add_lessonstub.py | 96 - .../0013_auto__add_field_section_image.py | 91 - .../0014_auto__add_field_section_summary.py | 94 - ...0015_auto__add_field_lesson_description.py | 95 - ...d_field_section_pic_attribution__add_fi.py | 114 - catalogue/migrations/__init__.py | 0 catalogue/models.py | 317 -- catalogue/publish.py | 121 - catalogue/search_indexes.py | 10 - catalogue/static/catalogue/css/carousel.css | 110 - catalogue/static/catalogue/css/carousel.scss | 140 - catalogue/static/catalogue/css/exercise.css | 231 - catalogue/static/catalogue/css/exercise.scss | 320 -- catalogue/static/catalogue/css/lesson.css | 254 - catalogue/static/catalogue/css/lesson.scss | 327 -- .../static/catalogue/css/section_list.css | 58 - .../static/catalogue/css/section_list.scss | 90 - .../static/catalogue/img/carousel-left.png | Bin 2139 -> 0 bytes .../static/catalogue/img/carousel-right.png | Bin 1794 -> 0 bytes .../img/carousel/katarzyna-wlodarczyk.jpg | Bin 43105 -> 0 bytes catalogue/static/catalogue/js/carousel.js | 27 - catalogue/static/catalogue/js/edumed.js | 673 --- .../static/catalogue/js/jquery.cycle.all.js | 1538 ----- catalogue/static/catalogue/js/lesson-list.js | 60 - catalogue/static/catalogue/js/lesson.js | 12 - .../catalogue/latest_blog_posts.html | 5 - .../lesson/added-var/lesson_detail.html | 31 - .../catalogue/lesson/added/lesson_detail.html | 31 - .../lesson/appendix/lesson_detail.html | 11 - .../templates/catalogue/lesson/box-icons.html | 18 - .../lesson/course/lesson_detail.html | 31 - .../catalogue/lesson/lesson_detail.html | 134 - .../lesson/project/lesson_detail.html | 28 - .../lesson/synthetic/lesson_detail.html | 25 - .../templates/catalogue/lesson_list.html | 47 - .../templates/catalogue/section_detail.html | 11 - .../catalogue/snippets/carousel.html | 27 - .../catalogue/snippets/lesson_link.html | 1 - .../catalogue/snippets/lesson_nav.html | 27 - .../catalogue/snippets/lesson_or_stub.html | 9 - .../catalogue/snippets/level_box.html | 176 - .../catalogue/snippets/levels_main.html | 36 - .../search/indexes/catalogue/lesson_text.txt | 1 - catalogue/templatetags/__init__.py | 0 catalogue/templatetags/catalogue_tags.py | 173 - catalogue/tests.py | 17 - catalogue/urls.py | 13 - catalogue/views.py | 35 - comment/__init__.py | 0 comment/admin.py | 10 - comment/locale/pl/LC_MESSAGES/django.mo | Bin 2971 -> 0 bytes comment/locale/pl/LC_MESSAGES/django.po | 84 - comment/migrations/0001_initial.py | 38 - ...add_field_commentdocument_language_code.py | 34 - comment/migrations/__init__.py | 0 comment/models.py | 20 - .../comment/commentdocument_detail.html | 9 - .../comment/commentdocument_list.html | 39 - comment/urls.py | 11 - comment/views.py | 29 - curriculum/__init__.py | 0 curriculum/admin.py | 32 - curriculum/fixtures/competences.json | 2951 ---------- curriculum/fixtures/curriculum.json | 567 -- curriculum/locale/pl/LC_MESSAGES/django.mo | Bin 2152 -> 0 bytes curriculum/locale/pl/LC_MESSAGES/django.po | 131 - curriculum/migrations/0001_initial.py | 95 - .../0002_auto__add_field_level_group.py | 55 - .../0003_auto__chg_field_level_slug.py | 59 - ...d_curriculumlevel__add_curriculumcourse.py | 102 - ...__add_field_curriculumcourse_accusative.py | 79 - ..._description_pl__add_field_competencele.py | 158 - ...0007_translatable_fields_data_migration.py | 92 - ..._description__del_field_section_name__d.py | 103 - ..._description_en__chg_field_competencele.py | 133 - .../0010_auto__add_field_level_meta_name.py | 82 - curriculum/migrations/0011_meta_name.py | 77 - ..._level_meta_name__add_unique_level_slug.py | 86 - ...ackage__add_field_level_student_package.py | 92 - curriculum/migrations/__init__.py | 0 curriculum/models.py | 227 - curriculum/static/curriculum/curriculum.css | 40 - curriculum/static/curriculum/curriculum.js | 43 - curriculum/static/curriculum/curriculum.scss | 67 - .../curriculum/competence_detail.html | 13 - .../templates/curriculum/competence_list.html | 73 - .../curriculum/snippets/competence.html | 12 - .../curriculum/snippets/course_box.html | 35 - .../curriculum/snippets/course_boxes.html | 8 - .../curriculum/snippets/course_boxes_toc.html | 14 - .../curriculum/snippets/curriculum.html | 17 - curriculum/templatetags/__init__.py | 0 curriculum/templatetags/curriculum_tags.py | 96 - curriculum/tests.py | 17 - curriculum/urls.py | 9 - curriculum/views.py | 66 - edumed/context_processors.py | 4 - edumed/forms.py | 17 - edumed/forum.py | 25 - edumed/locale-contrib/django.pot | 715 --- .../locale-contrib/pl/LC_MESSAGES/django.mo | Bin 1685 -> 0 bytes .../locale-contrib/pl/LC_MESSAGES/django.po | 677 --- edumed/milurls.py | 28 - edumed/settings/apps.py | 8 - edumed/settings/context.py | 2 - edumed/settings/contrib.py | 8 - edumed/settings/custom.py | 2 +- edumed/settings/locale.py | 1 - edumed/settings/middleware.py | 2 - edumed/settings/static.py | 16 +- edumed/static/catalogue/css/carousel.css | 110 - edumed/static/catalogue/css/carousel.scss | 140 - edumed/static/catalogue/css/lesson.css | 254 - edumed/static/catalogue/css/lesson.scss | 327 -- edumed/static/catalogue/css/section_list.css | 58 - edumed/static/catalogue/css/section_list.scss | 90 - edumed/static/catalogue/img/carousel-left.png | Bin 2139 -> 0 bytes .../static/catalogue/img/carousel-right.png | Bin 1794 -> 0 bytes .../img/carousel/katarzyna-wlodarczyk.jpg | Bin 43105 -> 0 bytes edumed/static/catalogue/js/carousel.js | 27 - .../catalogue/js/jquery-ui-1.10.0.custom.js | 5027 ----------------- .../static/catalogue/js/jquery.cycle.all.js | 1538 ----- edumed/static/catalogue/js/lesson-list.js | 60 - edumed/static/catalogue/js/lesson.js | 12 - edumed/static/css/base.css | 42 - edumed/static/css/base.scss | 14 - edumed/static/css/forum.css | 89 - edumed/static/css/forum.scss | 180 - edumed/static/css/mil.css | 47 - edumed/static/css/mil.scss | 57 - edumed/static/css/promobox.css | 0 edumed/static/css/promobox.scss | 9 - edumed/static/img/logo-mil.png | Bin 11893 -> 0 bytes edumed/static/img/logo.png | Bin 3020 -> 0 bytes edumed/static/img/logo_fnp_white.png | Bin 1674 -> 0 bytes edumed/static/img/menu/katalog.png | Bin 885 -> 0 bytes edumed/static/img/menu/katalog_active.png | Bin 874 -> 0 bytes edumed/static/img/menu/kontakt.png | Bin 481 -> 0 bytes edumed/static/img/menu/kontakt_active.png | Bin 470 -> 0 bytes edumed/static/img/menu/lekcje.png | Bin 804 -> 0 bytes edumed/static/img/menu/lekcje_active.png | Bin 791 -> 0 bytes edumed/static/img/menu/mil/catalog.png | Bin 606 -> 0 bytes edumed/static/img/menu/mil/consultations.png | Bin 624 -> 0 bytes edumed/static/img/menu/mil/contact.png | Bin 404 -> 0 bytes edumed/static/img/menu/mil/knowledgebase.png | Bin 777 -> 0 bytes edumed/static/img/menu/mil/lang_en.png | Bin 1175 -> 0 bytes edumed/static/img/menu/mil/lang_pl.png | Bin 361 -> 0 bytes edumed/static/img/menu/mil/takepart.png | Bin 523 -> 0 bytes edumed/static/img/menu/o-nas.png | Bin 681 -> 0 bytes edumed/static/img/menu/o-nas_active.png | Bin 679 -> 0 bytes edumed/static/img/menu/szkolenia.png | Bin 743 -> 0 bytes edumed/static/img/menu/szkolenia_active.png | Bin 739 -> 0 bytes edumed/static/img/menu/wesprzyj.png | Bin 753 -> 0 bytes edumed/static/img/menu/wesprzyj_active.png | Bin 755 -> 0 bytes edumed/static/img/menu/wspolpraca.png | Bin 635 -> 0 bytes edumed/static/img/menu/wspolpraca_active.png | Bin 634 -> 0 bytes edumed/static/img/nina-white.png | Bin 2792 -> 0 bytes edumed/static/img/nina.jpg | Bin 3768 -> 0 bytes .../static}/js/jquery-ui-1.10.0.custom.js | 0 edumed/templates/404_mil.html | 14 - edumed/templates/base_forum.html | 10 - edumed/templates/base_mil.html | 38 - .../templates/contact/konkurs/mail_body.txt | 15 - .../contact/konkurs/mail_subject.txt | 1 - edumed/templates/contact/konkurs/thanks.html | 13 - .../templates/contact/sugestie/mail_body.txt | 10 - .../contact/sugestie/mail_subject.txt | 1 - edumed/templates/contact/sugestie/thanks.html | 5 - edumed/templates/contact/tem/mail_body.txt | 8 - edumed/templates/contact/tem/mail_subject.txt | 1 - edumed/templates/contact/tem/thanks.html | 7 - .../contact/wspolpraca/mail_body.txt | 9 - .../contact/wspolpraca/mail_subject.txt | 1 - .../templates/contact/wspolpraca/thanks.html | 5 - edumed/templates/contact/wtem/form.html | 71 - edumed/templates/contact/wtem/mail_body.txt | 19 - .../templates/contact/wtem/mail_subject.txt | 1 - .../contact/wtem/student_mail_body.html | 17 - .../contact/wtem/student_mail_subject.html | 1 - edumed/templates/contact/wtem/thanks.html | 15 - edumed/templates/flatpages/mil.html | 10 - edumed/templates/home.html | 70 - edumed/templates/home_mil.html | 5 - edumed/templates/olimpiada_teaser.html | 45 - .../pybb/_need_to_login_message.html | 2 - edumed/templates/pybb/avatar.html | 8 - edumed/templates/pybb/breadcrumb.html | 20 - .../pybb/breadcrumb_top_extra_crumb.html | 1 - edumed/urls.py | 52 +- edumed/views.py | 36 +- forum/__init__.py | 0 forum/forms.py | 41 - forum/locale/pl/LC_MESSAGES/django.mo | Bin 536 -> 0 bytes forum/locale/pl/LC_MESSAGES/django.po | 60 - forum/middleware.py | 16 - forum/migrations/0001_initial.py | 164 - forum/migrations/__init__.py | 0 forum/models.py | 11 - forum/search_indexes.py | 10 - .../templates/forum/related_lesson_info.html | 4 - forum/templates/forum/search_results.html | 41 - forum/templates/pybb/category.html | 47 - .../pybb/forum_last_update_info.html | 5 - forum/templates/pybb/post_form.html | 36 - forum/templates/pybb/topic.html | 102 - .../pybb/topic_last_message_info.html | 6 - .../search/indexes/pybb/post_text.txt | 1 - forum/urls.py | 26 - forum/views.py | 58 - lib/librarian | 1 - publishers/__init__.py | 0 publishers/admin.py | 5 - publishers/migrations/0001_initial.py | 34 - publishers/migrations/__init__.py | 0 publishers/models.py | 10 - requirements.txt | 1 - 244 files changed, 20 insertions(+), 23583 deletions(-) delete mode 100644 api/__init__.py delete mode 100644 api/admin.py delete mode 100644 api/handlers.py delete mode 100644 api/helpers.py delete mode 100644 api/models.py delete mode 100644 api/templates/oauth/challenge.html delete mode 100644 api/templates/piston/authorize_token.html delete mode 100644 api/tests.py delete mode 100644 api/urls.py delete mode 100644 api/views.py delete mode 100644 catalogue/__init__.py delete mode 100755 catalogue/admin.py delete mode 100644 catalogue/forms.py delete mode 100755 catalogue/management/__init__.py delete mode 100755 catalogue/management/commands/__init__.py delete mode 100755 catalogue/management/commands/importlessons.py delete mode 100755 catalogue/management/commands/repackage.py delete mode 100644 catalogue/migrations/0001_initial.py delete mode 100644 catalogue/migrations/0002_auto__add_field_section_slug.py delete mode 100644 catalogue/migrations/0003_auto__chg_field_lesson_xml_file__chg_field_lesson_student_package__chg.py delete mode 100644 catalogue/migrations/0004_auto__add_part__add_attachment__add_field_lesson_pdf__add_field_lesson.py delete mode 100644 catalogue/migrations/0005_auto__add_field_lesson_dc.py delete mode 100644 catalogue/migrations/0006_auto__add_field_attachment_slug__add_field_attachment_ext__add_unique_.py delete mode 100644 catalogue/migrations/0007_auto__add_field_lesson_type__chg_field_lesson_section.py delete mode 100644 catalogue/migrations/0008_auto__del_field_lesson_depth.py delete mode 100644 catalogue/migrations/0009_auto__add_field_section_xml_file.py delete mode 100644 catalogue/migrations/0010_auto.py delete mode 100644 catalogue/migrations/0011_auto__chg_field_lesson_xml_file__chg_field_lesson_student_pdf__chg_fie.py delete mode 100644 catalogue/migrations/0012_auto__add_lessonstub.py delete mode 100644 catalogue/migrations/0013_auto__add_field_section_image.py delete mode 100644 catalogue/migrations/0014_auto__add_field_section_summary.py delete mode 100644 catalogue/migrations/0015_auto__add_field_lesson_description.py delete mode 100644 catalogue/migrations/0016_auto__add_field_section_pic__add_field_section_pic_attribution__add_fi.py delete mode 100644 catalogue/migrations/__init__.py delete mode 100644 catalogue/models.py delete mode 100755 catalogue/publish.py delete mode 100755 catalogue/search_indexes.py delete mode 100644 catalogue/static/catalogue/css/carousel.css delete mode 100755 catalogue/static/catalogue/css/carousel.scss delete mode 100644 catalogue/static/catalogue/css/exercise.css delete mode 100755 catalogue/static/catalogue/css/exercise.scss delete mode 100644 catalogue/static/catalogue/css/lesson.css delete mode 100755 catalogue/static/catalogue/css/lesson.scss delete mode 100644 catalogue/static/catalogue/css/section_list.css delete mode 100755 catalogue/static/catalogue/css/section_list.scss delete mode 100644 catalogue/static/catalogue/img/carousel-left.png delete mode 100644 catalogue/static/catalogue/img/carousel-right.png delete mode 100644 catalogue/static/catalogue/img/carousel/katarzyna-wlodarczyk.jpg delete mode 100755 catalogue/static/catalogue/js/carousel.js delete mode 100644 catalogue/static/catalogue/js/edumed.js delete mode 100644 catalogue/static/catalogue/js/jquery.cycle.all.js delete mode 100644 catalogue/static/catalogue/js/lesson-list.js delete mode 100755 catalogue/static/catalogue/js/lesson.js delete mode 100755 catalogue/templates/catalogue/latest_blog_posts.html delete mode 100644 catalogue/templates/catalogue/lesson/added-var/lesson_detail.html delete mode 100644 catalogue/templates/catalogue/lesson/added/lesson_detail.html delete mode 100755 catalogue/templates/catalogue/lesson/appendix/lesson_detail.html delete mode 100644 catalogue/templates/catalogue/lesson/box-icons.html delete mode 100755 catalogue/templates/catalogue/lesson/course/lesson_detail.html delete mode 100755 catalogue/templates/catalogue/lesson/lesson_detail.html delete mode 100755 catalogue/templates/catalogue/lesson/project/lesson_detail.html delete mode 100755 catalogue/templates/catalogue/lesson/synthetic/lesson_detail.html delete mode 100755 catalogue/templates/catalogue/lesson_list.html delete mode 100755 catalogue/templates/catalogue/section_detail.html delete mode 100755 catalogue/templates/catalogue/snippets/carousel.html delete mode 100755 catalogue/templates/catalogue/snippets/lesson_link.html delete mode 100755 catalogue/templates/catalogue/snippets/lesson_nav.html delete mode 100644 catalogue/templates/catalogue/snippets/lesson_or_stub.html delete mode 100755 catalogue/templates/catalogue/snippets/level_box.html delete mode 100644 catalogue/templates/catalogue/snippets/levels_main.html delete mode 100755 catalogue/templates/search/indexes/catalogue/lesson_text.txt delete mode 100755 catalogue/templatetags/__init__.py delete mode 100755 catalogue/templatetags/catalogue_tags.py delete mode 100644 catalogue/tests.py delete mode 100755 catalogue/urls.py delete mode 100644 catalogue/views.py delete mode 100644 comment/__init__.py delete mode 100644 comment/admin.py delete mode 100644 comment/locale/pl/LC_MESSAGES/django.mo delete mode 100644 comment/locale/pl/LC_MESSAGES/django.po delete mode 100644 comment/migrations/0001_initial.py delete mode 100644 comment/migrations/0002_auto__add_field_commentdocument_language_code.py delete mode 100644 comment/migrations/__init__.py delete mode 100644 comment/models.py delete mode 100644 comment/templates/comment/commentdocument_detail.html delete mode 100644 comment/templates/comment/commentdocument_list.html delete mode 100644 comment/urls.py delete mode 100644 comment/views.py delete mode 100644 curriculum/__init__.py delete mode 100755 curriculum/admin.py delete mode 100644 curriculum/fixtures/competences.json delete mode 100644 curriculum/fixtures/curriculum.json delete mode 100644 curriculum/locale/pl/LC_MESSAGES/django.mo delete mode 100644 curriculum/locale/pl/LC_MESSAGES/django.po delete mode 100644 curriculum/migrations/0001_initial.py delete mode 100644 curriculum/migrations/0002_auto__add_field_level_group.py delete mode 100644 curriculum/migrations/0003_auto__chg_field_level_slug.py delete mode 100644 curriculum/migrations/0004_auto__add_curriculum__add_curriculumlevel__add_curriculumcourse.py delete mode 100644 curriculum/migrations/0005_auto__add_field_curriculumcourse_accusative.py delete mode 100644 curriculum/migrations/0006_auto__add_field_competencelevel_description_pl__add_field_competencele.py delete mode 100644 curriculum/migrations/0007_translatable_fields_data_migration.py delete mode 100644 curriculum/migrations/0008_auto__del_field_competencelevel_description__del_field_section_name__d.py delete mode 100644 curriculum/migrations/0009_auto__chg_field_competencelevel_description_en__chg_field_competencele.py delete mode 100644 curriculum/migrations/0010_auto__add_field_level_meta_name.py delete mode 100644 curriculum/migrations/0011_meta_name.py delete mode 100644 curriculum/migrations/0012_auto__add_unique_level_meta_name__add_unique_level_slug.py delete mode 100644 curriculum/migrations/0013_auto__add_field_level_package__add_field_level_student_package.py delete mode 100644 curriculum/migrations/__init__.py delete mode 100644 curriculum/models.py delete mode 100644 curriculum/static/curriculum/curriculum.css delete mode 100755 curriculum/static/curriculum/curriculum.js delete mode 100755 curriculum/static/curriculum/curriculum.scss delete mode 100755 curriculum/templates/curriculum/competence_detail.html delete mode 100755 curriculum/templates/curriculum/competence_list.html delete mode 100755 curriculum/templates/curriculum/snippets/competence.html delete mode 100755 curriculum/templates/curriculum/snippets/course_box.html delete mode 100755 curriculum/templates/curriculum/snippets/course_boxes.html delete mode 100755 curriculum/templates/curriculum/snippets/course_boxes_toc.html delete mode 100755 curriculum/templates/curriculum/snippets/curriculum.html delete mode 100755 curriculum/templatetags/__init__.py delete mode 100755 curriculum/templatetags/curriculum_tags.py delete mode 100644 curriculum/tests.py delete mode 100755 curriculum/urls.py delete mode 100644 curriculum/views.py delete mode 100644 edumed/context_processors.py delete mode 100644 edumed/forms.py delete mode 100644 edumed/forum.py delete mode 100644 edumed/locale-contrib/django.pot delete mode 100644 edumed/locale-contrib/pl/LC_MESSAGES/django.mo delete mode 100644 edumed/locale-contrib/pl/LC_MESSAGES/django.po delete mode 100644 edumed/milurls.py delete mode 100644 edumed/static/catalogue/css/carousel.css delete mode 100755 edumed/static/catalogue/css/carousel.scss delete mode 100644 edumed/static/catalogue/css/lesson.css delete mode 100755 edumed/static/catalogue/css/lesson.scss delete mode 100644 edumed/static/catalogue/css/section_list.css delete mode 100755 edumed/static/catalogue/css/section_list.scss delete mode 100644 edumed/static/catalogue/img/carousel-left.png delete mode 100644 edumed/static/catalogue/img/carousel-right.png delete mode 100644 edumed/static/catalogue/img/carousel/katarzyna-wlodarczyk.jpg delete mode 100755 edumed/static/catalogue/js/carousel.js delete mode 100644 edumed/static/catalogue/js/jquery-ui-1.10.0.custom.js delete mode 100644 edumed/static/catalogue/js/jquery.cycle.all.js delete mode 100644 edumed/static/catalogue/js/lesson-list.js delete mode 100755 edumed/static/catalogue/js/lesson.js delete mode 100644 edumed/static/css/forum.css delete mode 100755 edumed/static/css/forum.scss delete mode 100644 edumed/static/css/mil.css delete mode 100644 edumed/static/css/mil.scss delete mode 100644 edumed/static/css/promobox.css delete mode 100755 edumed/static/css/promobox.scss delete mode 100644 edumed/static/img/logo-mil.png delete mode 100644 edumed/static/img/logo.png delete mode 100644 edumed/static/img/logo_fnp_white.png delete mode 100644 edumed/static/img/menu/katalog.png delete mode 100644 edumed/static/img/menu/katalog_active.png delete mode 100644 edumed/static/img/menu/kontakt.png delete mode 100644 edumed/static/img/menu/kontakt_active.png delete mode 100644 edumed/static/img/menu/lekcje.png delete mode 100644 edumed/static/img/menu/lekcje_active.png delete mode 100644 edumed/static/img/menu/mil/catalog.png delete mode 100644 edumed/static/img/menu/mil/consultations.png delete mode 100644 edumed/static/img/menu/mil/contact.png delete mode 100644 edumed/static/img/menu/mil/knowledgebase.png delete mode 100644 edumed/static/img/menu/mil/lang_en.png delete mode 100644 edumed/static/img/menu/mil/lang_pl.png delete mode 100644 edumed/static/img/menu/mil/takepart.png delete mode 100644 edumed/static/img/menu/o-nas.png delete mode 100644 edumed/static/img/menu/o-nas_active.png delete mode 100644 edumed/static/img/menu/szkolenia.png delete mode 100644 edumed/static/img/menu/szkolenia_active.png delete mode 100644 edumed/static/img/menu/wesprzyj.png delete mode 100644 edumed/static/img/menu/wesprzyj_active.png delete mode 100644 edumed/static/img/menu/wspolpraca.png delete mode 100644 edumed/static/img/menu/wspolpraca_active.png delete mode 100644 edumed/static/img/nina-white.png delete mode 100644 edumed/static/img/nina.jpg rename {catalogue/static/catalogue => edumed/static}/js/jquery-ui-1.10.0.custom.js (100%) delete mode 100644 edumed/templates/404_mil.html delete mode 100755 edumed/templates/base_forum.html delete mode 100644 edumed/templates/base_mil.html delete mode 100644 edumed/templates/contact/konkurs/mail_body.txt delete mode 100644 edumed/templates/contact/konkurs/mail_subject.txt delete mode 100644 edumed/templates/contact/konkurs/thanks.html delete mode 100644 edumed/templates/contact/sugestie/mail_body.txt delete mode 100644 edumed/templates/contact/sugestie/mail_subject.txt delete mode 100644 edumed/templates/contact/sugestie/thanks.html delete mode 100755 edumed/templates/contact/tem/mail_body.txt delete mode 100755 edumed/templates/contact/tem/mail_subject.txt delete mode 100755 edumed/templates/contact/tem/thanks.html delete mode 100644 edumed/templates/contact/wspolpraca/mail_body.txt delete mode 100644 edumed/templates/contact/wspolpraca/mail_subject.txt delete mode 100644 edumed/templates/contact/wspolpraca/thanks.html delete mode 100755 edumed/templates/contact/wtem/form.html delete mode 100755 edumed/templates/contact/wtem/mail_body.txt delete mode 100755 edumed/templates/contact/wtem/mail_subject.txt delete mode 100644 edumed/templates/contact/wtem/student_mail_body.html delete mode 100644 edumed/templates/contact/wtem/student_mail_subject.html delete mode 100755 edumed/templates/contact/wtem/thanks.html delete mode 100644 edumed/templates/flatpages/mil.html delete mode 100755 edumed/templates/home.html delete mode 100644 edumed/templates/home_mil.html delete mode 100644 edumed/templates/olimpiada_teaser.html delete mode 100755 edumed/templates/pybb/_need_to_login_message.html delete mode 100755 edumed/templates/pybb/avatar.html delete mode 100755 edumed/templates/pybb/breadcrumb.html delete mode 100755 edumed/templates/pybb/breadcrumb_top_extra_crumb.html delete mode 100644 forum/__init__.py delete mode 100644 forum/forms.py delete mode 100644 forum/locale/pl/LC_MESSAGES/django.mo delete mode 100644 forum/locale/pl/LC_MESSAGES/django.po delete mode 100644 forum/middleware.py delete mode 100644 forum/migrations/0001_initial.py delete mode 100644 forum/migrations/__init__.py delete mode 100644 forum/models.py delete mode 100644 forum/search_indexes.py delete mode 100644 forum/templates/forum/related_lesson_info.html delete mode 100644 forum/templates/forum/search_results.html delete mode 100644 forum/templates/pybb/category.html delete mode 100644 forum/templates/pybb/forum_last_update_info.html delete mode 100644 forum/templates/pybb/post_form.html delete mode 100644 forum/templates/pybb/topic.html delete mode 100644 forum/templates/pybb/topic_last_message_info.html delete mode 100644 forum/templates/search/indexes/pybb/post_text.txt delete mode 100644 forum/urls.py delete mode 100644 forum/views.py delete mode 160000 lib/librarian delete mode 100644 publishers/__init__.py delete mode 100644 publishers/admin.py delete mode 100644 publishers/migrations/0001_initial.py delete mode 100644 publishers/migrations/__init__.py delete mode 100644 publishers/models.py diff --git a/api/__init__.py b/api/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/api/admin.py b/api/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/api/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/api/handlers.py b/api/handlers.py deleted file mode 100644 index 5746b0c..0000000 --- a/api/handlers.py +++ /dev/null @@ -1,62 +0,0 @@ -# -*- coding: utf-8 -*- -import json - -from django.contrib.sites.models import Site -from django.core.urlresolvers import reverse -from django.utils.functional import lazy -from piston.handler import BaseHandler -from piston.utils import rc - -from catalogue.forms import LessonImportForm -from catalogue.models import Lesson - -API_BASE = EDUMED_BASE = MEDIA_BASE = lazy( - lambda: u'https://' + Site.objects.get_current().domain, unicode)() - - -class LessonDetails(object): - """Custom fields used for representing Lessons.""" - - @classmethod - def href(cls, lesson): - """ Returns an URI for a Lesson in the API. """ - return API_BASE + reverse("api_lesson", args=[lesson.slug]) - - @classmethod - def url(cls, lesson): - """ Returns Lesson's URL on the site. """ - return EDUMED_BASE + lesson.get_absolute_url() - - -class LessonDetailHandler(BaseHandler, LessonDetails): - """ Main handler for Lesson objects. - - Responsible for single Lesson details. - """ - allowed_methods = ['GET'] - fields = ['title', 'url'] - - def read(self, request, lesson): - """ Returns details of a lesson, identified by a slug. """ - try: - return Lesson.objects.get(slug=lesson) - except Lesson.DoesNotExist: - return rc.NOT_FOUND - - -class LessonsHandler(LessonDetailHandler): - allowed_methods = ('GET', 'POST') - model = Lesson - fields = ['href', 'title', 'url'] - - def create(self, request, *args, **kwargs): - if not request.user.has_perm('catalogue.add_lesson'): - return rc.FORBIDDEN - - data = json.loads(request.POST.get('data')) - form = LessonImportForm(data) - if form.is_valid(): - form.save() - return rc.CREATED - else: - return rc.NOT_FOUND diff --git a/api/helpers.py b/api/helpers.py deleted file mode 100644 index a40373a..0000000 --- a/api/helpers.py +++ /dev/null @@ -1,9 +0,0 @@ -# -*- coding: utf-8 -*- -from piston.resource import Resource - - -class CsrfExemptResource(Resource): - """A Custom Resource that is csrf exempt""" - def __init__(self, handler, authentication=None): - super(CsrfExemptResource, self).__init__(handler, authentication) - self.csrf_exempt = getattr(self.handler, 'csrf_exempt', True) \ No newline at end of file diff --git a/api/models.py b/api/models.py deleted file mode 100644 index 71a8362..0000000 --- a/api/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/api/templates/oauth/challenge.html b/api/templates/oauth/challenge.html deleted file mode 100644 index e69de29..0000000 diff --git a/api/templates/piston/authorize_token.html b/api/templates/piston/authorize_token.html deleted file mode 100644 index 0151b58..0000000 --- a/api/templates/piston/authorize_token.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block titleextra %}Zezwól na dostęp do Edukacji Medialnej{% endblock %} - -{% block body %} -

    Zezwól na dostęp do Edukacji Medialnej

    - -
    -

    - Potwierdź dostęp do Edukacji Medialnej jako użytkownik {{ user }}. -

    - - - {% csrf_token %} - {{ form.as_p }} - - -
    -{% endblock %} diff --git a/api/tests.py b/api/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/api/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/api/urls.py b/api/urls.py deleted file mode 100644 index a111872..0000000 --- a/api/urls.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -from django.conf.urls import patterns, url -from django.views.decorators.csrf import csrf_exempt -from piston.authentication import OAuthAuthentication, oauth_access_token -from piston.resource import Resource - -from api import handlers -from api.helpers import CsrfExemptResource - -auth = OAuthAuthentication(realm="Edukacja Medialna") - -lesson_list_resource = CsrfExemptResource(handler=handlers.LessonsHandler, authentication=auth) -lesson_resource = Resource(handler=handlers.LessonDetailHandler) - -urlpatterns = patterns( - 'piston.authentication', - url(r'^oauth/request_token/$', 'oauth_request_token'), - url(r'^oauth/authorize/$', 'oauth_user_auth'), - url(r'^oauth/access_token/$', csrf_exempt(oauth_access_token)), -) - -urlpatterns += patterns( - '', - # url(r'^$', TemplateView.as_view(template_name='api/main.html'), name='api'), - - # objects details - url(r'^lessons/(?P[a-z0-9-]+)/$', lesson_resource, name="api_lesson"), - - # lessons - url(r'^lessons/$', lesson_list_resource, name='api_lesson_list'), -) diff --git a/api/views.py b/api/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/api/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/catalogue/__init__.py b/catalogue/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/catalogue/admin.py b/catalogue/admin.py deleted file mode 100755 index 8256d66..0000000 --- a/catalogue/admin.py +++ /dev/null @@ -1,17 +0,0 @@ -# -*- coding: utf-8 -*- -from django.contrib import admin -from .models import Attachment, Section, Lesson, LessonStub - - -class AttachmentInline(admin.TabularInline): - model = Attachment - - -class LessonAdmin(admin.ModelAdmin): - inlines = [AttachmentInline] - list_display = ['title', 'section', 'type'] - list_filter = ['level', 'type'] - -admin.site.register(Section) -admin.site.register(Lesson, LessonAdmin) -admin.site.register(LessonStub) diff --git a/catalogue/forms.py b/catalogue/forms.py deleted file mode 100644 index 7230b23..0000000 --- a/catalogue/forms.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -import json -import os.path -import shutil -import urllib -from tempfile import mkdtemp - -from django.forms import Form, CharField - -from librarian import IOFile -from catalogue.models import Lesson - - -class LessonImportForm(Form): - lesson_xml = CharField() - gallery_url = CharField(required=False) - attachments = CharField(required=False) - - def save(self): - temp_dir = mkdtemp() - attachment_names = json.loads(self.cleaned_data['attachments']) - attachments = {} - remote_gallery_url = self.cleaned_data['gallery_url'] - if remote_gallery_url and attachment_names: - for attachment_name in attachment_names: - attachment_url = ('%s%s' % (remote_gallery_url, attachment_name)).encode('utf-8') - temp_filename = os.path.join(temp_dir, attachment_name) - urllib.urlretrieve(attachment_url, temp_filename) - attachments[attachment_name] = IOFile.from_filename(temp_filename) - - lesson = Lesson.publish( - IOFile.from_string(self.cleaned_data['lesson_xml'], attachments=attachments)) - if os.path.isdir(temp_dir): - shutil.rmtree(temp_dir) - return lesson diff --git a/catalogue/management/__init__.py b/catalogue/management/__init__.py deleted file mode 100755 index e69de29..0000000 diff --git a/catalogue/management/commands/__init__.py b/catalogue/management/commands/__init__.py deleted file mode 100755 index e69de29..0000000 diff --git a/catalogue/management/commands/importlessons.py b/catalogue/management/commands/importlessons.py deleted file mode 100755 index d4733d3..0000000 --- a/catalogue/management/commands/importlessons.py +++ /dev/null @@ -1,144 +0,0 @@ -# -*- coding: utf-8 -*- -# This file is part of EduMed, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. -# -import os -import sys -from optparse import make_option - -from django.core.management.base import BaseCommand -from django.db import transaction - -from catalogue.models import Lesson, Section -from librarian import IOFile - - -class Command(BaseCommand): - option_list = BaseCommand.option_list + ( - make_option('-q', '--quiet', action='store_false', dest='verbose', default=True, - help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'), - make_option('-a', '--attachments', dest='attachments', metavar="PATH", default='materialy', - help='Attachments dir path.'), - make_option('--ignore-incomplete', action='store_true', dest='ignore_incomplete', default=False, - help='Attachments dir path.'), - ) - help = 'Imports lessons from the specified directories.' - args = 'directory [directory ...]' - - def __init__(self): - super(Command, self).__init__() - self.options = None - self.levels = None - - @staticmethod - def all_attachments(path): - files = {} - if not os.path.isdir(path): - return files - - def read_dir(path): - for name in os.listdir(path): - fullname = os.path.join(path, name) - if os.path.isdir(fullname): - read_dir(fullname) - else: - f = IOFile.from_filename(fullname) - files[name.decode('utf-8')] = f - files.setdefault(name.replace(" ", "").decode('utf-8'), f) - - read_dir(path) - return files - - @transaction.atomic - def handle(self, *directories, **options): - - self.levels = set() - - curdir = os.path.abspath(os.curdir) - self.options = options - - files_imported = 0 - files_skipped = 0 - - for dir_name in directories: - abs_dir = os.path.join(curdir, dir_name) - if not os.path.isdir(abs_dir): - print self.style.ERROR("%s: Not a directory. Skipping." % abs_dir) - else: - files_imported_dir, files_skipped_dir = self.import_from_dir(abs_dir) - files_imported += files_imported_dir - files_skipped += files_skipped_dir - - if self.levels: - print "Rebuilding level packages:" - for level in self.levels: - print level.name - level.build_packages() - - # Print results - print - print "Results: %d files imported, %d skipped, %d total." % ( - files_imported, files_skipped, files_imported + files_skipped) - print - - def import_from_dir(self, abs_dir): - verbose = self.options.get('verbose') - files_imported = 0 - files_skipped = 0 - att_dir = os.path.join(abs_dir, self.options['attachments']) - attachments = self.all_attachments(att_dir) - # files queue - files = sorted(os.listdir(abs_dir)) - postponed = {} - ignore_incomplete = set() - while files: - file_name = files.pop(0) - file_path = os.path.join(abs_dir, file_name) - file_base, ext = os.path.splitext(file_path) - - if os.path.isdir(file_path): - dir_imported, dir_skipped = self.import_from_dir(file_path) - files_imported += dir_imported - files_skipped += files_skipped - continue - - # Skip files that are not XML files - if not ext == '.xml': - continue - - if verbose > 0: - print "Parsing '%s'" % file_path - else: - sys.stdout.write('.') - sys.stdout.flush() - - try: - iofile = IOFile.from_filename(file_path) - iofile.attachments = attachments - lesson = Lesson.publish(iofile, file_name in ignore_incomplete) - except Section.IncompleteError: - if file_name not in postponed or postponed[file_name] < files_imported: - # Push it back into the queue, maybe the missing lessons will show up. - if verbose > 0: - print self.style.NOTICE('Waiting for missing lessons.') - files.append(file_name) - postponed[file_name] = files_imported - elif self.options['ignore_incomplete'] and file_name not in ignore_incomplete: - files.append(file_name) - ignore_incomplete.add(file_name) - postponed[file_name] = files_imported - else: - # We're in a loop, nothing's being imported - some lesson is really missing. - raise - except BaseException: - import traceback - traceback.print_exc() - files_skipped += 1 - else: - files_imported += 1 - if hasattr(lesson, 'level'): - self.levels.add(lesson.level) - finally: - if verbose > 0: - print - return files_imported, files_skipped diff --git a/catalogue/management/commands/repackage.py b/catalogue/management/commands/repackage.py deleted file mode 100755 index a2851f6..0000000 --- a/catalogue/management/commands/repackage.py +++ /dev/null @@ -1,15 +0,0 @@ -# -*- coding: utf-8 -*- -# This file is part of EduMed, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. -# -from django.core.management.base import BaseCommand - - -class Command(BaseCommand): - help = 'Rebuilds downloadable packages.' - - def handle(self, **options): - from curriculum.models import Level - - for level in Level.objects.all(): - level.build_packages() diff --git a/catalogue/migrations/0001_initial.py b/catalogue/migrations/0001_initial.py deleted file mode 100644 index 846c559..0000000 --- a/catalogue/migrations/0001_initial.py +++ /dev/null @@ -1,74 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding model 'Section' - db.create_table('catalogue_section', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('title', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('order', self.gf('django.db.models.fields.IntegerField')()), - )) - db.send_create_signal('catalogue', ['Section']) - - # Adding model 'Lesson' - db.create_table('catalogue_lesson', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('section', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Section'])), - ('level', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['curriculum.Level'])), - ('title', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('slug', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=50)), - ('depth', self.gf('django.db.models.fields.IntegerField')()), - ('order', self.gf('django.db.models.fields.IntegerField')()), - ('xml_file', self.gf('django.db.models.fields.files.FileField')(max_length=100)), - ('package', self.gf('django.db.models.fields.files.FileField')(max_length=100)), - ('student_package', self.gf('django.db.models.fields.files.FileField')(max_length=100)), - ('html_file', self.gf('django.db.models.fields.files.FileField')(max_length=100)), - )) - db.send_create_signal('catalogue', ['Lesson']) - - - def backwards(self, orm): - # Deleting model 'Section' - db.delete_table('catalogue_section') - - # Deleting model 'Lesson' - db.delete_table('catalogue_lesson') - - - models = { - 'catalogue.lesson': { - 'Meta': {'ordering': "['section', 'level', 'depth', 'order']", 'object_name': 'Lesson'}, - 'depth': ('django.db.models.fields.IntegerField', [], {}), - 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}) - }, - 'catalogue.section': { - 'Meta': {'object_name': 'Section'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['catalogue'] \ No newline at end of file diff --git a/catalogue/migrations/0002_auto__add_field_section_slug.py b/catalogue/migrations/0002_auto__add_field_section_slug.py deleted file mode 100644 index 4b7ef4c..0000000 --- a/catalogue/migrations/0002_auto__add_field_section_slug.py +++ /dev/null @@ -1,53 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Section.slug' - db.add_column('catalogue_section', 'slug', - self.gf('django.db.models.fields.SlugField')(default='x', max_length=50), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'Section.slug' - db.delete_column('catalogue_section', 'slug') - - - models = { - 'catalogue.lesson': { - 'Meta': {'ordering': "['section', 'level', 'depth', 'order']", 'object_name': 'Lesson'}, - 'depth': ('django.db.models.fields.IntegerField', [], {}), - 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}) - }, - 'catalogue.section': { - 'Meta': {'object_name': 'Section'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['catalogue'] \ No newline at end of file diff --git a/catalogue/migrations/0003_auto__chg_field_lesson_xml_file__chg_field_lesson_student_package__chg.py b/catalogue/migrations/0003_auto__chg_field_lesson_xml_file__chg_field_lesson_student_package__chg.py deleted file mode 100644 index 8be90a8..0000000 --- a/catalogue/migrations/0003_auto__chg_field_lesson_xml_file__chg_field_lesson_student_package__chg.py +++ /dev/null @@ -1,81 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'Lesson.xml_file' - db.alter_column('catalogue_lesson', 'xml_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) - - # Changing field 'Lesson.student_package' - db.alter_column('catalogue_lesson', 'student_package', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) - - # Changing field 'Lesson.package' - db.alter_column('catalogue_lesson', 'package', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) - - # Changing field 'Lesson.html_file' - db.alter_column('catalogue_lesson', 'html_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) - # Adding unique constraint on 'Section', fields ['title'] - db.create_unique('catalogue_section', ['title']) - - # Adding unique constraint on 'Section', fields ['slug'] - db.create_unique('catalogue_section', ['slug']) - - - def backwards(self, orm): - # Removing unique constraint on 'Section', fields ['slug'] - db.delete_unique('catalogue_section', ['slug']) - - # Removing unique constraint on 'Section', fields ['title'] - db.delete_unique('catalogue_section', ['title']) - - - # User chose to not deal with backwards NULL issues for 'Lesson.xml_file' - raise RuntimeError("Cannot reverse this migration. 'Lesson.xml_file' and its values cannot be restored.") - - # User chose to not deal with backwards NULL issues for 'Lesson.student_package' - raise RuntimeError("Cannot reverse this migration. 'Lesson.student_package' and its values cannot be restored.") - - # User chose to not deal with backwards NULL issues for 'Lesson.package' - raise RuntimeError("Cannot reverse this migration. 'Lesson.package' and its values cannot be restored.") - - # User chose to not deal with backwards NULL issues for 'Lesson.html_file' - raise RuntimeError("Cannot reverse this migration. 'Lesson.html_file' and its values cannot be restored.") - - models = { - 'catalogue.lesson': { - 'Meta': {'ordering': "['section', 'level', 'depth', 'order']", 'object_name': 'Lesson'}, - 'depth': ('django.db.models.fields.IntegerField', [], {}), - 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.section': { - 'Meta': {'object_name': 'Section'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}) - }, - 'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['catalogue'] \ No newline at end of file diff --git a/catalogue/migrations/0004_auto__add_part__add_attachment__add_field_lesson_pdf__add_field_lesson.py b/catalogue/migrations/0004_auto__add_part__add_attachment__add_field_lesson_pdf__add_field_lesson.py deleted file mode 100644 index 59ae0d7..0000000 --- a/catalogue/migrations/0004_auto__add_part__add_attachment__add_field_lesson_pdf__add_field_lesson.py +++ /dev/null @@ -1,99 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding model 'Part' - db.create_table('catalogue_part', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('lesson', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Lesson'])), - ('pdf', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True, blank=True)), - ('student_pdf', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True, blank=True)), - )) - db.send_create_signal('catalogue', ['Part']) - - # Adding model 'Attachment' - db.create_table('catalogue_attachment', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('lesson', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Lesson'])), - ('file', self.gf('django.db.models.fields.files.FileField')(max_length=100)), - )) - db.send_create_signal('catalogue', ['Attachment']) - - # Adding field 'Lesson.pdf' - db.add_column('catalogue_lesson', 'pdf', - self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True, blank=True), - keep_default=False) - - # Adding field 'Lesson.student_pdf' - db.add_column('catalogue_lesson', 'student_pdf', - self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True, blank=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting model 'Part' - db.delete_table('catalogue_part') - - # Deleting model 'Attachment' - db.delete_table('catalogue_attachment') - - # Deleting field 'Lesson.pdf' - db.delete_column('catalogue_lesson', 'pdf') - - # Deleting field 'Lesson.student_pdf' - db.delete_column('catalogue_lesson', 'student_pdf') - - - models = { - 'catalogue.attachment': { - 'Meta': {'object_name': 'Attachment'}, - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}) - }, - 'catalogue.lesson': { - 'Meta': {'ordering': "['section', 'level', 'depth', 'order']", 'object_name': 'Lesson'}, - 'depth': ('django.db.models.fields.IntegerField', [], {}), - 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.part': { - 'Meta': {'object_name': 'Part'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}) - }, - 'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['catalogue'] \ No newline at end of file diff --git a/catalogue/migrations/0005_auto__add_field_lesson_dc.py b/catalogue/migrations/0005_auto__add_field_lesson_dc.py deleted file mode 100644 index ce7705f..0000000 --- a/catalogue/migrations/0005_auto__add_field_lesson_dc.py +++ /dev/null @@ -1,69 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Lesson.dc' - db.add_column('catalogue_lesson', 'dc', - self.gf('jsonfield.fields.JSONField')(default='{}'), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'Lesson.dc' - db.delete_column('catalogue_lesson', 'dc') - - - models = { - 'catalogue.attachment': { - 'Meta': {'object_name': 'Attachment'}, - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}) - }, - 'catalogue.lesson': { - 'Meta': {'ordering': "['section', 'level', 'depth', 'order']", 'object_name': 'Lesson'}, - 'dc': ('jsonfield.fields.JSONField', [], {'default': "'{}'"}), - 'depth': ('django.db.models.fields.IntegerField', [], {}), - 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.part': { - 'Meta': {'object_name': 'Part'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}) - }, - 'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['catalogue'] \ No newline at end of file diff --git a/catalogue/migrations/0006_auto__add_field_attachment_slug__add_field_attachment_ext__add_unique_.py b/catalogue/migrations/0006_auto__add_field_attachment_slug__add_field_attachment_ext__add_unique_.py deleted file mode 100644 index 043627d..0000000 --- a/catalogue/migrations/0006_auto__add_field_attachment_slug__add_field_attachment_ext__add_unique_.py +++ /dev/null @@ -1,85 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Attachment.slug' - db.add_column('catalogue_attachment', 'slug', - self.gf('django.db.models.fields.CharField')(default='', max_length=255), - keep_default=False) - - # Adding field 'Attachment.ext' - db.add_column('catalogue_attachment', 'ext', - self.gf('django.db.models.fields.CharField')(default='', max_length=15), - keep_default=False) - - # Adding unique constraint on 'Attachment', fields ['ext', 'lesson', 'slug'] - db.create_unique('catalogue_attachment', ['ext', 'lesson_id', 'slug']) - - - def backwards(self, orm): - # Removing unique constraint on 'Attachment', fields ['ext', 'lesson', 'slug'] - db.delete_unique('catalogue_attachment', ['ext', 'lesson_id', 'slug']) - - # Deleting field 'Attachment.slug' - db.delete_column('catalogue_attachment', 'slug') - - # Deleting field 'Attachment.ext' - db.delete_column('catalogue_attachment', 'ext') - - - models = { - 'catalogue.attachment': { - 'Meta': {'unique_together': "(['lesson', 'slug', 'ext'],)", 'object_name': 'Attachment'}, - 'ext': ('django.db.models.fields.CharField', [], {'max_length': '15'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'catalogue.lesson': { - 'Meta': {'ordering': "['section', 'level', 'depth', 'order']", 'object_name': 'Lesson'}, - 'dc': ('jsonfield.fields.JSONField', [], {'default': "'{}'"}), - 'depth': ('django.db.models.fields.IntegerField', [], {}), - 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.part': { - 'Meta': {'object_name': 'Part'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}) - }, - 'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['catalogue'] \ No newline at end of file diff --git a/catalogue/migrations/0007_auto__add_field_lesson_type__chg_field_lesson_section.py b/catalogue/migrations/0007_auto__add_field_lesson_type__chg_field_lesson_section.py deleted file mode 100644 index 25204db..0000000 --- a/catalogue/migrations/0007_auto__add_field_lesson_type__chg_field_lesson_section.py +++ /dev/null @@ -1,96 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Lesson.type' - db.add_column('catalogue_lesson', 'type', - self.gf('django.db.models.fields.CharField')(default='course', max_length=15, db_index=True), - keep_default=False) - - # Changing field 'Lesson.section' - db.alter_column('catalogue_lesson', 'section_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Section'], null=True)) - # Adding index on 'Lesson', fields ['order'] - db.create_index('catalogue_lesson', ['order']) - - if not db.dry_run: - orm.Lesson.objects.filter(depth=0).update(type='synthetic') - - - def backwards(self, orm): - # Removing index on 'Lesson', fields ['order'] - db.delete_index('catalogue_lesson', ['order']) - - # Deleting field 'Lesson.type' - db.delete_column('catalogue_lesson', 'type') - - section = 0 - if not db.dry_run: - orm.Lesson.objects.filter(type='synthetic').update(depth=0) - try: - section = orm.Section.objects.all()[0] - except orm.Section.DoesNotExist: - pass - - # Changing field 'Lesson.section' - db.alter_column('catalogue_lesson', 'section_id', - self.gf('django.db.models.fields.related.ForeignKey')(default=section, to=orm['catalogue.Section'])) - - - models = { - 'catalogue.attachment': { - 'Meta': {'ordering': "['slug', 'ext']", 'unique_together': "(['lesson', 'slug', 'ext'],)", 'object_name': 'Attachment'}, - 'ext': ('django.db.models.fields.CharField', [], {'max_length': '15'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'catalogue.lesson': { - 'Meta': {'ordering': "['section', 'level', 'order']", 'object_name': 'Lesson'}, - 'dc': ('jsonfield.fields.JSONField', [], {'default': "'{}'"}), - 'depth': ('django.db.models.fields.IntegerField', [], {}), - 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Section']", 'null': 'True', 'blank': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.part': { - 'Meta': {'object_name': 'Part'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}) - }, - 'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - } - } - - complete_apps = ['catalogue'] diff --git a/catalogue/migrations/0008_auto__del_field_lesson_depth.py b/catalogue/migrations/0008_auto__del_field_lesson_depth.py deleted file mode 100644 index 4bd650f..0000000 --- a/catalogue/migrations/0008_auto__del_field_lesson_depth.py +++ /dev/null @@ -1,72 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Deleting field 'Lesson.depth' - db.delete_column('catalogue_lesson', 'depth') - - - def backwards(self, orm): - # Adding field 'Lesson.depth' - db.add_column('catalogue_lesson', 'depth', - self.gf('django.db.models.fields.IntegerField')(default=1), - keep_default=False) - - - models = { - 'catalogue.attachment': { - 'Meta': {'ordering': "['slug', 'ext']", 'unique_together': "(['lesson', 'slug', 'ext'],)", 'object_name': 'Attachment'}, - 'ext': ('django.db.models.fields.CharField', [], {'max_length': '15'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'catalogue.lesson': { - 'Meta': {'ordering': "['section', 'level', 'order']", 'object_name': 'Lesson'}, - 'dc': ('jsonfield.fields.JSONField', [], {'default': "'{}'"}), - 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Section']", 'null': 'True', 'blank': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.part': { - 'Meta': {'object_name': 'Part'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}) - }, - 'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - } - } - - complete_apps = ['catalogue'] diff --git a/catalogue/migrations/0009_auto__add_field_section_xml_file.py b/catalogue/migrations/0009_auto__add_field_section_xml_file.py deleted file mode 100644 index 6686e5c..0000000 --- a/catalogue/migrations/0009_auto__add_field_section_xml_file.py +++ /dev/null @@ -1,73 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Section.xml_file' - db.add_column('catalogue_section', 'xml_file', - self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True, blank=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'Section.xml_file' - db.delete_column('catalogue_section', 'xml_file') - - - models = { - 'catalogue.attachment': { - 'Meta': {'ordering': "['slug', 'ext']", 'unique_together': "(['lesson', 'slug', 'ext'],)", 'object_name': 'Attachment'}, - 'ext': ('django.db.models.fields.CharField', [], {'max_length': '15'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'catalogue.lesson': { - 'Meta': {'ordering': "['section', 'level', 'order']", 'object_name': 'Lesson'}, - 'dc': ('jsonfield.fields.JSONField', [], {'default': "'{}'"}), - 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Section']", 'null': 'True', 'blank': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.part': { - 'Meta': {'object_name': 'Part'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - } - } - - complete_apps = ['catalogue'] \ No newline at end of file diff --git a/catalogue/migrations/0010_auto.py b/catalogue/migrations/0010_auto.py deleted file mode 100644 index 73602ca..0000000 --- a/catalogue/migrations/0010_auto.py +++ /dev/null @@ -1,83 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding M2M table for field curriculum_courses on 'Lesson' - db.create_table('catalogue_lesson_curriculum_courses', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('lesson', models.ForeignKey(orm['catalogue.lesson'], null=False)), - ('curriculumcourse', models.ForeignKey(orm['curriculum.curriculumcourse'], null=False)) - )) - db.create_unique('catalogue_lesson_curriculum_courses', ['lesson_id', 'curriculumcourse_id']) - - - def backwards(self, orm): - # Removing M2M table for field curriculum_courses on 'Lesson' - db.delete_table('catalogue_lesson_curriculum_courses') - - - models = { - 'catalogue.attachment': { - 'Meta': {'ordering': "['slug', 'ext']", 'unique_together': "(['lesson', 'slug', 'ext'],)", 'object_name': 'Attachment'}, - 'ext': ('django.db.models.fields.CharField', [], {'max_length': '15'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'catalogue.lesson': { - 'Meta': {'ordering': "['section', 'level', 'order']", 'object_name': 'Lesson'}, - 'curriculum_courses': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['curriculum.CurriculumCourse']", 'symmetrical': 'False'}), - 'dc': ('jsonfield.fields.JSONField', [], {'default': "'{}'"}), - 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Section']", 'null': 'True', 'blank': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.part': { - 'Meta': {'object_name': 'Part'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'curriculum.curriculumcourse': { - 'Meta': {'object_name': 'CurriculumCourse'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - } - } - - complete_apps = ['catalogue'] \ No newline at end of file diff --git a/catalogue/migrations/0011_auto__chg_field_lesson_xml_file__chg_field_lesson_student_pdf__chg_fie.py b/catalogue/migrations/0011_auto__chg_field_lesson_xml_file__chg_field_lesson_student_pdf__chg_fie.py deleted file mode 100644 index 5963f2b..0000000 --- a/catalogue/migrations/0011_auto__chg_field_lesson_xml_file__chg_field_lesson_student_pdf__chg_fie.py +++ /dev/null @@ -1,127 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'Lesson.xml_file' - db.alter_column('catalogue_lesson', 'xml_file', self.gf('django.db.models.fields.files.FileField')(max_length=255, null=True)) - - # Changing field 'Lesson.student_pdf' - db.alter_column('catalogue_lesson', 'student_pdf', self.gf('django.db.models.fields.files.FileField')(max_length=255, null=True)) - - # Changing field 'Lesson.student_package' - db.alter_column('catalogue_lesson', 'student_package', self.gf('django.db.models.fields.files.FileField')(max_length=255, null=True)) - - # Changing field 'Lesson.package' - db.alter_column('catalogue_lesson', 'package', self.gf('django.db.models.fields.files.FileField')(max_length=255, null=True)) - - # Changing field 'Lesson.html_file' - db.alter_column('catalogue_lesson', 'html_file', self.gf('django.db.models.fields.files.FileField')(max_length=255, null=True)) - - # Changing field 'Lesson.pdf' - db.alter_column('catalogue_lesson', 'pdf', self.gf('django.db.models.fields.files.FileField')(max_length=255, null=True)) - - # Changing field 'Lesson.slug' - db.alter_column('catalogue_lesson', 'slug', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=255)) - - # Changing field 'Section.xml_file' - db.alter_column('catalogue_section', 'xml_file', self.gf('django.db.models.fields.files.FileField')(max_length=255, null=True)) - - # Changing field 'Section.slug' - db.alter_column('catalogue_section', 'slug', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=255)) - - def backwards(self, orm): - - # Changing field 'Lesson.xml_file' - db.alter_column('catalogue_lesson', 'xml_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) - - # Changing field 'Lesson.student_pdf' - db.alter_column('catalogue_lesson', 'student_pdf', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) - - # Changing field 'Lesson.student_package' - db.alter_column('catalogue_lesson', 'student_package', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) - - # Changing field 'Lesson.package' - db.alter_column('catalogue_lesson', 'package', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) - - # Changing field 'Lesson.html_file' - db.alter_column('catalogue_lesson', 'html_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) - - # Changing field 'Lesson.pdf' - db.alter_column('catalogue_lesson', 'pdf', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) - - # Changing field 'Lesson.slug' - db.alter_column('catalogue_lesson', 'slug', self.gf('django.db.models.fields.SlugField')(max_length=50, unique=True)) - - # Changing field 'Section.xml_file' - db.alter_column('catalogue_section', 'xml_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) - - # Changing field 'Section.slug' - db.alter_column('catalogue_section', 'slug', self.gf('django.db.models.fields.SlugField')(max_length=50, unique=True)) - - models = { - 'catalogue.attachment': { - 'Meta': {'ordering': "['slug', 'ext']", 'unique_together': "(['lesson', 'slug', 'ext'],)", 'object_name': 'Attachment'}, - 'ext': ('django.db.models.fields.CharField', [], {'max_length': '15'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'catalogue.lesson': { - 'Meta': {'ordering': "['section', 'level', 'order']", 'object_name': 'Lesson'}, - 'curriculum_courses': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['curriculum.CurriculumCourse']", 'symmetrical': 'False'}), - 'dc': ('jsonfield.fields.JSONField', [], {'default': "'{}'"}), - 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Section']", 'null': 'True', 'blank': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.part': { - 'Meta': {'object_name': 'Part'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}), - 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) - }, - 'curriculum.curriculumcourse': { - 'Meta': {'ordering': "['slug']", 'object_name': 'CurriculumCourse'}, - 'accusative': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - } - } - - complete_apps = ['catalogue'] \ No newline at end of file diff --git a/catalogue/migrations/0012_auto__add_lessonstub.py b/catalogue/migrations/0012_auto__add_lessonstub.py deleted file mode 100644 index d8e53bb..0000000 --- a/catalogue/migrations/0012_auto__add_lessonstub.py +++ /dev/null @@ -1,96 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding model 'LessonStub' - db.create_table('catalogue_lessonstub', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('section', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Section'], null=True, blank=True)), - ('level', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['curriculum.Level'])), - ('title', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('type', self.gf('django.db.models.fields.CharField')(max_length=15, db_index=True)), - ('order', self.gf('django.db.models.fields.IntegerField')(db_index=True)), - )) - db.send_create_signal('catalogue', ['LessonStub']) - - - def backwards(self, orm): - # Deleting model 'LessonStub' - db.delete_table('catalogue_lessonstub') - - - models = { - 'catalogue.attachment': { - 'Meta': {'ordering': "['slug', 'ext']", 'unique_together': "(['lesson', 'slug', 'ext'],)", 'object_name': 'Attachment'}, - 'ext': ('django.db.models.fields.CharField', [], {'max_length': '15'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'catalogue.lesson': { - 'Meta': {'ordering': "['section', 'level', 'order']", 'object_name': 'Lesson'}, - 'curriculum_courses': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['curriculum.CurriculumCourse']", 'symmetrical': 'False'}), - 'dc': ('jsonfield.fields.JSONField', [], {'default': "'{}'"}), - 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Section']", 'null': 'True', 'blank': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.lessonstub': { - 'Meta': {'ordering': "['section', 'level', 'order']", 'object_name': 'LessonStub'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Section']", 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}) - }, - 'catalogue.part': { - 'Meta': {'object_name': 'Part'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Lesson']"}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - 'catalogue.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}), - 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) - }, - 'curriculum.curriculumcourse': { - 'Meta': {'ordering': "['slug']", 'object_name': 'CurriculumCourse'}, - 'accusative': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - } - } - - complete_apps = ['catalogue'] \ No newline at end of file diff --git a/catalogue/migrations/0013_auto__add_field_section_image.py b/catalogue/migrations/0013_auto__add_field_section_image.py deleted file mode 100644 index e097d57..0000000 --- a/catalogue/migrations/0013_auto__add_field_section_image.py +++ /dev/null @@ -1,91 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Section.image' - db.add_column(u'catalogue_section', 'image', - self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True, blank=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'Section.image' - db.delete_column(u'catalogue_section', 'image') - - - models = { - u'catalogue.attachment': { - 'Meta': {'ordering': "['slug', 'ext']", 'unique_together': "(['lesson', 'slug', 'ext'],)", 'object_name': 'Attachment'}, - 'ext': ('django.db.models.fields.CharField', [], {'max_length': '15'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Lesson']"}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'catalogue.lesson': { - 'Meta': {'ordering': "['section', 'level', 'order']", 'object_name': 'Lesson'}, - 'curriculum_courses': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['curriculum.CurriculumCourse']", 'symmetrical': 'False', 'blank': 'True'}), - 'dc': ('jsonfield.fields.JSONField', [], {'default': "'{}'"}), - 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Section']", 'null': 'True', 'blank': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) - }, - u'catalogue.lessonstub': { - 'Meta': {'ordering': "['section', 'level', 'order']", 'object_name': 'LessonStub'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Section']", 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}) - }, - u'catalogue.part': { - 'Meta': {'object_name': 'Part'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Lesson']"}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - u'catalogue.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}), - 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) - }, - u'curriculum.curriculumcourse': { - 'Meta': {'ordering': "['slug']", 'object_name': 'CurriculumCourse'}, - 'accusative': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - } - } - - complete_apps = ['catalogue'] \ No newline at end of file diff --git a/catalogue/migrations/0014_auto__add_field_section_summary.py b/catalogue/migrations/0014_auto__add_field_section_summary.py deleted file mode 100644 index 7805ec7..0000000 --- a/catalogue/migrations/0014_auto__add_field_section_summary.py +++ /dev/null @@ -1,94 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Section.summary' - db.add_column(u'catalogue_section', 'summary', - self.gf('django.db.models.fields.TextField')(null=True, blank=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'Section.summary' - db.delete_column(u'catalogue_section', 'summary') - - - models = { - u'catalogue.attachment': { - 'Meta': {'ordering': "['slug', 'ext']", 'unique_together': "(['lesson', 'slug', 'ext'],)", 'object_name': 'Attachment'}, - 'ext': ('django.db.models.fields.CharField', [], {'max_length': '15'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Lesson']"}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'catalogue.lesson': { - 'Meta': {'ordering': "['section', 'level', 'order']", 'object_name': 'Lesson'}, - 'curriculum_courses': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['curriculum.CurriculumCourse']", 'symmetrical': 'False', 'blank': 'True'}), - 'dc': ('jsonfield.fields.JSONField', [], {'default': "'{}'"}), - 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Section']", 'null': 'True', 'blank': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) - }, - u'catalogue.lessonstub': { - 'Meta': {'ordering': "['section', 'level', 'order']", 'object_name': 'LessonStub'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Section']", 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}) - }, - u'catalogue.part': { - 'Meta': {'object_name': 'Part'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Lesson']"}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - u'catalogue.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}), - 'summary': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) - }, - u'curriculum.curriculumcourse': { - 'Meta': {'ordering': "['slug']", 'object_name': 'CurriculumCourse'}, - 'accusative': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'group_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - } - } - - complete_apps = ['catalogue'] \ No newline at end of file diff --git a/catalogue/migrations/0015_auto__add_field_lesson_description.py b/catalogue/migrations/0015_auto__add_field_lesson_description.py deleted file mode 100644 index 6d7dd5d..0000000 --- a/catalogue/migrations/0015_auto__add_field_lesson_description.py +++ /dev/null @@ -1,95 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Lesson.description' - db.add_column(u'catalogue_lesson', 'description', - self.gf('django.db.models.fields.TextField')(null=True, blank=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'Lesson.description' - db.delete_column(u'catalogue_lesson', 'description') - - - models = { - u'catalogue.attachment': { - 'Meta': {'ordering': "['slug', 'ext']", 'unique_together': "(['lesson', 'slug', 'ext'],)", 'object_name': 'Attachment'}, - 'ext': ('django.db.models.fields.CharField', [], {'max_length': '15'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Lesson']"}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'catalogue.lesson': { - 'Meta': {'ordering': "['section', 'level', 'order']", 'object_name': 'Lesson'}, - 'curriculum_courses': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['curriculum.CurriculumCourse']", 'symmetrical': 'False', 'blank': 'True'}), - 'dc': ('jsonfield.fields.JSONField', [], {'default': "'{}'"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Section']", 'null': 'True', 'blank': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) - }, - u'catalogue.lessonstub': { - 'Meta': {'ordering': "['section', 'level', 'order']", 'object_name': 'LessonStub'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Section']", 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}) - }, - u'catalogue.part': { - 'Meta': {'object_name': 'Part'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Lesson']"}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - u'catalogue.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}), - 'summary': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) - }, - u'curriculum.curriculumcourse': { - 'Meta': {'ordering': "['slug']", 'object_name': 'CurriculumCourse'}, - 'accusative': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'group_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - } - } - - complete_apps = ['catalogue'] \ No newline at end of file diff --git a/catalogue/migrations/0016_auto__add_field_section_pic__add_field_section_pic_attribution__add_fi.py b/catalogue/migrations/0016_auto__add_field_section_pic__add_field_section_pic_attribution__add_fi.py deleted file mode 100644 index 6be3fcf..0000000 --- a/catalogue/migrations/0016_auto__add_field_section_pic__add_field_section_pic_attribution__add_fi.py +++ /dev/null @@ -1,114 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Section.pic' - db.add_column(u'catalogue_section', 'pic', - self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True, blank=True), - keep_default=False) - - # Adding field 'Section.pic_attribution' - db.add_column(u'catalogue_section', 'pic_attribution', - self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), - keep_default=False) - - # Adding field 'Section.pic_src' - db.add_column(u'catalogue_section', 'pic_src', - self.gf('django.db.models.fields.URLField')(max_length=200, null=True, blank=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'Section.pic' - db.delete_column(u'catalogue_section', 'pic') - - # Deleting field 'Section.pic_attribution' - db.delete_column(u'catalogue_section', 'pic_attribution') - - # Deleting field 'Section.pic_src' - db.delete_column(u'catalogue_section', 'pic_src') - - - models = { - u'catalogue.attachment': { - 'Meta': {'ordering': "['slug', 'ext']", 'unique_together': "(['lesson', 'slug', 'ext'],)", 'object_name': 'Attachment'}, - 'ext': ('django.db.models.fields.CharField', [], {'max_length': '15'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Lesson']"}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'catalogue.lesson': { - 'Meta': {'ordering': "['section', 'level', 'order']", 'object_name': 'Lesson'}, - 'curriculum_courses': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['curriculum.CurriculumCourse']", 'symmetrical': 'False', 'blank': 'True'}), - 'dc': ('jsonfield.fields.JSONField', [], {'default': "'{}'"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Section']", 'null': 'True', 'blank': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) - }, - u'catalogue.lessonstub': { - 'Meta': {'ordering': "['section', 'level', 'order']", 'object_name': 'LessonStub'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Section']", 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}) - }, - u'catalogue.part': { - 'Meta': {'object_name': 'Part'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Lesson']"}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) - }, - u'catalogue.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'pic': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'pic_attribution': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'pic_src': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}), - 'summary': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) - }, - u'curriculum.curriculumcourse': { - 'Meta': {'ordering': "['slug']", 'object_name': 'CurriculumCourse'}, - 'accusative': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'group_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - } - } - - complete_apps = ['catalogue'] \ No newline at end of file diff --git a/catalogue/migrations/__init__.py b/catalogue/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/catalogue/models.py b/catalogue/models.py deleted file mode 100644 index bae04ed..0000000 --- a/catalogue/models.py +++ /dev/null @@ -1,317 +0,0 @@ -# -*- coding: utf-8 -from django.core.files import File -from django.core.urlresolvers import reverse -from django.db import models -from jsonfield import JSONField -from fnpdjango.storage import BofhFileSystemStorage -from curriculum.models import Level, Curriculum, CurriculumCourse -import logging - -bofh_storage = BofhFileSystemStorage() - - -class Section(models.Model): - title = models.CharField(max_length=255, unique=True) - slug = models.SlugField(max_length=255, unique=True) - order = models.IntegerField() - xml_file = models.FileField( - upload_to="catalogue/section/xml", - null=True, blank=True, max_length=255, - storage=bofh_storage) - image = models.ImageField(upload_to="catalogue/section/image", null=True, blank=True) - - pic = models.ImageField(upload_to="catalogue/section/pic", null=True, blank=True) - pic_attribution = models.CharField(max_length=255, null=True, blank=True) - pic_src = models.URLField(null=True, blank=True) - - summary = models.TextField(blank=True, null=True) - - class Meta: - ordering = ['order'] - - class IncompleteError(BaseException): - pass - - def __unicode__(self): - return self.title - - def get_absolute_url(self): - return "%s#gimnazjum_%s" % (reverse("catalogue_lessons"), self.slug) - - @classmethod - def publish(cls, infile, ignore_incomplete=False): - from librarian.parser import WLDocument - from django.core.files.base import ContentFile - xml = infile.get_string() - wldoc = WLDocument.from_string(xml) - - lessons = [] - for part in wldoc.book_info.parts: - try: - lessons.append(Lesson.objects.get(slug=part.slug)) - except Lesson.DoesNotExist, e: - if not ignore_incomplete: - raise cls.IncompleteError(part.slug) - - slug = wldoc.book_info.url.slug - try: - section = cls.objects.get(slug=slug) - except cls.DoesNotExist: - section = cls(slug=slug, order=0) - - # Save XML file - section.xml_file.save('%s.xml' % slug, ContentFile(xml), save=False) - section.title = wldoc.book_info.title - section.save() - - section.lesson_set.all().update(section=None) - for i, lesson in enumerate(lessons): - lesson.section = section - lesson.order = i - lesson.save() - - return section - - def syntetic_lesson(self, level): - try: - return self.lesson_set.filter(type='synthetic', level=level)[0] - except IndexError: - return None - - -class Lesson(models.Model): - section = models.ForeignKey(Section, null=True, blank=True) - level = models.ForeignKey(Level) - title = models.CharField(max_length=255) - slug = models.SlugField(max_length=255, unique=True) - type = models.CharField(max_length=15, db_index=True) - order = models.IntegerField(db_index=True) - dc = JSONField(default='{}') - curriculum_courses = models.ManyToManyField(CurriculumCourse, blank=True) - description = models.TextField(null=True, blank=True) - - xml_file = models.FileField( - upload_to="catalogue/lesson/xml", - null=True, blank=True, max_length=255, storage=bofh_storage) - html_file = models.FileField( - upload_to="catalogue/lesson/html", - null=True, blank=True, max_length=255, storage=bofh_storage) - package = models.FileField( - upload_to="catalogue/lesson/pack", - null=True, blank=True, max_length=255, storage=bofh_storage) - student_package = models.FileField( - upload_to="catalogue/lesson/student_pack", - null=True, blank=True, max_length=255, storage=bofh_storage) - pdf = models.FileField( - upload_to="catalogue/lesson/pdf", - null=True, blank=True, max_length=255, storage=bofh_storage) - student_pdf = models.FileField( - upload_to="catalogue/lesson/student_pdf", - null=True, blank=True, max_length=255, storage=bofh_storage) - - class Meta: - ordering = ['section', 'level', 'order'] - - def __unicode__(self): - return self.title - - @models.permalink - def get_absolute_url(self): - return 'catalogue_lesson', [self.slug] - - @classmethod - def publish(cls, infile, ignore_incomplete=False): - from librarian.parser import WLDocument - from django.core.files.base import ContentFile - wldoc = WLDocument(infile) - - # Check if not section metadata block. - if wldoc.book_info.parts: - return Section.publish(infile, ignore_incomplete=ignore_incomplete) - - slug = wldoc.book_info.url.slug - try: - lesson = cls.objects.get(slug=slug) - lesson.attachment_set.all().delete() - except cls.DoesNotExist: - lesson = cls(slug=slug, order=0) - - # Save XML file - lesson.xml_file.save('%s.xml' % slug, ContentFile(infile.get_string()), save=False) - lesson.title = wldoc.book_info.title - - lesson.level = Level.objects.get(meta_name=wldoc.book_info.audience) - lesson.populate_dc() - lesson.populate_description(wldoc=wldoc) - lesson.build_html(infile=infile) - lesson.build_pdf() - lesson.build_package() - if lesson.type != 'project': - lesson.build_pdf(student=True) - lesson.build_package(student=True) - return lesson - - def populate_dc(self): - from librarian.parser import WLDocument - wldoc = WLDocument.from_file(self.xml_file.path) - self.dc = wldoc.book_info.to_dict() - self.type = self.dc["type"] - assert self.type in ('appendix', 'course', 'synthetic', 'project', 'added', 'added-var'), \ - u"Unknown lesson type: %s" % self.type - self.save() - - courses = set() - for identifier in wldoc.book_info.curriculum: - identifier = (identifier or "").replace(' ', '') - if not identifier: - continue - try: - curr = Curriculum.objects.get(identifier__iexact=identifier) - except Curriculum.DoesNotExist: - logging.warn('Unknown curriculum course %s in lesson %s' % (identifier, self.slug)) - pass - else: - courses.add(curr.course) - self.curriculum_courses = courses - - def populate_description(self, wldoc=None, infile=None): - if wldoc is None: - wldoc = self.wldocument(infile) - if self.type == 'project': - lookup = u'Zadanie' - else: - lookup = u'Pomysł na lekcję' - for header in wldoc.edoc.findall('.//naglowek_rozdzial'): - if (header.text or '').strip() == lookup: - from lxml import etree - self.description = etree.tostring( - header.getnext(), method='text', encoding='unicode').strip() - self.save() - return - - def wldocument(self, infile=None): - from librarian import IOFile - from librarian.parser import WLDocument - from .publish import OrmDocProvider - - if infile is None: - infile = IOFile.from_filename(self.xml_file.path) - for att in self.attachment_set.all(): - infile.attachments["%s.%s" % (att.slug, att.ext)] = \ - IOFile.from_filename(att.file.path) - return WLDocument(infile, provider=OrmDocProvider()) - - def build_html(self, infile=None): - from .publish import HtmlFormat - wldoc = self.wldocument(infile) - html = HtmlFormat(wldoc).build() - self.html_file.save("%s.html" % self.slug, File(open(html.get_filename()))) - - def build_pdf(self, student=False): - from .publish import PdfFormat - # PDF uses document with attachments already saved as media, - # otherwise sorl.thumbnail complains about SuspiciousOperations. - wldoc = self.wldocument() - if student: - pdf = PdfFormat(wldoc).build() - self.student_pdf.save("%s.pdf" % self.slug, File(open(pdf.get_filename()))) - else: - pdf = PdfFormat(wldoc, teacher=True).build() - self.pdf.save("%s.pdf" % self.slug, File(open(pdf.get_filename()))) - - def add_to_zip(self, zipf, student=False, prefix=''): - pdf = self.student_pdf if student else self.pdf - if pdf: - zipf.write(pdf.path, "%s%s%s.pdf" % (prefix, self.slug, "_student" if student else "")) - for attachment in self.attachment_set.all(): - zipf.write(attachment.file.path, u"%smaterialy/%s.%s" % (prefix, attachment.slug, attachment.ext)) - zipf.write(self.xml_file.path, "%spliki-zrodlowe/%s.xml" % (prefix, self.slug)) - - def build_package(self, student=False): - from StringIO import StringIO - import zipfile - from django.core.files.base import ContentFile - buff = StringIO() - zipf = zipfile.ZipFile(buff, 'w', zipfile.ZIP_STORED) - self.add_to_zip(zipf, student) - zipf.close() - fieldname = "student_package" if student else "package" - getattr(self, fieldname).save( - "%s%s.zip" % (self.slug, "_student" if student else ""), - ContentFile(buff.getvalue())) - - def get_syntetic(self): - if self.section is None: - return None - return self.section.syntetic_lesson(self.level) - - def get_other_level(self): - if self.section is None: - return None - other_levels = self.section.lesson_set.exclude(level=self.level) - if other_levels.exists(): - return other_levels[0].level - - def get_previous(self): - if self.section is None: - return None - try: - return self.section.lesson_set.filter( - type=self.type, level=self.level, - order__lt=self.order).order_by('-order')[0] - except IndexError: - return None - - def get_next(self): - if self.section is None: - return None - try: - return self.section.lesson_set.filter( - type=self.type, level=self.level, - order__gt=self.order).order_by('order')[0] - except IndexError: - return None - - def requires_internet(self): - return 'internet' in self.dc.get('requires', []) - - -class Attachment(models.Model): - slug = models.CharField(max_length=255) - ext = models.CharField(max_length=15) - lesson = models.ForeignKey(Lesson) - file = models.FileField(upload_to="catalogue/attachment", storage=bofh_storage) - - class Meta: - ordering = ['slug', 'ext'] - unique_together = ['lesson', 'slug', 'ext'] - - def __unicode__(self): - return "%s.%s" % (self.slug, self.ext) - - -class Part(models.Model): - lesson = models.ForeignKey(Lesson) - pdf = models.FileField(upload_to="catalogue/part/pdf", null=True, blank=True) - student_pdf = models.FileField(upload_to="catalogue/part/student_pdf", null=True, blank=True) - - -class LessonStub(models.Model): - section = models.ForeignKey(Section, null=True, blank=True) - level = models.ForeignKey(Level) - title = models.CharField(max_length=255) - type = models.CharField(max_length=15, db_index=True) - order = models.IntegerField(db_index=True) - - class Meta: - ordering = ['section', 'level', 'order'] - - def __unicode__(self): - return self.title - - @property - def slug(self): - return '' - - def add_to_zip(self, *args, **kwargs): - pass diff --git a/catalogue/publish.py b/catalogue/publish.py deleted file mode 100755 index 89c76a1..0000000 --- a/catalogue/publish.py +++ /dev/null @@ -1,121 +0,0 @@ -# -*- coding: utf-8 -from django.core.files import File -from django.core.urlresolvers import reverse -from librarian import DocProvider, IOFile -from librarian.pyhtml import EduModuleFormat -from librarian.pypdf import EduModulePDFFormat -from .models import Lesson, Attachment -from fnpdjango.utils.text.slughifi import slughifi - - -# TODO: Using sorl.thumbnail for now, -# but this should be done in Librarian, -# directly using convert or PIL as a fallback. -def get_image(src_img_path, width=None, default_width=1600, formats=('PNG', 'JPEG', 'GIF')): - """ Returns an object with `url` and `storage` attributes, - or None if using the original image is OK. - """ - - from PIL import Image - from sorl.thumbnail import get_thumbnail - - # Does it need converting? - # Yes, if width is given explicitly. - convert = width is not None - if not convert: - # Looks like it doesn't need converting. - # But let's try opening it and checking its type. - try: - simg = Image.open(src_img_path) - except IOError: - # It doesn't look like image, - # but maybe it's convertable to one. - convert = True - else: - if simg.format not in formats: - # It's an image, but it's in some weird format. - convert = True - width = simg.size[0] - - if convert: - if width is None: - width = default_width - return get_thumbnail(src_img_path, '%sx%s' % (width, 10*width)) - else: - return None - - -class HtmlFormat(EduModuleFormat): - IMAGE_FORMATS = ('PNG', 'JPEG', 'GIF') - DEFAULT_IMAGE_WIDTH = 1600 - - def find_attachment(self, slug, fmt): - lesson_slug = self.wldoc.book_info.url.slug - try: - # If already saved, use it. - att = Attachment.objects.get(lesson__slug=lesson_slug, - slug=slug, ext=fmt) - except Attachment.DoesNotExist, e: - # If attached to source IOFile, save now. - att_name = "%s.%s" % (slug, fmt) - try: - att_file = self.wldoc.source.attachments[att_name] - except KeyError: - print u"ATTACHMENT MISSING:", att_name - raise self.MaterialNotFound() - else: - lesson = Lesson.objects.get(slug=lesson_slug) - att = lesson.attachment_set.create(slug=slug, ext=fmt) - att.file.save(att_name, File(att_file.get_file())) - return att - else: - return att - - def url_for_material(self, slug, fmt): - return self.find_attachment(slug, fmt).file.url - - def url_for_image(self, slug, fmt, width=None): - try: - src_img = self.find_attachment(slug, fmt).file - except self.MaterialNotFound: - return '' - img = get_image(src_img.path, width, self.DEFAULT_IMAGE_WIDTH, self.IMAGE_FORMATS) - return (img or src_img).url - - def text_to_anchor(self, text): - return slughifi(text) - - def get_forma_url(self, forma): - return '%s#%s' % ( - reverse('catalogue_lesson', args=['metody']), - self.text_to_anchor(forma) - ) - - def get_help_url(self, naglowek): - return '%s%s#%s' % ( - '//edukacjamedialna.edu.pl', - reverse('info', args=['jak-korzystac/']), - self.naglowek_to_anchor(naglowek) - ) - - -class PdfFormat(EduModulePDFFormat): - IMAGE_FORMATS = ('PNG', 'JPEG', 'GIF') - DEFAULT_IMAGE_WIDTH = 1600 - - def get_image(self, name): - src_img = super(PdfFormat, self).get_image(name) - img = get_image( - src_img.get_filename(), - default_width=self.DEFAULT_IMAGE_WIDTH, - formats=self.IMAGE_FORMATS) - if img: - return IOFile.from_filename(img.storage.path(img)) - else: - return src_img - - -class OrmDocProvider(DocProvider): - def by_slug(self, slug): - """Should return a file-like object with a WL document XML.""" - return IOFile.from_filename(Lesson.objects.get(slug=slug).xml_file.path) diff --git a/catalogue/search_indexes.py b/catalogue/search_indexes.py deleted file mode 100755 index 035ce98..0000000 --- a/catalogue/search_indexes.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -from haystack import indexes -from .models import Lesson - - -class LessonIndex(indexes.SearchIndex, indexes.Indexable): - text = indexes.CharField(document=True, use_template=True) - - def get_model(self): - return Lesson diff --git a/catalogue/static/catalogue/css/carousel.css b/catalogue/static/catalogue/css/carousel.css deleted file mode 100644 index 992e285..0000000 --- a/catalogue/static/catalogue/css/carousel.css +++ /dev/null @@ -1,110 +0,0 @@ -#catalogue-carousel { - float: left; - position: relative; - width: 43.75em; - height: 14.6875em; - overflow: hidden; - border-radius: 0.9375em; -} - #catalogue-carousel #catalogue-carousel-links { - width: 28.75em; - height: 14.6875em; - list-style: none; - margin: 0; - padding: 0; } - #catalogue-carousel #catalogue-carousel-links li { - display: block; - position: absolute; - top: 0; - left: 0; - height: 100%; - background-size: 100% 100%; - border-top-left-radius: 0.9375em 6.38%; - border-bottom-left-radius: 0.9375em 6.38%; - z-index: 100; - background-color: #888; } - #catalogue-carousel #catalogue-carousel-links li a.catalogue-carousel-link { - display: block; - overflow: hidden; - width: 28.75em; - height: 100%; - background: url(/static/catalogue/img/carousel-left.png) 100% 0 no-repeat; - background-size: 4.375em 100%; } - #catalogue-carousel #catalogue-carousel-links li a.catalogue-carousel-link .catalogue-carousel-note { - position: relative; - height: 100%; - color: white; - margin-top: 8.5em; } - #catalogue-carousel #catalogue-carousel-links li a.catalogue-carousel-link .catalogue-carousel-note div:before { - content: " "; - display: block; - position: absolute; - height: 100%; - width: 100%; - z-index: -1; - background-color: black; - opacity: 0.6; } - #catalogue-carousel #catalogue-carousel-links li a.catalogue-carousel-link .catalogue-carousel-note div p { - padding: .4em 3em 0 .5em; } - #catalogue-carousel #catalogue-carousel-links li a.catalogue-carousel-link .catalogue-carousel-note div p strong { - font-size: 1.2em; - display: block; } - #catalogue-carousel #catalogue-carousel-links li a.catalogue-carousel-link .catalogue-carousel-note div p .more { - position: absolute; - right: 4em; - top: 4.5em; } - #catalogue-carousel #catalogue-carousel-links li a.catalogue-carousel-link:active { - outline: none; } - #catalogue-carousel #catalogue-carousel-links li .attribution { - text-align: right; - font-size: .75em; - position: absolute; - right: 5em; - top: .1em; - color: white; - font-weight: bold; - text-shadow: 0 0 5px #000; } - #catalogue-carousel #catalogue-carousel-switcher { - margin: 0; - padding: 0.1875em 0 0 3.625em; - width: 11.375em; - height: 14.6875em; - position: absolute; - right: 0; - top: 0; - list-style: none; - border-radius: 0 0.9375em 0.9375em 0; - background-color: #ed7831; - background-image: url(/static/catalogue/img/carousel-right.png); - background-position: 0 0; - background-repeat: no-repeat; - background-size: auto 14.6875em; - /* right part of mask as background */ } - #catalogue-carousel #catalogue-carousel-switcher li { - margin-bottom: .4em; - font-size: .85em; - line-height: 1em; } - #catalogue-carousel #catalogue-carousel-switcher li a { - text-transform: uppercase; - color: #363a3e; } - #catalogue-carousel #catalogue-carousel-switcher li a:before { - vertical-align: top; - margin-right: 1.5em; } - #catalogue-carousel #catalogue-carousel-switcher li .knowledge:before { - content: url(/static/img/icons/knowledge_dark.png); } - #catalogue-carousel #catalogue-carousel-switcher li .activity:before { - content: url(/static/img/icons/activity_dark.png); } - #catalogue-carousel #catalogue-carousel-switcher li .lesson-plan:before { - content: url(/static/img/icons/lesson-plan_dark.png); } - #catalogue-carousel #catalogue-carousel-switcher li .reference:before { - content: url(/static/img/icons/reference_dark.png); } - #catalogue-carousel #catalogue-carousel-switcher li.activeSlide a { - color: white; } - #catalogue-carousel #catalogue-carousel-switcher li.activeSlide .knowledge:before { - content: url(/static/img/icons/knowledge_white.png); } - #catalogue-carousel #catalogue-carousel-switcher li.activeSlide .activity:before { - content: url(/static/img/icons/activity_white.png); } - #catalogue-carousel #catalogue-carousel-switcher li.activeSlide .lesson-plan:before { - content: url(/static/img/icons/lesson-plan_white.png); } - #catalogue-carousel #catalogue-carousel-switcher li.activeSlide .reference:before { - content: url(/static/img/icons/reference_white.png); } diff --git a/catalogue/static/catalogue/css/carousel.scss b/catalogue/static/catalogue/css/carousel.scss deleted file mode 100755 index 299f95b..0000000 --- a/catalogue/static/catalogue/css/carousel.scss +++ /dev/null @@ -1,140 +0,0 @@ -$px: .0625em; - -$ciemny: #363a3e; - - -#catalogue-carousel { - float: left; - position: relative; - width: 700*$px; - height: 235*$px; - overflow: hidden; - border-radius: 15*$px; - - #catalogue-carousel-links { - width: 460*$px; - height: 235*$px; - list-style: none; - margin: 0; - padding: 0; - - li { - display: block; - position: absolute; - top: 0; - left: 0; - height: 100%; - background-size: 100% 100%; - border-top-left-radius: 15*$px 6.38%; - border-bottom-left-radius: 15*$px 6.38%; - z-index: 100; - background-color: #888; - - a.catalogue-carousel-link { - display: block; - overflow: hidden; - width: 460*$px; - height: 100%; - background: url(/static/catalogue/img/carousel-left.png) 100% 0 no-repeat; - background-size: 70*$px 100%; - - .catalogue-carousel-note { - position: relative; - height: 100%; - color: white; - margin-top: 8.5em; - - div { - &:before { - content: " "; - display: block; - position: absolute; - height: 100%; - width: 100%; - z-index: -1; - background-color: black; - opacity: 0.6; - } - - p { - padding: .4em 3em 0 .5em; - - strong { - font-size: 1.2em; - display: block; - } - - .more { - position: absolute; - right: 4em; - top: 4.5em; - } - } - } - } - } - a.catalogue-carousel-link:active { - outline: none; - } - .attribution { - text-align: right; - font-size: .75em; - position: absolute; - right: 5em; - top: .1em; - color: white; - font-weight: bold; - text-shadow: 0 0 5px #000; - } - - } - } - #catalogue-carousel-switcher { - margin: 0; - padding: 3*$px 0 0 58*$px; - width: 240*$px - 58*$px; - height: 243*$px - 8*$px; - position: absolute; - right: 0; - top: 0; - list-style: none; - border-radius: 0 15*$px 15*$px 0; - background-color: #ed7831; - background-image: url(/static/catalogue/img/carousel-right.png); - background-position: 0 0; - background-repeat: no-repeat; - background-size: auto 235*$px; - - /* right part of mask as background */ - - li { - margin-bottom: .4em; - font-size: .85em; - line-height: 1em; - - a { - text-transform: uppercase; - color: $ciemny; - } - a:before { - vertical-align: top; - margin-right: 1.5em; - } - .knowledge:before {content: url(/static/img/icons/knowledge_dark.png);} - .activity:before {content: url(/static/img/icons/activity_dark.png);} - .lesson-plan:before {content: url(/static/img/icons/lesson-plan_dark.png);} - .reference:before {content: url(/static/img/icons/reference_dark.png);} - } - li.activeSlide { - a { - color: white; - } - .knowledge:before {content: url(/static/img/icons/knowledge_white.png);} - .activity:before {content: url(/static/img/icons/activity_white.png);} - .lesson-plan:before {content: url(/static/img/icons/lesson-plan_white.png);} - .reference:before {content: url(/static/img/icons/reference_white.png);} - } - } - - -} diff --git a/catalogue/static/catalogue/css/exercise.css b/catalogue/static/catalogue/css/exercise.css deleted file mode 100644 index ce6f783..0000000 --- a/catalogue/static/catalogue/css/exercise.css +++ /dev/null @@ -1,231 +0,0 @@ -@charset "UTF-8"; -.exercise img { - vertical-align: top; } -.exercise .question-piece { - border-radius: 0.6875em; - padding: 0.5em 0.6875em; } -.exercise .lista.punkt { - list-style: none; - margin: 0; - padding: 0; } -.exercise .lista li { - margin: 0.3125em 0; } -.exercise .question-piece.correct { - background-color: #16a487; - color: white; } -.exercise .question-piece.incorrect { - background-color: #f00; - color: white; } -.exercise .placeholder.dragover { - background: #ed7831 !important; } -.exercise .remove { - float: right; - display: inline-block; - border-radius: 0.5em; - padding: 0.25em 0.5em; - margin: -0.25em -0.5em -0.25em 0.5em; - background: #ed7831; - color: white; } -.exercise .buttons { - background: #5e6165; - border-radius: 0.5625em; - height: 1.875em; - line-height: 1.875em; - overflow: hidden; - color: white; - margin-top: 1.875em; } - .exercise .buttons input { - height: 100%; - border: 0; - background: #8e9093; - color: white; - text-transform: uppercase; - font-weight: bold; } - .exercise .buttons .message { - float: right; - padding: 0 1.25em; - background: red; } - .exercise .buttons .maxscore { - background: #16a487; } - .exercise .buttons input.check { - background: #ed7831; } - -.exercise .instruction, .exercise-wtem .instruction { - display: block; - margin: .3em; - color: green; - font-size: .9em; } -.exercise .instruction:before, .exercise-wtem .instruction:before { - content: "☞ "; } - -.luki .question-piece { - background-color: #d4d6d8; - color: #363a3e; - cursor: pointer; - z-index: 2; - display: inline-block; - margin: 0.3125em; - z-index: 2; - max-width: 38em; } -.luki .question-piece.disabled { - background-color: #eee; - color: #d4d6d8; } -.luki .placeholder { - border-radius: 0.6875em; - padding: 0.5em 0.6875em; - display: inline-block; - margin: 0.3125em; - z-index: 2; - width: 4em; - background-color: #eee; - z-index: 1; } -.luki .placeholder:after { - content: "\0000a0"; } - -.zastap .question-piece { - background-color: #d4d6d8; - color: #363a3e; - cursor: pointer; - z-index: 2; - display: inline-block; - margin: 0.3125em; - z-index: 2; } -.zastap .question-piece.disabled { - background-color: #eee; - color: #d4d6d8; } -.zastap .question-piece.placeholder { - background-color: inherit; - color: inherit; - cursor: inherit; - z-index: inherit; - display: inline; - margin: 0; - padding: 0; - z-index: inherit; - border-radius: 0; } - -.uporzadkuj .question-piece { - background-color: #d4d6d8; - color: #363a3e; - cursor: pointer; - z-index: 2; } -.uporzadkuj .question-piece.disabled { - background-color: #eee; - color: #d4d6d8; } -.uporzadkuj .lista { - list-style: none; - margin: 0; - padding: 0; - counter-reset: answer; } - .uporzadkuj .lista li { - counter-increment: answer; - padding-right: 3em; - background-image: url(/static/img/ornaments/draggable.png); - background-repeat: no-repeat; - background-position: 100% 50%; } - .uporzadkuj .lista li:before { - border-radius: 0.6875em; - padding: 0.5em 0.6875em; - background-color: #d4d6d8; - color: #363a3e; - cursor: pointer; - z-index: 2; - content: counter(answer); - float: left; - margin: -.5em 0 0 -3em; } - .uporzadkuj .lista li.ui-sortable-placeholder { - counter-increment: answer 0; } - .uporzadkuj .lista li.ui-sortable-helper:before { - content: none; } - -.przyporzadkuj .question-piece { - background-color: #d4d6d8; - color: #363a3e; - cursor: pointer; - z-index: 2; - width: 38.625em; } -.przyporzadkuj .question-piece.short { - display: inline-block; - margin: .2em .1em; - width: auto; } -.przyporzadkuj span.question-piece { - display: inline-block; - margin: .1em; - width: auto; } -.przyporzadkuj .question-piece.disabled { - background-color: #eee; - color: #d4d6d8; } -.przyporzadkuj .predicate { - list-style: none; - margin: 0; - padding: 0; } - .przyporzadkuj .predicate > li { - border-radius: 0.6875em; - padding: 0.5em 0.6875em; - display: inline-block; - background-color: #5e6165; - color: white; - width: 11.75em; - position: relative; - vertical-align: top; } - .przyporzadkuj .predicate > li .subjects { - list-style: none; - margin: 0; - padding: 0; - min-height: 2.8125em; - position: relative; - margin: 0.5em -0.6875em -0.5em -0.6875em; - padding: 0.5em 0.6875em; } - .przyporzadkuj .predicate > li .subjects li { - width: auto; } - .przyporzadkuj .predicate > li .subjects .placeholder { - border-radius: 0.6875em; - padding: 0.5em 0.6875em; - text-align: right; - position: relative; - padding: 0.5em 0.6875em; - margin: 0 -0.6875em; } - .przyporzadkuj .predicate > li .subjects .multiple { - position: absolute; - z-index: -1; - top: 0; - bottom: 0; - left: 0; - right: 0; - margin: 0; } - .przyporzadkuj .predicate > li .subjects .placeholder.dragover { - z-index: 1; } - .przyporzadkuj .predicate > li .subjects .placeholder:after { - content: "upuść tutaj"; - text-style: italic; } -.przyporzadkuj .subject { - list-style: none; - margin: 0; - padding: 0; } - -.prawdafalsz .question li.question-piece { - position: relative; - padding-left: 11em; } -.prawdafalsz .question .buttons { - margin-top: 0; - top: 0; - left: 0; - position: absolute; - background-color: #d4d6d8; - color: #363a3e; - display: inline-block; } - .prawdafalsz .question .buttons a { - color: #363a3e; - text-transform: uppercase; - font-weight: bold; - display: inline-block; - padding: 0 0.6875em; } - .prawdafalsz .question .buttons a.chosen { - background: #ed7831; - color: white; } - -.wybor .question .lista { - list-style: none; - padding: 0; } - .wybor .question .lista li { - margin: 0; } diff --git a/catalogue/static/catalogue/css/exercise.scss b/catalogue/static/catalogue/css/exercise.scss deleted file mode 100755 index a9fc200..0000000 --- a/catalogue/static/catalogue/css/exercise.scss +++ /dev/null @@ -1,320 +0,0 @@ -$px: 0.0625em; -$oranji: #ed7831; -$ciemny: #363a3e; -$zielony: #16a487; - - -@mixin bubble { - border-radius: 11*$px; - padding: 8*$px 11*$px; -} -@mixin bubble-drag { - background-color: #d4d6d8; - color: #363a3e; - cursor: pointer; - z-index: 2; -} -@mixin bubble-drag-disabled { - background-color: #eee; - color: #d4d6d8; -} -@mixin un-bubble-drag { - background-color: inherit; - color: inherit; - cursor: inherit; - z-index: inherit; -} - -@mixin bubble-inline { - display: inline-block; - margin: 5*$px; - z-index: 2; -} -@mixin un-bubble-inline { - display: inline; - margin: 0; - padding: 0; - z-index: inherit; - border-radius: 0; -} -@mixin list-plain { - list-style: none; - margin: 0; - padding: 0; -} - - -.exercise { - img { - vertical-align: top; - } - - .question-piece { - @include bubble; - } - .lista.punkt { - @include list-plain; - } - .lista { - li { - margin: 5*$px 0; - } - } - - .question-piece.correct { - background-color: #16a487; - color: white; - } - .question-piece.incorrect { - background-color: #f00; - color: white; - } - - .placeholder.dragover { - background: #ed7831 !important; - } - - .remove { - float: right; - display: inline-block; - border-radius: 8*$px; - padding: 4*$px 8*$px; - margin: -4*$px -8*$px -.25em 8*$px; - background: #ed7831; - color: white; - } - - .buttons { - background: #5e6165; - border-radius: 9*$px; - height: 30*$px; - line-height: 30*$px; - overflow: hidden; - color: white; - margin-top: 30*$px; - - input { - height: 100%; - border: 0; - background: #8e9093; - color: white; - text-transform: uppercase; - font-weight: bold; - } - .message { - float: right; - padding: 0 20*$px; - background: red; - } - .maxscore { - background: #16a487; - } - - input.check { - background: #ed7831; - - } - } -} - - -.exercise, .exercise-wtem { - .instruction { - display: block; - margin: .3em; - color: green; - font-size: .9em; - } - .instruction:before { - content: "☞ "; - } -} - - -.luki { - .question-piece { - @include bubble-drag; - @include bubble-inline; - max-width: 608*$px; - } - .question-piece.disabled { - @include bubble-drag-disabled; - } - - .placeholder { - @include bubble; - @include bubble-inline; - - width: 4em; - background-color: #eee; - z-index: 1; - } - .placeholder:after { - content: "\0000a0"; - } -} - - -.zastap { - .question-piece { - @include bubble-drag; - @include bubble-inline; - } - .question-piece.disabled { - @include bubble-drag-disabled; - } - .question-piece.placeholder { - @include un-bubble-drag; - @include un-bubble-inline; - } -} - -.uporzadkuj { - .question-piece { - @include bubble-drag; - } - .question-piece.disabled { - @include bubble-drag-disabled; - } - .lista { - @include list-plain; - counter-reset: answer; - li { - counter-increment: answer; - padding-right: 3em; - background-image: url(/static/img/ornaments/draggable.png); - background-repeat: no-repeat; - background-position: 100% 50%; - } - li:before { - @include bubble; - @include bubble-drag; - content: counter(answer); - float: left; - margin: -.5em 0 0 -3em; - } - li.ui-sortable-placeholder { - counter-increment: answer 0; - } - li.ui-sortable-helper:before { - content: none; - } - } -} - -.przyporzadkuj { - .question-piece { - @include bubble-drag; - width: 618*$px; - } - .question-piece.short { - display: inline-block; - margin: .2em .1em; - width: auto; - } - span.question-piece { - display: inline-block; - margin: .1em; - width: auto; - } - .question-piece.disabled { - @include bubble-drag-disabled; - } - .predicate { - @include list-plain; - - > li { - @include bubble; - display: inline-block; - background-color: #5e6165; - color: white; - width: 188*$px; - position: relative; - vertical-align: top; - - .subjects { - @include list-plain; - min-height: 45*$px; - position: relative; - margin: 8*$px -11*$px -8*$px -11*$px; - padding: 8*$px 11*$px; - - li { - width: auto; - } - - .placeholder { - @include bubble; - text-align: right; - position:relative; - padding: 8*$px 11*$px; - margin: 0 -11*$px; - } - .multiple { - position: absolute; - z-index: -1; - top: 0; - bottom: 0; - left: 0; - right: 0; - margin: 0; - } - - .placeholder.dragover { - z-index: 1; - } - .placeholder:after { - content: "upuść tutaj"; - text-style: italic; - } - } - } - .comment { - } - } - .subject { - @include list-plain; - } - -} - - -.prawdafalsz .question { - li.question-piece { - position: relative; - padding-left: 11em; - } - - .buttons { - margin-top: 0; - top: 0; - left: 0; - position: absolute; - - background-color: #d4d6d8; - color: #363a3e; - display: inline-block; - - a { - color: #363a3e; - text-transform: uppercase; - font-weight: bold; - display: inline-block; - padding: 0 11*$px; - } - a.chosen { - background: #ed7831; - color: white; - } - } -} - -.wybor .question { - .lista { - list-style: none; - padding: 0; - li { - margin: 0; - } - } -} diff --git a/catalogue/static/catalogue/css/lesson.css b/catalogue/static/catalogue/css/lesson.css deleted file mode 100644 index c8e73c4..0000000 --- a/catalogue/static/catalogue/css/lesson.css +++ /dev/null @@ -1,254 +0,0 @@ -/* =================================================== */ -/* = Common elements: headings, paragraphs and lines = */ -/* =================================================== */ -/*h1 { - font-size: 3em; - margin: 1.5em 0; - text-align: center; - line-height: 1.5em; - font-weight: bold; -} - -h2 { - font-size: 2em; - margin: 1.5em 0 0; - font-weight: bold; - line-height: 1.5em; -} - -h3 { - font-size: 1.5em; - margin: 1.5em 0 0; - font-weight: normal; - line-height: 1.5em; -} - -h4 { - font-size: 1em; - margin: 1.5em 0 0; - line-height: 1.5em; -} - -p { - margin: 0; -} -*/ -/* ======================== */ -/* = Footnotes and themes = */ -/* ======================== */ -.annotation { - font-style: normal; - font-weight: normal; - font-size: 12px; - padding-left: 2px; - position: relative; - top: -4px; } - -#footnotes { - margin-top: 3em; } - -#footnotes .annotation { - display: block; - float: left; - width: 2.5em; - clear: both; } - -#footnotes div { - margin: 1.5em 0 0 0; } - -#footnotes p, #footnotes ul { - margin-left: 2.5em; - font-size: 0.875em; } - -#footnotes .permalink { - font-size: .75em; } - -blockquote { - font-size: 0.875em; } - -/* ============= */ -/* = Numbering = */ -/* ============= */ -.verse, .paragraph { - position: relative; } - -.anchor { - position: absolute; - margin: -0.25em -0.5em; - left: -3em; - color: #777; - font-size: 12px; - width: 2em; - text-align: center; - padding: 0.25em 0.5em; - line-height: 1.5em; } - -.anchor:hover, #book-text .anchor:active { - color: #FFF; - background-color: #CCC; } - -/* =================== */ -/* = Custom elements = */ -/* =================== */ -span.author { - font-size: 0.5em; - display: block; - line-height: 1.5em; - margin-bottom: 0.25em; } - -span.collection { - font-size: 0.375em; - display: block; - line-height: 1.5em; - margin-bottom: -0.25em; } - -span.subtitle { - font-size: 0.5em; - display: block; - line-height: 1.5em; - margin-top: -0.25em; } - -span.translator { - font-size: 0.375em; - display: block; - line-height: 1.5em; - margin-top: 0.25em; } - -div.didaskalia { - font-style: italic; - margin: 0.5em 0 0 1.5em; } - -div.kwestia { - margin: 0.5em 0 0; } - -div.stanza { - margin: 1.5em 0 0; } - -div.kwestia div.stanza { - margin: 0; } - -p.paragraph { - text-align: justify; - margin: 1.5em 0 0; } - -p.motto { - text-align: justify; - font-style: italic; - margin: 1.5em 0 0; } - -p.motto_podpis { - font-size: 0.875em; - text-align: right; } - -div.fragment { - border-bottom: 0.1em solid #999; - padding-bottom: 1.5em; } - -div.note p, div.dedication p, div.note p.paragraph, div.dedication p.paragraph { - text-align: right; - font-style: italic; } - -hr.spacer { - height: 3em; - visibility: hidden; } - -hr.spacer-line { - margin: 1.5em 0; - border: none; - border-bottom: 0.1em solid #000; } - -p.spacer-asterisk { - padding: 0; - margin: 1.5em 0; - text-align: center; } - -div.person-list ol { - list-style: none; - padding: 0 0 0 1.5em; } - -p.place-and-time { - font-style: italic; } - -em.math, em.foreign-word, em.book-title, em.didaskalia { - font-style: italic; } - -em.author-emphasis { - letter-spacing: 0.1em; } - -em.person { - font-style: normal; - font-variant: small-caps; } - -.verse:after { - content: "\feff"; } - -/* =================================== */ -/* = Hide some elements for printing = */ -/* =================================== */ -@media print { - #menu { - display: none; } } -.activity { - clear: both; } - -.activity .text { - width: 27.5em; - margin-right: 20px; - float: left; } - -.activity .description p:first-child { - margin-top: 0; } - -.activity { - margin-top: 2em; } - .activity .act_counter { - float: left; - margin-right: .5em; - font-size: 2em; } - .activity .info { - float: right; - width: 8.4375em; } - .activity .info .infobox { - padding: 1em 0; - border-top: 1px solid #c9ccce; } - .activity .info .infobox h1 { - text-transform: uppercase; - font-weight: bold; - margin: 0 0 0.5em -2.1875em; - padding-left: 2.1875em; - line-height: 24px; - font-size: 1em; } - .activity .info .infobox p { - margin: 0; } - .activity .info .time h1 { - background: url(/static/img/icons/activity-time.png) 0 0 no-repeat; } - .activity .info .kind h1 { - background: url(/static/img/icons/activity-kind.png) 0 0 no-repeat; } - .activity .info .materials h1 { - background: url(/static/img/icons/activity-tools.png) 0 0 no-repeat; } - -.lista .paragraph { - margin: .3em 0; } -.lista li { - margin: .75em 0; } - -.clearboth { - clear: both; } - -#book-text .caption { - margin: 1.5em; } - #book-text .caption p { - margin: 0; } - -/* utils */ -.clr { - clear: both; } - -#book-text .top-link { - margin-top: 1em; } - -.help { - font-size: .7em; - padding: 0 .5em; - color: #888; - vertical-align: super; } diff --git a/catalogue/static/catalogue/css/lesson.scss b/catalogue/static/catalogue/css/lesson.scss deleted file mode 100755 index d98f1a3..0000000 --- a/catalogue/static/catalogue/css/lesson.scss +++ /dev/null @@ -1,327 +0,0 @@ -$px: .0625em; - -/* =================================================== */ -/* = Common elements: headings, paragraphs and lines = */ -/* =================================================== */ - -/*h1 { - font-size: 3em; - margin: 1.5em 0; - text-align: center; - line-height: 1.5em; - font-weight: bold; -} - -h2 { - font-size: 2em; - margin: 1.5em 0 0; - font-weight: bold; - line-height: 1.5em; -} - -h3 { - font-size: 1.5em; - margin: 1.5em 0 0; - font-weight: normal; - line-height: 1.5em; -} - -h4 { - font-size: 1em; - margin: 1.5em 0 0; - line-height: 1.5em; -} - -p { - margin: 0; -} -*/ - -/* ======================== */ -/* = Footnotes and themes = */ -/* ======================== */ - -.annotation { - font-style: normal; - font-weight: normal; - font-size: 12px; - padding-left: 2px; - position: relative; - top: -4px; -} - -#footnotes { - margin-top: 3em; -} - -#footnotes .annotation { - display: block; - float: left; - width: 2.5em; - clear: both; -} - -#footnotes div { - margin: 1.5em 0 0 0; -} - -#footnotes p, #footnotes ul { - margin-left: 2.5em; - font-size: 0.875em; -} - -#footnotes .permalink { - font-size: .75em; -} - -blockquote { - font-size: 0.875em; -} - -/* ============= */ -/* = Numbering = */ -/* ============= */ -.verse, .paragraph { - position:relative; -} -.anchor { - position: absolute; - margin: -0.25em -0.5em; - left: -3em; - color: #777; - font-size: 12px; - width: 2em; - text-align: center; - padding: 0.25em 0.5em; - line-height: 1.5em; -} - -.anchor:hover, #book-text .anchor:active { - color: #FFF; - background-color: #CCC; -} - -/* =================== */ -/* = Custom elements = */ -/* =================== */ -span.author { - font-size: 0.5em; - display: block; - line-height: 1.5em; - margin-bottom: 0.25em; -} - -span.collection { - font-size: 0.375em; - display: block; - line-height: 1.5em; - margin-bottom: -0.25em; -} - -span.subtitle { - font-size: 0.5em; - display: block; - line-height: 1.5em; - margin-top: -0.25em; -} - -span.translator { - font-size: 0.375em; - display: block; - line-height: 1.5em; - margin-top: 0.25em; -} - -div.didaskalia { - font-style: italic; - margin: 0.5em 0 0 1.5em; -} - -div.kwestia { - margin: 0.5em 0 0; -} - -div.stanza { - margin: 1.5em 0 0; -} - -div.kwestia div.stanza { - margin: 0; -} - -p.paragraph { - text-align: justify; - margin: 1.5em 0 0; -} - -p.motto { - text-align: justify; - font-style: italic; - margin: 1.5em 0 0; -} - -p.motto_podpis { - font-size: 0.875em; - text-align: right; -} - -div.fragment { - border-bottom: 0.1em solid #999; - padding-bottom: 1.5em; -} - -div.note p, div.dedication p, div.note p.paragraph, div.dedication p.paragraph { - text-align: right; - font-style: italic; -} - -hr.spacer { - height: 3em; - visibility: hidden; -} - -hr.spacer-line { - margin: 1.5em 0; - border: none; - border-bottom: 0.1em solid #000; -} - -p.spacer-asterisk { - padding: 0; - margin: 1.5em 0; - text-align: center; -} - -div.person-list ol { - list-style: none; - padding: 0 0 0 1.5em; -} - -p.place-and-time { - font-style: italic; -} - -em.math, em.foreign-word, em.book-title, em.didaskalia { - font-style: italic; -} - -em.author-emphasis { - letter-spacing: 0.1em; -} - -em.person { - font-style: normal; - font-variant: small-caps; -} - -.verse:after { - content: "\feff"; -} - - -/* =================================== */ -/* = Hide some elements for printing = */ -/* =================================== */ - -@media print { - #menu {display: none;} -} - - - -.activity { - clear:both; -} - -.activity .text { - width: 440*$px; - margin-right: 20px; - float: left; -} - -.activity .description p:first-child { - margin-top: 0; -} - - - -.activity { - margin-top: 2em; - - .act_counter { - float: left; - margin-right: .5em; - font-size: 2em; - } - - .info { - float: right; - width: 135*$px; - - .infobox { - padding: 1em 0; - border-top: 1px solid #c9ccce; - h1 { - text-transform: uppercase; - font-weight: bold; - margin: 0 0 .5em -35*$px; - padding-left: 35*$px; - line-height: 24px; - font-size: 1em; - } - p { - margin: 0; - } - - } - .time h1 { - background: url(/static/img/icons/activity-time.png) 0 0 no-repeat; - } - .kind h1 { - background: url(/static/img/icons/activity-kind.png) 0 0 no-repeat; - } - .materials h1 { - background: url(/static/img/icons/activity-tools.png) 0 0 no-repeat; - } - } -} - -.lista { - .paragraph { - margin: .3em 0; - } - li { - margin: .75em 0; - } -} - - -.clearboth { - clear: both; -} - -#book-text { - .caption { - margin: 1.5em; - p { - margin: 0; - } - } -} - -/* utils */ - -.clr { - clear: both; -} - -#book-text .top-link { - margin-top: 1em; -} - -.help { - font-size: .7em; - padding: 0 .5em; - color: #888; - vertical-align: super; -} diff --git a/catalogue/static/catalogue/css/section_list.css b/catalogue/static/catalogue/css/section_list.css deleted file mode 100644 index bd68dee..0000000 --- a/catalogue/static/catalogue/css/section_list.css +++ /dev/null @@ -1,58 +0,0 @@ -#level-chooser-place { - min-height: 5.9375em; - margin-top: 2em; } - #level-chooser-place ul#level-chooser { - margin: 0; - padding: 1em 0 1em 8.75em; - background-color: white; - width: 31.25em; - z-index: 300; - position: relative; - text-transform: uppercase; - text-align: right; } - #level-chooser-place ul#level-chooser .home { - display: none; - position: absolute; - top: 1.5em; - left: 0; } - #level-chooser-place ul#level-chooser .home a { - background: none; - padding: 0; } - #level-chooser-place ul#level-chooser .home a img { - width: 7.5em; } - #level-chooser-place ul#level-chooser.fixed { - position: fixed; - top: 0; - border-bottom: 1px solid #c9ccce; } - #level-chooser-place ul#level-chooser.fixed .home { - display: block; } - #level-chooser-place ul#level-chooser li { - display: inline-block; - list-style: none; - max-width: 175px; } - #level-chooser-place ul#level-chooser li a { - display: table-cell; - padding: .5em 1em; - border-radius: 0.3125em; - background: #eee; - height: 2.625em; - vertical-align: middle; } - #level-chooser-place ul#level-chooser li a.active { - color: white; - background: #ED7831; } - -.level .link-list { - margin-left: 1em; } -.level .level-toc { - overflow: hidden; - /* Because we're changing bg color lower. */ } - .level .level-toc.fixed { - position: fixed; } - .level .level-toc .link-list { - margin-left: 1em; } - .level .level-toc .link-list li { - margin-bottom: 0; } - .level .level-toc .link-list li.curriculumcourses { - margin: 10px -17px -17px; - padding: 10px 16px 16px; - background-color: #eee; } diff --git a/catalogue/static/catalogue/css/section_list.scss b/catalogue/static/catalogue/css/section_list.scss deleted file mode 100755 index fda2be3..0000000 --- a/catalogue/static/catalogue/css/section_list.scss +++ /dev/null @@ -1,90 +0,0 @@ -$px: 0.0625em; - -#level-chooser-place { - min-height: 95*$px; - margin-top: 2em; - - ul#level-chooser { - margin: 0; - padding: 16*$px 0 16*$px 140*$px; - background-color: white; - width: 500*$px; - z-index: 300; - position: relative; - text-transform: uppercase; - text-align: right; - - .home { - display: none; - position: absolute; - top: 1.5em; - left: 0; - - a { - background: none; - padding: 0; - img { - width: 120*$px; - } - } - } - - &.fixed { - position: fixed; - top: 0; - border-bottom: 1px solid #c9ccce; - - .home { - display: block; - } - } - - li { - display: inline-block; - list-style: none; - max-width: 175px; - - a { - display: table-cell; - padding: .5em 1em; - border-radius: 5*$px; - background: #eee; - height: 42*$px; - vertical-align: middle; - - &.active { - color: white; - background: #ED7831; - } - } - } - } -} - -.level { - .link-list { - margin-left: 1em; - } - - .level-toc { - overflow: hidden; /* Because we're changing bg color lower. */ - - &.fixed { - position: fixed; - } - - .link-list { - margin-left: 1em; - - li { - margin-bottom: 0; - - &.curriculumcourses { - margin: 10px -17px -17px; - padding: 10px 16px 16px; - background-color: #eee; - } - } - } - } -} diff --git a/catalogue/static/catalogue/img/carousel-left.png b/catalogue/static/catalogue/img/carousel-left.png deleted file mode 100644 index 3f6090bd6a38d9b2b521e2c0f88ea9f697e7acfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2139 zcmV-h2&DIkP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00+ZKL_t(|+U=cPh*eb>hM%=( z)I=v6XBxG#ES0F#$sf#&D9XC2D76SHDf7aMH0vfJ6se2A5G>es`FsT|&?x!gd9Pq6g<65)R&TZ5fk2RM9Th$o1 zwgWp9j2ovDz~dSvf1J(&egOukF==ZK0WYXAerqNHUxo5|f-uI`R{JqQqjXA~jsvSS zO8z(v2fhKi)R?q2eZYGfC4a32jwu+oz65qE82?OoH6S|px`XgAU_UTOjY(T`79T{?Z9|7#+?a2 zrN)$>3Gb!JC#~jfj5#?I{!oqaTQd>(TEX}S;k}g3#ndQy+7W7u$C?h{cQwYf<_M+p zz10|xHBIXYC*-?!0NWIdza8;}MydQv_$S~DHO8F@uTx|E)?7}h^=Z_YbZxdbjgn^& zep;jCkJE7b_T8<|WILiT##n2n0-w=Okx26L)SnHf7DJmG- z6MjXF@mo`KPdK62wSyYBVktBj+m2YSQS!&B6aPBlsH1dpiQ21Zd99fuBFCkQN+Myi zi7J`eF~jZ!*J zCxDeY`1-9GMrjwdfoe?Jn!^ONflp}GOwhr%{2;ssI7c;c;mlWK{9yWBC!E9z#`c8Q zX?Fb9Tvjehv4d$7k!=db4`-f&@q_6Ukw0VY;Pp2MYfrczYo>_E35}9}5ZZOO2Q9ky;3OC zj!+7IFavZRzU$d@9(cDYi4*+JGN`^G^4>u^BUy3U?uj4a`z1{Awho^R9brj0USQ>AIs* zDA5=rBJGqmT_0EJV`4F8S~XB&0<)yr2gI=BP&e>vwU3LznA>W3P|>%0YXf#u!)e4t zH>Q^w&#f*xm}Rv-u*iFD_S@5q*_e6tJh-U)`JT3?8>=zXsk5hBR4~ixeS#wHGT#mS zOr1+oi)hTf=#?zIGu`ij(e*x8(Tus03L4!pf?3k26cp+DNZOcP}uq(a)WCV|tqb zr3he_H|vQ_j$>3;Pq)a%+|$e_H#xPX?w)Q@jhRl9*XiaJ%<^U*z~nGS-FEIWNR4p^ z-9c)MJJa0-oZswY<;|Fxz`3nBP~N~)yiPZoDA}Iw?pBO1c{65CtDxk@m|E89#$wFm zRzk@Wn1@?^K$C+Qb=eP$s4?l9oy9>-;I_0;x&-_PH6~q|?Y$5>m=#$a*aRG-ruKC6 zY|PzR9^3?KOVfM0c{OGR8SlLiDwyS2zW@_pj4IlDAx2~7XALDdV{Cij8{opMUrT7l zTmg&;;e~_-W@#uEn}A}}L+PuLA!5xEBVm>iU8A(U=PZOdG2Nu9I^%0OTv zIohW?X#tdW;7#Bva#Tr^p|k<712>VgGEIiEfs9r}1qnt(I)Hb8YsqPuCP0~B-;%q? zaU~6gazC&+?@$_MjEIZ^)&VzAkV@(VGDJjHP+FZ(7$`LxBO-%=+kxk)VuSKRg0Vf6 z3BUqMmk%63fy-1dl^<{4b{7E?iKLAE<2&qlGYaSdt^=+IE}^vVQ*>9=`3E0vOHfq% R>G}Ww002ovPDHLkV1h}}+wlMZ diff --git a/catalogue/static/catalogue/img/carousel-right.png b/catalogue/static/catalogue/img/carousel-right.png deleted file mode 100644 index 3987678a4884608a201cedfa6e6541f88b1393c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1794 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 score[2] && score[1] === 0) { - return $msg.addClass("maxscore"); - } else { - return $msg.removeClass("maxscore"); - } - }; - - Exercise.prototype.draggable_equal = function($draggable1, $draggable2) { - return false; - }; - - Exercise.prototype.draggable_accept = function($draggable, $droppable) { - var d, dropped, _i, _len; - dropped = $droppable.closest("ul, ol").find(".draggable"); - for (_i = 0, _len = dropped.length; _i < _len; _i++) { - d = dropped[_i]; - if (this.draggable_equal($draggable, $(d))) { - return false; - } - } - return true; - }; - - Exercise.prototype.draggable_move = function($draggable, $placeholder, ismultiple) { - var $added, - _this = this; - $added = $draggable.clone(); - $added.data("original", $draggable.get(0)); - if (!ismultiple) { - $draggable.addClass('disabled').draggable('disable'); - } - $placeholder.after($added); - if (!$placeholder.hasClass('multiple')) { - $placeholder.hide(); - } - if ($added.is(".add-li")) { - $added.wrap("
  2. "); - } - $added.append('x
    '); - return $('.remove', $added).click(function(ev) { - _this.retry(); - if (!ismultiple) { - $($added.data('original')).removeClass('disabled').draggable('enable'); - } - if ($added.is(".add-li")) { - $added = $added.closest('li'); - } - $added.prev(".placeholder:not(.multiple)").show(); - return $added.remove(); - }); - }; - - Exercise.prototype.dragging = function(ismultiple, issortable) { - var _this = this; - return $(".question", this.element).each(function(i, question) { - var draggable_opts, self; - draggable_opts = { - revert: 'invalid', - helper: 'clone', - start: _this.retry - }; - $(".draggable", question).draggable(draggable_opts); - self = _this; - return $(".placeholder", question).droppable({ - accept: function(draggable) { - var $draggable, is_accepted; - $draggable = $(draggable); - is_accepted = true; - if (!$draggable.is(".draggable")) { - is_accepted = false; - } - if (is_accepted) { - is_accepted = self.draggable_accept($draggable, $(this)); - } - if (is_accepted) { - $(this).addClass('accepting'); - } else { - $(this).removeClass('accepting'); - } - return is_accepted; - }, - drop: function(ev, ui) { - $(ev.target).removeClass('accepting dragover'); - return _this.draggable_move($(ui.draggable), $(ev.target), ismultiple); - }, - over: function(ev, ui) { - return $(ev.target).addClass('dragover'); - }, - out: function(ev, ui) { - return $(ev.target).removeClass('dragover'); - } - }); - }); - }; - - return Exercise; - - })(Binding); - - Wybor = (function(_super) { - - __extends(Wybor, _super); - - function Wybor(element) { - Wybor.__super__.constructor.call(this, element); - $(".question-piece input", element).change(this.retry); - } - - Wybor.prototype.check_question = function(question) { - var all, bad, good, solution, - _this = this; - all = 0; - good = 0; - bad = 0; - solution = this.get_value_list(question, 'solution'); - $(".question-piece", question).each(function(i, qpiece) { - var is_checked, piece_name, piece_no, should_be_checked; - piece_no = $(qpiece).attr('data-no'); - piece_name = $(qpiece).attr('data-name'); - if (piece_name) { - should_be_checked = solution.indexOf(piece_name) >= 0; - } else { - should_be_checked = solution.indexOf(piece_no) >= 0; - } - is_checked = $("input", qpiece).is(":checked"); - if (should_be_checked) { - all += 1; - } - if (is_checked) { - if (should_be_checked) { - good += 1; - return _this.piece_correct(qpiece); - } else { - bad += 1; - return _this.piece_incorrect(qpiece); - } - } else { - return $(qpiece).removeClass("correct,incorrect"); - } - }); - return [good, bad, all]; - }; - - Wybor.prototype.solve_question = function(question) { - var solution, - _this = this; - solution = this.get_value_list(question, 'solution'); - return $(".question-piece", question).each(function(i, qpiece) { - var piece_name, piece_no, should_be_checked; - piece_no = $(qpiece).attr('data-no'); - piece_name = $(qpiece).attr('data-name'); - if (piece_name) { - should_be_checked = solution.indexOf(piece_name) >= 0; - } else { - should_be_checked = solution.indexOf(piece_no) >= 0; - } - console.log("check " + $("input[type=checkbox]", qpiece).attr("id") + " -> " + should_be_checked); - return $("input[type=checkbox],input[type=radio]", qpiece).prop('checked', should_be_checked); - }); - }; - - return Wybor; - - })(Exercise); - - Uporzadkuj = (function(_super) { - - __extends(Uporzadkuj, _super); - - function Uporzadkuj(element) { - Uporzadkuj.__super__.constructor.call(this, element); - $('ol, ul', this.element).sortable({ - items: "> li", - start: this.retry - }); - } - - Uporzadkuj.prototype.check_question = function(question) { - var all, bad, correct, pkt, pkts, positions, sorted, _i, _ref; - positions = this.get_value_list(question, 'original', true); - sorted = positions.sort(function(a, b) { - return a - b; - }); - pkts = $('.question-piece', question); - correct = 0; - bad = 0; - all = 0; - for (pkt = _i = 0, _ref = pkts.length; 0 <= _ref ? _i < _ref : _i > _ref; pkt = 0 <= _ref ? ++_i : --_i) { - all += 1; - if (pkts.eq(pkt).data('pos') === sorted[pkt]) { - correct += 1; - this.piece_correct(pkts.eq(pkt)); - } else { - bad += 1; - this.piece_incorrect(pkts.eq(pkt)); - } - } - return [correct, bad, all]; - }; - - Uporzadkuj.prototype.solve_question = function(question) { - var p, parent, pkts, _i, _len, _results; - pkts = $('.question-piece', question); - pkts.sort(function(a, b) { - return $(a).data('pos') - $(b).data('pos'); - }); - parent = pkts.eq(0).parent(); - _results = []; - for (_i = 0, _len = pkts.length; _i < _len; _i++) { - p = pkts[_i]; - _results.push(parent.append(p)); - } - return _results; - }; - - return Uporzadkuj; - - })(Exercise); - - Luki = (function(_super) { - - __extends(Luki, _super); - - function Luki(element) { - Luki.__super__.constructor.call(this, element); - this.dragging(false, false); - } - - Luki.prototype.check = function() { - var all, bad, correct, - _this = this; - all = $(".placeholder", this.element).length; - correct = 0; - bad = 0; - $(".placeholder + .question-piece", this.element).each(function(i, qpiece) { - var $placeholder; - $placeholder = $(qpiece).prev(".placeholder"); - if ($placeholder.data('solution') === $(qpiece).data('no')) { - _this.piece_correct(qpiece); - return correct += 1; - } else { - bad += 1; - return _this.piece_incorrect(qpiece); - } - }); - return this.show_score([correct, bad, all]); - }; - - Luki.prototype.solve_question = function(question) { - var _this = this; - return $(".placeholder", question).each(function(i, placeholder) { - var $qp; - $qp = $(".question-piece[data-no=" + $(placeholder).data('solution') + "]", question); - return _this.draggable_move($qp, $(placeholder), false); - }); - }; - - return Luki; - - })(Exercise); - - Zastap = (function(_super) { - - __extends(Zastap, _super); - - function Zastap(element) { - var _this = this; - Zastap.__super__.constructor.call(this, element); - $(".paragraph", this.element).each(function(i, par) { - return _this.wrap_words($(par), $('')); - }); - this.dragging(false, false); - } - - Zastap.prototype.check = function() { - var all, bad, correct, - _this = this; - all = 0; - correct = 0; - bad = 0; - $(".paragraph", this.element).each(function(i, par) { - return $(".placeholder", par).each(function(j, qpiece) { - var $dragged, $qp; - $qp = $(qpiece); - $dragged = $qp.next(".draggable"); - if ($qp.data("solution")) { - if ($dragged && $qp.data("solution") === $dragged.data("no")) { - _this.piece_correct($dragged); - correct += 1; - } - return all += 1; - } - }); - }); - return this.show_score([correct, bad, all]); - }; - - Zastap.prototype.show_solutions = function() { - var _this = this; - this.reset(); - return $(".paragraph", this.element).each(function(i, par) { - return $(".placeholder[data-solution]", par).each(function(j, qpiece) { - var $dr, $qp; - $qp = $(qpiece); - $dr = $(".draggable[data-no=" + $qp.data('solution') + "]", _this.element); - return _this.draggable_move($dr, $qp, false); - }); - }); - }; - - Zastap.prototype.wrap_words = function(element, wrapper) { - var chld, i, ignore, insertWrapped, j, len, space, wordb, _i, _ref, _results; - ignore = /^[ \t.,:;()]+/; - insertWrapped = function(txt, elem) { - var nw; - nw = wrapper.clone(); - return $(document.createTextNode(txt)).wrap(nw).parent().attr("data-original", txt).insertBefore(elem); - }; - _results = []; - for (j = _i = _ref = element.get(0).childNodes.length - 1; _ref <= 0 ? _i <= 0 : _i >= 0; j = _ref <= 0 ? ++_i : --_i) { - chld = element.get(0).childNodes[j]; - if (chld.nodeType === document.TEXT_NODE) { - len = chld.textContent.length; - wordb = 0; - i = 0; - while (i < len) { - space = ignore.exec(chld.textContent.substr(i)); - if (space != null) { - if (wordb < i) { - insertWrapped(chld.textContent.substr(wordb, i - wordb), chld); - } - $(document.createTextNode(space[0])).insertBefore(chld); - i += space[0].length; - wordb = i; - } else { - i = i + 1; - } - } - if (wordb < len - 1) { - insertWrapped(chld.textContent.substr(wordb, len - 1 - wordb), chld); - } - _results.push($(chld).remove()); - } else { - _results.push(void 0); - } - } - return _results; - }; - - return Zastap; - - })(Exercise); - - Przyporzadkuj = (function(_super) { - - __extends(Przyporzadkuj, _super); - - Przyporzadkuj.prototype.is_multiple = function() { - var qp, _i, _len, _ref; - _ref = $(".question-piece", this.element); - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - qp = _ref[_i]; - if ($(qp).attr('data-solution').split(/[ ,]+/).length > 1) { - return true; - } - } - return false; - }; - - function Przyporzadkuj(element) { - Przyporzadkuj.__super__.constructor.call(this, element); - this.multiple = this.is_multiple(); - this.dragging(this.multiple, true); - } - - Przyporzadkuj.prototype.draggable_equal = function(d1, d2) { - return d1.data("no") === d2.data("no"); - }; - - Przyporzadkuj.prototype.check_question = function(question) { - var all, bad_count, count, mandatory, minimum, optional, pn, pred, qp, self, v, _i, _j, _len, _len1, _ref, _ref1; - minimum = $(question).data("minimum"); - count = 0; - bad_count = 0; - all = 0; - if (!minimum) { - self = this; - $(".subject .question-piece", question).each(function(i, el) { - var mandatory, v; - v = self.get_value_optional_list(el, 'solution'); - mandatory = v[0]; - return all += mandatory.length; - }); - } - _ref = $(".predicate [data-predicate]", question); - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - pred = _ref[_i]; - pn = $(pred).attr('data-predicate'); - _ref1 = $(".question-piece", pred); - for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) { - qp = _ref1[_j]; - v = this.get_value_optional_list(qp, 'solution'); - mandatory = v[0]; - optional = v[1]; - if (mandatory.indexOf(pn) >= 0 || (minimum && optional.indexOf(pn) >= 0)) { - count += 1; - this.piece_correct(qp); - } else { - bad_count += 1; - this.piece_incorrect(qp); - } - } - } - return [count, bad_count, all]; - }; - - Przyporzadkuj.prototype.solve_question = function(question) { - var $ph, $pr, draggables, m, mandatory, minimum, optional, qp, v, _i, _len, _ref, _results; - minimum = $(question).data("min"); - _ref = $(".subject .question-piece", question); - _results = []; - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - qp = _ref[_i]; - v = this.get_value_optional_list(qp, 'solution'); - mandatory = v[0]; - optional = v[1]; - if (minimum) { - draggables = mandatory.count(optional).slice(0, minimum); - } else { - draggables = mandatory; - } - _results.push((function() { - var _j, _len1, _results1; - _results1 = []; - for (_j = 0, _len1 = draggables.length; _j < _len1; _j++) { - m = draggables[_j]; - $pr = $(".predicate [data-predicate=" + m + "]", question); - $ph = $pr.find(".placeholder:visible"); - _results1.push(this.draggable_move($(qp), $ph.eq(0), this.multiple)); - } - return _results1; - }).call(this)); - } - return _results; - }; - - return Przyporzadkuj; - - })(Exercise); - - PrawdaFalsz = (function(_super) { - - __extends(PrawdaFalsz, _super); - - function PrawdaFalsz(element) { - var qp, _i, _len, _ref, - _this = this; - PrawdaFalsz.__super__.constructor.call(this, element); - _ref = $(".question-piece", this.element); - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - qp = _ref[_i]; - $(".true", qp).click(function(ev) { - ev.preventDefault(); - _this.retry(); - $(ev.target).closest(".question-piece").data("value", "true"); - return $(ev.target).addClass('chosen').siblings('a').removeClass('chosen'); - }); - $(".false", qp).click(function(ev) { - ev.preventDefault(); - _this.retry(); - $(ev.target).closest(".question-piece").data("value", "false"); - return $(ev.target).addClass('chosen').siblings('a').removeClass('chosen'); - }); - } - } - - PrawdaFalsz.prototype.check_question = function() { - var all, bad, good, qp, _i, _len, _ref; - all = 0; - good = 0; - bad = 0; - _ref = $(".question-piece", this.element); - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - qp = _ref[_i]; - if ($(qp).data("solution").toString() === $(qp).data("value")) { - good += 1; - this.piece_correct(qp); - } else { - bad += 1; - this.piece_incorrect(qp); - } - all += 1; - } - return [good, bad, all]; - }; - - PrawdaFalsz.prototype.show_solutions = function() { - var qp, _i, _len, _ref, _results; - this.reset(); - _ref = $(".question-piece", this.element); - _results = []; - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - qp = _ref[_i]; - if ($(qp).data('solution') === true) { - _results.push($(".true", qp).click()); - } else { - _results.push($(".false", qp).click()); - } - } - return _results; - }; - - return PrawdaFalsz; - - })(Exercise); - - exercise = function(ele) { - var cls, es; - es = { - wybor: Wybor, - uporzadkuj: Uporzadkuj, - luki: Luki, - zastap: Zastap, - przyporzadkuj: Przyporzadkuj, - prawdafalsz: PrawdaFalsz - }; - cls = es[$(ele).attr('data-type')]; - return new cls(ele); - }; - - window.edumed = { - 'EduModule': EduModule - }; - - $(document).ready(function() { - new EduModule($("#book-text")); - return $(".exercise").each(function(i, el) { - return exercise(this); - }); - }); - -}).call(this); diff --git a/catalogue/static/catalogue/js/jquery.cycle.all.js b/catalogue/static/catalogue/js/jquery.cycle.all.js deleted file mode 100644 index 666afda..0000000 --- a/catalogue/static/catalogue/js/jquery.cycle.all.js +++ /dev/null @@ -1,1538 +0,0 @@ -/*! - * jQuery Cycle Plugin (with Transition Definitions) - * Examples and documentation at: http://jquery.malsup.com/cycle/ - * Copyright (c) 2007-2012 M. Alsup - * Version: 2.9999.81 (15-JAN-2013) - * Dual licensed under the MIT and GPL licenses. - * http://jquery.malsup.com/license.html - * Requires: jQuery v1.7.1 or later - */ -;(function($, undefined) { -"use strict"; - -var ver = '2.9999.81'; - -function debug(s) { - if ($.fn.cycle.debug) - log(s); -} -function log() { - if (window.console && console.log) - console.log('[cycle] ' + Array.prototype.join.call(arguments,' ')); -} -$.expr[':'].paused = function(el) { - return el.cyclePause; -}; - - -// the options arg can be... -// a number - indicates an immediate transition should occur to the given slide index -// a string - 'pause', 'resume', 'toggle', 'next', 'prev', 'stop', 'destroy' or the name of a transition effect (ie, 'fade', 'zoom', etc) -// an object - properties to control the slideshow -// -// the arg2 arg can be... -// the name of an fx (only used in conjunction with a numeric value for 'options') -// the value true (only used in first arg == 'resume') and indicates -// that the resume should occur immediately (not wait for next timeout) - -$.fn.cycle = function(options, arg2) { - var o = { s: this.selector, c: this.context }; - - // in 1.3+ we can fix mistakes with the ready state - if (this.length === 0 && options != 'stop') { - if (!$.isReady && o.s) { - log('DOM not ready, queuing slideshow'); - $(function() { - $(o.s,o.c).cycle(options,arg2); - }); - return this; - } - // is your DOM ready? http://docs.jquery.com/Tutorials:Introducing_$(document).ready() - log('terminating; zero elements found by selector' + ($.isReady ? '' : ' (DOM not ready)')); - return this; - } - - // iterate the matched nodeset - return this.each(function() { - var opts = handleArguments(this, options, arg2); - if (opts === false) - return; - - opts.updateActivePagerLink = opts.updateActivePagerLink || $.fn.cycle.updateActivePagerLink; - - // stop existing slideshow for this container (if there is one) - if (this.cycleTimeout) - clearTimeout(this.cycleTimeout); - this.cycleTimeout = this.cyclePause = 0; - this.cycleStop = 0; // issue #108 - - var $cont = $(this); - var $slides = opts.slideExpr ? $(opts.slideExpr, this) : $cont.children(); - var els = $slides.get(); - - if (els.length < 2) { - log('terminating; too few slides: ' + els.length); - return; - } - - var opts2 = buildOptions($cont, $slides, els, opts, o); - if (opts2 === false) - return; - - var startTime = opts2.continuous ? 10 : getTimeout(els[opts2.currSlide], els[opts2.nextSlide], opts2, !opts2.backwards); - - // if it's an auto slideshow, kick it off - if (startTime) { - startTime += (opts2.delay || 0); - if (startTime < 10) - startTime = 10; - debug('first timeout: ' + startTime); - this.cycleTimeout = setTimeout(function(){go(els,opts2,0,!opts.backwards);}, startTime); - } - }); -}; - -function triggerPause(cont, byHover, onPager) { - var opts = $(cont).data('cycle.opts'); - if (!opts) - return; - var paused = !!cont.cyclePause; - if (paused && opts.paused) - opts.paused(cont, opts, byHover, onPager); - else if (!paused && opts.resumed) - opts.resumed(cont, opts, byHover, onPager); -} - -// process the args that were passed to the plugin fn -function handleArguments(cont, options, arg2) { - if (cont.cycleStop === undefined) - cont.cycleStop = 0; - if (options === undefined || options === null) - options = {}; - if (options.constructor == String) { - switch(options) { - case 'destroy': - case 'stop': - var opts = $(cont).data('cycle.opts'); - if (!opts) - return false; - cont.cycleStop++; // callbacks look for change - if (cont.cycleTimeout) - clearTimeout(cont.cycleTimeout); - cont.cycleTimeout = 0; - if (opts.elements) - $(opts.elements).stop(); - $(cont).removeData('cycle.opts'); - if (options == 'destroy') - destroy(cont, opts); - return false; - case 'toggle': - cont.cyclePause = (cont.cyclePause === 1) ? 0 : 1; - checkInstantResume(cont.cyclePause, arg2, cont); - triggerPause(cont); - return false; - case 'pause': - cont.cyclePause = 1; - triggerPause(cont); - return false; - case 'resume': - cont.cyclePause = 0; - checkInstantResume(false, arg2, cont); - triggerPause(cont); - return false; - case 'prev': - case 'next': - opts = $(cont).data('cycle.opts'); - if (!opts) { - log('options not found, "prev/next" ignored'); - return false; - } - $.fn.cycle[options](opts); - return false; - default: - options = { fx: options }; - } - return options; - } - else if (options.constructor == Number) { - // go to the requested slide - var num = options; - options = $(cont).data('cycle.opts'); - if (!options) { - log('options not found, can not advance slide'); - return false; - } - if (num < 0 || num >= options.elements.length) { - log('invalid slide index: ' + num); - return false; - } - options.nextSlide = num; - if (cont.cycleTimeout) { - clearTimeout(cont.cycleTimeout); - cont.cycleTimeout = 0; - } - if (typeof arg2 == 'string') - options.oneTimeFx = arg2; - go(options.elements, options, 1, num >= options.currSlide); - return false; - } - return options; - - function checkInstantResume(isPaused, arg2, cont) { - if (!isPaused && arg2 === true) { // resume now! - var options = $(cont).data('cycle.opts'); - if (!options) { - log('options not found, can not resume'); - return false; - } - if (cont.cycleTimeout) { - clearTimeout(cont.cycleTimeout); - cont.cycleTimeout = 0; - } - go(options.elements, options, 1, !options.backwards); - } - } -} - -function removeFilter(el, opts) { - if (!$.support.opacity && opts.cleartype && el.style.filter) { - try { el.style.removeAttribute('filter'); } - catch(smother) {} // handle old opera versions - } -} - -// unbind event handlers -function destroy(cont, opts) { - if (opts.next) - $(opts.next).unbind(opts.prevNextEvent); - if (opts.prev) - $(opts.prev).unbind(opts.prevNextEvent); - - if (opts.pager || opts.pagerAnchorBuilder) - $.each(opts.pagerAnchors || [], function() { - this.unbind().remove(); - }); - opts.pagerAnchors = null; - $(cont).unbind('mouseenter.cycle mouseleave.cycle'); - if (opts.destroy) // callback - opts.destroy(opts); -} - -// one-time initialization -function buildOptions($cont, $slides, els, options, o) { - var startingSlideSpecified; - // support metadata plugin (v1.0 and v2.0) - var opts = $.extend({}, $.fn.cycle.defaults, options || {}, $.metadata ? $cont.metadata() : $.meta ? $cont.data() : {}); - var meta = $.isFunction($cont.data) ? $cont.data(opts.metaAttr) : null; - if (meta) - opts = $.extend(opts, meta); - if (opts.autostop) - opts.countdown = opts.autostopCount || els.length; - - var cont = $cont[0]; - $cont.data('cycle.opts', opts); - opts.$cont = $cont; - opts.stopCount = cont.cycleStop; - opts.elements = els; - opts.before = opts.before ? [opts.before] : []; - opts.after = opts.after ? [opts.after] : []; - - // push some after callbacks - if (!$.support.opacity && opts.cleartype) - opts.after.push(function() { removeFilter(this, opts); }); - if (opts.continuous) - opts.after.push(function() { go(els,opts,0,!opts.backwards); }); - - saveOriginalOpts(opts); - - // clearType corrections - if (!$.support.opacity && opts.cleartype && !opts.cleartypeNoBg) - clearTypeFix($slides); - - // container requires non-static position so that slides can be position within - if ($cont.css('position') == 'static') - $cont.css('position', 'relative'); - if (opts.width) - $cont.width(opts.width); - if (opts.height && opts.height != 'auto') - $cont.height(opts.height); - - if (opts.startingSlide !== undefined) { - opts.startingSlide = parseInt(opts.startingSlide,10); - if (opts.startingSlide >= els.length || opts.startSlide < 0) - opts.startingSlide = 0; // catch bogus input - else - startingSlideSpecified = true; - } - else if (opts.backwards) - opts.startingSlide = els.length - 1; - else - opts.startingSlide = 0; - - // if random, mix up the slide array - if (opts.random) { - opts.randomMap = []; - for (var i = 0; i < els.length; i++) - opts.randomMap.push(i); - opts.randomMap.sort(function(a,b) {return Math.random() - 0.5;}); - if (startingSlideSpecified) { - // try to find the specified starting slide and if found set start slide index in the map accordingly - for ( var cnt = 0; cnt < els.length; cnt++ ) { - if ( opts.startingSlide == opts.randomMap[cnt] ) { - opts.randomIndex = cnt; - } - } - } - else { - opts.randomIndex = 1; - opts.startingSlide = opts.randomMap[1]; - } - } - else if (opts.startingSlide >= els.length) - opts.startingSlide = 0; // catch bogus input - opts.currSlide = opts.startingSlide || 0; - var first = opts.startingSlide; - - // set position and zIndex on all the slides - $slides.css({position: 'absolute', top:0, left:0}).hide().each(function(i) { - var z; - if (opts.backwards) - z = first ? i <= first ? els.length + (i-first) : first-i : els.length-i; - else - z = first ? i >= first ? els.length - (i-first) : first-i : els.length-i; - $(this).css('z-index', z); - }); - - // make sure first slide is visible - $(els[first]).css('opacity',1).show(); // opacity bit needed to handle restart use case - removeFilter(els[first], opts); - - // stretch slides - if (opts.fit) { - if (!opts.aspect) { - if (opts.width) - $slides.width(opts.width); - if (opts.height && opts.height != 'auto') - $slides.height(opts.height); - } else { - $slides.each(function(){ - var $slide = $(this); - var ratio = (opts.aspect === true) ? $slide.width()/$slide.height() : opts.aspect; - if( opts.width && $slide.width() != opts.width ) { - $slide.width( opts.width ); - $slide.height( opts.width / ratio ); - } - - if( opts.height && $slide.height() < opts.height ) { - $slide.height( opts.height ); - $slide.width( opts.height * ratio ); - } - }); - } - } - - if (opts.center && ((!opts.fit) || opts.aspect)) { - $slides.each(function(){ - var $slide = $(this); - $slide.css({ - "margin-left": opts.width ? - ((opts.width - $slide.width()) / 2) + "px" : - 0, - "margin-top": opts.height ? - ((opts.height - $slide.height()) / 2) + "px" : - 0 - }); - }); - } - - if (opts.center && !opts.fit && !opts.slideResize) { - $slides.each(function(){ - var $slide = $(this); - $slide.css({ - "margin-left": opts.width ? ((opts.width - $slide.width()) / 2) + "px" : 0, - "margin-top": opts.height ? ((opts.height - $slide.height()) / 2) + "px" : 0 - }); - }); - } - - // stretch container - var reshape = (opts.containerResize || opts.containerResizeHeight) && !$cont.innerHeight(); - if (reshape) { // do this only if container has no size http://tinyurl.com/da2oa9 - var maxw = 0, maxh = 0; - for(var j=0; j < els.length; j++) { - var $e = $(els[j]), e = $e[0], w = $e.outerWidth(), h = $e.outerHeight(); - if (!w) w = e.offsetWidth || e.width || $e.attr('width'); - if (!h) h = e.offsetHeight || e.height || $e.attr('height'); - maxw = w > maxw ? w : maxw; - maxh = h > maxh ? h : maxh; - } - if (opts.containerResize && maxw > 0 && maxh > 0) - $cont.css({width:maxw+'px',height:maxh+'px'}); - if (opts.containerResizeHeight && maxh > 0) - $cont.css({height:maxh+'px'}); - } - - var pauseFlag = false; // https://github.com/malsup/cycle/issues/44 - if (opts.pause) - $cont.bind('mouseenter.cycle', function(){ - pauseFlag = true; - this.cyclePause++; - triggerPause(cont, true); - }).bind('mouseleave.cycle', function(){ - if (pauseFlag) - this.cyclePause--; - triggerPause(cont, true); - }); - - if (supportMultiTransitions(opts) === false) - return false; - - // apparently a lot of people use image slideshows without height/width attributes on the images. - // Cycle 2.50+ requires the sizing info for every slide; this block tries to deal with that. - var requeue = false; - options.requeueAttempts = options.requeueAttempts || 0; - $slides.each(function() { - // try to get height/width of each slide - var $el = $(this); - this.cycleH = (opts.fit && opts.height) ? opts.height : ($el.height() || this.offsetHeight || this.height || $el.attr('height') || 0); - this.cycleW = (opts.fit && opts.width) ? opts.width : ($el.width() || this.offsetWidth || this.width || $el.attr('width') || 0); - - if ( $el.is('img') ) { - var loading = (this.cycleH === 0 && this.cycleW === 0 && !this.complete); - // don't requeue for images that are still loading but have a valid size - if (loading) { - if (o.s && opts.requeueOnImageNotLoaded && ++options.requeueAttempts < 100) { // track retry count so we don't loop forever - log(options.requeueAttempts,' - img slide not loaded, requeuing slideshow: ', this.src, this.cycleW, this.cycleH); - setTimeout(function() {$(o.s,o.c).cycle(options);}, opts.requeueTimeout); - requeue = true; - return false; // break each loop - } - else { - log('could not determine size of image: '+this.src, this.cycleW, this.cycleH); - } - } - } - return true; - }); - - if (requeue) - return false; - - opts.cssBefore = opts.cssBefore || {}; - opts.cssAfter = opts.cssAfter || {}; - opts.cssFirst = opts.cssFirst || {}; - opts.animIn = opts.animIn || {}; - opts.animOut = opts.animOut || {}; - - $slides.not(':eq('+first+')').css(opts.cssBefore); - $($slides[first]).css(opts.cssFirst); - - if (opts.timeout) { - opts.timeout = parseInt(opts.timeout,10); - // ensure that timeout and speed settings are sane - if (opts.speed.constructor == String) - opts.speed = $.fx.speeds[opts.speed] || parseInt(opts.speed,10); - if (!opts.sync) - opts.speed = opts.speed / 2; - - var buffer = opts.fx == 'none' ? 0 : opts.fx == 'shuffle' ? 500 : 250; - while((opts.timeout - opts.speed) < buffer) // sanitize timeout - opts.timeout += opts.speed; - } - if (opts.easing) - opts.easeIn = opts.easeOut = opts.easing; - if (!opts.speedIn) - opts.speedIn = opts.speed; - if (!opts.speedOut) - opts.speedOut = opts.speed; - - opts.slideCount = els.length; - opts.currSlide = opts.lastSlide = first; - if (opts.random) { - if (++opts.randomIndex == els.length) - opts.randomIndex = 0; - opts.nextSlide = opts.randomMap[opts.randomIndex]; - } - else if (opts.backwards) - opts.nextSlide = opts.startingSlide === 0 ? (els.length-1) : opts.startingSlide-1; - else - opts.nextSlide = opts.startingSlide >= (els.length-1) ? 0 : opts.startingSlide+1; - - // run transition init fn - if (!opts.multiFx) { - var init = $.fn.cycle.transitions[opts.fx]; - if ($.isFunction(init)) - init($cont, $slides, opts); - else if (opts.fx != 'custom' && !opts.multiFx) { - log('unknown transition: ' + opts.fx,'; slideshow terminating'); - return false; - } - } - - // fire artificial events - var e0 = $slides[first]; - if (!opts.skipInitializationCallbacks) { - if (opts.before.length) - opts.before[0].apply(e0, [e0, e0, opts, true]); - if (opts.after.length) - opts.after[0].apply(e0, [e0, e0, opts, true]); - } - if (opts.next) - $(opts.next).bind(opts.prevNextEvent,function(){return advance(opts,1);}); - if (opts.prev) - $(opts.prev).bind(opts.prevNextEvent,function(){return advance(opts,0);}); - if (opts.pager || opts.pagerAnchorBuilder) - buildPager(els,opts); - - exposeAddSlide(opts, els); - - return opts; -} - -// save off original opts so we can restore after clearing state -function saveOriginalOpts(opts) { - opts.original = { before: [], after: [] }; - opts.original.cssBefore = $.extend({}, opts.cssBefore); - opts.original.cssAfter = $.extend({}, opts.cssAfter); - opts.original.animIn = $.extend({}, opts.animIn); - opts.original.animOut = $.extend({}, opts.animOut); - $.each(opts.before, function() { opts.original.before.push(this); }); - $.each(opts.after, function() { opts.original.after.push(this); }); -} - -function supportMultiTransitions(opts) { - var i, tx, txs = $.fn.cycle.transitions; - // look for multiple effects - if (opts.fx.indexOf(',') > 0) { - opts.multiFx = true; - opts.fxs = opts.fx.replace(/\s*/g,'').split(','); - // discard any bogus effect names - for (i=0; i < opts.fxs.length; i++) { - var fx = opts.fxs[i]; - tx = txs[fx]; - if (!tx || !txs.hasOwnProperty(fx) || !$.isFunction(tx)) { - log('discarding unknown transition: ',fx); - opts.fxs.splice(i,1); - i--; - } - } - // if we have an empty list then we threw everything away! - if (!opts.fxs.length) { - log('No valid transitions named; slideshow terminating.'); - return false; - } - } - else if (opts.fx == 'all') { // auto-gen the list of transitions - opts.multiFx = true; - opts.fxs = []; - for (var p in txs) { - if (txs.hasOwnProperty(p)) { - tx = txs[p]; - if (txs.hasOwnProperty(p) && $.isFunction(tx)) - opts.fxs.push(p); - } - } - } - if (opts.multiFx && opts.randomizeEffects) { - // munge the fxs array to make effect selection random - var r1 = Math.floor(Math.random() * 20) + 30; - for (i = 0; i < r1; i++) { - var r2 = Math.floor(Math.random() * opts.fxs.length); - opts.fxs.push(opts.fxs.splice(r2,1)[0]); - } - debug('randomized fx sequence: ',opts.fxs); - } - return true; -} - -// provide a mechanism for adding slides after the slideshow has started -function exposeAddSlide(opts, els) { - opts.addSlide = function(newSlide, prepend) { - var $s = $(newSlide), s = $s[0]; - if (!opts.autostopCount) - opts.countdown++; - els[prepend?'unshift':'push'](s); - if (opts.els) - opts.els[prepend?'unshift':'push'](s); // shuffle needs this - opts.slideCount = els.length; - - // add the slide to the random map and resort - if (opts.random) { - opts.randomMap.push(opts.slideCount-1); - opts.randomMap.sort(function(a,b) {return Math.random() - 0.5;}); - } - - $s.css('position','absolute'); - $s[prepend?'prependTo':'appendTo'](opts.$cont); - - if (prepend) { - opts.currSlide++; - opts.nextSlide++; - } - - if (!$.support.opacity && opts.cleartype && !opts.cleartypeNoBg) - clearTypeFix($s); - - if (opts.fit && opts.width) - $s.width(opts.width); - if (opts.fit && opts.height && opts.height != 'auto') - $s.height(opts.height); - s.cycleH = (opts.fit && opts.height) ? opts.height : $s.height(); - s.cycleW = (opts.fit && opts.width) ? opts.width : $s.width(); - - $s.css(opts.cssBefore); - - if (opts.pager || opts.pagerAnchorBuilder) - $.fn.cycle.createPagerAnchor(els.length-1, s, $(opts.pager), els, opts); - - if ($.isFunction(opts.onAddSlide)) - opts.onAddSlide($s); - else - $s.hide(); // default behavior - }; -} - -// reset internal state; we do this on every pass in order to support multiple effects -$.fn.cycle.resetState = function(opts, fx) { - fx = fx || opts.fx; - opts.before = []; opts.after = []; - opts.cssBefore = $.extend({}, opts.original.cssBefore); - opts.cssAfter = $.extend({}, opts.original.cssAfter); - opts.animIn = $.extend({}, opts.original.animIn); - opts.animOut = $.extend({}, opts.original.animOut); - opts.fxFn = null; - $.each(opts.original.before, function() { opts.before.push(this); }); - $.each(opts.original.after, function() { opts.after.push(this); }); - - // re-init - var init = $.fn.cycle.transitions[fx]; - if ($.isFunction(init)) - init(opts.$cont, $(opts.elements), opts); -}; - -// this is the main engine fn, it handles the timeouts, callbacks and slide index mgmt -function go(els, opts, manual, fwd) { - var p = opts.$cont[0], curr = els[opts.currSlide], next = els[opts.nextSlide]; - - // opts.busy is true if we're in the middle of an animation - if (manual && opts.busy && opts.manualTrump) { - // let manual transitions requests trump active ones - debug('manualTrump in go(), stopping active transition'); - $(els).stop(true,true); - opts.busy = 0; - clearTimeout(p.cycleTimeout); - } - - // don't begin another timeout-based transition if there is one active - if (opts.busy) { - debug('transition active, ignoring new tx request'); - return; - } - - - // stop cycling if we have an outstanding stop request - if (p.cycleStop != opts.stopCount || p.cycleTimeout === 0 && !manual) - return; - - // check to see if we should stop cycling based on autostop options - if (!manual && !p.cyclePause && !opts.bounce && - ((opts.autostop && (--opts.countdown <= 0)) || - (opts.nowrap && !opts.random && opts.nextSlide < opts.currSlide))) { - if (opts.end) - opts.end(opts); - return; - } - - // if slideshow is paused, only transition on a manual trigger - var changed = false; - if ((manual || !p.cyclePause) && (opts.nextSlide != opts.currSlide)) { - changed = true; - var fx = opts.fx; - // keep trying to get the slide size if we don't have it yet - curr.cycleH = curr.cycleH || $(curr).height(); - curr.cycleW = curr.cycleW || $(curr).width(); - next.cycleH = next.cycleH || $(next).height(); - next.cycleW = next.cycleW || $(next).width(); - - // support multiple transition types - if (opts.multiFx) { - if (fwd && (opts.lastFx === undefined || ++opts.lastFx >= opts.fxs.length)) - opts.lastFx = 0; - else if (!fwd && (opts.lastFx === undefined || --opts.lastFx < 0)) - opts.lastFx = opts.fxs.length - 1; - fx = opts.fxs[opts.lastFx]; - } - - // one-time fx overrides apply to: $('div').cycle(3,'zoom'); - if (opts.oneTimeFx) { - fx = opts.oneTimeFx; - opts.oneTimeFx = null; - } - - $.fn.cycle.resetState(opts, fx); - - // run the before callbacks - if (opts.before.length) - $.each(opts.before, function(i,o) { - if (p.cycleStop != opts.stopCount) return; - o.apply(next, [curr, next, opts, fwd]); - }); - - // stage the after callacks - var after = function() { - opts.busy = 0; - $.each(opts.after, function(i,o) { - if (p.cycleStop != opts.stopCount) return; - o.apply(next, [curr, next, opts, fwd]); - }); - if (!p.cycleStop) { - // queue next transition - queueNext(); - } - }; - - debug('tx firing('+fx+'); currSlide: ' + opts.currSlide + '; nextSlide: ' + opts.nextSlide); - - // get ready to perform the transition - opts.busy = 1; - if (opts.fxFn) // fx function provided? - opts.fxFn(curr, next, opts, after, fwd, manual && opts.fastOnEvent); - else if ($.isFunction($.fn.cycle[opts.fx])) // fx plugin ? - $.fn.cycle[opts.fx](curr, next, opts, after, fwd, manual && opts.fastOnEvent); - else - $.fn.cycle.custom(curr, next, opts, after, fwd, manual && opts.fastOnEvent); - } - else { - queueNext(); - } - - if (changed || opts.nextSlide == opts.currSlide) { - // calculate the next slide - var roll; - opts.lastSlide = opts.currSlide; - if (opts.random) { - opts.currSlide = opts.nextSlide; - if (++opts.randomIndex == els.length) { - opts.randomIndex = 0; - opts.randomMap.sort(function(a,b) {return Math.random() - 0.5;}); - } - opts.nextSlide = opts.randomMap[opts.randomIndex]; - if (opts.nextSlide == opts.currSlide) - opts.nextSlide = (opts.currSlide == opts.slideCount - 1) ? 0 : opts.currSlide + 1; - } - else if (opts.backwards) { - roll = (opts.nextSlide - 1) < 0; - if (roll && opts.bounce) { - opts.backwards = !opts.backwards; - opts.nextSlide = 1; - opts.currSlide = 0; - } - else { - opts.nextSlide = roll ? (els.length-1) : opts.nextSlide-1; - opts.currSlide = roll ? 0 : opts.nextSlide+1; - } - } - else { // sequence - roll = (opts.nextSlide + 1) == els.length; - if (roll && opts.bounce) { - opts.backwards = !opts.backwards; - opts.nextSlide = els.length-2; - opts.currSlide = els.length-1; - } - else { - opts.nextSlide = roll ? 0 : opts.nextSlide+1; - opts.currSlide = roll ? els.length-1 : opts.nextSlide-1; - } - } - } - if (changed && opts.pager) - opts.updateActivePagerLink(opts.pager, opts.currSlide, opts.activePagerClass); - - function queueNext() { - // stage the next transition - var ms = 0, timeout = opts.timeout; - if (opts.timeout && !opts.continuous) { - ms = getTimeout(els[opts.currSlide], els[opts.nextSlide], opts, fwd); - if (opts.fx == 'shuffle') - ms -= opts.speedOut; - } - else if (opts.continuous && p.cyclePause) // continuous shows work off an after callback, not this timer logic - ms = 10; - if (ms > 0) - p.cycleTimeout = setTimeout(function(){ go(els, opts, 0, !opts.backwards); }, ms); - } -} - -// invoked after transition -$.fn.cycle.updateActivePagerLink = function(pager, currSlide, clsName) { - $(pager).each(function() { - $(this).children().removeClass(clsName).eq(currSlide).addClass(clsName); - }); -}; - -// calculate timeout value for current transition -function getTimeout(curr, next, opts, fwd) { - if (opts.timeoutFn) { - // call user provided calc fn - var t = opts.timeoutFn.call(curr,curr,next,opts,fwd); - while (opts.fx != 'none' && (t - opts.speed) < 250) // sanitize timeout - t += opts.speed; - debug('calculated timeout: ' + t + '; speed: ' + opts.speed); - if (t !== false) - return t; - } - return opts.timeout; -} - -// expose next/prev function, caller must pass in state -$.fn.cycle.next = function(opts) { advance(opts,1); }; -$.fn.cycle.prev = function(opts) { advance(opts,0);}; - -// advance slide forward or back -function advance(opts, moveForward) { - var val = moveForward ? 1 : -1; - var els = opts.elements; - var p = opts.$cont[0], timeout = p.cycleTimeout; - if (timeout) { - clearTimeout(timeout); - p.cycleTimeout = 0; - } - if (opts.random && val < 0) { - // move back to the previously display slide - opts.randomIndex--; - if (--opts.randomIndex == -2) - opts.randomIndex = els.length-2; - else if (opts.randomIndex == -1) - opts.randomIndex = els.length-1; - opts.nextSlide = opts.randomMap[opts.randomIndex]; - } - else if (opts.random) { - opts.nextSlide = opts.randomMap[opts.randomIndex]; - } - else { - opts.nextSlide = opts.currSlide + val; - if (opts.nextSlide < 0) { - if (opts.nowrap) return false; - opts.nextSlide = els.length - 1; - } - else if (opts.nextSlide >= els.length) { - if (opts.nowrap) return false; - opts.nextSlide = 0; - } - } - - var cb = opts.onPrevNextEvent || opts.prevNextClick; // prevNextClick is deprecated - if ($.isFunction(cb)) - cb(val > 0, opts.nextSlide, els[opts.nextSlide]); - go(els, opts, 1, moveForward); - return false; -} - -function buildPager(els, opts) { - var $p = $(opts.pager); - $.each(els, function(i,o) { - $.fn.cycle.createPagerAnchor(i,o,$p,els,opts); - }); - opts.updateActivePagerLink(opts.pager, opts.startingSlide, opts.activePagerClass); -} - -$.fn.cycle.createPagerAnchor = function(i, el, $p, els, opts) { - var a; - if ($.isFunction(opts.pagerAnchorBuilder)) { - a = opts.pagerAnchorBuilder(i,el); - debug('pagerAnchorBuilder('+i+', el) returned: ' + a); - } - else - a = ''+(i+1)+''; - - if (!a) - return; - var $a = $(a); - // don't reparent if anchor is in the dom - if ($a.parents('body').length === 0) { - var arr = []; - if ($p.length > 1) { - $p.each(function() { - var $clone = $a.clone(true); - $(this).append($clone); - arr.push($clone[0]); - }); - $a = $(arr); - } - else { - $a.appendTo($p); - } - } - - opts.pagerAnchors = opts.pagerAnchors || []; - opts.pagerAnchors.push($a); - - var pagerFn = function(e) { - e.preventDefault(); - opts.nextSlide = i; - var p = opts.$cont[0], timeout = p.cycleTimeout; - if (timeout) { - clearTimeout(timeout); - p.cycleTimeout = 0; - } - var cb = opts.onPagerEvent || opts.pagerClick; // pagerClick is deprecated - if ($.isFunction(cb)) - cb(opts.nextSlide, els[opts.nextSlide]); - go(els,opts,1,opts.currSlide < i); // trigger the trans -// return false; // <== allow bubble - }; - - if ( /mouseenter|mouseover/i.test(opts.pagerEvent) ) { - $a.hover(pagerFn, function(){/* no-op */} ); - } - else { - $a.bind(opts.pagerEvent, pagerFn); - } - - if ( ! /^click/.test(opts.pagerEvent) && !opts.allowPagerClickBubble) - $a.bind('click.cycle', function(){return false;}); // suppress click - - var cont = opts.$cont[0]; - var pauseFlag = false; // https://github.com/malsup/cycle/issues/44 - if (opts.pauseOnPagerHover) { - $a.hover( - function() { - pauseFlag = true; - cont.cyclePause++; - triggerPause(cont,true,true); - }, function() { - if (pauseFlag) - cont.cyclePause--; - triggerPause(cont,true,true); - } - ); - } -}; - -// helper fn to calculate the number of slides between the current and the next -$.fn.cycle.hopsFromLast = function(opts, fwd) { - var hops, l = opts.lastSlide, c = opts.currSlide; - if (fwd) - hops = c > l ? c - l : opts.slideCount - l; - else - hops = c < l ? l - c : l + opts.slideCount - c; - return hops; -}; - -// fix clearType problems in ie6 by setting an explicit bg color -// (otherwise text slides look horrible during a fade transition) -function clearTypeFix($slides) { - debug('applying clearType background-color hack'); - function hex(s) { - s = parseInt(s,10).toString(16); - return s.length < 2 ? '0'+s : s; - } - function getBg(e) { - for ( ; e && e.nodeName.toLowerCase() != 'html'; e = e.parentNode) { - var v = $.css(e,'background-color'); - if (v && v.indexOf('rgb') >= 0 ) { - var rgb = v.match(/\d+/g); - return '#'+ hex(rgb[0]) + hex(rgb[1]) + hex(rgb[2]); - } - if (v && v != 'transparent') - return v; - } - return '#ffffff'; - } - $slides.each(function() { $(this).css('background-color', getBg(this)); }); -} - -// reset common props before the next transition -$.fn.cycle.commonReset = function(curr,next,opts,w,h,rev) { - $(opts.elements).not(curr).hide(); - if (typeof opts.cssBefore.opacity == 'undefined') - opts.cssBefore.opacity = 1; - opts.cssBefore.display = 'block'; - if (opts.slideResize && w !== false && next.cycleW > 0) - opts.cssBefore.width = next.cycleW; - if (opts.slideResize && h !== false && next.cycleH > 0) - opts.cssBefore.height = next.cycleH; - opts.cssAfter = opts.cssAfter || {}; - opts.cssAfter.display = 'none'; - $(curr).css('zIndex',opts.slideCount + (rev === true ? 1 : 0)); - $(next).css('zIndex',opts.slideCount + (rev === true ? 0 : 1)); -}; - -// the actual fn for effecting a transition -$.fn.cycle.custom = function(curr, next, opts, cb, fwd, speedOverride) { - var $l = $(curr), $n = $(next); - var speedIn = opts.speedIn, speedOut = opts.speedOut, easeIn = opts.easeIn, easeOut = opts.easeOut; - $n.css(opts.cssBefore); - if (speedOverride) { - if (typeof speedOverride == 'number') - speedIn = speedOut = speedOverride; - else - speedIn = speedOut = 1; - easeIn = easeOut = null; - } - var fn = function() { - $n.animate(opts.animIn, speedIn, easeIn, function() { - cb(); - }); - }; - $l.animate(opts.animOut, speedOut, easeOut, function() { - $l.css(opts.cssAfter); - if (!opts.sync) - fn(); - }); - if (opts.sync) fn(); -}; - -// transition definitions - only fade is defined here, transition pack defines the rest -$.fn.cycle.transitions = { - fade: function($cont, $slides, opts) { - $slides.not(':eq('+opts.currSlide+')').css('opacity',0); - opts.before.push(function(curr,next,opts) { - $.fn.cycle.commonReset(curr,next,opts); - opts.cssBefore.opacity = 0; - }); - opts.animIn = { opacity: 1 }; - opts.animOut = { opacity: 0 }; - opts.cssBefore = { top: 0, left: 0 }; - } -}; - -$.fn.cycle.ver = function() { return ver; }; - -// override these globally if you like (they are all optional) -$.fn.cycle.defaults = { - activePagerClass: 'activeSlide', // class name used for the active pager link - after: null, // transition callback (scope set to element that was shown): function(currSlideElement, nextSlideElement, options, forwardFlag) - allowPagerClickBubble: false, // allows or prevents click event on pager anchors from bubbling - animIn: null, // properties that define how the slide animates in - animOut: null, // properties that define how the slide animates out - aspect: false, // preserve aspect ratio during fit resizing, cropping if necessary (must be used with fit option) - autostop: 0, // true to end slideshow after X transitions (where X == slide count) - autostopCount: 0, // number of transitions (optionally used with autostop to define X) - backwards: false, // true to start slideshow at last slide and move backwards through the stack - before: null, // transition callback (scope set to element to be shown): function(currSlideElement, nextSlideElement, options, forwardFlag) - center: null, // set to true to have cycle add top/left margin to each slide (use with width and height options) - cleartype: !$.support.opacity, // true if clearType corrections should be applied (for IE) - cleartypeNoBg: false, // set to true to disable extra cleartype fixing (leave false to force background color setting on slides) - containerResize: 1, // resize container to fit largest slide - containerResizeHeight: 0, // resize containers height to fit the largest slide but leave the width dynamic - continuous: 0, // true to start next transition immediately after current one completes - cssAfter: null, // properties that defined the state of the slide after transitioning out - cssBefore: null, // properties that define the initial state of the slide before transitioning in - delay: 0, // additional delay (in ms) for first transition (hint: can be negative) - easeIn: null, // easing for "in" transition - easeOut: null, // easing for "out" transition - easing: null, // easing method for both in and out transitions - end: null, // callback invoked when the slideshow terminates (use with autostop or nowrap options): function(options) - fastOnEvent: 0, // force fast transitions when triggered manually (via pager or prev/next); value == time in ms - fit: 0, // force slides to fit container - fx: 'fade', // name of transition effect (or comma separated names, ex: 'fade,scrollUp,shuffle') - fxFn: null, // function used to control the transition: function(currSlideElement, nextSlideElement, options, afterCalback, forwardFlag) - height: 'auto', // container height (if the 'fit' option is true, the slides will be set to this height as well) - manualTrump: true, // causes manual transition to stop an active transition instead of being ignored - metaAttr: 'cycle', // data- attribute that holds the option data for the slideshow - next: null, // element, jQuery object, or jQuery selector string for the element to use as event trigger for next slide - nowrap: 0, // true to prevent slideshow from wrapping - onPagerEvent: null, // callback fn for pager events: function(zeroBasedSlideIndex, slideElement) - onPrevNextEvent: null, // callback fn for prev/next events: function(isNext, zeroBasedSlideIndex, slideElement) - pager: null, // element, jQuery object, or jQuery selector string for the element to use as pager container - pagerAnchorBuilder: null, // callback fn for building anchor links: function(index, DOMelement) - pagerEvent: 'click.cycle', // name of event which drives the pager navigation - pause: 0, // true to enable "pause on hover" - pauseOnPagerHover: 0, // true to pause when hovering over pager link - prev: null, // element, jQuery object, or jQuery selector string for the element to use as event trigger for previous slide - prevNextEvent: 'click.cycle',// event which drives the manual transition to the previous or next slide - random: 0, // true for random, false for sequence (not applicable to shuffle fx) - randomizeEffects: 1, // valid when multiple effects are used; true to make the effect sequence random - requeueOnImageNotLoaded: true, // requeue the slideshow if any image slides are not yet loaded - requeueTimeout: 250, // ms delay for requeue - rev: 0, // causes animations to transition in reverse (for effects that support it such as scrollHorz/scrollVert/shuffle) - shuffle: null, // coords for shuffle animation, ex: { top:15, left: 200 } - skipInitializationCallbacks: false, // set to true to disable the first before/after callback that occurs prior to any transition - slideExpr: null, // expression for selecting slides (if something other than all children is required) - slideResize: 1, // force slide width/height to fixed size before every transition - speed: 1000, // speed of the transition (any valid fx speed value) - speedIn: null, // speed of the 'in' transition - speedOut: null, // speed of the 'out' transition - startingSlide: undefined,// zero-based index of the first slide to be displayed - sync: 1, // true if in/out transitions should occur simultaneously - timeout: 4000, // milliseconds between slide transitions (0 to disable auto advance) - timeoutFn: null, // callback for determining per-slide timeout value: function(currSlideElement, nextSlideElement, options, forwardFlag) - updateActivePagerLink: null,// callback fn invoked to update the active pager link (adds/removes activePagerClass style) - width: null // container width (if the 'fit' option is true, the slides will be set to this width as well) -}; - -})(jQuery); - - -/*! - * jQuery Cycle Plugin Transition Definitions - * This script is a plugin for the jQuery Cycle Plugin - * Examples and documentation at: http://malsup.com/jquery/cycle/ - * Copyright (c) 2007-2010 M. Alsup - * Version: 2.73 - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - */ -(function($) { -"use strict"; - -// -// These functions define slide initialization and properties for the named -// transitions. To save file size feel free to remove any of these that you -// don't need. -// -$.fn.cycle.transitions.none = function($cont, $slides, opts) { - opts.fxFn = function(curr,next,opts,after){ - $(next).show(); - $(curr).hide(); - after(); - }; -}; - -// not a cross-fade, fadeout only fades out the top slide -$.fn.cycle.transitions.fadeout = function($cont, $slides, opts) { - $slides.not(':eq('+opts.currSlide+')').css({ display: 'block', 'opacity': 1 }); - opts.before.push(function(curr,next,opts,w,h,rev) { - $(curr).css('zIndex',opts.slideCount + (rev !== true ? 1 : 0)); - $(next).css('zIndex',opts.slideCount + (rev !== true ? 0 : 1)); - }); - opts.animIn.opacity = 1; - opts.animOut.opacity = 0; - opts.cssBefore.opacity = 1; - opts.cssBefore.display = 'block'; - opts.cssAfter.zIndex = 0; -}; - -// scrollUp/Down/Left/Right -$.fn.cycle.transitions.scrollUp = function($cont, $slides, opts) { - $cont.css('overflow','hidden'); - opts.before.push($.fn.cycle.commonReset); - var h = $cont.height(); - opts.cssBefore.top = h; - opts.cssBefore.left = 0; - opts.cssFirst.top = 0; - opts.animIn.top = 0; - opts.animOut.top = -h; -}; -$.fn.cycle.transitions.scrollDown = function($cont, $slides, opts) { - $cont.css('overflow','hidden'); - opts.before.push($.fn.cycle.commonReset); - var h = $cont.height(); - opts.cssFirst.top = 0; - opts.cssBefore.top = -h; - opts.cssBefore.left = 0; - opts.animIn.top = 0; - opts.animOut.top = h; -}; -$.fn.cycle.transitions.scrollLeft = function($cont, $slides, opts) { - $cont.css('overflow','hidden'); - opts.before.push($.fn.cycle.commonReset); - var w = $cont.width(); - opts.cssFirst.left = 0; - opts.cssBefore.left = w; - opts.cssBefore.top = 0; - opts.animIn.left = 0; - opts.animOut.left = 0-w; -}; -$.fn.cycle.transitions.scrollRight = function($cont, $slides, opts) { - $cont.css('overflow','hidden'); - opts.before.push($.fn.cycle.commonReset); - var w = $cont.width(); - opts.cssFirst.left = 0; - opts.cssBefore.left = -w; - opts.cssBefore.top = 0; - opts.animIn.left = 0; - opts.animOut.left = w; -}; -$.fn.cycle.transitions.scrollHorz = function($cont, $slides, opts) { - $cont.css('overflow','hidden').width(); - opts.before.push(function(curr, next, opts, fwd) { - if (opts.rev) - fwd = !fwd; - $.fn.cycle.commonReset(curr,next,opts); - opts.cssBefore.left = fwd ? (next.cycleW-1) : (1-next.cycleW); - opts.animOut.left = fwd ? -curr.cycleW : curr.cycleW; - }); - opts.cssFirst.left = 0; - opts.cssBefore.top = 0; - opts.animIn.left = 0; - opts.animOut.top = 0; -}; -$.fn.cycle.transitions.scrollVert = function($cont, $slides, opts) { - $cont.css('overflow','hidden'); - opts.before.push(function(curr, next, opts, fwd) { - if (opts.rev) - fwd = !fwd; - $.fn.cycle.commonReset(curr,next,opts); - opts.cssBefore.top = fwd ? (1-next.cycleH) : (next.cycleH-1); - opts.animOut.top = fwd ? curr.cycleH : -curr.cycleH; - }); - opts.cssFirst.top = 0; - opts.cssBefore.left = 0; - opts.animIn.top = 0; - opts.animOut.left = 0; -}; - -// slideX/slideY -$.fn.cycle.transitions.slideX = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $(opts.elements).not(curr).hide(); - $.fn.cycle.commonReset(curr,next,opts,false,true); - opts.animIn.width = next.cycleW; - }); - opts.cssBefore.left = 0; - opts.cssBefore.top = 0; - opts.cssBefore.width = 0; - opts.animIn.width = 'show'; - opts.animOut.width = 0; -}; -$.fn.cycle.transitions.slideY = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $(opts.elements).not(curr).hide(); - $.fn.cycle.commonReset(curr,next,opts,true,false); - opts.animIn.height = next.cycleH; - }); - opts.cssBefore.left = 0; - opts.cssBefore.top = 0; - opts.cssBefore.height = 0; - opts.animIn.height = 'show'; - opts.animOut.height = 0; -}; - -// shuffle -$.fn.cycle.transitions.shuffle = function($cont, $slides, opts) { - var i, w = $cont.css('overflow', 'visible').width(); - $slides.css({left: 0, top: 0}); - opts.before.push(function(curr,next,opts) { - $.fn.cycle.commonReset(curr,next,opts,true,true,true); - }); - // only adjust speed once! - if (!opts.speedAdjusted) { - opts.speed = opts.speed / 2; // shuffle has 2 transitions - opts.speedAdjusted = true; - } - opts.random = 0; - opts.shuffle = opts.shuffle || {left:-w, top:15}; - opts.els = []; - for (i=0; i < $slides.length; i++) - opts.els.push($slides[i]); - - for (i=0; i < opts.currSlide; i++) - opts.els.push(opts.els.shift()); - - // custom transition fn (hat tip to Benjamin Sterling for this bit of sweetness!) - opts.fxFn = function(curr, next, opts, cb, fwd) { - if (opts.rev) - fwd = !fwd; - var $el = fwd ? $(curr) : $(next); - $(next).css(opts.cssBefore); - var count = opts.slideCount; - $el.animate(opts.shuffle, opts.speedIn, opts.easeIn, function() { - var hops = $.fn.cycle.hopsFromLast(opts, fwd); - for (var k=0; k < hops; k++) { - if (fwd) - opts.els.push(opts.els.shift()); - else - opts.els.unshift(opts.els.pop()); - } - if (fwd) { - for (var i=0, len=opts.els.length; i < len; i++) - $(opts.els[i]).css('z-index', len-i+count); - } - else { - var z = $(curr).css('z-index'); - $el.css('z-index', parseInt(z,10)+1+count); - } - $el.animate({left:0, top:0}, opts.speedOut, opts.easeOut, function() { - $(fwd ? this : curr).hide(); - if (cb) cb(); - }); - }); - }; - $.extend(opts.cssBefore, { display: 'block', opacity: 1, top: 0, left: 0 }); -}; - -// turnUp/Down/Left/Right -$.fn.cycle.transitions.turnUp = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,true,false); - opts.cssBefore.top = next.cycleH; - opts.animIn.height = next.cycleH; - opts.animOut.width = next.cycleW; - }); - opts.cssFirst.top = 0; - opts.cssBefore.left = 0; - opts.cssBefore.height = 0; - opts.animIn.top = 0; - opts.animOut.height = 0; -}; -$.fn.cycle.transitions.turnDown = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,true,false); - opts.animIn.height = next.cycleH; - opts.animOut.top = curr.cycleH; - }); - opts.cssFirst.top = 0; - opts.cssBefore.left = 0; - opts.cssBefore.top = 0; - opts.cssBefore.height = 0; - opts.animOut.height = 0; -}; -$.fn.cycle.transitions.turnLeft = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,false,true); - opts.cssBefore.left = next.cycleW; - opts.animIn.width = next.cycleW; - }); - opts.cssBefore.top = 0; - opts.cssBefore.width = 0; - opts.animIn.left = 0; - opts.animOut.width = 0; -}; -$.fn.cycle.transitions.turnRight = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,false,true); - opts.animIn.width = next.cycleW; - opts.animOut.left = curr.cycleW; - }); - $.extend(opts.cssBefore, { top: 0, left: 0, width: 0 }); - opts.animIn.left = 0; - opts.animOut.width = 0; -}; - -// zoom -$.fn.cycle.transitions.zoom = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,false,false,true); - opts.cssBefore.top = next.cycleH/2; - opts.cssBefore.left = next.cycleW/2; - $.extend(opts.animIn, { top: 0, left: 0, width: next.cycleW, height: next.cycleH }); - $.extend(opts.animOut, { width: 0, height: 0, top: curr.cycleH/2, left: curr.cycleW/2 }); - }); - opts.cssFirst.top = 0; - opts.cssFirst.left = 0; - opts.cssBefore.width = 0; - opts.cssBefore.height = 0; -}; - -// fadeZoom -$.fn.cycle.transitions.fadeZoom = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,false,false); - opts.cssBefore.left = next.cycleW/2; - opts.cssBefore.top = next.cycleH/2; - $.extend(opts.animIn, { top: 0, left: 0, width: next.cycleW, height: next.cycleH }); - }); - opts.cssBefore.width = 0; - opts.cssBefore.height = 0; - opts.animOut.opacity = 0; -}; - -// blindX -$.fn.cycle.transitions.blindX = function($cont, $slides, opts) { - var w = $cont.css('overflow','hidden').width(); - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts); - opts.animIn.width = next.cycleW; - opts.animOut.left = curr.cycleW; - }); - opts.cssBefore.left = w; - opts.cssBefore.top = 0; - opts.animIn.left = 0; - opts.animOut.left = w; -}; -// blindY -$.fn.cycle.transitions.blindY = function($cont, $slides, opts) { - var h = $cont.css('overflow','hidden').height(); - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts); - opts.animIn.height = next.cycleH; - opts.animOut.top = curr.cycleH; - }); - opts.cssBefore.top = h; - opts.cssBefore.left = 0; - opts.animIn.top = 0; - opts.animOut.top = h; -}; -// blindZ -$.fn.cycle.transitions.blindZ = function($cont, $slides, opts) { - var h = $cont.css('overflow','hidden').height(); - var w = $cont.width(); - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts); - opts.animIn.height = next.cycleH; - opts.animOut.top = curr.cycleH; - }); - opts.cssBefore.top = h; - opts.cssBefore.left = w; - opts.animIn.top = 0; - opts.animIn.left = 0; - opts.animOut.top = h; - opts.animOut.left = w; -}; - -// growX - grow horizontally from centered 0 width -$.fn.cycle.transitions.growX = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,false,true); - opts.cssBefore.left = this.cycleW/2; - opts.animIn.left = 0; - opts.animIn.width = this.cycleW; - opts.animOut.left = 0; - }); - opts.cssBefore.top = 0; - opts.cssBefore.width = 0; -}; -// growY - grow vertically from centered 0 height -$.fn.cycle.transitions.growY = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,true,false); - opts.cssBefore.top = this.cycleH/2; - opts.animIn.top = 0; - opts.animIn.height = this.cycleH; - opts.animOut.top = 0; - }); - opts.cssBefore.height = 0; - opts.cssBefore.left = 0; -}; - -// curtainX - squeeze in both edges horizontally -$.fn.cycle.transitions.curtainX = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,false,true,true); - opts.cssBefore.left = next.cycleW/2; - opts.animIn.left = 0; - opts.animIn.width = this.cycleW; - opts.animOut.left = curr.cycleW/2; - opts.animOut.width = 0; - }); - opts.cssBefore.top = 0; - opts.cssBefore.width = 0; -}; -// curtainY - squeeze in both edges vertically -$.fn.cycle.transitions.curtainY = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,true,false,true); - opts.cssBefore.top = next.cycleH/2; - opts.animIn.top = 0; - opts.animIn.height = next.cycleH; - opts.animOut.top = curr.cycleH/2; - opts.animOut.height = 0; - }); - opts.cssBefore.height = 0; - opts.cssBefore.left = 0; -}; - -// cover - curr slide covered by next slide -$.fn.cycle.transitions.cover = function($cont, $slides, opts) { - var d = opts.direction || 'left'; - var w = $cont.css('overflow','hidden').width(); - var h = $cont.height(); - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts); - opts.cssAfter.display = ''; - if (d == 'right') - opts.cssBefore.left = -w; - else if (d == 'up') - opts.cssBefore.top = h; - else if (d == 'down') - opts.cssBefore.top = -h; - else - opts.cssBefore.left = w; - }); - opts.animIn.left = 0; - opts.animIn.top = 0; - opts.cssBefore.top = 0; - opts.cssBefore.left = 0; -}; - -// uncover - curr slide moves off next slide -$.fn.cycle.transitions.uncover = function($cont, $slides, opts) { - var d = opts.direction || 'left'; - var w = $cont.css('overflow','hidden').width(); - var h = $cont.height(); - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,true,true,true); - if (d == 'right') - opts.animOut.left = w; - else if (d == 'up') - opts.animOut.top = -h; - else if (d == 'down') - opts.animOut.top = h; - else - opts.animOut.left = -w; - }); - opts.animIn.left = 0; - opts.animIn.top = 0; - opts.cssBefore.top = 0; - opts.cssBefore.left = 0; -}; - -// toss - move top slide and fade away -$.fn.cycle.transitions.toss = function($cont, $slides, opts) { - var w = $cont.css('overflow','visible').width(); - var h = $cont.height(); - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,true,true,true); - // provide default toss settings if animOut not provided - if (!opts.animOut.left && !opts.animOut.top) - $.extend(opts.animOut, { left: w*2, top: -h/2, opacity: 0 }); - else - opts.animOut.opacity = 0; - }); - opts.cssBefore.left = 0; - opts.cssBefore.top = 0; - opts.animIn.left = 0; -}; - -// wipe - clip animation -$.fn.cycle.transitions.wipe = function($cont, $slides, opts) { - var w = $cont.css('overflow','hidden').width(); - var h = $cont.height(); - opts.cssBefore = opts.cssBefore || {}; - var clip; - if (opts.clip) { - if (/l2r/.test(opts.clip)) - clip = 'rect(0px 0px '+h+'px 0px)'; - else if (/r2l/.test(opts.clip)) - clip = 'rect(0px '+w+'px '+h+'px '+w+'px)'; - else if (/t2b/.test(opts.clip)) - clip = 'rect(0px '+w+'px 0px 0px)'; - else if (/b2t/.test(opts.clip)) - clip = 'rect('+h+'px '+w+'px '+h+'px 0px)'; - else if (/zoom/.test(opts.clip)) { - var top = parseInt(h/2,10); - var left = parseInt(w/2,10); - clip = 'rect('+top+'px '+left+'px '+top+'px '+left+'px)'; - } - } - - opts.cssBefore.clip = opts.cssBefore.clip || clip || 'rect(0px 0px 0px 0px)'; - - var d = opts.cssBefore.clip.match(/(\d+)/g); - var t = parseInt(d[0],10), r = parseInt(d[1],10), b = parseInt(d[2],10), l = parseInt(d[3],10); - - opts.before.push(function(curr, next, opts) { - if (curr == next) return; - var $curr = $(curr), $next = $(next); - $.fn.cycle.commonReset(curr,next,opts,true,true,false); - opts.cssAfter.display = 'block'; - - var step = 1, count = parseInt((opts.speedIn / 13),10) - 1; - (function f() { - var tt = t ? t - parseInt(step * (t/count),10) : 0; - var ll = l ? l - parseInt(step * (l/count),10) : 0; - var bb = b < h ? b + parseInt(step * ((h-b)/count || 1),10) : h; - var rr = r < w ? r + parseInt(step * ((w-r)/count || 1),10) : w; - $next.css({ clip: 'rect('+tt+'px '+rr+'px '+bb+'px '+ll+'px)' }); - (step++ <= count) ? setTimeout(f, 13) : $curr.css('display', 'none'); - })(); - }); - $.extend(opts.cssBefore, { display: 'block', opacity: 1, top: 0, left: 0 }); - opts.animIn = { left: 0 }; - opts.animOut = { left: 0 }; -}; - -})(jQuery); diff --git a/catalogue/static/catalogue/js/lesson-list.js b/catalogue/static/catalogue/js/lesson-list.js deleted file mode 100644 index 62bbb65..0000000 --- a/catalogue/static/catalogue/js/lesson-list.js +++ /dev/null @@ -1,60 +0,0 @@ -(function($){ -$(function() { - - -function scrollTo(thing) { - $('html, body').scrollTop($(thing).offset().top - $('#level-chooser').outerHeight()); -} - -function updateView() { - var scrolltop = $(window).scrollTop(); - - $('#level-chooser-place').each(function(i, el){ - if (scrolltop > $(el).offset().top) { - $("#level-chooser").addClass("fixed"); - } - else { - $("#level-chooser").removeClass("fixed"); - } - }); - - $('.level-toc').each(function(i, el) { - var $sect = $($(el).parent()); - var menu_top = $('#level-chooser').outerHeight(); - var menu_scrolltop = scrolltop + menu_top; - - if (menu_scrolltop + 2 >= $sect.offset().top && - menu_scrolltop < $sect.offset().top + $sect.outerHeight()) { - $(el).addClass("fixed").css("top", Math.min( - menu_top, - - scrolltop + $sect.offset().top + $sect.outerHeight() - $(el).outerHeight() - )); - $("#level-chooser a[href='#" + $sect.attr('id') + "']").addClass('active'); - } - else { - $(el).removeClass("fixed"); - $("#level-chooser a[href='#" + $sect.attr('id') + "']").removeClass('active'); - } - }); -} - - - -$("#level-chooser a, .level-toc a").click(function(ev) { - ev.preventDefault(); - scrollTo($(this).attr('href')); -}); - - - - - -updateView(); -$(document).scroll(updateView); -if (window.location.hash) { - scrollTo(window.location.hash); -} - - -}); -})(jQuery); diff --git a/catalogue/static/catalogue/js/lesson.js b/catalogue/static/catalogue/js/lesson.js deleted file mode 100755 index 080eb45..0000000 --- a/catalogue/static/catalogue/js/lesson.js +++ /dev/null @@ -1,12 +0,0 @@ -(function($){ -$(function() { - - -$('a.image').colorbox({ - maxWidth: '100%', - maxHeight: '100%', -}); - - -}); -})($); diff --git a/catalogue/templates/catalogue/latest_blog_posts.html b/catalogue/templates/catalogue/latest_blog_posts.html deleted file mode 100755 index e9eb109..0000000 --- a/catalogue/templates/catalogue/latest_blog_posts.html +++ /dev/null @@ -1,5 +0,0 @@ -
      -{% for post in posts %} -
    1. {{ post.title }}
      2. -{% endfor %} -
    diff --git a/catalogue/templates/catalogue/lesson/added-var/lesson_detail.html b/catalogue/templates/catalogue/lesson/added-var/lesson_detail.html deleted file mode 100644 index a40c999..0000000 --- a/catalogue/templates/catalogue/lesson/added-var/lesson_detail.html +++ /dev/null @@ -1,31 +0,0 @@ -{% extends "catalogue/lesson/lesson_detail.html" %} -{% load static from staticfiles %} - -{% block lesson-info %} -
    -

    45m
    - - {% include "catalogue/lesson/box-icons.html" %} - -

    Ta lekcja jest częścią tematu - Edukacja varsavianistyczna - na poziomie {{ object.level|lower }}. -

    -
    -
    - -{% endblock %} - - -{% block sidebar-top %} -
    - -{% if object.package %} -
    Pobierz całą lekcję
    -{% endif %} -{% if object.student_package %} -
    Pobierz lekcję w wersji dla ucznia
    -{% endif %} - -
    -{% endblock %} diff --git a/catalogue/templates/catalogue/lesson/added/lesson_detail.html b/catalogue/templates/catalogue/lesson/added/lesson_detail.html deleted file mode 100644 index 62ec0a4..0000000 --- a/catalogue/templates/catalogue/lesson/added/lesson_detail.html +++ /dev/null @@ -1,31 +0,0 @@ -{% extends "catalogue/lesson/lesson_detail.html" %} -{% load static from staticfiles %} - -{% block lesson-info %} -
    -

    45m
    - - {% include "catalogue/lesson/box-icons.html" %} - -

    Ta lekcja jest częścią tematu - Edukacja filmowa - na poziomie {{ object.level|lower }}. -

    -
    -
    - -{% endblock %} - - -{% block sidebar-top %} -
    - -{% if object.package %} -
    Pobierz całą lekcję
    -{% endif %} -{% if object.student_package %} -
    Pobierz lekcję w wersji dla ucznia
    -{% endif %} - -
    -{% endblock %} diff --git a/catalogue/templates/catalogue/lesson/appendix/lesson_detail.html b/catalogue/templates/catalogue/lesson/appendix/lesson_detail.html deleted file mode 100755 index 98b6e3b..0000000 --- a/catalogue/templates/catalogue/lesson/appendix/lesson_detail.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "catalogue/lesson/lesson_detail.html" %} - -{% block lesson-info %} -{% endblock %} - - -{% block suggest-link %} - - Zgłoś swoją uwagę na temat tej strony. - -{% endblock %} diff --git a/catalogue/templates/catalogue/lesson/box-icons.html b/catalogue/templates/catalogue/lesson/box-icons.html deleted file mode 100644 index 2963698..0000000 --- a/catalogue/templates/catalogue/lesson/box-icons.html +++ /dev/null @@ -1,18 +0,0 @@ -{% load static from staticfiles %} -{% if object.requires_internet %} -
    Wymaga dostępu do Internetu
    Internet
    -{% else %} -
    Nie wymaga dostępu do Internetu
    Bez Internetu
    -{% endif %} -{% if publisher %} -
    {{ publisher.name }}
    -{% endif %} diff --git a/catalogue/templates/catalogue/lesson/course/lesson_detail.html b/catalogue/templates/catalogue/lesson/course/lesson_detail.html deleted file mode 100755 index 38ef906..0000000 --- a/catalogue/templates/catalogue/lesson/course/lesson_detail.html +++ /dev/null @@ -1,31 +0,0 @@ -{% extends "catalogue/lesson/lesson_detail.html" %} -{% load static from staticfiles %} - -{% block lesson-info %} -
    -

    45m
    - - {% include "catalogue/lesson/box-icons.html" %} - -

    Ta lekcja jest częścią tematu - {{ object.section }} - na poziomie {{ object.level|lower }}. -

    -
    -
    - -{% endblock %} - - -{% block sidebar-top %} -
    - -{% if object.package %} -
    Pobierz całą lekcję
    -{% endif %} -{% if object.student_package %} -
    Pobierz lekcję w wersji dla ucznia
    -{% endif %} - -
    -{% endblock %} diff --git a/catalogue/templates/catalogue/lesson/lesson_detail.html b/catalogue/templates/catalogue/lesson/lesson_detail.html deleted file mode 100755 index 3da0600..0000000 --- a/catalogue/templates/catalogue/lesson/lesson_detail.html +++ /dev/null @@ -1,134 +0,0 @@ -{% extends "base.html" %} -{% load lesson_link lesson_nav person_list from catalogue_tags %} -{% load competence curriculum url_for_level from curriculum_tags %} - - -{% block title %}{{ object }}{% endblock %} - -{% block body %} - - - - -
    - -{% block lesson-info %} -{% endblock %} - -{{ object.html_file.read|safe }} - - -wróć na górę - - - -{% if request.user.is_authenticated and object.forum_topics.all.count %} -

    Na forum

    - -{% endif %} - -
    - -{% endblock %} diff --git a/catalogue/templates/catalogue/lesson/project/lesson_detail.html b/catalogue/templates/catalogue/lesson/project/lesson_detail.html deleted file mode 100755 index 7a17251..0000000 --- a/catalogue/templates/catalogue/lesson/project/lesson_detail.html +++ /dev/null @@ -1,28 +0,0 @@ -{% extends "catalogue/lesson/lesson_detail.html" %} - -{% block lesson-info %} -
    - {% if publisher %} -
    {{ publisher.name }}
    - {% endif %} - -

    To jest projekt - na poziomie - {{ object.level|lower }}. -

    -
    -{% endblock %} - - - -{% block sidebar-top %} - - -{% if object.package %} -
    Pobierz cały projekt
    -{% endif %} - -{% endblock %} diff --git a/catalogue/templates/catalogue/lesson/synthetic/lesson_detail.html b/catalogue/templates/catalogue/lesson/synthetic/lesson_detail.html deleted file mode 100755 index df60c9f..0000000 --- a/catalogue/templates/catalogue/lesson/synthetic/lesson_detail.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "catalogue/lesson/lesson_detail.html" %} - -{% block lesson-info %} -
    -

    45m
    - - {% include "catalogue/lesson/box-icons.html" %} - -

    Ta lekcja jest częścią skróconego kursu na poziomie {{ object.level|lower }}. - Zobacz też pełny kurs. -

    -
    -
    -{% endblock %} - -{% block sidebar-top %} - -{% if object.package %} -
    Pobierz całą lekcję
    -{% endif %} -{% if object.student_package %} -
    Pobierz lekcję w wersji dla ucznia
    -{% endif %} - -{% endblock %} diff --git a/catalogue/templates/catalogue/lesson_list.html b/catalogue/templates/catalogue/lesson_list.html deleted file mode 100755 index 26befba..0000000 --- a/catalogue/templates/catalogue/lesson_list.html +++ /dev/null @@ -1,47 +0,0 @@ -{% extends "base.html" %} -{% load catalogue_tags %} -{% load static from staticfiles %} -{% load course_boxes course_boxes_toc from curriculum_tags %} -{% load chunk from chunks %} - -{% block title %}Lekcje{% endblock %} - -{% block body %} -

    Lekcje

    - - - -
    -
    - {% chunk 'levels_disclaimer' %} -
    - -
    -
      -
      • - {% for object in object_list %} -
    • {{ object }}
      • - {% endfor %} -
    -
    - - - - {% for level in object_list %} - {% level_box level %} - {% endfor %} -
    - - -{% endblock %} diff --git a/catalogue/templates/catalogue/section_detail.html b/catalogue/templates/catalogue/section_detail.html deleted file mode 100755 index 01889ee..0000000 --- a/catalogue/templates/catalogue/section_detail.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "base.html" %} -{% load catalogue_tags %} - -{% block title %}{{ object }}{% endblock %} - -{% block body %} -

    {{ object }}

    - {% section_box object %} - - -{% endblock %} diff --git a/catalogue/templates/catalogue/snippets/carousel.html b/catalogue/templates/catalogue/snippets/carousel.html deleted file mode 100755 index bb31eae..0000000 --- a/catalogue/templates/catalogue/snippets/carousel.html +++ /dev/null @@ -1,27 +0,0 @@ -{% load thumbnail %} -{% url 'catalogue_lessons' as lessons %} - diff --git a/catalogue/templates/catalogue/snippets/lesson_link.html b/catalogue/templates/catalogue/snippets/lesson_link.html deleted file mode 100755 index 749b4e1..0000000 --- a/catalogue/templates/catalogue/snippets/lesson_link.html +++ /dev/null @@ -1 +0,0 @@ -{% if lesson %}{{ lesson }}{% endif %} diff --git a/catalogue/templates/catalogue/snippets/lesson_nav.html b/catalogue/templates/catalogue/snippets/lesson_nav.html deleted file mode 100755 index 0e64225..0000000 --- a/catalogue/templates/catalogue/snippets/lesson_nav.html +++ /dev/null @@ -1,27 +0,0 @@ -

    -{% if root %} - {{ root }},
    {{ lesson.level }}     -{% elif lesson.type == 'synthetic' %} - Kurs skrócony,
    {{ lesson.level }}     -{% elif lesson.type == 'project' %} - Projekty,
    {{ lesson.level }}     -{% elif lesson.type == 'added' %} - Edukacja filmowa -{% elif lesson.type == 'added-var' %} - Edukacja varsavianistyczna -{% else %} - Inne -{% endif %} -

    - -
      -{% for item in siblings %} -
    • - {% if item == lesson %} - {{ item }} - {% else %} - {{ item }} - {% endif %} -
      • -{% endfor %} -
    diff --git a/catalogue/templates/catalogue/snippets/lesson_or_stub.html b/catalogue/templates/catalogue/snippets/lesson_or_stub.html deleted file mode 100644 index 5bb2614..0000000 --- a/catalogue/templates/catalogue/snippets/lesson_or_stub.html +++ /dev/null @@ -1,9 +0,0 @@ -{% if lesson.slug %} - -{% endif %} -{{ lesson }} -{% if lesson.slug %} - -{% else %} -(w przygotowaniu) -{% endif %} diff --git a/catalogue/templates/catalogue/snippets/level_box.html b/catalogue/templates/catalogue/snippets/level_box.html deleted file mode 100755 index 3155cce..0000000 --- a/catalogue/templates/catalogue/snippets/level_box.html +++ /dev/null @@ -1,176 +0,0 @@ -
    - -
    - {{ level }} - - - -
    - - - -

    {{ level }}

    - -
    Pobierz wszystkie lekcje
    -
    Pobierz wszystkie lekcje w wersji dla ucznia
    - - {% if lessons.synthetic %} -
    -

    Skrócony kurs

    - -

    Masz kilka godzin? Przeprowadź po jednej lekcji przeglądowej z każdego tematu.

    - -
      - {% for lesson in lessons.synthetic %} -
    • {% include "catalogue/snippets/lesson_or_stub.html" %}
      • - {% endfor %} -
    -
    - {% endif %} - - - {% if lessons.course %} -
    -

    Pełny kurs

    - -

    Masz więcej czasu? Zrealizuj kompletny program edukacji medialnej.

    - - {% for section, s_lessons in lessons.course.items %} -
    -

    {{ section }}

    - -
      - {% for lesson in s_lessons %} -
    • {% include "catalogue/snippets/lesson_or_stub.html" %}
      • - {% endfor %} -
    -
    - {% endfor %} - -
    - {% endif %} - - - {% if lessons.project %} -
    -

    Projekty

    - -

    Masz 4-6 tygodni? Zrealizuj jeden z projektów ze swoimi uczniami.

    - -
      - {% for lesson in lessons.project %} -
    • {% include "catalogue/snippets/lesson_or_stub.html" %}
      • - {% endfor %} -
    -
    - {% endif %} - - - {% if courses %} -
    -

    Według podstawy programowej

    - - {% for course, lessons in courses %} -
    -

    {{ course }}

    - - {% if lessons.synthetic %} -
    -

    Z kursu skróconego

    -
      - {% for lesson in lessons.synthetic %} -
    • {% include "catalogue/snippets/lesson_or_stub.html" %}
      • - {% endfor %} -
    -
    - {% endif %} - - {% if lessons.course %} -
    -

    Z kursu pełnego

    -
      - {% for lesson in lessons.course %} -
    • {% include "catalogue/snippets/lesson_or_stub.html" %}
      • - {% endfor %} -
    -
    - {% endif %} - - {% if lessons.project %} -
    -

    Projekty

    -
      - {% for lesson in lessons.project %} -
    • {% include "catalogue/snippets/lesson_or_stub.html" %}
      • - {% endfor %} -
    -
    - {% endif %} - -
    - {% endfor %} - -
    - {% endif %} - - - {% if added %} -
    -

    Inne

    - - {% for item in added %} -
    -

    {{ item.title }}

    - -
      - {% for lesson in item.lessons %} -
    • {{ lesson }}
      • - {% endfor %} -
    -
    - {% endfor %} -
    - {% endif %} - - -
    diff --git a/catalogue/templates/catalogue/snippets/levels_main.html b/catalogue/templates/catalogue/snippets/levels_main.html deleted file mode 100644 index 54ceed9..0000000 --- a/catalogue/templates/catalogue/snippets/levels_main.html +++ /dev/null @@ -1,36 +0,0 @@ -{% load i18n %} - -{% url 'catalogue_lessons' as les %} - diff --git a/catalogue/templates/search/indexes/catalogue/lesson_text.txt b/catalogue/templates/search/indexes/catalogue/lesson_text.txt deleted file mode 100755 index ab6feff..0000000 --- a/catalogue/templates/search/indexes/catalogue/lesson_text.txt +++ /dev/null @@ -1 +0,0 @@ -{{ object.html_file.read|striptags }} diff --git a/catalogue/templatetags/__init__.py b/catalogue/templatetags/__init__.py deleted file mode 100755 index e69de29..0000000 diff --git a/catalogue/templatetags/catalogue_tags.py b/catalogue/templatetags/catalogue_tags.py deleted file mode 100755 index b74224d..0000000 --- a/catalogue/templatetags/catalogue_tags.py +++ /dev/null @@ -1,173 +0,0 @@ -# -*- coding: utf-8 -*- -from collections import defaultdict -from django import template -from django.utils.datastructures import SortedDict -from ..models import Lesson, Section -from curriculum.models import Level, CurriculumCourse -from librarian.dcparser import WLURI, Person - -register = template.Library() - - -@register.inclusion_tag("catalogue/snippets/carousel.html") -def catalogue_carousel(): - return { - "object_list": Section.objects.all() - } - - -@register.inclusion_tag("catalogue/snippets/levels_main.html") -def catalogue_levels_main(): - object_list = Level.objects.exclude(lesson=None) - c = object_list.count() - return { - 'object_list': object_list, - # 'section_width': (700 - 20 * (c - 1)) / c, - 'section_width': (700 - 20 * 2) / 3 - } - - -@register.inclusion_tag("catalogue/snippets/level_box.html") -def level_box(level): - lessons = {'synthetic': [], 'course': SortedDict(), 'project': []} - by_course = defaultdict(lambda: defaultdict(list)) - - lesson_lists = [alist for alist in [ - list(level.lesson_set.exclude(type='appendix').order_by('section__order', 'order')), - list(level.lessonstub_set.all()) - ] if alist] - - while lesson_lists: - min_index, min_list = min(enumerate(lesson_lists), key=lambda x: x[1][0].order) - lesson = min_list.pop(0) - if not min_list: - lesson_lists.pop(min_index) - - if lesson.type == 'course': - if lesson.section not in lessons['course']: - lessons['course'][lesson.section] = [] - lessons['course'][lesson.section].append(lesson) - elif lesson.type.startswith('added'): - continue - else: - lessons[lesson.type].append(lesson) - - if hasattr(lesson, 'curriculum_courses'): - for course in lesson.curriculum_courses.all(): - by_course[course][lesson.type].append(lesson) - - courses = [(course, by_course[course]) - for course in CurriculumCourse.objects.filter(lesson__level=level).distinct()] - - added = [] - if level.slug == 'liceum': - added.append({ - 'slug': 'filmowa', - 'title': u'Edukacja filmowa', - 'lessons': [ - Lesson.objects.get(slug=s) for s in [ - 'film-co-to-wlasciwie-jest', - 'scenariusz-scenopis-i-srodki-realizacyjne', - 'kompozycja-obrazu-filmowego', - 'praca-kamery-kadr-kat', - 'montaz-materialu-filmowego', - 'swiatlo-i-dzwiek-w-filmie', - 'scenografia-charakteryzacja-kostiumy-i-aktorzy', - 'narracja-w-filmie-tekst-i-fabula', - ] - ], - }) - added.append({ - 'slug': 'varsaviana', - 'title': u'Edukacja varsavianistyczna', - 'lessons': [ - Lesson.objects.get(slug=s) for s in [ - 'czego-prus-w-lalce-o-zydach-nie-powiedzial', - 'jak-zmienila-sie-warszawa-o-dworcu-dawniej-i-dzis', - 'o-gwarze-praskiej', - 'poznaj-i-pokaz-prage', - 'praga-trzech-religii', - 'sladami-zydow-w-warszawie', - 'tajemnice-palacu-saskiego', - 'warszawa-przedwojenne-miasto-neonow', - 'warszawski-barok', - 'ziemianska-jako-soczewka-swiata-lat-miedzywojennych', - ] - ], - }) - - return { - "level": level, - "lessons": lessons, - "courses": courses, - "added": added, - } - - -@register.inclusion_tag("catalogue/snippets/lesson_nav.html") -def lesson_nav(lesson): - if lesson.type == 'course': - root = lesson.section - siblings = Lesson.objects.filter(type='course', level=lesson.level, section=root) - elif lesson.type == 'appendix': - root = None - siblings = Lesson.objects.filter(type=lesson.type) - elif lesson.type == 'added': - root = None - siblings = [ - Lesson.objects.get(slug=s) for s in [ - 'film-co-to-wlasciwie-jest', - 'scenariusz-scenopis-i-srodki-realizacyjne', - 'kompozycja-obrazu-filmowego', - 'praca-kamery-kadr-kat', - 'montaz-materialu-filmowego', - 'swiatlo-i-dzwiek-w-filmie', - 'scenografia-charakteryzacja-kostiumy-i-aktorzy', - 'narracja-w-filmie-tekst-i-fabula', - ] - ] - else: - root = None - siblings = Lesson.objects.filter(type=lesson.type, level=lesson.level) - return { - "lesson": lesson, - "root": root, - "siblings": siblings, - } - - -@register.inclusion_tag("catalogue/snippets/lesson_link.html") -def lesson_link(uri): - try: - return {'lesson': Lesson.objects.get(slug=WLURI(uri).slug)} - except Lesson.DoesNotExist: - return {} - - -@register.filter -def person_list(persons): - return u", ".join(Person.from_text(p).readable() for p in persons) - - -# FIXME: Move to fnpdjango -import feedparser -import datetime - - -@register.inclusion_tag('catalogue/latest_blog_posts.html') -def latest_blog_posts(feed_url, posts_to_show=5): - try: - feed = feedparser.parse(str(feed_url)) - posts = [] - for i in range(posts_to_show): - pub_date = feed['entries'][i].updated_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, - 'link': feed['entries'][i].link, - 'date': published, - }) - return {'posts': posts} - except: - return {'posts': []} diff --git a/catalogue/tests.py b/catalogue/tests.py deleted file mode 100644 index b967c44..0000000 --- a/catalogue/tests.py +++ /dev/null @@ -1,17 +0,0 @@ -# -*- coding: utf-8 -*- -""" -This file demonstrates writing tests using the unittest module. These will pass -when you run "manage.py test". - -Replace this with more appropriate tests for your application. -""" - -from django.test import TestCase - - -class SimpleTest(TestCase): - def test_basic_addition(self): - """ - Tests that 1 + 1 always equals 2. - """ - self.assertEqual(1 + 1, 2) diff --git a/catalogue/urls.py b/catalogue/urls.py deleted file mode 100755 index f2a8b08..0000000 --- a/catalogue/urls.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from django.conf.urls import patterns, url -from .views import LessonListView, LessonView - -urlpatterns = patterns( - '', - url(r'^$', - LessonListView.as_view(), - name="catalogue_lessons"), - url(r'^(?P[^/]+)/$', - LessonView.as_view(), - name="catalogue_lesson"), -) diff --git a/catalogue/views.py b/catalogue/views.py deleted file mode 100644 index 4f9d78c..0000000 --- a/catalogue/views.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -from django.views.generic import DetailView, ListView - -from curriculum.models import Level -from publishers.models import Publisher -from .models import Lesson - - -class LessonListView(ListView): - queryset = Level.objects.exclude(lesson=None) - template_name = "catalogue/lesson_list.html" - - def get_context_data(self, **kwargs): - context = super(LessonListView, self).get_context_data(**kwargs) - context['appendix'] = Lesson.objects.filter(type='appendix') - return context - - -class LessonView(DetailView): - model = Lesson - - def get_template_names(self): - return [ - 'catalogue/lesson/%s/lesson_detail.html' % self.object.type, - 'catalogue/lesson/lesson_detail.html', - ] - - def get_context_data(self, **kwargs): - context = super(LessonView, self).get_context_data(**kwargs) - try: - context['publisher'] = Publisher.objects.get( - name=context['object'].dc.get('publisher', '').strip()) - except (Publisher.DoesNotExist, Publisher.MultipleObjectsReturned): - pass - return context diff --git a/comment/__init__.py b/comment/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/comment/admin.py b/comment/admin.py deleted file mode 100644 index 7c9ce9a..0000000 --- a/comment/admin.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -from django.contrib import admin - -from .models import CommentDocument - - -class CommentDocumentAdmin(admin.ModelAdmin): - prepopulated_fields = {"slug": ("name",)} - -admin.site.register(CommentDocument, CommentDocumentAdmin) diff --git a/comment/locale/pl/LC_MESSAGES/django.mo b/comment/locale/pl/LC_MESSAGES/django.mo deleted file mode 100644 index b3595bd4384b2acc453ec21238847d564f5923ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2971 zcma)8O>Y}F5LMf>2OWFvVW1*`jd=Cpq(G`jN>o`%+{hoWl^FG z#$Ak0F*+FL`2pi+ykz)%jqwlWzkig={d6Oj`wQdC&vLmxu>Nm8m&3BPgAeyjcq5K8l?SSy8% z{HoO_GBF!G7}pQ%+oenCHx5ncNt{7M5 zV5!*G8IBM@i`2^akpW-uY7?xs$d?1F0l-y57V#|Jg*>j{td&ecm+V7P^V~DfgN){< zK0pIc#9-)SXq@UtY+$swK&JVR`ikFcq%-Bd58V~!J`2=~wFd9_vuyMJIwRd_$mg<; zdn4#R%aw#CG7vW7bGvJR9J3dfnYywsBg(+e>aWYjoI-}eL%qG1quvzt=A#B|Dr$^| z5%1RvH#Z=-$@k{VrYbbdF|$xBu?9hjbA%>h6>?YfQMOnMIpS~yx25fgexFAsE}UMe zY-MwpJB*|uz}fYj=R8u-ZIuq2t*6b$ZF=55I^I3l&mZwnM%vj^1K~N}!~^AYWtH-W z2VJKXaVs)shiP7=?Q-RgQ`vUPUs3t%>fL*{%aw8&8=WKmLKx%oec!d4N6y}Xv(uy} z2i3jZ+ouQn?RfXal| zH!I~veVcCGveR1qu9LSj+MDWOm0+U7S-(X%Y#ctlE^zuH`5A>(ZJC!vv!INCm1 z;Rf>})CqS?ci$p0!TBu;SeghmmYYRdgplGkln5Y<(y5DgD+sQ4x6i0+{eWF`<;(-6 zQfUUZDVeI-83W~sV4j@F*=wXSlsZ9_Udl%2zqo8A6X&lkpqRV@JXAoiG_ss-5rZt) zSWgoO!>HoI_x1QrmUNhCL1{dDJJn;E1Y*oc(2xP3EYjf|6L_0*Fje8@_;KY>P0v@O!~reFZdt5$T8cjq4fe6r;67=KQSs-i$(AtZT2lgV2eRMi|8~SmNP_d@@ WnbfcJL}_4VS0bwZLz`lDJN^gl`LU`1 diff --git a/comment/locale/pl/LC_MESSAGES/django.po b/comment/locale/pl/LC_MESSAGES/django.po deleted file mode 100644 index 94594a8..0000000 --- a/comment/locale/pl/LC_MESSAGES/django.po +++ /dev/null @@ -1,84 +0,0 @@ -# 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: 2013-12-05 09:48+0100\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" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" - -#: templates/comment/commentdocument_list.html:7 -#, python-format -msgid "" -"\n" -" Take part in the consultation by filling in the form or comment on specific competencies in different thematic " -"fields\n" -" " -msgstr "" -"\n" -" Weź udział w konsultacjach wypełniając ten " -"formularz lub skomentuj szczegółowo kompetencje w poszczególnych " -"obszarach tematycznych\n" -" " - -#: templates/comment/commentdocument_list.html:17 -msgid "" -"\n" -"

    To insert comments in a selected thematic field you need to " -"register.

    \n" -"\n" -"

    How to do it?

    \n" -"
      \n" -"
    1. Click on a selected link from the list of the thematic " -"fields.
      2. \n" -"
    2. Choose \"Register\" option.
      3. \n" -"
    3. Enter your data.
      4. \n" -"
    4. Check your email for the message confirming the registration " -"and click on the link included.
      5. \n" -"
    5. Enter your username and password.
      6. \n" -"
    6. Go back to the consultation page. Choose one of the fields, " -"log in and share your comments.
      7. \n" -"
    \n" -"\n" -"

    How to add a comment?

    \n" -"
      \n" -"
    1. Highlight a fragment of the text.
      2. \n" -"
    2. Click on a yellow \"comment\" button on the left.
      3. \n" -"
    3. Type in a subject and content of your comment.
      4. \n" -"
    4. Save your comment.
      5. \n" -"
    \n" -" " -msgstr "" -"\n" -"

    Aby wprowadzić szczegółowe komentarze w poszczególnych obszarach tematycznych konieczna jest rejestracja.

    " -"

    Jak to zrobić?

    " -"
      " -"
    1. Kliknij w dowolny link z listy obszarów tematycznych.
      2. " -"
    2. Wybierz opcję \"Register\" (Zarejestruj się).
      3. " -"
    3. Wprowadź swoje dane (adres e-mail, imię, nazwisko). Kliknij zielony przycisk \"Register\".
      4. " -"
    4. Na Twoje konto e-mail zostanie wysłana wiadomość potwierdzająca rejestrację. Kliknij w podany w niej link, aby aktywować swoje konto.
      5. " -"
    5. Wprowadź nazwę użytkownika i hasło. Potwierdź zielonym przyciskiem.
      6. " -"
    6. Wejdź ponownie na stronę http://katalog.edukacjamedialna.edu.pl/wez-udzial/. Wybierz interesujący Cię obszar tematyczny, zaloguj się i podziel się swoimi uwagami.
      7. " -"
    " -" " -"

    Jak dodać komentarz?

    " -"
      " -"
    1. Zaznacz dowolny fragment tekstu.
      2. " -"
    2. Wciśnij żółty przycisk \"comment\" po lewej stronie.
      3. " -"
    3. W polu \"subject\" wpisz temat uwagi, a w polu \"content\" jej treść.
      4. " -"
    4. Zapisz swój komentarz przyciskiem \"save\".
      5. " -"
    " -" " \ No newline at end of file diff --git a/comment/migrations/0001_initial.py b/comment/migrations/0001_initial.py deleted file mode 100644 index 9bf33a5..0000000 --- a/comment/migrations/0001_initial.py +++ /dev/null @@ -1,38 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding model 'CommentDocument' - db.create_table(u'comment_commentdocument', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('name', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255)), - ('slug', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=255)), - ('comment_id', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255)), - ('order', self.gf('django.db.models.fields.IntegerField')()), - )) - db.send_create_signal(u'comment', ['CommentDocument']) - - - def backwards(self, orm): - # Deleting model 'CommentDocument' - db.delete_table(u'comment_commentdocument') - - - models = { - u'comment.commentdocument': { - 'Meta': {'ordering': "['order']", 'object_name': 'CommentDocument'}, - 'comment_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}) - } - } - - complete_apps = ['comment'] \ No newline at end of file diff --git a/comment/migrations/0002_auto__add_field_commentdocument_language_code.py b/comment/migrations/0002_auto__add_field_commentdocument_language_code.py deleted file mode 100644 index 686f568..0000000 --- a/comment/migrations/0002_auto__add_field_commentdocument_language_code.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'CommentDocument.language_code' - db.add_column(u'comment_commentdocument', 'language_code', - self.gf('django.db.models.fields.CharField')(default='pl', max_length=2), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'CommentDocument.language_code' - db.delete_column(u'comment_commentdocument', 'language_code') - - - models = { - u'comment.commentdocument': { - 'Meta': {'ordering': "['order']", 'object_name': 'CommentDocument'}, - 'comment_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'language_code': ('django.db.models.fields.CharField', [], {'default': "'pl'", 'max_length': '2'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}) - } - } - - complete_apps = ['comment'] \ No newline at end of file diff --git a/comment/migrations/__init__.py b/comment/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/comment/models.py b/comment/models.py deleted file mode 100644 index 38c43d1..0000000 --- a/comment/models.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from django.db import models -from django.core.urlresolvers import reverse - - -class CommentDocument(models.Model): - name = models.CharField(max_length=255, unique=True) - slug = models.SlugField(max_length=255, unique=True) - comment_id = models.CharField(max_length=255, unique=True) - order = models.IntegerField() - language_code = models.CharField(max_length=2, default='pl') - - class Meta: - ordering = ['order'] - - def __unicode__(self): - return self.name - - def get_absolute_url(self): - return reverse('comment_document', kwargs={'slug': self.slug}) diff --git a/comment/templates/comment/commentdocument_detail.html b/comment/templates/comment/commentdocument_detail.html deleted file mode 100644 index 2ab214b..0000000 --- a/comment/templates/comment/commentdocument_detail.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "base_mil.html" %} - -{% block body %} - -

    {{object.name}}

    - - - -{% endblock %} \ No newline at end of file diff --git a/comment/templates/comment/commentdocument_list.html b/comment/templates/comment/commentdocument_list.html deleted file mode 100644 index 0a13f63..0000000 --- a/comment/templates/comment/commentdocument_list.html +++ /dev/null @@ -1,39 +0,0 @@ -{% extends "base_mil.html" %} -{% load i18n %} - - -{% block body %} - -

    {% blocktrans with href=form_href %} - Take part in the consultation by filling in the form or comment on specific competencies in different thematic fields - {% endblocktrans %}:

    - -
      - {% for document in object_list %} -
    1. {{document.name}}
      2. - {% endfor %} -
    - - {% blocktrans %} -

    To insert comments in a selected thematic field you need to register.

    - -

    How to do it?

    -
      -
    1. Click on a selected link from the list of the thematic fields.
      2. -
    2. Choose "Register" option.
      3. -
    3. Enter your data.
      4. -
    4. Check your email for the message confirming the registration and click on the link included.
      5. -
    5. Enter your username and password.
      6. -
    6. Go back to the consultation page. Choose one of the fields, log in and share your comments.
      7. -
    - -

    How to add a comment?

    -
      -
    1. Highlight a fragment of the text.
      2. -
    2. Click on a yellow "comment" button on the left.
      3. -
    3. Type in a subject and content of your comment.
      4. -
    4. Save your comment.
      5. -
    - {% endblocktrans %} - -{% endblock %} \ No newline at end of file diff --git a/comment/urls.py b/comment/urls.py deleted file mode 100644 index ef48089..0000000 --- a/comment/urls.py +++ /dev/null @@ -1,11 +0,0 @@ -# -*- coding: utf-8 -*- -from django.conf.urls import patterns, url - -from .views import CommentDocumentList, CommentDocument - - -urlpatterns = patterns( - '', - url('^$', CommentDocumentList.as_view(), name='comment_document_index'), - url('^(?P[^/]+)/$', CommentDocument.as_view(), name='comment_document') -) diff --git a/comment/views.py b/comment/views.py deleted file mode 100644 index 40db4b0..0000000 --- a/comment/views.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -from django.views.generic import ListView, DetailView -from django.conf import settings -from django.utils.translation import get_language - -from django.core.urlresolvers import reverse - -from .models import CommentDocument as CommentDocumentModel - - -class CommentDocumentList(ListView): - model = CommentDocumentModel - - def get_queryset(self): - return super(CommentDocumentList, self).get_queryset().filter(language_code=get_language()) - - def get_context_data(self, **kwargs): - context = super(CommentDocumentList, self).get_context_data(**kwargs) - context['form_href'] = reverse('contact_form', kwargs={'form_tag': 'mil'}) - return context - - -class CommentDocument(DetailView): - model = CommentDocumentModel - - def get_context_data(self, **kwargs): - context = super(CommentDocument, self).get_context_data(**kwargs) - context['comment_url'] = settings.COMMENT_URL - return context \ No newline at end of file diff --git a/curriculum/__init__.py b/curriculum/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/curriculum/admin.py b/curriculum/admin.py deleted file mode 100755 index 0f378bc..0000000 --- a/curriculum/admin.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -from django.contrib import admin -from .models import Competence, CompetenceLevel, Level, Section, CurriculumCourse, CurriculumLevel, Curriculum - - -class CompetenceLevelInline(admin.TabularInline): - model = CompetenceLevel - - -class CompetenceAdmin(admin.ModelAdmin): - model = Competence - list_display = ['name_pl', 'name_en', 'section', 'slug', 'order'] - inlines = [CompetenceLevelInline] - - -class LevelAdmin(admin.ModelAdmin): - model = Level - list_display = ['name_pl', 'name_en', 'group_pl', 'group_en', 'slug', 'order'] - - -class SectionAdmin(admin.ModelAdmin): - model = Section - list_display = ['name_pl', 'name_en', 'slug', 'order'] - - -admin.site.register(Level, LevelAdmin) -admin.site.register(Section, SectionAdmin) -admin.site.register(Competence, CompetenceAdmin) - -admin.site.register(CurriculumCourse) -admin.site.register(CurriculumLevel) -admin.site.register(Curriculum) diff --git a/curriculum/fixtures/competences.json b/curriculum/fixtures/competences.json deleted file mode 100644 index 3d6731d..0000000 --- a/curriculum/fixtures/competences.json +++ /dev/null @@ -1,2951 +0,0 @@ -[ - { - "pk": 1, - "model": "curriculum.section", - "fields": { - "order": 1, - "name": "Korzystanie z informacji", - "slug": "korzystanie-z-informacji" - } - }, - { - "pk": 2, - "model": "curriculum.section", - "fields": { - "order": 2, - "name": "Relacje w \u015brodowisku medialnym", - "slug": "relacje-w-srodowisku-medialnym" - } - }, - { - "pk": 3, - "model": "curriculum.section", - "fields": { - "order": 3, - "name": "J\u0119zyk medi\u00f3w", - "slug": "jezyk-mediow" - } - }, - { - "pk": 4, - "model": "curriculum.section", - "fields": { - "order": 4, - "name": "Kreatywne korzystanie z medi\u00f3w", - "slug": "kreatywne-korzystanie-z-mediow" - } - }, - { - "pk": 5, - "model": "curriculum.section", - "fields": { - "order": 5, - "name": "Etyka i warto\u015bci w komunikacji i mediach", - "slug": "etyka-i-wartosci-w-komunikacji-i-mediach" - } - }, - { - "pk": 6, - "model": "curriculum.section", - "fields": { - "order": 6, - "name": "Bezpiecze\u0144stwo w komunikacji i mediach", - "slug": "bezpieczenstwo-w-komunikacji-i-mediach" - } - }, - { - "pk": 7, - "model": "curriculum.section", - "fields": { - "order": 7, - "name": "Prawo w komunikacji i mediach", - "slug": "prawo-w-mediach-i-komunikacji" - } - }, - { - "pk": 8, - "model": "curriculum.section", - "fields": { - "order": 8, - "name": "Ekonomiczne aspekty dzia\u0142ania medi\u00f3w", - "slug": "ekonomiczne-aspekty-dzialania-mediow" - } - }, - { - "pk": 1, - "model": "curriculum.competence", - "fields": { - "section": 1, - "order": 1, - "name": "\u0179r\u00f3d\u0142a informacji", - "slug": "zrodla-informacji" - } - }, - { - "pk": 2, - "model": "curriculum.competence", - "fields": { - "section": 1, - "order": 2, - "name": "Wyszukiwanie informacji", - "slug": "wyszukiwanie-informacji" - } - }, - { - "pk": 3, - "model": "curriculum.competence", - "fields": { - "section": 1, - "order": 3, - "name": "Podej\u015bcie krytyczne do informacji", - "slug": "podejscie-krytyczne-do-informacji" - } - }, - { - "pk": 4, - "model": "curriculum.competence", - "fields": { - "section": 1, - "order": 4, - "name": "Wykorzystanie informacji", - "slug": "wykorzystanie-informacji" - } - }, - { - "pk": 7, - "model": "curriculum.competence", - "fields": { - "section": 2, - "order": 1, - "name": "Wizerunek", - "slug": "wizerunek" - } - }, - { - "pk": 5, - "model": "curriculum.competence", - "fields": { - "section": 2, - "order": 2, - "name": "Komunikacja", - "slug": "komunikacja" - } - }, - { - "pk": 6, - "model": "curriculum.competence", - "fields": { - "section": 2, - "order": 3, - "name": "Otoczenie", - "slug": "otoczenie" - } - }, - { - "pk": 10, - "model": "curriculum.competence", - "fields": { - "section": 3, - "order": 1, - "name": "J\u0119zykowa natura medi\u00f3w", - "slug": "jezykowa-natura-mediow" - } - }, - { - "pk": 9, - "model": "curriculum.competence", - "fields": { - "section": 3, - "order": 2, - "name": "Funkcje komunikat\u00f3w medialnych", - "slug": "funkcje-komunikatow-medialnych" - } - }, - { - "pk": 8, - "model": "curriculum.competence", - "fields": { - "section": 3, - "order": 3, - "name": "Kultura komunikacji medialnej", - "slug": "kultura-komunikacji-medialnej" - } - }, - { - "pk": 11, - "model": "curriculum.competence", - "fields": { - "section": 4, - "order": 1, - "name": "Tworzenie", - "slug": "tworzenie" - } - }, - { - "pk": 12, - "model": "curriculum.competence", - "fields": { - "section": 4, - "order": 2, - "name": "Przetwarzanie", - "slug": "przetwarzanie" - } - }, - { - "pk": 13, - "model": "curriculum.competence", - "fields": { - "section": 4, - "order": 3, - "name": "Prezentowanie", - "slug": "prezentowanie" - } - }, - { - "pk": 16, - "model": "curriculum.competence", - "fields": { - "section": 5, - "order": 1, - "name": "Komunikacja i media jako przedmiot refleksji etycznej", - "slug": "komunikacja-i-media-jako-przedmiot-refleksji-etycz" - } - }, - { - "pk": 15, - "model": "curriculum.competence", - "fields": { - "section": 5, - "order": 2, - "name": "Wyzwania etyczne a tre\u015bci medi\u00f3w i komunikacji", - "slug": "wyzwania-etyczne-a-tresci-mediow-i-komunikacji" - } - }, - { - "pk": 17, - "model": "curriculum.competence", - "fields": { - "section": 5, - "order": 3, - "name": "Wyzwania etyczne w relacjach przez media", - "slug": "wyzwania-etyczne-w-relacjach-przez-media" - } - }, - { - "pk": 14, - "model": "curriculum.competence", - "fields": { - "section": 5, - "order": 4, - "name": "Wyzwania etyczne a normy prawa w mediach i komunikacji", - "slug": "wyzwania-etyczne-a-normy-prawa" - } - }, - { - "pk": 21, - "model": "curriculum.competence", - "fields": { - "section": 6, - "order": 1, - "name": "Ochrona prywatno\u015bci i wizerunku", - "slug": "ochrona-prywatnosci-i-wizerunku" - } - }, - { - "pk": 20, - "model": "curriculum.competence", - "fields": { - "section": 6, - "order": 2, - "name": "Anonimowo\u015b\u0107", - "slug": "anonimowosc" - } - }, - { - "pk": 18, - "model": "curriculum.competence", - "fields": { - "section": 6, - "order": 3, - "name": "Bezpiecze\u0144stwo komunikacji, pracy i transakcji", - "slug": "bezpieczenstwo-komunikacji-pracy-i-transakcji" - } - }, - { - "pk": 22, - "model": "curriculum.competence", - "fields": { - "section": 6, - "order": 4, - "name": "Nadz\u00f3r nad sieci\u0105", - "slug": "nadzor-nad-siecia" - } - }, - { - "pk": 19, - "model": "curriculum.competence", - "fields": { - "section": 6, - "order": 5, - "name": "Uzale\u017cnienia i higiena korzystania z medi\u00f3w", - "slug": "uzaleznienia-i-higiena-korzystania-z-mediow" - } - }, - { - "pk": 23, - "model": "curriculum.competence", - "fields": { - "section": 7, - "order": 1, - "name": "Rodzaje, \u017ar\u00f3d\u0142a i praktyka stosowania prawa w kontek\u015bcie medi\u00f3w", - "slug": "rodzaje-zrodla-i-praktyka-stosowania-prawa" - } - }, - { - "pk": 28, - "model": "curriculum.competence", - "fields": { - "section": 7, - "order": 2, - "name": "Media a prawa cz\u0142owieka, obywatela i dziecka", - "slug": "media-a-prawa-czlowieka-obywatela-i-dziecka" - } - }, - { - "pk": 27, - "model": "curriculum.competence", - "fields": { - "section": 7, - "order": 3, - "name": "Prawa wy\u0142\u0105czne i monopole intelektualne", - "slug": "prawa-wylaczne-i-monopole-intelektualne" - } - }, - { - "pk": 29, - "model": "curriculum.competence", - "fields": { - "section": 7, - "order": 4, - "name": "Prawo telekomunikacyjne", - "slug": "prawo-telekomunikacyjne" - } - }, - { - "pk": 25, - "model": "curriculum.competence", - "fields": { - "section": 7, - "order": 5, - "name": "Prawo medi\u00f3w i media publiczne", - "slug": "prawo-mediow-i-media-publiczne" - } - }, - { - "pk": 24, - "model": "curriculum.competence", - "fields": { - "section": 7, - "order": 6, - "name": "Prawa os\u00f3b niepe\u0142nosprawnych", - "slug": "prawa-osob-niepelnosprawnych" - } - }, - { - "pk": 26, - "model": "curriculum.competence", - "fields": { - "section": 7, - "order": 7, - "name": "Ochrona danych osobowych", - "slug": "ochrona-danych-osobowych" - } - }, - { - "pk": 30, - "model": "curriculum.competence", - "fields": { - "section": 8, - "order": 1, - "name": "Rynek medi\u00f3w", - "slug": "rynek-mediow" - } - }, - { - "pk": 31, - "model": "curriculum.competence", - "fields": { - "section": 8, - "order": 2, - "name": "Informacja jako dobro ekonomiczne", - "slug": "informacja-jako-dobro-ekonomiczne" - } - }, - { - "pk": 32, - "model": "curriculum.competence", - "fields": { - "section": 8, - "order": 3, - "name": "Finansowanie medi\u00f3w i wybrane sposoby zarabiania w nowych mediach", - "slug": "finansowanie-mediow-i-wybrane-sposoby-zarabiania" - } - }, - { - "pk": 33, - "model": "curriculum.competence", - "fields": { - "section": 8, - "order": 4, - "name": "Polityka medialna", - "slug": "polityka-medialna" - } - }, - { - "pk": 1, - "model": "curriculum.level", - "fields": { - "order": 1, - "group": "edukacja formalna", - "name": "Wych. przedszkolne", - "slug": "przedszkole" - } - }, - { - "pk": 2, - "model": "curriculum.level", - "fields": { - "order": 2, - "group": "edukacja formalna", - "name": "SP 1-3", - "slug": "sp1-3" - } - }, - { - "pk": 3, - "model": "curriculum.level", - "fields": { - "order": 3, - "group": "edukacja formalna", - "name": "SP 4-6", - "slug": "sp4-6" - } - }, - { - "pk": 4, - "model": "curriculum.level", - "fields": { - "order": 4, - "group": "edukacja formalna", - "name": "Gimnazjum", - "slug": "gimnazjum" - } - }, - { - "pk": 5, - "model": "curriculum.level", - "fields": { - "order": 5, - "group": "edukacja formalna", - "name": "Szk. ponadgimnazjalna", - "slug": "liceum" - } - }, - { - "pk": 6, - "model": "curriculum.level", - "fields": { - "order": 6, - "group": "edukacja formalna", - "name": "Szk. wy\u017csze", - "slug": "studia" - } - }, - { - "pk": 7, - "model": "curriculum.level", - "fields": { - "order": 101, - "group": "edukacja ustawiczna", - "name": "Poziom minimum", - "slug": "minimum" - } - }, - { - "pk": 8, - "model": "curriculum.level", - "fields": { - "order": 102, - "group": "edukacja ustawiczna", - "name": "Poziom optimum", - "slug": "optimum" - } - }, - { - "pk": 9, - "model": "curriculum.level", - "fields": { - "order": 103, - "group": "edukacja ustawiczna", - "name": "Poziom mistrzowski", - "slug": "master" - } - }, - { - "pk": 1, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce informacja wyst\u0119puje w r\u00f3\u017cnych formach; \u00a0np. rozumie, jakie s\u0105 podstawowe r\u00f3\u017cnice pomi\u0119dzy obrazem, tekstem, filmem, stron\u0105 internetow\u0105.\n- wie, \u017ce istniej\u0105 r\u00f3\u017cne \u017ar\u00f3d\u0142a informacji (TV, internet, radio, ksi\u0105\u017cki, gazety, inni ludzie).\n- umie skorzysta\u0107 z wybranych \u017ar\u00f3de\u0142 informacji; np. wyszukuje potrzebne informacje na temat ulubionego zwierz\u0119cia korzystaj\u0105c ze s\u0142ownika obrazkowego, rozmawiaj\u0105c z rodzicem / nauczycielem.", - "competence": 1, - "level": 1 - } - }, - { - "pk": 2, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie s\u0105 najwa\u017cniejsze \u017ar\u00f3d\u0142a informacji dostosowane do jego wieku i poziomu edukacji i umie z nich skorzysta\u0107;\nnp. korzysta z drukowanych i elektronicznych encyklopedii i s\u0142ownik\u00f3w dla dzieci.\n- umie skorzysta\u0107 z biblioteki szkolnej, kieruj\u0105c si\u0119 wskaz\u00f3wkami nauczyciela;\nnp. wybiera lektury, korzystaj\u0105c z rad nauczyciela.\n- wie, \u017ce informacje pochodz\u0105ce z r\u00f3\u017cnych \u017ar\u00f3de\u0142 mog\u0105 si\u0119 r\u00f3\u017cni\u0107.", - "competence": 1, - "level": 2 - } - }, - { - "pk": 3, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie s\u0105 podstawowe kryteria oceny \u017ar\u00f3de\u0142 informacji; np. wie, czym jest wiarygodno\u015b\u0107, \u0142atwo\u015b\u0107 i efektywno\u015b\u0107 korzystania, szybko\u015b\u0107 dost\u0119pu w odniesieniu do \u017ar\u00f3de\u0142 informacji.\n- umie dokona\u0107 wyboru \u017ar\u00f3de\u0142 informacji, kieruj\u0105c si\u0119 przede wszystkim kryterium wiarygodno\u015bci;\nnp. umie skorzysta\u0107 z wiarygodnych \u017ar\u00f3de\u0142 takich jak encyklopedie, s\u0142owniki drukowane lub elektroniczne.\n- umie skorzysta\u0107 z zasob\u00f3w biblioteki szkolnej, samodzielnie wybieraj\u0105c lektury oraz dobieraj\u0105c odpowiednie \u017ar\u00f3d\u0142a informacji do konkretnych zada\u0144.\n- wie, \u017ce jako\u015b\u0107 \u017ar\u00f3de\u0142 informacji ma zasadnicze znaczenie dla wynik\u00f3w pracy.", - "competence": 1, - "level": 3 - } - }, - { - "pk": 4, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce \u017ar\u00f3d\u0142a informacji nale\u017cy wybiera\u0107 \u015bwiadomie, maj\u0105c na uwadze potrzeby informacyjne oraz cel wykorzystania informacji.\n- umie biegle wybiera\u0107 \u017ar\u00f3d\u0142a informacji wykorzystywanych w procesie kszta\u0142cenia, kieruj\u0105c si\u0119 poszczeg\u00f3lnymi kryteriami wyboru;\nnp. zale\u017cnie od sytuacji korzysta z Wikipedii lub innych \u017ar\u00f3de\u0142.\n- rozumie konsekwencje korzystania z niew\u0142a\u015bciwych \u017ar\u00f3de\u0142 informacji w odniesieniu do edukacji szkolnej.\n- rozumie, jakie s\u0105 r\u00f3\u017cnice pomi\u0119dzy kana\u0142em a \u017ar\u00f3d\u0142em informacji.", - "competence": 1, - "level": 4 - } - }, - { - "pk": 5, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie s\u0105 najwa\u017cniejsze \u017ar\u00f3d\u0142a informacji naukowej i umie z nich skorzysta\u0107 w podstawowym zakresie;\nnp. korzysta z katalog\u00f3w elektronicznych bibliotek akademickich.\n- umie dokona\u0107 wyboru \u017ar\u00f3de\u0142 informacji, bior\u0105c pod uwag\u0119 dodatkowe kryteria takie jak relewancja, \u0142atwo\u015b\u0107 i efektywno\u015b\u0107 korzystania.\n- rozumie znaczenie doboru w\u0142a\u015bciwych \u017ar\u00f3de\u0142 informacji dla efekt\u00f3w wykonywanej pracy.\n- rozumie przyczyny ogranicze\u0144 system\u00f3w organizacji informacji;\nnp. rozumie, jakie nast\u0119pstwa ma fakt, \u017ce j\u0119zyki informacyjno-wyszukiwawcze s\u0105 j\u0119zykami sztucznymi.", - "competence": 1, - "level": 5 - } - }, - { - "pk": 6, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jaka jest r\u00f3\u017cnica pomi\u0119dzy \u017ar\u00f3d\u0142ami informacji wykorzystywanymi w pracy naukowej i \u017cyciu codziennym.\n- umie dokona\u0107 wyboru optymalnych \u017ar\u00f3de\u0142 informacji naukowej.\n- umie dokona\u0107 wyboru system\u00f3w informacyjnych zgodnie z zapotrzebowaniem wynikaj\u0105cym z jego pracy.\n- rozumie, jakie s\u0105 konsekwencje wykorzystania niew\u0142a\u015bciwych \u017ar\u00f3de\u0142 w pracy naukowej.\n- rozumie konieczno\u015b\u0107 odwo\u0142ywania si\u0119 do wykorzystanych \u017ar\u00f3de\u0142;\nnp. wie, jak i dlaczego nale\u017cy stosowa\u0107 przypisy i zamieszcza\u0107 bibliografi\u0119.", - "competence": 1, - "level": 6 - } - }, - { - "pk": 7, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie s\u0105 najwa\u017cniejsze \u017ar\u00f3d\u0142a informacji we wsp\u00f3\u0142czesnym \u015bwiecie.\n- wie, \u017ce \u017ar\u00f3d\u0142a informacji nale\u017cy wybiera\u0107 \u015bwiadomie, maj\u0105c na uwadze potrzeby informacyjne oraz cel wykorzystania informacji.\n- umie wykorzysta\u0107 g\u0142\u00f3wne \u017ar\u00f3d\u0142a informacji w procesie zaspokajania swoich potrzeb informacyjnych.\n- umie w spos\u00f3b intuicyjny oceni\u0107 wiarygodno\u015b\u0107 \u017ar\u00f3de\u0142 informacji.\n- umie dokona\u0107 wyboru \u017ar\u00f3de\u0142 informacji, bior\u0105c pod uwag\u0119 takie kryteria jak wiarygodno\u015b\u0107, relewancja, \u0142atwo\u015b\u0107 i efektywno\u015b\u0107 korzystania.\n- rozumie, jakie jest znaczenie informacji w spo\u0142ecze\u0144stwie XXI wieku.\n- rozumie, \u017ce informacje r\u00f3\u017cni\u0105 si\u0119 w zale\u017cno\u015bci od \u017ar\u00f3d\u0142a, z kt\u00f3rego pochodz\u0105, oraz intencji nadawcy.", - "competence": 1, - "level": 7 - } - }, - { - "pk": 8, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce relewantna i wiarygodna informacja powinna zawsze by\u0107 podstaw\u0105 podejmowanych decyzji.\n- wie, jakie s\u0105 najwa\u017cniejsze modele zachowa\u0144 informacyjnych.\n- umie biegle wybiera\u0107 \u017ar\u00f3d\u0142a informacji wykorzystywanych w procesie kszta\u0142cenia, kieruj\u0105c si\u0119 odpowiednimi kryteriami.\n- rozumie, jakie jest znaczenie doboru w\u0142a\u015bciwych \u017ar\u00f3de\u0142 informacji dla efekt\u00f3w wykonywanej pracy.", - "competence": 1, - "level": 8 - } - }, - { - "pk": 9, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jaka jest organizacja \u017ar\u00f3de\u0142 informacji oraz przep\u0142ywu informacji w spo\u0142ecze\u0144stwie.\n- umie sprawnie wybiera\u0107 \u017ar\u00f3d\u0142a informacji w zale\u017cno\u015bci od celu dzia\u0142ania i specyfiki realizowanego zadania.\n- rozumie, jakie s\u0105 konsekwencje korzystania z niew\u0142a\u015bciwych \u017ar\u00f3de\u0142 informacji w odniesieniu do efekt\u00f3w wykonywanej pracy i realizacji konkretnego zadania.", - "competence": 1, - "level": 9 - } - }, - { - "pk": 10, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie skorzysta\u0107 z pomocy doros\u0142ego w procesie pozyskiwania informacji; np. prosi rodzica o znalezienie jakiej\u015b informacji.", - "competence": 2, - "level": 1 - } - }, - { - "pk": 11, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce \u201ej\u0119zyk komputera\u201d r\u00f3\u017cni si\u0119 od j\u0119zyka m\u00f3wionego;\nnp. wie, \u017ce komputer zawsze \u201erobi\u201d to, co mu si\u0119 ka\u017ce, dlatego trzeba si\u0119 nauczy\u0107, jak wydawa\u0107 polecenia.\n- umie skorzysta\u0107 z podstawowych technik wyszukiwania w \u017ar\u00f3d\u0142ach tradycyjnych oraz elektronicznych.\n- wie, \u017ce dzia\u0142ania na zbiorach mog\u0105 by\u0107 wykorzystywane przy szukaniu informacji;\nnp. poznaje mo\u017cliwo\u015bci prostych zastosowa\u0144 operator\u00f3w logicznych (kot AND/ORAZ pies itd.)\n- umie zastosowa\u0107 proste has\u0142a osobowe, przedmiotowe, wpisuje proste zapytania informacyjno-wyszukiwawcze w wyszukiwarkach, encyklopediach;\nnp. wyszukuje informacje nt. ulubionego zwierz\u0119cia w s\u0142owniku obrazkowym, encyklopedii elektronicznej dla dzieci i internecie.\n- rozumie, \u017ce umiej\u0119tno\u015b\u0107 wyszukiwania informacji przyda mu si\u0119 w \u017cyciu;\nnp. rozumie, \u017ce na podstawie wyszukanych informacji b\u0119dzie podejmowa\u0142 r\u00f3\u017cne decyzje.", - "competence": 2, - "level": 2 - } - }, - { - "pk": 12, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie s\u0105 podstawowe r\u00f3\u017cnice w budowie hase\u0142 w j\u0119zyku naturalnym i j\u0119zyku systemu informacyjnego;\nnp. poznaje na przyk\u0142adzie hase\u0142 przedmiotowych r\u00f3\u017cnice w okre\u015blaniu zwierz\u0105t.\n- wie, \u017ce s\u0105 r\u00f3\u017cne modele zachowa\u0144 informacyjnych - umie wyszuka\u0107 informacje w wybranych tradycyjnych i elektronicznych \u017ar\u00f3d\u0142ach.\n- umie budowa\u0107 proste zapytania informacyjno-wyszukiwawcze;\nnp. rozk\u0142ad jazdy pkp warszawa.\n- wie, \u017ce trzeba dok\u0142adnie formu\u0142owa\u0107 zapytania informacyjno-wyszukiwawcze.\n- wie, \u017ce wynik wyszukiwania zale\u017cy od tego, jak b\u0119dzie sformu\u0142owane zapytanie informacyjno-wyszukiwawcze.", - "competence": 2, - "level": 3 - } - }, - { - "pk": 13, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie s\u0105 podstawowe techniki i strategie wyszukiwania informacji;\nnp. stosuje strategi\u0119 zaw\u0119\u017cania wynik\u00f3w poszukiwa\u0144.\n- umie wyszukiwa\u0107 informacje w \u017ar\u00f3d\u0142ach tradycyjnych i elektronicznych;\nnp. wyszukuje informacje, korzystaj\u0105c ze stron, blog\u00f3w, portali, wortali oraz materia\u0142\u00f3w drukowanych.\n- umie zastosowa\u0107 z\u0142o\u017cone strategie wyszukiwania w oparciu o znane modele zachowa\u0144 informacyjnych w odpowiednich adaptacjach.\n\n- umie wykorzysta\u0107 wybrane techniki wyszukiwania;\nnp. korzysta z operator\u00f3w logicznych.\n- umie budowa\u0107 zapytania informacyjno-wyszukiwawcze w j\u0119zyku systemu informacyjnego.", - "competence": 2, - "level": 4 - } - }, - { - "pk": 14, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie s\u0105 z\u0142o\u017cone strategie wyszukiwania.\n- umie sprawnie wyszukiwa\u0107 informacje, buduj\u0105c strategie wyszukiwania w oparciu o najwa\u017cniejsze modele zachowa\u0144 informacyjnych.\n- umie przek\u0142ada\u0107 zapytania informacyjno-wyszukiwawcze wyra\u017cone w j\u0119zyku naturalnym na j\u0119zyk systemu informacyjnego.", - "competence": 2, - "level": 5 - } - }, - { - "pk": 15, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jak wyszukiwa\u0107 informacj\u0119 naukow\u0105 w r\u00f3\u017cnych \u017ar\u00f3d\u0142ach.\n- umie biegle korzysta\u0107 z najwa\u017cniejszych \u017ar\u00f3de\u0142 informacji naukowej;\nnp. biegle korzysta z katalog\u00f3w bibliotecznych, stosuj\u0105c opcje wyszukiwania zaawansowanego, sprawnie korzysta z dziedzinowych baz danych literatury naukowej.\n- umie zaprojektowa\u0107 efektywn\u0105 strategi\u0119 wyszukiwania informacji.", - "competence": 2, - "level": 6 - } - }, - { - "pk": 16, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce wyszukiwanie informacji wymaga odpowiednich umiej\u0119tno\u015bci.\n- wie, \u017ce trzeba dok\u0142adnie formu\u0142owa\u0107 zapytania informacyjno-wyszukiwawcze.\n- umie skorzysta\u0107 z podstawowych technik wyszukiwania w \u017ar\u00f3d\u0142ach tradycyjnych oraz elektronicznych.\n- umie zastosowa\u0107 proste has\u0142a osobowe, przedmiotowe, wpisuje zapytania informacyjno-wyszukiwawcze w wyszukiwarkach, encyklopediach.\n- rozumie, \u017ce wynik wyszukiwania zale\u017cy od tego, jak b\u0119dzie sformu\u0142owane zapytanie informacyjno-wyszukiwawcze.\n- rozumie konsekwencje, jakie mo\u017ce mie\u0107 opieranie swoich decyzji na niepe\u0142nych lub nieaktualnych informacjach.", - "competence": 2, - "level": 7 - } - }, - { - "pk": 17, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie s\u0105 podstawowe techniki i strategie wyszukiwania informacji.\n- wie, jakie s\u0105 najwa\u017cniejsze modele zachowa\u0144 informacyjnych.\n- wie, jakie s\u0105 podstawowe r\u00f3\u017cnice w budowie hase\u0142 w j\u0119zyku naturalnym i j\u0119zyku systemu informacyjnego.\n- umie sprawnie wyszukiwa\u0107 informacje, buduj\u0105c strategie wyszukiwania w oparciu o najwa\u017cniejsze modele zachowa\u0144 informacyjnych.\n- umie stosowa\u0107 zaawansowane techniki wyszukiwania informacji.\n- umie dodawa\u0107, ulepsza\u0107 i \u0142\u0105czy\u0107 informacje w r\u00f3\u017cnych formach, zaczerpni\u0119te z r\u00f3\u017cnych \u017ar\u00f3de\u0142.", - "competence": 2, - "level": 8 - } - }, - { - "pk": 18, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie s\u0105 z\u0142o\u017cone strategie wyszukiwania.\n- umie sprawnie wyszukiwa\u0107 informacje, buduj\u0105c strategie wyszukiwania w oparciu o najwa\u017cniejsze modele zachowa\u0144 informacyjnych.\n- umie zaprojektowa\u0107 efektywn\u0105 strategi\u0119 wyszukiwania informacji.", - "competence": 2, - "level": 9 - } - }, - { - "pk": 19, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce je\u015bli informacja budzi w\u0105tpliwo\u015bci, powinien j\u0105 om\u00f3wi\u0107 z rodzicami lub nauczycielem przedszkolnym.\n- umie zada\u0107 pytanie dotycz\u0105ce wiarygodno\u015bci informacji;\nnp. zadaje pytania \u201emamo, czy to prawda, \u017ce\u201d...", - "competence": 3, - "level": 1 - } - }, - { - "pk": 20, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce informacje mog\u0105 by\u0107 nieprawdziwe, niepe\u0142ne, niedok\u0142adne.\n- wie, \u017ce nale\u017cy zastanawia\u0107 si\u0119 i rozmawia\u0107 na temat sposob\u00f3w korzystania z informacji.\n- wie, \u017ce nadawcy informacji mog\u0105 chcie\u0107 wywrze\u0107 na niego wp\u0142yw i sk\u0142oni\u0107 do okre\u015blonych zachowa\u0144.\n- umie dostrzec r\u00f3\u017cnic\u0119 pomi\u0119dzy informacj\u0105 prawdziw\u0105 i nieprawdziw\u0105, kieruj\u0105c si\u0119 swoj\u0105 intuicj\u0105.", - "competence": 3, - "level": 2 - } - }, - { - "pk": 21, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce przekazywane informacje r\u00f3\u017cni\u0105 si\u0119 w zale\u017cno\u015bci od intencji nadawcy;\nnp. por\u00f3wnuje, jak przekazywana jest ta sama informacja w r\u00f3\u017cnych mediach.\n- wie, \u017ce informacje niskiej jako\u015bci prowadz\u0105 do b\u0142\u0119dnych wniosk\u00f3w.\n- umie kwestionowa\u0107 wiarygodno\u015b\u0107 informacji.\n- umie weryfikowa\u0107 informacje poprzez por\u00f3wnywanie ich w r\u00f3\u017cnych \u017ar\u00f3d\u0142ach.\n- wie, \u017ce jest r\u00f3\u017cnica pomi\u0119dzy informacj\u0105 a plotk\u0105.\n- rozumie, czym jest manipulacja informacj\u0105.", - "competence": 3, - "level": 3 - } - }, - { - "pk": 22, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce zawsze nale\u017cy by\u0107 krytycznym wobec \u017ar\u00f3d\u0142a.\n- wie, z jakich \u017ar\u00f3de\u0142 skorzysta\u0107, by jednoznacznie zweryfikowa\u0107 informacje;\nnp. korzysta z encyklopedii PWN, by potwierdzi\u0107 informacje znalezione na blogu.\n- umie selekcjonowa\u0107 potrzebne informacje, sprawdzaj\u0105c ich dok\u0142adno\u015b\u0107.\n- umie oceni\u0107 wykorzystanie TIK w swojej pracy.\n- umie dostrzec i okre\u015bli\u0107 r\u00f3\u017cnice pomi\u0119dzy informacj\u0105 a innym przekazem, w tym opini\u0105, ocen\u0105, krytyk\u0105;\nnp. por\u00f3wnuje artyku\u0142y z r\u00f3\u017cnych gazet, okre\u015blaj\u0105c ich cechy.\n- umie rozr\u00f3\u017cni\u0107 cechy i funkcje informacji i plotki; np. por\u00f3wnuje teksty z \u201eGazety Wyborczej\u201d, \u201eFaktu\u201d i \u201ePudelka\u201d.", - "competence": 3, - "level": 4 - } - }, - { - "pk": 23, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce umiej\u0119tno\u015b\u0107 krytycznej oceny informacji jest kluczowa w procesie realizacji zada\u0144.\n- wie, \u017ce \u017ar\u00f3d\u0142a informacji i narz\u0119dzia TIK wykorzystywane w pracy maj\u0105 swoje wady, zalety i ograniczenia.\n- umie przedstawi\u0107 argumenty dotycz\u0105ce wad, zalet i ogranicze\u0144 \u017ar\u00f3de\u0142 informacji i narz\u0119dzi TIK.\n- rozumie konsekwencje wynikaj\u0105ce z braku podej\u015bcia krytycznego w zakresie korzystania ze \u017ar\u00f3de\u0142 informacji i narz\u0119dzi TIK.\n- rozumie konsekwencje przyjmowania okre\u015blonego stanowiska w pracy z informacj\u0105; np. np.rozumie, \u017ce wyniki bada\u0144 dotycz\u0105cych preferencji politycznych mog\u0105 by\u0107 r\u00f3\u017cnie interpretowane w zale\u017cno\u015bci od przekona\u0144 i sympatii politycznych autora lub linii programowej stacji oraz zdaje sobie spraw\u0119, \u017ce mo\u017ce to prowadzi\u0107 do b\u0142\u0119dnych wniosk\u00f3w.", - "competence": 3, - "level": 5 - } - }, - { - "pk": 24, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie wykorzysta\u0107 wyniki rozm\u00f3w na temat wad, zalet i ogranicze\u0144 \u017ar\u00f3de\u0142 informacji i narz\u0119dzi TIK do formu\u0142owania ocen dotycz\u0105cych jako\u015bci swojej pracy.\n- rozumie, jaki wp\u0142yw na rozw\u00f3j sektora TIK maj\u0105 czynniki takie jak prawo,etyka, ekonomia i wykorzystuje t\u0119 wiedz\u0119 w procesie realizacji zada\u0144 informacyjnych.", - "competence": 3, - "level": 6 - } - }, - { - "pk": 25, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce nadawcy informacji mog\u0105 chcie\u0107 wywrze\u0107 na niego wp\u0142yw i sk\u0142oni\u0107 do okre\u015blonych zachowa\u0144.\n- wie, \u017ce intencje nadawcy oraz specyfika danego medium ma decyduj\u0105cy wp\u0142yw na tre\u015b\u0107 i form\u0119 informacji.\n- wie, jakie s\u0105 podstawowe kryteria oceny \u017ar\u00f3de\u0142 informacji.\n- umie dostrzec r\u00f3\u017cnic\u0119 pomi\u0119dzy informacj\u0105 prawdziw\u0105 i nieprawdziw\u0105, kieruj\u0105c si\u0119 swoj\u0105 intuicj\u0105.\n- umie kwestionowa\u0107 wiarygodno\u015b\u0107 informacji.\n- umie weryfikowa\u0107 informacje poprzez por\u00f3wnywanie ich w r\u00f3\u017cnych \u017ar\u00f3d\u0142ach.\n- umie dostrzec i okre\u015bli\u0107 r\u00f3\u017cnice pomi\u0119dzy informacj\u0105 a innym przekazem, w tym opini\u0105, ocen\u0105, krytyk\u0105.\n- rozumie, czym jest manipulacja informacj\u0105.", - "competence": 3, - "level": 7 - } - }, - { - "pk": 26, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce umiej\u0119tno\u015b\u0107 krytycznej oceny informacji jest kluczowa w procesie realizacji zada\u0144.\n- rozumie konsekwencje przyjmowania okre\u015blonego stanowiska w pracy z informacj\u0105.", - "competence": 3, - "level": 8 - } - }, - { - "pk": 27, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie, jaki wp\u0142yw na rozw\u00f3j sektora TIK maj\u0105 czynniki takie jak prawo,etyka, ekonomia i wykorzystuje t\u0119 wiedz\u0119 w procesie realizacji zada\u0144 informacyjnych.", - "competence": 3, - "level": 9 - } - }, - { - "pk": 29, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce zasoby informacyjne trzeba porz\u0105dkowa\u0107 w celu \u0142atwego ich wykorzystania i odnalezienia.\n- umie wprowadza\u0107, zachowywa\u0107 i odzyskiwa\u0107 wyniki swojej pracy;\nnp. zapisuje wyniki swojej pracy w edytorze tekst\u00f3w.\n- umie zastosowa\u0107 proste schematy organizacji informacji, \u0142\u0105czy\u0107 i organizowa\u0107 materia\u0142;\nnp. szereguje, klasyfikuje, tworzy katalogi i foldery, opisuje je w zrozumia\u0142y dla siebie spos\u00f3b.", - "competence": 4, - "level": 2 - } - }, - { - "pk": 30, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce prezentuj\u0105c wyniki swojej pracy, powinien bra\u0107 pod uwag\u0119 potrzeby odbiorc\u00f3w.\n- umie wykorzystywa\u0107 TIK podczas tworzenia, ulepszania i zapisywania wynik\u00f3w pracy;\nnp. umie skorzysta\u0107 z poczty e-mail, by przes\u0142a\u0107 wyniki pracy kolegom.\n- umie wykorzystywa\u0107 TIK do dzielenia si\u0119 swoimi pomys\u0142ami z innymi, wykorzystuj\u0105c w tym celu r\u00f3\u017cne formy prezentacji informacji;\nnp. tworzy wsp\u00f3lnie z kolegami projekt, wykorzystuj\u0105c tekst, tabele, ilustracje.\n- umie sprawnie organizowa\u0107 w\u0142asne zasoby informacyjne w celu \u0142atwego ich wykorzystania.\n- rozumie, jakie s\u0105 konsekwencje braku opracowania i organizacji informacji.\n- rozumie, jakie s\u0105 potrzeby poszczeg\u00f3lnych grup odbiorc\u00f3w w zakresie prezentowania informacji;\nnp. rozumie, \u017ce komunikat podobnej tre\u015bci nale\u017cy zbudowa\u0107 inaczej, gdy jest adresowany do r\u00f3wie\u015bnik\u00f3w, rodzic\u00f3w, nauczycieli.", - "competence": 4, - "level": 3 - } - }, - { - "pk": 31, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jak odpowiednio prezentowa\u0107 wyniki swojej pracy;\nnp. wie, \u017ce prezentacja musi by\u0107 przejrzysta, zawiera\u0107 niezbyt du\u017co tekstu oraz rozmaite ilustracje.\n- umie dodawa\u0107, ulepsza\u0107 i \u0142\u0105czy\u0107 informacje w r\u00f3\u017cnych formach, zaczerpni\u0119te z r\u00f3\u017cnych \u017ar\u00f3de\u0142.\n- umie wykorzystywa\u0107 TIK w procesie prezentowania wynik\u00f3w swojej pracy;\nnp. umie przygotowa\u0107 prezentacje multimedialne i prowadzi\u0107 wyst\u0105pienia publiczne.\n- umie organizowa\u0107 informacje w spos\u00f3b najbardziej odpowiedni do wykorzystania.", - "competence": 4, - "level": 4 - } - }, - { - "pk": 32, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie rozwija\u0107 i ulepsza\u0107 wyniki swojej pracy z wykorzystaniem TIK, by podnie\u015b\u0107 jej jako\u015b\u0107.\n- umie \u0142\u0105czy\u0107 informacje pochodz\u0105ce z r\u00f3\u017cnych \u017ar\u00f3de\u0142, by w odpowiedni spos\u00f3b przedstawi\u0107 je odbiorcom.\n- umie samodzielnie wybra\u0107 narz\u0119dzia TIK odpowiadaj\u0105ce realizacji okre\u015blonych zada\u0144.\n- rozumie, jakie s\u0105 przyczyny ogranicze\u0144 zastosowania TIK w wykonywaniu okre\u015blonych prac;\nnp. rozumie ograniczenia wynikaj\u0105ce z konieczno\u015bci algorytmizacji wszelkich prac, by mog\u0142y by\u0107 wykonywane przez TIK.", - "competence": 4, - "level": 5 - } - }, - { - "pk": 34, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce prezentuj\u0105c wyniki swojej pracy, powinien bra\u0107 pod uwag\u0119 potrzeby odbiorc\u00f3w.\n- umie wprowadza\u0107, zachowywa\u0107 i odzyskiwa\u0107 wyniki swojej pracy.\n- umie wykorzystywa\u0107 TIK podczas tworzenia, ulepszania i zapisywania wynik\u00f3w pracy.\n- umie selekcjonowa\u0107 potrzebne informacje, sprawdzaj\u0105c ich dok\u0142adno\u015b\u0107.", - "competence": 4, - "level": 7 - } - }, - { - "pk": 35, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce \u017ar\u00f3d\u0142a informacji i narz\u0119dzia TIK wykorzystywane w pracy maj\u0105 swoje wady, zalety i ograniczenia.\n- umie wykorzystywa\u0107 TIK w procesie prezentowania wynik\u00f3w swojej pracy.\n- umie oceni\u0107 wykorzystanie TIK w swojej pracy.\n- umie wykorzysta\u0107 wyniki rozm\u00f3w na temat wad, zalet i ogranicze\u0144 \u017ar\u00f3de\u0142 informacji i narz\u0119dzi TIK do formu\u0142owania ocen dotycz\u0105cych jako\u015bci jego pracy.\n- rozumie, jakie s\u0105 przyczyny ogranicze\u0144 zastosowania TIK w wykonywaniu okre\u015blonych prac.", - "competence": 4, - "level": 8 - } - }, - { - "pk": 36, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie \u0142\u0105czy\u0107 informacje pochodz\u0105ce z r\u00f3\u017cnych \u017ar\u00f3de\u0142, by w odpowiedni spos\u00f3b przedstawi\u0107 je odbiorcom.\n- umie wybra\u0107 narz\u0119dzia TIK odpowiadaj\u0105ce realizacji okre\u015blonych zada\u0144.\n- rozumie konsekwencje wynikaj\u0105ce z braku podej\u015bcia krytycznego w zakresie korzystania ze \u017ar\u00f3de\u0142 informacji i narz\u0119dzi TIK.", - "competence": 4, - "level": 9 - } - }, - { - "pk": 55, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie s\u0105 specyficzne cechy jego samego i najbli\u017cszego otoczenia;\r\nnp. w przekazach medialnych rozpoznaje og\u00f3lne podobie\u0144stwa miejsc i przedmiot\u00f3w, zauwa\u017ca taki sam rower lub plac zabaw.\r\n- umie rozr\u00f3\u017cni\u0107 siebie na tle innych (poczucie indywiduum);\r\nnp. dostrzega na zdj\u0119ciach lub materia\u0142ach filmowych swoje cechy indywidualne w por\u00f3wnaniu z innymi (wzrost, kolor w\u0142os\u00f3w).", - "competence": 7, - "level": 1 - } - }, - { - "pk": 56, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce nie zawsze i wsz\u0119dzie nale\u017cy ujawnia\u0107 informacje o sobie;\r\nnp. rozmawiaj\u0105c z nowo poznan\u0105 osob\u0105 na czacie, nie podaje swojego numeru telefonu ani maila.\r\n- umie dostrzec r\u00f3\u017cnice mi\u0119dzy swoim wizerunkiem, zdolno\u015bciami i umiej\u0119tno\u015bciami a cechami postaci w grze; np. graj\u0105c w gr\u0119 komputerow\u0105, ma \u015bwiadomo\u015b\u0107, \u017ce po wyj\u015bciu z niej nie b\u0119dzie mia\u0142 nadal trzech \u201e\u017cy\u0107\u201d jak jego awatar.", - "competence": 7, - "level": 2 - } - }, - { - "pk": 57, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce wizerunek mo\u017cna budowa\u0107 i prezentowa\u0107 na r\u00f3\u017cne sposoby;\r\nnp. ma \u015bwiadomo\u015b\u0107, \u017ce osoba siedz\u0105ca po drugiej stronie monitora podczas czatu, mo\u017ce by\u0107 zupe\u0142nie kim\u015b innym ni\u017c ta, za kt\u00f3r\u0105 si\u0119 podaje.\r\n- wie, jakie dzia\u0142ania przez media mog\u0105 mie\u0107 negatywne konsekwencje dla niego lub innych;\r\nnp. wie, \u017ce np. \u015bmieszny filmik z jego udzia\u0142em, wrzucony spontanicznie do sieci, mo\u017ce kiedy\u015b zosta\u0107 wykorzystany przeciwko niemu lub sprawi\u0107 komu\u015b przykro\u015b\u0107.\r\n- umie \u015bwiadomie kreowa\u0107 sw\u00f3j wizerunek w podstawowym zakresie;\r\nnp. rejestruj\u0105c si\u0119 na nowym portalu, umie wybra\u0107, kieruj\u0105c si\u0119 wzgl\u0119dami bezpiecze\u0144stwa, kt\u00f3re informacje o sobie podaje, a kt\u00f3rych nie.", - "competence": 7, - "level": 3 - } - }, - { - "pk": 58, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie, w zale\u017cno\u015bci od potrzeb, tworzy\u0107 i modyfikowa\u0107 sw\u00f3j wizerunek;\r\nnp. do\u0142\u0105czaj\u0105c do jakiej\u015b grupy w sieci, podaje tylko wybrane informacje o sobie.\r\n- rozumie szanse i zagro\u017cenia wynikaj\u0105ce z budowania w\u0142asnego wizerunku;\r\nnp. zwraca du\u017c\u0105 uwag\u0119 na to, co i gdzie na jego temat pojawia si\u0119 w internecie. Ma \u015bwiadomo\u015b\u0107, \u017ce nawet po skasowaniu jakiej\u015b tre\u015bci, w sieci i tak pozostaje po niej \u015blad.", - "competence": 7, - "level": 4 - } - }, - { - "pk": 59, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie s\u0105 elementy sk\u0142adowe wizerunku i umie je interpretowa\u0107;\r\nnp. zdaje sobie spraw\u0119, \u017ce wizerunek medialny os\u00f3b publicznych wykorzystuje j\u0119zyk i mow\u0119 cia\u0142a do realizacji zak\u0142adnych cel\u00f3w (np. pozyskania poparcia wyborc\u00f3w)\r\n- umie \u015bwiadomie tworzy\u0107 sw\u00f3j wizerunek w zale\u017cno\u015bci od kontekstu;\r\nnp. wpisuj\u0105c komentarze na portalach spo\u0142eczno\u015bciowych, zdaje sobie spraw\u0119, \u017ce s\u0105 one elementem jego to\u017csamo\u015bci w oczach innych, w tym r\u00f3wnie\u017c przysz\u0142ych pracodawc\u00f3w.\r\n- rozumie konsekwencje i potrzeb\u0119 \u015bwiadomego budowania w\u0142asnego wizerunku;\r\nnp. nie pozwala przypadkowo fotografowa\u0107 swojej osoby podczas imprez.", - "competence": 7, - "level": 5 - } - }, - { - "pk": 61, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie wskaza\u0107 elementy wizerunku on-line, zar\u00f3wno swojego, jak i innych os\u00f3b.\r\n- umie do\u0142\u0105czy\u0107 do wybranej spo\u0142eczno\u015bci i uczestniczy\u0107 w jej \u017cyciu, odpowiednio kreuj\u0105c sw\u00f3j wizerunek;\r\nnp. aktywnie uczestniczy w r\u00f3\u017cnych grupach hobbystycznych, edukacyjnych, terapeutycznych, \u015bwiatopogl\u0105dowych, politycznych itd.\r\n- rozumie r\u00f3\u017cnice pomi\u0119dzy \u015bwiatem do\u015bwiadczanym bezpo\u015brednio i przez media, zdaje sobie spraw\u0119 z powi\u0105za\u0144 mi\u0119dzy nimi;\r\nnp. tworz\u0105c profil na portalu spo\u0142eczno\u015bciowym dba przy tym o w\u0142asny wizerunek, gdy\u017c ma \u015bwiadomo\u015b\u0107 mo\u017cliwych konsekwencji, m.in. wp\u0142ywu na swoj\u0105 \u015bcie\u017ck\u0119 kariery.", - "competence": 7, - "level": 7 - } - }, - { - "pk": 62, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie budowa\u0107 sieci kontakt\u00f3w \u2013 trwa\u0142e i zadaniowe;\r\nnp. w zale\u017cno\u015bci od kontekstu kreuje sw\u00f3j wizerunek w sieci na potrzeby danych \u015brodowisk, przyjmuj\u0105c w nich r\u00f3\u017cne role spo\u0142eczne.\r\n- umie w spos\u00f3b \u015bwiadomy i odpowiedzialny budowa\u0107 sw\u00f3j wizerunek sieciowy i wykorzysta\u0107 go do realizacji okre\u015blonych cel\u00f3w;\r\nnp. wykorzystuje swojego bloga do budowania pozycji w \u015brodowisku zawodowym.\r\n- rozumie r\u00f3\u017cnice pomi\u0119dzy wizerunkami trwa\u0142ymi a ulotnymi;\r\nnp. inaczej buduje sw\u00f3j wizerunek w procesie tworzenia profilu na portalu spo\u0142eczno\u015bciowym czy forum specjalistycznym, a inaczej na czacie.\r\n- rozumie szanse i korzy\u015bci p\u0142yn\u0105ce z przynale\u017cno\u015bci do danej grupy;\r\n\r\nnp. potrafi je wykorzystywa\u0107 w planowaniu kariery zawodowej, do\u0142\u0105czaj\u0105c do grup specjalist\u00f3w w danej dziedzinie oraz tworz\u0105c profile w spo\u0142eczno\u015bciowych serwisach specjalistycznych.", - "competence": 7, - "level": 8 - } - }, - { - "pk": 63, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie budowa\u0107 spo\u0142eczno\u015bci i wsp\u00f3\u0142tworzy\u0107 \u015brodowisko cyfrowe oraz kreowa\u0107 to\u017csamo\u015bci zbiorowe, takie jak grupy hobbystyczne czy polityczne;\r\nnp. samodzielnie prowadzi forum, administruje stron\u0105 internetow\u0105 lub tworzy potrzebne mu narz\u0119dzia cyfrowe.\r\n- umie kszta\u0142towa\u0107 w\u0142asny wizerunek w sieci stosownie do r\u00f3\u017cnych kontekst\u00f3w;\r\nnp. na tym samym profilu spo\u0142eczno\u015bciowym potrafi wykreowa\u0107 kilka, cz\u0119sto zupe\u0142nie r\u00f3\u017cnych wizerunk\u00f3w w zale\u017cno\u015bci od kontekstu i potrzeb.", - "competence": 7, - "level": 9 - } - }, - { - "pk": 37, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jak wyra\u017ca\u0107 swoje elementarne potrzeby i emocje dotycz\u0105ce medi\u00f3w;\r\nnp. w kontakcie z medium (ksi\u0105\u017ck\u0105 czy gr\u0105 w sieci) wskazuje na to, co lubi; wybiera, kt\u00f3r\u0105 ksi\u0105\u017ck\u0119 chce przeczyta\u0107.\r\n- umie korzysta\u0107 ze znanych mu kana\u0142\u00f3w komunikacji;\r\nnp. w podstawowym zakresie rozr\u00f3\u017cnia zasady korzystania z poszczeg\u00f3lnych medi\u00f3w, wie, \u017ce radia (muzyki) si\u0119 s\u0142ucha, a telewizj\u0119 (film) ogl\u0105da.", - "competence": 5, - "level": 1 - } - }, - { - "pk": 38, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jak zastosowa\u0107 r\u00f3\u017cne rodzaje komunikat\u00f3w (formalne i nieformalne);\r\nnp. dostrzega, \u017ce innymi kana\u0142ami i w inny spos\u00f3b komunikuje si\u0119 z kolegami z klasy i nauczycielem.\r\n- umie korzysta\u0107 z podstawowych narz\u0119dzi komunikacyjnych;\r\nnp. porozumiewa si\u0119 za pomoc\u0105 telefonu kom\u00f3rkowego i komunikator\u00f3w internetowych.\r\n- wie, jakie s\u0105 podstawowe rodzaje komunikat\u00f3w i zna ich funkcje (obraz, d\u017awi\u0119k, s\u0142owo);\r\nnp. potrafi dopasowa\u0107 element muzyczny do odpowiadaj\u0105cej mu ilustracji.", - "competence": 5, - "level": 2 - } - }, - { - "pk": 39, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, w jaki spos\u00f3b tworzy\u0107 komunikaty w zale\u017cno\u015bci od kontekstu;\r\nnp. inaczej napisze fragment bloga, a inaczej maila do nauczyciela.\r\n- wie, jak znale\u017a\u0107 w sieci osoby, kt\u00f3re podzielaj\u0105 jego zainteresowania, i umie si\u0119 z nimi komunikowa\u0107;\r\nnp. potrafi za\u0142o\u017cy\u0107 nowy w\u0105tek na forum lub do\u0142\u0105czy\u0107 si\u0119 do istniej\u0105cej ju\u017c grupy dyskusyjnej.\r\n- umie wybra\u0107 narz\u0119dzia / technologie w zale\u017cno\u015bci od potrzeb komunikacyjnych;\r\nnp. \u015bwiadomie w\u0142\u0105cza lub wy\u0142\u0105cza kamer\u0119 internetow\u0105 podczas rozmowy przez komunikator.\r\n- rozumie przebieg procesu komunikacji bezpo\u015bredniej i przez media;\r\nnp. potrafi wyja\u015bni\u0107 r\u00f3\u017cnice i podobie\u0144stwa mi\u0119dzy nadawc\u0105 i odbiorc\u0105 komunikatu, a tak\u017ce bierze odpowiedzialno\u015b\u0107 za komunikowane przez siebie tre\u015bci.", - "competence": 5, - "level": 3 - } - }, - { - "pk": 40, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie s\u0105 zasady komunikowania si\u0119 z innymi u\u017cytkownikami medi\u00f3w;\r\nnp. zna i potrafi stosowa\u0107 w praktyce zasady netykiety.\r\n- wie, jak u\u017cywa\u0107 r\u00f3\u017cnych rodzaj\u00f3w komunikat\u00f3w do przekazywania okre\u015blonych tre\u015bci w zale\u017cno\u015bci od celu i potrzeb;\r\nnp. ma \u015bwiadomo\u015b\u0107 tego, \u017ce czasami jedno zdj\u0119cie mo\u017ce wyrazi\u0107 wi\u0119cej ni\u017c wiele s\u0142\u00f3w.\r\n- wie, czym s\u0105 spo\u0142eczno\u015bci fanowskie oraz zjawisko fanfiction;\r\nnp. umie tworzy\u0107 sieci kontakt\u00f3w spo\u0142ecznych w internecie, w tym r\u00f3wnie\u017c grupy skupiaj\u0105ce cz\u0142onk\u00f3w subkultur fanowskich.", - "competence": 5, - "level": 4 - } - }, - { - "pk": 41, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie czynniki mog\u0105 mie\u0107 wp\u0142yw na przebieg komunikacji;\r\nnp. zdaje sobie spraw\u0119, \u017ce to, czy jego wiadomo\u015b\u0107 w rozmowie telefonicznej lub kontakcie mailowym zostanie odebrana zgodnie z jego intencj\u0105, zale\u017cy od sytuacji i mo\u017cliwo\u015bci odbiorcy.\r\n- umie skutecznie i precyzyjnie porozumiewa\u0107 si\u0119 z innymi, wykorzystuj\u0105c do tego r\u00f3\u017cnego rodzaju kana\u0142y komunikacji.", - "competence": 5, - "level": 5 - } - }, - { - "pk": 43, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce anonimowo\u015b\u0107 w sieci jest cz\u0119sto pozorna;\r\nzdaje sobie spraw\u0119, \u017ce ka\u017cdy jego ruch w internecie pozostawia \u015blad mo\u017cliwy potem do odtworzenia.\r\n- wie, \u017ce swoim zachowaniem nie wolno rani\u0107 innych i w procesie komunikacji nie dopuszcza si\u0119 zachowa\u0144 nieakceptowanych spo\u0142ecznie;\r\nnp. prowokowanie k\u0142\u00f3tni, u\u017cywanie obelg, trollowanie itp.\r\n- umie zachowywa\u0107 si\u0119 w spos\u00f3b asertywny i skutecznie komunikowa\u0107 si\u0119 w \u015brodowisku medialnym;\r\nnp. umie w spos\u00f3b jasny, konkretny, otwarty i szczery wyra\u017ca\u0107 swoje opinie, ch\u0119ci, potrzeby i uczucia, a tak\u017ce odrzuca\u0107 propozycje mog\u0105ce stanowi\u0107 zagro\u017cenie.\r\n- umie wyr\u00f3\u017cnia\u0107 komunikaty k\u0142amliwe, propagandowe, maj\u0105ce na celu manipulacj\u0119;\r\nnp. ogl\u0105daj\u0105c reklam\u0119 telewizyjn\u0105 dostrzega w niej elementy r\u00f3\u017cnych socjotechnik.\r\n- rozumie r\u00f3\u017cnice pomi\u0119dzy komunikacj\u0105 formaln\u0105 a nieformaln\u0105;\r\nnp. tworz\u0105c komunikat, uwzgl\u0119dnia specyfik\u0119 jego odbiorcy oraz kontekstu wypowiedzi (np. inaczej napisze maila do prze\u0142o\u017conego, a inaczej do kolegi z pracy).\r\n- wie, jak znale\u017a\u0107 w sieci osoby, kt\u00f3re podzielaj\u0105 jego zainteresowania, i umie si\u0119 z nimi komunikowa\u0107;\r\nnp. potrafi za\u0142o\u017cy\u0107 nowy w\u0105tek na forum lub do\u0142\u0105czy\u0107 si\u0119 do istniej\u0105cej ju\u017c grupy dyskusyjnej.", - "competence": 5, - "level": 7 - } - }, - { - "pk": 44, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie s\u0105 zasady komunikowania si\u0119 z innymi u\u017cytkownikami medi\u00f3w;\r\nnp. zna i potrafi stosowa\u0107 w praktyce zasady netykiety.\r\n- wie, jakie czynniki mog\u0105 mie\u0107 wp\u0142yw na przebieg komunikacji;\r\nnp. zdaje sobie spraw\u0119, \u017ce to, czy jego wiadomo\u015b\u0107 w rozmowie telefonicznej lub kontakcie mailowym zostanie odebrana zgodnie z jego intencj\u0105, zale\u017cy od sytuacji i mo\u017cliwo\u015bci odbiorcy.\r\n- umie nawi\u0105zywa\u0107 kontakty z osobami mieszkaj\u0105cymi w r\u00f3\u017cnych cz\u0119\u015bciach \u015bwiata, wie, jak r\u00f3\u017cnice kulturowe mog\u0105 wp\u0142ywa\u0107 na proces komunikacji;\r\nnp. potrafi aktywnie uczestniczy\u0107 w spo\u0142eczno\u015bciach ponadlokalnych, mi\u0119dzynarodowych.", - "competence": 5, - "level": 8 - } - }, - { - "pk": 45, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie wychwytywa\u0107 dzia\u0142ania niezgodne z prawem lub spo\u0142ecznie nieakceptowane pope\u0142niane przez lub wobec innych cz\u0142onk\u00f3w spo\u0142eczno\u015bci oraz reaguje na nie;\r\nnp. b\u0119d\u0105c administratorem forum moderuje i weryfikuje proces przep\u0142ywu informacji.\r\n- umie przeciwdzia\u0142a\u0107 barierom informacyjnym, wykluczeniu cyfrowemu, asymetrii informacji oraz prowadzi\u0107 dzia\u0142alno\u015b\u0107 informacyjn\u0105;\r\nnp. samodzielnie tworzy materia\u0142y edukacyjne oraz odpowiednie narz\u0119dzia medialne dla os\u00f3b maj\u0105cych trudno\u015bci z poruszaniem si\u0119 w \u015brodowisku medialnym.", - "competence": 5, - "level": 9 - } - }, - { - "pk": 46, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie dostrzec w przekazie medialnym elementy znanego mu otoczenia;\r\nnp. wyr\u00f3\u017cnia z t\u0142a medialnego znane mu miejsca.\r\n- umie intuicyjnie pos\u0142ugiwa\u0107 si\u0119 na poziomie elementarnym dost\u0119pnymi w jego otoczeniu mediami;\r\nnp. samodzielnie w\u0142\u0105czy telewizor na kana\u0142 z kresk\u00f3wkami lub uruchomi w telefonie aplikacj\u0119 z ulubion\u0105 gr\u0105.", - "competence": 6, - "level": 1 - } - }, - { - "pk": 47, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce \u015bwiat przedstawiany w mediach nie jest tym samym, co \u015bwiat do\u015bwiadczany bezpo\u015brednio;\r\nnp. zdaje sobie spraw\u0119, \u017ce nie wszystko to, co jest mo\u017cliwe w grach, jest mo\u017cliwe r\u00f3wnie\u017c w rzeczywisto\u015bci.\r\n- wie, jakie s\u0105 zasady bezpiecze\u0144stwa i higieny korzystania z medi\u00f3w;\r\nnp. ma \u015bwiadomo\u015b\u0107, \u017ce nie nale\u017cy zbyt d\u0142ugo siedzie\u0107 przed telewizorem lub monitorem komputera.\r\n- wie, \u017ce dzi\u0119ki mediom mo\u017cemy poznawa\u0107 \u015bwiat\r\nnp. zdaje sobie spraw\u0119, \u017ce na wybranym kanale telewizyjnym lub w internecie mo\u017ce \u00a0ogl\u0105da\u0107 rzeczy odleg\u0142e i nieznane mu z najbli\u017cszego otoczenia, np. filmy przyrodnicze.\r\n- umie korzysta\u0107 z r\u00f3\u017cnych \u017ar\u00f3de\u0142 i kana\u0142\u00f3w informacji;\r\nnp. potrafi wyszukiwa\u0107 informacje w internecie.", - "competence": 6, - "level": 2 - } - }, - { - "pk": 48, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie s\u0105 mo\u017cliwo\u015bci i zagro\u017cenia w korzystaniu z r\u00f3\u017cnych medi\u00f3w;\r\nnp. ma \u015bwiadomo\u015b\u0107, \u017ce nale\u017cy by\u0107 ostro\u017cnym w kontaktach z nieznajomymi poznanymi np. poprzez komunikator internetowy.\r\n- umie aktywnie korzysta\u0107 z nowych medi\u00f3w;\r\nnp. potrafi zapisa\u0107 si\u0119 do grupy dyskusyjnej i bra\u0107 w niej aktywny udzia\u0142 lub przy\u0142\u0105czy\u0107 si\u0119 do czatu.\r\n- umie w spos\u00f3b \u015bwiadomy korzysta\u0107 z r\u00f3\u017cnych kana\u0142\u00f3w informacji;\r\nnp. znajduje kilka r\u00f3\u017cnych \u017ar\u00f3de\u0142 odnosz\u0105cych si\u0119 do tej samej informacji i dokonuje ich weryfikacji.\r\n- rozumie podstawowe zasady bezpiecze\u0144stwa w przestrzeni cyfrowej;\r\nnp. nie pobiera z internetu tre\u015bci nieznanych lub pochodz\u0105cych z niepewnych \u017ar\u00f3de\u0142.", - "competence": 6, - "level": 3 - } - }, - { - "pk": 49, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie s\u0105 og\u00f3lne zasady dzia\u0142ania i umie wykorzystywa\u0107 r\u00f3\u017cne narz\u0119dzia medialne w zale\u017cno\u015bci od specyfiki otoczenia;\r\nnp. w miar\u0119 potrzeby komunikuje si\u0119 za pomoc\u0105 telefonu kom\u00f3rkowego,\r\nkomunikatora internetowego lub pisz\u0105c na forum.\r\n- wie, jak grupa i otoczenie wp\u0142ywaj\u0105 na jego \u017cycie;\r\nnp. umie dostrzec wp\u0142yw komentarzy pod swoim wpisem na portalu spo\u0142eczno\u015bciowym na w\u0142asne wybory, decyzje i upodobania.\r\n- umie aktywnie uczestniczy\u0107 w wybranych spo\u0142eczno\u015bciach on-line;\r\nnp. wymienia si\u0119 informacjami, wyra\u017ca opinie i prowadzi dyskusje w r\u00f3\u017cnych sieciach spo\u0142ecznych w internecie.", - "competence": 6, - "level": 4 - } - }, - { - "pk": 50, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce r\u00f3\u017cne grupy istniej\u0105ce w otoczeniu medialnym maj\u0105 sw\u00f3j specyficzny charakter, zasady funkcjonowania oraz dynamik\u0119;\r\nnp. wskazuje r\u00f3\u017cnice pomi\u0119dzy spo\u0142eczno\u015bciami on-line os\u00f3b, kt\u00f3re si\u0119 nigdy nie spotka\u0142y, a tymi, kt\u00f3re znaj\u0105 si\u0119 np. ze szko\u0142y.\r\n- umie wykorzystywa\u0107 spo\u0142eczno\u015bciowy potencja\u0142 sieci dla realizacji w\u0142asnych cel\u00f3w;\r\nnp. potrafi w zale\u017cno\u015bci od potrzeby znale\u017a\u0107 po\u017c\u0105dany produkt lub us\u0142ug\u0119 i pozna\u0107 opinie innych u\u017cytkownik\u00f3w na jej temat.\r\n- rozumie procesy powstawania grup i budowania sieci spo\u0142ecznych;\r\nnp. dostrzega r\u00f3\u017cnice w sposobie uczestnictwa w spontanicznie zebranej grupie os\u00f3b w internecie, a r\u00f3wnolegle dzia\u0142aj\u0105cej grupie graczy spotykaj\u0105cych si\u0119 regularnie on-line.", - "competence": 6, - "level": 5 - } - }, - { - "pk": 52, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie pos\u0142ugiwa\u0107 si\u0119 nowymi technologiami w zakresie umo\u017cliwiaj\u0105cym uczestnictwo w spo\u0142e\r\n- umie aktywnie uczestniczy\u0107 w wybranych spo\u0142eczno\u015bciach on-line;\r\nnp. wymienia si\u0119 informacjami, wyra\u017ca opinie i prowadzi dyskusje w r\u00f3\u017cnych sieciach spo\u0142ecznych w internecie.\r\n- zna zasady bezpiecze\u0144stwa i higieny korzystania z medi\u00f3w.\r\n- umie kszta\u0142towa\u0107 swoje relacje przez media tak, by nie zaburza\u0142y one relacji bezpo\u015brednich;\r\nnp. bezpo\u015brednie kontakty z najbli\u017cszymi osobami uzupe\u0142nia o mo\u017cliwo\u015bci komunikacji przez media, a nie zast\u0119puje ich nimi.", - "competence": 6, - "level": 7 - } - }, - { - "pk": 53, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce internet to wi\u0119cej ni\u017c tylko medium;\r\nma \u015bwiadomo\u015b\u0107, \u017ce jest to nowy rodzaj rzeczywisto\u015bci, w kt\u00f3rym toczy si\u0119 r\u00f3wnoleg\u0142e, cz\u0119sto tak samo prawdziwe \u017cycie, za\u015b komunikacja przez media jest tylko innym, r\u00f3wnorz\u0119dnym i r\u00f3wnoprawnym sposobem komunikacji z lud\u017ami.\r\n- rozumie zagro\u017cenia mog\u0105ce p\u0142yn\u0105\u0107 z uzale\u017cnienia od internetu.\r\n- wie, \u017ce r\u00f3\u017cne grupy istniej\u0105ce w otoczeniu medialnym maj\u0105 sw\u00f3j specyficzny charakter, zasady funkcjonowania oraz dynamik\u0119;\r\nnp. wskazuje r\u00f3\u017cnice pomi\u0119dzy spo\u0142eczno\u015bciami on-line os\u00f3b, kt\u00f3re si\u0119 nigdy nie spotka\u0142y, a tymi, kt\u00f3re znaj\u0105 si\u0119 np. z pracy.\r\n- umie wykorzystywa\u0107 spo\u0142eczno\u015bciowy potencja\u0142 sieci dla realizacji w\u0142asnych cel\u00f3w;\r\nnp. potrafi w zale\u017cno\u015bci od potrzeby znale\u017a\u0107 po\u017c\u0105dany produkt lub us\u0142ug\u0119 i pozna\u0107 opinie innych u\u017cytkownik\u00f3w na jej temat.", - "competence": 6, - "level": 8 - } - }, - { - "pk": 54, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie zarz\u0105dza\u0107 infrastruktur\u0105 informatyczn\u0105. Posiada odpowiednie umiej\u0119tno\u015bci techniczne pozwalaj\u0105ce na dob\u00f3r specyficznych narz\u0119dzi i technologii do realizacji okre\u015blonych zada\u0144;\r\nnp. potrafi od podstaw stworzy\u0107 i skutecznie pozycjonowa\u0107 stron\u0119 internetow\u0105 lub portal.\r\n- rozumie procesy powstawania grup i budowania sieci spo\u0142ecznych, umie nimi zarz\u0105dza\u0107.", - "competence": 6, - "level": 9 - } - }, - { - "pk": 82, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce postacie obserwowane w mediach, ukazywane na ekranie telewizyjnym mog\u0105 by\u0107 fikcyjne;\r\nnp. wie, \u017ce postacie z bajek telewizyjnych tj. Gumisie, Kaczor Donald nie istniej\u0105 w rzeczywisto\u015bci, a s\u0105 jedynie wymys\u0142em cz\u0142owieka.\r\n- rozumie r\u00f3\u017cnic\u0119 pomi\u0119dzy bezpo\u015bredni\u0105 rozmow\u0105 a komunikacj\u0105 przez media;\r\nnp. wie, \u017ce podczas rozmowy telefonicznej s\u0142yszymy jedynie g\u0142os rozm\u00f3wcy, ale mo\u017ce on pozostawa\u0107 daleko od nas.\r\n- wie, \u017ce s\u0105 r\u00f3\u017cne sposoby zapisywania i przekazywania s\u0142\u00f3w, obraz\u00f3w i d\u017awi\u0119k\u00f3w, \u017ce mo\u017cna przekazywa\u0107 t\u0119 sam\u0105 tre\u015b\u0107 za pomoc\u0105 r\u00f3\u017cnych urz\u0105dze\u0144;\r\nnp. wie, \u017ce mo\u017cna nagra\u0107 i odtwarza\u0107 odg\u0142osy przyrody i w\u0142asnej mowy, rysowa\u0107, a potem zeskanowa\u0107 rysunek i ogl\u0105da\u0107 go na ekranie komputera, telewizora lub telefonu.\r\n- znai rozr\u00f3\u017cnia r\u00f3\u017cnorakie urz\u0105dzenia s\u0142u\u017c\u0105ce do przekazywania informacji;\r\nnp. umie wskazywa\u0107, podawa\u0107 nazwy oraz opisywa\u0107 w\u0142asnymi s\u0142owami, do czego s\u0142u\u017c\u0105 radio, telewizja, komputer przy\u0142\u0105czony do internetu, telefon kom\u00f3rkowy.", - "competence": 10, - "level": 1 - } - }, - { - "pk": 83, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce same przekazy audiowizualne, nawet prezentuj\u0105ce realnie istniej\u0105ce postacie, r\u00f3\u017cni\u0105 si\u0119 od spotkania w rzeczywistym \u015bwiecie;\r\nnp. postacie obserwowane w telewizji, na ekranie kinowym lub komputera mog\u0105 wygl\u0105da\u0107 odmiennie, kiedy spotkamy je osobi\u015bcie.\r\n- umie rozr\u00f3\u017cnia\u0107 pomi\u0119dzy potocznym j\u0119zykiem, kt\u00f3rym m\u00f3wimy do rodzic\u00f3w i r\u00f3wie\u015bnik\u00f3w, a s\u0142owami p\u0142yn\u0105cymi z telewizji;\r\nnp. wie, czym r\u00f3\u017cni si\u0119 j\u0119zyk ogl\u0105danej bajki czy transmisji sportowej od codziennej rozmowy.\r\n- zna r\u00f3\u017cne formy przekaz\u00f3w audialnych i audiowizualnych, potrafi wskazywa\u0107 na r\u00f3\u017cnice mi\u0119dzy nimi oraz sposobem ich odbioru;\r\nnp. potrafi wskaza\u0107, czym r\u00f3\u017cni si\u0119 bajka na DVD, emitowana w telewizji, nagrana w formie s\u0142uchowiska na audiobooku, drukowana w formie ksi\u0105\u017cki lub wydana jako e-book.\r\n- zna r\u00f3\u017cnic\u0119 pomi\u0119dzy przekazem tekstowym, d\u017awi\u0119kowym i wideo, potrafi wskaza\u0107 na korzy\u015bci i ograniczenia w odbiorze tych przekaz\u00f3w;\r\nnp. wie, \u017ce lektura s\u0142owa drukowanego wymaga wi\u0119kszego zaanga\u017cowania uwagi ni\u017c telewizja, \u017ce druk bardziej oddzia\u0142uje na nasze my\u015bli, a telewizja na emocje; \u017ce radio pozwala wykonywa\u0107 inne czynno\u015bci i najmniej anga\u017cuje nasz\u0105 uwag\u0119 po\u015br\u00f3d wy\u017cej wymienionych.", - "competence": 10, - "level": 2 - } - }, - { - "pk": 84, - "model": "curriculum.competencelevel", - "fields": { - "description": "- zna poj\u0119cie technologii analogowej i cyfrowej;\r\nnp. wie, \u017ce media cyfrowe opieraj\u0105 si\u0119 na kodowaniu przekaz\u00f3w w formie zapisu binarnego (zerojedynkowego).\r\n- umie w\u0142asnymi s\u0142owami wskaza\u0107 najprostsze r\u00f3\u017cnice mi\u0119dzy zapisami analogowymi i cyfrowymi oraz wskaza\u0107 przyk\u0142ady urz\u0105dze\u0144 do zapisu i odtwarzania w obu technologiach;\r\nnp. wie, czym r\u00f3\u017cni si\u0119 fotografia cyfrowa od wykonanej na kliszy, jaki jest proces jej powstawania, czym si\u0119 r\u00f3\u017cni\u0105 te procesy.\r\n- zna podstawowe poj\u0119cia zwi\u0105zane z j\u0119zykiem filmu oraz fotografii zar\u00f3wno w odniesieniu do medi\u00f3w analogowych, jak i cyfrowych;\r\nnp. wie, czym jest kadr, uj\u0119cie, monta\u017c, zna proces powstawania fotografii i filmu w technologii analogowej i cyfrowej.\r\n- rozumie poj\u0119cie multimedi\u00f3w jako technologii integruj\u0105cych r\u00f3\u017cne techniki przekazu;\r\nnp. wie, \u017ce \u0142\u0105cz\u0105 one d\u017awi\u0119ki, teksty drukowane, fotografie i filmy, \u017ce dzi\u0119ki technologii cyfrowej mamy wi\u0119ksz\u0105 mo\u017cliwo\u015b\u0107 nie tylko modyfikowania, ale i \u0142\u0105czenia zapisywanych dot\u0105d w odmienny spos\u00f3b przekaz\u00f3w.", - "competence": 10, - "level": 3 - } - }, - { - "pk": 85, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie poj\u0119cie hipertekstu oraz umie wyja\u015bni\u0107 r\u00f3\u017cnic\u0119 mi\u0119dzy hipertekstem a tekstem linearnym;\r\nnp. wie, \u017ce s\u0105 to powi\u0105zane ze sob\u0105 odsy\u0142aczami teksty elektroniczne, co u\u0142atwia tworzenie skojarze\u0144 i poznawanie wiedzy, wie, \u017ce spos\u00f3b lektury hipertekst\u00f3w jest r\u00f3\u017cny od lektury drukowanych ksi\u0105\u017cek.\r\n- umie rozr\u00f3\u017cnia\u0107 podstawowe gatunki filmowe i telewizyjne;\r\nnp. potrafi opisa\u0107 w\u0142asnymi s\u0142owami, czym charakteryzuj\u0105 si\u0119 thriller, komedia romantyczna, telenowela dokumentalna, talk show.\r\n- rozumie zjawisko konwergencji gatunk\u00f3w medialnych;\r\nnp. zdaje sobie spraw\u0119, jak tradycyjne audycje i programy telewizyjne mo\u017cna odbiera\u0107 poprzez internet w formie podcast\u00f3w i wideocast\u00f3w, transmisji strumieniowych, jakie zmiany to powoduje dla tre\u015bci przekaz\u00f3w.\r\n- dostrzega, w jaki spos\u00f3b ten sam tekst kultury medialnej mo\u017ce by\u0107 przedstawiany za pomoc\u0105 r\u00f3\u017cnych no\u015bnik\u00f3w przekazu i reklamy;\r\nnp. strony internetowe, film kinowy i DVD, gad\u017cety zwi\u0105zane z seri\u0105 wydawnicz\u0105 o Harrym Potterze.", - "competence": 10, - "level": 4 - } - }, - { - "pk": 86, - "model": "curriculum.competencelevel", - "fields": { - "description": "- zna cechy r\u00f3\u017cnicuj\u0105ce przekazu tekstowego dostosowanego do r\u00f3\u017cnych medi\u00f3w i potrafi dostosowywa\u0107 form\u0119 przekazu do medium;\r\nnp. wie, czym r\u00f3\u017cni si\u0119 dany tekst zapisany w formie linearnej, strony internetowej, e-maila, czatu, SMS-a, postu w serwisie spo\u0142eczno\u015bciowym, wsp\u00f3lnie pisanego dokumentu w sieci \u00a0(booksprint).\r\n- rozumie poj\u0119cie interfejsu w relacjach u\u017cytkownik-medium;\r\nnp. potrafi scharakteryzowa\u0107 r\u00f3\u017cnice w sposobie korzystania z tabletu i z gazety, z interfejsu graficznego (GUI) i z interfejsu tekstowego aplikacji komputerowych.\r\n- rozumie poj\u0119cie ekranu, umie opisa\u0107 jego rol\u0119 i przemiany w kulturze audiowizualnej;\r\nnp. umie rozr\u00f3\u017cni\u0107 pomi\u0119dzy odbiorem filmu w kinie, na ekranie telewizora, komputera, tabletu.", - "competence": 10, - "level": 5 - } - }, - { - "pk": 87, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie poj\u0119cie medialnej reprezentacji rzeczywisto\u015bci i umie wskaza\u0107 na jej rol\u0119 i ograniczenia w poznaniu;\r\nnp. potrafi scharakteryzowa\u0107 spos\u00f3b, w jaki tw\u00f3rcy medi\u00f3w konstruuj\u0105 przekazy, opisa\u0107, czym gatunkowo przekazy audiowizualne r\u00f3\u017cni\u0105 si\u0119 od rzeczywisto\u015bci poznawanej bezpo\u015brednio, dlaczego m\u00f3wimy, \u017ce s\u0105 \u201eobrazami\u201d rzeczywisto\u015bci, potrafi wyja\u015bni\u0107 zjawisko teleobecno\u015bci podmiotu poznania w kategoriach filozoficznych.\r\n- rozumie poj\u0119cie tekstu w szerokim kulturowym znaczeniu, poj\u0119cia kodowania i dekodowania, znaku, semiotyki;\r\nnp. wie, w jaki spos\u00f3b mo\u017cemy postrzega\u0107 film, rze\u017ab\u0119, architektur\u0119 jako teksty kultury z\u0142o\u017cone z okre\u015blonych znak\u00f3w i kod\u00f3w j\u0119zykowych.\r\n- rozumie poj\u0119cie new media literacies;\r\nnp. potrafi opisa\u0107 w kategoriach gatunku medialnego nie tylko przekazy audiowizualne, ale tak\u017ce sieci spo\u0142eczno\u015bciowe, gry wideo, potrafi analizowa\u0107 i scharakteryzowa\u0107 obraz \u015bwiata, kt\u00f3ry tworz\u0105 te przekazy.", - "competence": 10, - "level": 6 - } - }, - { - "pk": 88, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie r\u00f3\u017cnice mi\u0119dzy gatunkami medialnymi;\r\nnp. potrafi odr\u00f3\u017cni\u0107 program informacyjny, debat\u0119 w studio telewizyjnym, serial, thriller, talent show i scharakteryzowa\u0107 ich g\u0142\u00f3wne cechy.\r\n- potrafi formu\u0142owa\u0107 komunikaty informacyjne w r\u00f3\u017cnych formach, tak\u017ce za po\u015brednictwem wybranych \u015brodk\u00f3w komunikacji internetowej, takich jak np. poczta elektroniczna, czat, komunikator g\u0142osowy, Skype.", - "competence": 10, - "level": 7 - } - }, - { - "pk": 89, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie specyfik\u0119 poszczeg\u00f3lnych gatunk\u00f3w medialnych i innych zagadnie\u0144;\r\nnp. zwi\u0105zanych z kadrowaniem w filmie, znajomo\u015bci\u0105 form i zasad komunikowania si\u0119 w internecie, w spo\u0142eczno\u015bciach sieciowych.", - "competence": 10, - "level": 8 - } - }, - { - "pk": 90, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie tworzy\u0107 przekazy medialne (audiowizualne, multimedialne), pos\u0142uguj\u0105c si\u0119 r\u00f3\u017cnymi gatunkami dziennikarskimi i medialnymi w swobodny spos\u00f3b;\r\nnp. potrafi za\u0142o\u017cy\u0107 stron\u0119 internetow\u0105 lub bloga, przygotowa\u0107 film amatorski, zredagowa\u0107 gazet\u0119 \u015brodowiskow\u0105, biuletyn elektroniczny, pos\u0142uguj\u0105c si\u0119 swobodnie aplikacjami umo\u017cliwiaj\u0105cymi wykonanie tych zada\u0144.", - "competence": 10, - "level": 9 - } - }, - { - "pk": 73, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce pewne przekazy medialne mog\u0105 zach\u0119ca\u0107 nas do czego\u015b;\r\nnp. do zakupu okre\u015blonego produktu, zabawki, czy te\u017c wykonania jakiej\u015b czynno\u015bci, obejrzenia bajki w telewizji.\r\n- wie, kt\u00f3re przekazy s\u0142u\u017c\u0105 zabawie, a kt\u00f3re dotycz\u0105 powa\u017cnych spraw, informuj\u0105 o pewnych wydarzeniach;\r\nnp. umie rozr\u00f3\u017cni\u0107 pomi\u0119dzy bajk\u0105 a programem dla dzieci, w kt\u00f3rym podawane s\u0105 wiadomo\u015bci dotycz\u0105ce naszego \u017cycia.", - "competence": 9, - "level": 1 - } - }, - { - "pk": 74, - "model": "curriculum.competencelevel", - "fields": { - "description": "- znapoj\u0119cie reklamy i umie zidentyfikowa\u0107 przekazy reklamowe, kt\u00f3re go otaczaj\u0105;\r\nnp. potrafi rozpoznawa\u0107 i por\u00f3wnywa\u0107 reklamy na ulicy, w prasie, telewizji, internecie.\r\n\r\n- umie rozr\u00f3\u017cni\u0107 pomi\u0119dzy przekazami medialnymi, kt\u00f3re wywo\u0142uj\u0105 r\u00f3\u017cne emocje;\r\nnp. strach, smutek, rado\u015b\u0107.", - "competence": 9, - "level": 2 - } - }, - { - "pk": 75, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie podstawowe elementy powinna zawiera\u0107 ka\u017cda informacja, tak\u017ce medialna;\r\nnp. umie analizowa\u0107 dany przekaz wiadomo\u015bci telewizyjnych pod k\u0105tem kategorii dlaczego, kto, co, kiedy, gdzie.\r\n- rozumie r\u00f3\u017cnic\u0119 pomi\u0119dzy informacj\u0105 a opini\u0105 i umie formu\u0142owa\u0107 komunikaty zr\u00f3\u017cnicowane pod wzgl\u0119dem funkcji w mediach, tak\u017ce spo\u0142eczno\u015bciowych;\r\nnp. umie poda\u0107 informacj\u0119 o danym przedsi\u0119wzi\u0119ciu spo\u0142ecznym czy kulturalnym oraz wyrazi\u0107 swoj\u0105 opini\u0119; widzi r\u00f3\u017cnic\u0119 pomi\u0119dzy tymi dwoma rodzajami wypowiedzi medialnych.", - "competence": 9, - "level": 3 - } - }, - { - "pk": 76, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie dyskutowa\u0107, formu\u0142uj\u0105c w\u0142asne opinie w mediach spo\u0142eczno\u015bciowych przy poszanowaniu godno\u015bci dyskutant\u00f3w i koncentrowaniu si\u0119 na merytorycznej stronie przekazu;\r\nnp. zna podstawy etykiety j\u0119zykowej w komunikacji internetowej.\r\n- umie przekonywa\u0107 do swoich racji innych, uzasadniaj\u0105c i obrazuj\u0105c swoje przekonania tak\u017ce przy u\u017cyciu \u015brodk\u00f3w audiowizualnych;\r\nnp. potrafi zaprezentowa\u0107 swoje stanowisko, przedstawi\u0107 je w punktach, zilustrowa\u0107 przyk\u0142adami, pos\u0142u\u017cy\u0107 si\u0119 obrazami, statystykami przestawionymi w formie wizualnej.", - "competence": 9, - "level": 4 - } - }, - { - "pk": 77, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie tworzy\u0107 przekazy informacyjne\r\ni reklamowe;\r\nnp. inicjatyw spo\u0142ecznych, kulturalnych, w kt\u00f3rych bierze udzia\u0142.\r\n- wie, \u017ce pewne przekazy informacyjne mog\u0105 zawiera\u0107 elementy rozrywki, potrafi wskaza\u0107 przyk\u0142ady takiego po\u0142\u0105czenia w r\u00f3\u017cnych gatunkach medialnych;\r\nnp. umie wskaza\u0107, co w danym przekazie audiowizualnym jest elementem telewizyjnego show, a co ma warto\u015b\u0107 poznawcz\u0105.", - "competence": 9, - "level": 5 - } - }, - { - "pk": 78, - "model": "curriculum.competencelevel", - "fields": { - "description": "- zna zagadnienia wsp\u00f3\u0142czesnej teorii wywierania wp\u0142ywu na spo\u0142ecze\u0144stwo, obejmuj\u0105cej zar\u00f3wno reklam\u0119, jak i elementy marketingu;\r\nnp. umie wskaza\u0107 przyk\u0142ady technik stosowanych przez polityk\u00f3w, sprzedawc\u00f3w w przekazach audiowizualnych dobieranych w celu przekonania nas do swojej racji lub produktu.\r\n- rozumie poj\u0119cia infotainment i edutaintment, potrafi \u0142\u0105czy\u0107 elementy edukacji opartej na przekazach werbalnych z reprezentacjami wizualnymi, d\u017awi\u0119kowymi;\r\nnp. umie tworzy\u0107 notatki, prezentacje, kt\u00f3re zawieraj\u0105 nie tylko informacje, ale r\u00f3wnie\u017c przekazy wizualne wyra\u017caj\u0105ce okre\u015blone emocje, potrafi pos\u0142ugiwa\u0107 si\u0119 j\u0119zykiem anegdoty, humoru w prezentowaniu informacji.", - "competence": 9, - "level": 6 - } - }, - { - "pk": 79, - "model": "curriculum.competencelevel", - "fields": { - "description": "- dostrzega r\u00f3\u017cnic\u0119 pomi\u0119dzy przekazami informacyjnymi, opiniami a perswazj\u0105;\r\nnp. w reklamie, w wypowiedziach polityk\u00f3w.\r\n- rozr\u00f3\u017cnia przekaz informacyjny od rozrywkowego;\r\nnp. umie okre\u015bli\u0107, co ma warto\u015b\u0107 poznawcz\u0105 w danym przekazie, a co jest elementem, kt\u00f3ry ma budzi\u0107 emocje odbiorcy.", - "competence": 9, - "level": 7 - } - }, - { - "pk": 80, - "model": "curriculum.competencelevel", - "fields": { - "description": "- potrafi formu\u0142owa\u0107 poprawne, jasne i logiczne komunikaty informacyjne w mowie i pi\u015bmie, tak\u017ce za po\u015brednictwem\r\n- potrafi wykorzysta\u0107 r\u00f3\u017cne media do formu\u0142owania komunikat\u00f3w perswazyjnych;\r\nnp. forum internetowe.\r\n- sprawnie pos\u0142uguje si\u0119 r\u00f3\u017cnymi \u015brodkami retorycznymi w formu\u0142owanych przez siebie komunikatach. Umie odwo\u0142ywa\u0107 si\u0119 do emocji w swoim przekazie stosownie do potrzeb, wywo\u0142ywa\u0107 wzruszenie;\r\nnp. potrafi przygotowa\u0107 i wyg\u0142osi\u0107 przem\u00f3wienie.", - "competence": 9, - "level": 8 - } - }, - { - "pk": 81, - "model": "curriculum.competencelevel", - "fields": { - "description": "- potrafi formu\u0142owa\u0107 skuteczne komunikaty informacyjne w mowie i pi\u015bmie, dostosowane do specyfiki r\u00f3\u017cnych medi\u00f3w komunikacyjnych;\r\nnp. mo\u017ce swobodnie operowa\u0107 j\u0119zykiem publicystycznym, informacyjnym, urz\u0119dowym, naukowym.", - "competence": 9, - "level": 9 - } - }, - { - "pk": 64, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie wyra\u017ca\u0107 swoj\u0105 opini\u0119 o danym przekazie i uzasadni\u0107 j\u0105 swoimi s\u0142owami;\r\nnp. m\u00f3wi: \u201epodoba mi si\u0119 ta bajka, bo te postacie s\u0105 bardzo zabawne\u201d.\r\n- wie, \u017ce zar\u00f3wno s\u0142owa, jak i obrazy maj\u0105 swoje specyficzne znaczenie;\r\nnp. wie, \u017ce mo\u017cna poinformowa\u0107 kogo\u015b zar\u00f3wno za pomoc\u0105 s\u0142owa, jak i rysunku.", - "competence": 8, - "level": 1 - } - }, - { - "pk": 65, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umieoceni\u0107 dany przekaz medialny w kategoriach estetycznych, uzasadniaj\u0105c swoj\u0105 opini\u0119;\r\nnp. umie powiedzie\u0107, \u017ce w tym filmie s\u0105 interesuj\u0105ce efekty specjalne, ale niezbyt interesuj\u0105ca fabu\u0142a, a bohater grany przez aktora jest osob\u0105 godn\u0105 na\u015bladowania, poniewa\u017c...\r\n- umie pos\u0142ugiwa\u0107 si\u0119 emotikonami w komunikacji SMS-owej i internetowej;\r\nnp. zna znaczenie symbolu :) czy :(\r\n- zna i rozumie r\u00f3\u017cnice pomi\u0119dzy komunikowaniem za pomoc\u0105 s\u0142\u00f3w i gest\u00f3w;\r\nnp. wie, co oznacza gest OK (uniesionego kciuka) lub V, kt\u00f3re gesty s\u0105 uznawane za obra\u017aliwe w danym kr\u0119gu kulturowym.", - "competence": 8, - "level": 2 - } - }, - { - "pk": 66, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie zjawisko wulgaryzacji kultury medialnej, umie ocenia\u0107 i wybiera\u0107 przekazy, kt\u00f3re temu przeciwdzia\u0142aj\u0105;\r\nnp. potrafi skrytykowa\u0107 film lub gr\u0119 komputerow\u0105 wskazuj\u0105c jej niski poziom, s\u0142u\u017c\u0105cy jedynie prostej rozrywce, brak przes\u0142ania, ub\u00f3stwo \u015brodk\u00f3w obrazowania czy warstwy d\u017awi\u0119kowej, agresywny j\u0119zyk przekazu.\r\n- umie przet\u0142umaczy\u0107 emocje wyra\u017cane emotikonami na zdania opisuj\u0105ce i uzasadniaj\u0105ce te emocje w komunikacji internetowej. Np. u\u017cywa stwierdze\u0144 takich jak: \u201eJestem smutny i rozczarowany, poniewa\u017c...\u201d zamiast skr\u00f3tu :(", - "competence": 8, - "level": 3 - } - }, - { - "pk": 67, - "model": "curriculum.competencelevel", - "fields": { - "description": "- zna podstawowe poj\u0119cia z zakresu estetyki, krytyki kulturalnej;\r\nnp. potrafi tworzy\u0107 recenzje przekaz\u00f3w medialnych, swobodnie operuj\u0105c przyk\u0142adami i por\u00f3wnaniami dzie\u0142 audiowizualnych.\r\n- wie, jakie znaczenie w komunikacji maj\u0105 poszczeg\u00f3lne gesty, mimika, postawy cia\u0142a czy odleg\u0142o\u015b\u0107 pomi\u0119dzy osobami i umie wskazywa\u0107 przyk\u0142ady w przekazach audiowizualnych;\r\nnp. potrafi okre\u015bli\u0107 na podstawie zachowa\u0144 polityk\u00f3w w studio telewizyjnym ich stosunek do omawianych kwestii.", - "competence": 8, - "level": 4 - } - }, - { - "pk": 68, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie i potrafi opisa\u0107 zasady zwi\u0105zane z savoir vivre w zakresie komunikowania si\u0119 z innymi osobami za po\u015brednictwem medi\u00f3w;\r\nnp. wie, o jakiej porze mo\u017cna zadzwoni\u0107 do danej osoby ze wzgl\u0119du na pe\u0142nion\u0105 funkcj\u0119, w jaki spos\u00f3b powinno si\u0119 odnosi\u0107 do go\u015bci w studio telewizyjnym itp.\r\n- umie stosowa\u0107 odpowiedni\u0105 dykcj\u0119, intonacj\u0119 g\u0142osu i mow\u0119 cia\u0142a podczas komunikacji bezpo\u015bredniej oraz pos\u0142ugiwa\u0107 si\u0119 symbolami w komunikacji wizualnej;\r\nnp. umie dobra\u0107 ilustracje do prezentacji wyra\u017caj\u0105cej r\u00f3\u017cne emocje, przekonania.", - "competence": 8, - "level": 5 - } - }, - { - "pk": 69, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umiewykorzysta\u0107 podstawowe poj\u0119cia z zakresu retoryki, umie przygotowa\u0107 i wyg\u0142osi\u0107 publiczne przem\u00f3wienie na zaj\u0119ciach akademickich;\r\nnp. potrafi wyst\u0105pi\u0107 publicznie w studio radiowym i telewizyjnym.\r\n- rozumie zagadnienia z zakresu komunikowania i kultury medialnej;\r\nnp. potrafi poda\u0107 podstawowe modele komunikowania, opisa\u0107 charakter przemian kulturowych (np. j\u0119zykowych) wywo\u0142anych przez zmiany technologiczne.", - "competence": 8, - "level": 6 - } - }, - { - "pk": 70, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie potrzeb\u0119 i specyfik\u0119 dostosowania j\u0119zyka do komunikacji z r\u00f3\u017cnymi grupami odbiorc\u00f3w za po\u015brednictwem medi\u00f3w;\r\nnp. wie, jakie s\u0105 psychologiczne i spo\u0142eczne uwarunkowania j\u0119zyka kierowanego do dzieci, podw\u0142adnych, prze\u0142o\u017conych, urz\u0119dnik\u00f3w, dziennikarzy.\r\n- zna znaczenie mowy cia\u0142a, rozpoznaje podstawowe gesty, pozycje cia\u0142a, mimik\u0119, rozumie znaczenie odleg\u0142o\u015bci od innych os\u00f3b w komunikacji, dostosowywania intonacji g\u0142osu;\r\nnp. potrafi wskazywa\u0107 je w \u017cyciu publicznym.", - "competence": 8, - "level": 7 - } - }, - { - "pk": 71, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie tworzy\u0107 przekazy medialne w pracy i \u017cyciu osobistym.\r\n- dba o logiczny, jasny i czytelny przekaz swoich komunikat\u00f3w.\r\n- potrafi wypowiada\u0107 si\u0119 podczas audycji radiowej i telewizyjnej, dyskusji internetowej z poszanowaniem zasad dyskusji i godno\u015bci jej uczestnik\u00f3w.", - "competence": 8, - "level": 8 - } - }, - { - "pk": 72, - "model": "curriculum.competencelevel", - "fields": { - "description": "- swobodnie dostosowuje sw\u00f3j przekaz do konkretnej osoby i sytuacji komunikacyjnej.\r\n- biegle zna j\u0119zyk cia\u0142a, umie si\u0119 nim pos\u0142ugiwa\u0107 w komunikacji publicznej, w kontaktach z mediami instytucjonalnymi. Potrafi dostosowa\u0107 sw\u00f3j przekaz do sytuacji medialnej, gatunku, formatu.\r\n- swobodnie wyst\u0119puje przed kamer\u0105, ma i stosuje wiedz\u0119 z zakresu wywierania wp\u0142ywu na inne osoby za pomoc\u0105 mowy cia\u0142a i intonacji g\u0142osu.\r\n- potrafiprzekazywa\u0107 swoj\u0105 wiedz\u0119 i umiej\u0119tno\u015bci w zakresie komunikacji innym;\r\nnp. mo\u017ce prowadzi\u0107 szkolenia i warsztaty z zakresu edukacji medialnej, etykiety komunikacyjnej.", - "competence": 8, - "level": 9 - } - }, - { - "pk": 91, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, za pomoc\u0105 jakich narz\u0119dzi medialnych mo\u017cna przygotowa\u0107 zdj\u0119cie, nagranie d\u017awi\u0119kowe, kr\u00f3tki film wideo, rysunek.\r\n- zna podstawowe poj\u0119cia zwi\u0105zane z korzystaniem z medi\u00f3w;\r\nnp. klikanie, ikona.\r\n- pr\u00f3buje samodzielnie korzysta\u0107 z medialnych narz\u0119dzi;\r\nnp. umie korzysta\u0107 z ekranu dotykowego lub pos\u0142ugiwa\u0107 si\u0119 myszk\u0105.\r\n- umie utrwala\u0107 subiektywny obraz \u015bwiata za pomoc\u0105 narz\u0119dzi medialnych;\r\n\r\nnp. fotografuje swoje zabawki.", - "competence": 11, - "level": 1 - } - }, - { - "pk": 92, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie przygotowa\u0107 z zastosowaniem prostego sprz\u0119tu: zdj\u0119cie, nagranie w\u0142asnego g\u0142osu lub d\u017awi\u0119k\u00f3w otoczenia, nagranie kr\u00f3tkiego filmu wideo, narysowa\u0107 prosty obraz przy u\u017cyciu odpowiedniego oprogramowania, napisa\u0107 kr\u00f3tki tekst w edytorze tekstu.\r\n- umie, wsp\u00f3lnie z innymi uczniami, przygotowa\u0107 prost\u0105 opowie\u015b\u0107 z wykorzystaniem komunikat\u00f3w medialnych jednego typu;\r\nnp. serii zdj\u0119\u0107, wykonanych przez r\u00f3\u017cnych uczni\u00f3w lub serii rysunk\u00f3w lub serii uj\u0119\u0107 wideo.", - "competence": 11, - "level": 2 - } - }, - { - "pk": 93, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie przygotowa\u0107 prost\u0105 fotografi\u0119 otoczenia lub obiekt\u00f3w, potrafi samodzielnie nagrywa\u0107 d\u017awi\u0119ki, umie przygotowa\u0107 kr\u00f3tki film wideo, przygotowa\u0107 prosty rysunek w odpowiednim programie, przygotowa\u0107 prost\u0105 form\u0119 graficzn\u0105 przy u\u017cyciu oprogramowania, przygotowa\u0107 kr\u00f3tki tekst w edytorze tekstu.\r\n- umie przygotowa\u0107 (przy wsparciu nauczyciela, animatora) w trakcie pracy grupowej prost\u0105 opowie\u015b\u0107 medialn\u0105 z wykorzystaniem medi\u00f3w jednego typu (elementy sk\u0142adowe przygotowuj\u0105 poszczeg\u00f3lni cz\u0142onkowie grupy), z dodaniem kr\u00f3tkich element\u00f3w tekstowych opisuj\u0105cych scen\u0119, zwiastuj\u0105cych kolejne wydarzenia.\r\n- pr\u00f3buje tworzy\u0107 w grupie proste narracje medialne z wykorzystaniem r\u00f3\u017cnorodnych komunikat\u00f3w sk\u0142adowych (digital storytelling).", - "competence": 11, - "level": 3 - } - }, - { - "pk": 94, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie samodzielnie przygotowa\u0107 zestaw fotografii, scen filmowych, rysunk\u00f3w, nagra\u0144, element\u00f3w graficznych na wybrany temat.- umie swobodnie \u0142\u0105czy\u0107 ze sob\u0105 r\u00f3\u017cnorodne zgromadzone tre\u015bci i tworzy\u0107 rozbudowane narracje cyfrowe na wybrany temat.\r\n- umie przygotowa\u0107 w grupie narracj\u0119 z\u0142o\u017con\u0105 z r\u00f3\u017cnorodnych medi\u00f3w na wybrany temat, planuj\u0105c wcze\u015bniej zespo\u0142owo dzia\u0142ania grupy on-line w edytorze rozszerzonych medi\u00f3w lub wymieniaj\u0105c si\u0119 informacjami na temat przygotowa\u0144 i planowania projektu na blogu lub w grupie w serwisie spo\u0142eczno\u015bciowym.\r\n- umie wsp\u00f3\u0142tworzy\u0107 w grupie proste teksty i prezentacje multimedialne przy u\u017cyciu narz\u0119dzi umo\u017cliwiaj\u0105cych sieciow\u0105 wsp\u00f3\u0142prac\u0119.", - "competence": 11, - "level": 4 - } - }, - { - "pk": 95, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie samodzielnie przygotowa\u0107 obszerny zestaw r\u00f3\u017cnorodnych tre\u015bci medialnych na wybrany temat.\r\n- umie swobodnie \u0142\u0105czy\u0107 ze sob\u0105 r\u00f3\u017cnorodne zgromadzone tre\u015bci i tworzy\u0107 na ich bazie rozbudowane narracje cyfrowe;\r\n\r\nnp. kolekcje i archiwa cyfrowe, blogi, wiki, opowiadanie hipertekstowe, serwis internetowy, gazeta on-line lub inne formy oparte na hipertekstowej architekturze.\r\n- umie zrealizowa\u0107 w grupie projekt medialny z podzia\u0142em zada\u0144 dotycz\u0105cych przygotowywania sk\u0142adowych cz\u0119\u015bci medialnych oraz montowania w ca\u0142o\u015b\u0107 zgromadzonych element\u00f3w lub ich kolekcji;\r\n\r\nnp. umie organizowa\u0107 prac\u0119 zwi\u0105zan\u0105 z przygotowaniem dzia\u0142a\u0144 grupy, w\u0142\u0105cza\u0107 si\u0119 za pomoc\u0105 narz\u0119dzi medialnych do grupowej pracy, nadzorowa\u0107 przebieg prac grupy, realizacj\u0119 kolejnych krok\u00f3w i tworzenie efekt\u00f3w projektu przy u\u017cyciu sieciowych technologii wsp\u00f3\u0142pracy, takich jak portal edukacyjny, wiki, blog, edytory tekstu lub prezentacje multimedialne wsp\u00f3\u0142tworzone on-line, serwisy spo\u0142eczno\u015bciowe.\r\n- umie wsp\u00f3\u0142tworzy\u0107 w grupie teksty i prezentacje multimedialne przy u\u017cyciu sieciowych narz\u0119dzi wsp\u00f3\u0142pracy.\r\n- umie dokumentowa\u0107 i komentowa\u0107 otoczenie i zachodz\u0105ce w nim procesy;\r\n\r\nnp. tworzy reporta\u017c tekstowy, zdj\u0119ciowy, wideo, reporta\u017c radiowy i inne formy radiowe publikowane w formie podcastu, wywiady, digitalizuje artefakty.", - "competence": 11, - "level": 5 - } - }, - { - "pk": 97, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie samodzielnie przygotowa\u0107 zestaw fotografii, scen filmowych, rysunk\u00f3w, nagra\u0144, element\u00f3w graficznych na wybrany temat.\r\n- umie swobodnie \u0142\u0105czy\u0107 ze sob\u0105 r\u00f3\u017cnorodne zgromadzone tre\u015bci i tworzy\u0107 proste narracje cyfrowe na wybrany temat.\r\n- umie przygotowa\u0107 w grupie narracj\u0119 z\u0142o\u017con\u0105 z r\u00f3\u017cnorodnych medi\u00f3w na wybrany temat, planuj\u0105c wcze\u015bniej zespo\u0142owo dzia\u0142ania grupy on-line w edytorze rozszerzonych medi\u00f3w lub wymieniaj\u0105c si\u0119 informacjami na temat przygotowa\u0144 i planowania projektu na blogu lub w grupie w serwisie spo\u0142eczno\u015bciowym.\r\n- umie wsp\u00f3\u0142tworzy\u0107 w grupie proste teksty i prezentacje multimedialne przy u\u017cyciu narz\u0119dzi umo\u017cliwiaj\u0105cych sieciow\u0105 wsp\u00f3\u0142prac\u0119.", - "competence": 11, - "level": 7 - } - }, - { - "pk": 98, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie samodzielnie przygotowa\u0107 obszerny zestaw r\u00f3\u017cnorodnych tre\u015bci medialnych na wybrany temat.\r\n- umie swobodnie \u0142\u0105czy\u0107 ze sob\u0105 r\u00f3\u017cnorodne zgromadzone tre\u015bci i tworzy\u0107 na ich bazie rozbudowane narracje cyfrowe (np. kolekcje i archiwa cyfrowe, blogi, wiki, opowiadanie hipertekstowe, serwis internetowy, gazeta on-line lub inne formy oparte na hipertekstowej architekturze).\r\n- umie zrealizowa\u0107 w grupie projekt medialny z podzia\u0142em zada\u0144 dotycz\u0105cych przygotowywania sk\u0142adowych cz\u0119\u015bci medialnych oraz montowania w ca\u0142o\u015b\u0107 zgromadzonych element\u00f3w lub ich kolekcji;\r\n\r\nnp. umie organizowa\u0107 prac\u0119 zwi\u0105zan\u0105 z przygotowaniem dzia\u0142a\u0144 grupy, w\u0142\u0105cza\u0107 si\u0119 za pomoc\u0105 narz\u0119dzi medialnych do grupowej pracy, nadzorowa\u0107 przebieg prac grupy, realizacj\u0119 kolejnych krok\u00f3w i tworzenie efekt\u00f3w projektu przy u\u017cyciu sieciowych technologii wsp\u00f3\u0142pracy, takich jak portal edukacyjny, wiki, blog, edytory tekstu lub prezentacje multimedialne wsp\u00f3\u0142tworzone on-line, serwisy spo\u0142eczno\u015bciowe.\r\n- umie wsp\u00f3\u0142tworzy\u0107 w grupie teksty i prezentacje multimedialne przy u\u017cyciu sieciowych narz\u0119dzi wsp\u00f3\u0142pracy.\r\n- umie dokumentowa\u0107 i komentowa\u0107 otoczenie i zachodz\u0105ce w nim procesy;\r\n\r\nnp. tworzy reporta\u017c tekstowy, zdj\u0119ciowy, wideo, reporta\u017c radiowy i inne formy radiowe publikowane w formie podcastu, wywiady, digitalizuje artefakty.", - "competence": 11, - "level": 8 - } - }, - { - "pk": 99, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie koordynowa\u0107 dzia\u0142anie zespo\u0142u przygotowuj\u0105cego tre\u015bci do realizowanego projektu medialnego.\r\n- umie uczy\u0107 innych, jak gromadzi\u0107 tre\u015bci i tworzy\u0107 na ich podstawie rozbudowane narracje cyfrowe.\r\n- umie nadzorowa\u0107 realizacj\u0119 projektu medialnego, dzieli\u0107 zadania dotycz\u0105ce przygotowywania sk\u0142adowych cz\u0119\u015bci medialnych oraz montowania w ca\u0142o\u015b\u0107 zgromadzonych element\u00f3w lub ich kolekcji, potrafi organizowa\u0107 prac\u0119 kilku zespo\u0142\u00f3w realizuj\u0105cych wsp\u00f3lny projekt medialny.\r\n- umie uczy\u0107 innych, jak przygotowywa\u0107 prezentacje medialne, umie tworzy\u0107 prezentacje medialne na profesjonalnym poziomie.\r\n- umie przeprowadzi\u0107 szkolenie w zakresie dokumentowania i komentowania otoczenia i zachodz\u0105cych w nim proces\u00f3w;\r\n\r\nnp. tworzenia reporta\u017cy tekstowych, zdj\u0119ciowych, wideo, reporta\u017cy radiowych i innych form radiowych publikowanych w formie podcastu, wywiad\u00f3w, digitalizowania artefakt\u00f3w.", - "competence": 11, - "level": 9 - } - }, - { - "pk": 100, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce proste tre\u015bci medialne mo\u017cna przetwarza\u0107.\r\n- pr\u00f3buje przy u\u017cyciu prostego oprogramowania modyfikowa\u0107 zdj\u0119cie lub grafik\u0119;\r\n\r\nnp. bawi si\u0119 programami do modyfikacji zdj\u0119\u0107 lub narz\u0119dziem do rysowania.", - "competence": 12, - "level": 1 - } - }, - { - "pk": 101, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie przetwarza\u0107 w podstawowym zakresie dost\u0119pne tre\u015bci medialne \u00a0 (zdj\u0119cia, grafik\u0119, filmy wideo, d\u017awi\u0119k) przy u\u017cyciu prostego oprogramowania do obr\u00f3bki tre\u015bci.\r\n- wie, \u017ce tre\u015bci analogowe mo\u017cna przekszta\u0142ci\u0107 na form\u0119 cyfrow\u0105, odtwarzan\u0105 za pomoc\u0105 cyfrowych urz\u0105dze\u0144.", - "competence": 12, - "level": 2 - } - }, - { - "pk": 102, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie przetwarza\u0107 dost\u0119pne i samodzielnie przygotowane tre\u015bci medialne (zdj\u0119cia, grafik\u0119, filmy wideo, d\u017awi\u0119k).\r\n- umie w grupie tworzy\u0107 cyfrowe narracje na bazie zmodyfikowanych wcze\u015bniej znalezionych lub przygotowanych przez zesp\u00f3\u0142 tre\u015bci medialnych.\r\n- potrafi skanowa\u0107 dokumenty, zdj\u0119cia i przeprowadza\u0107 ich podstawow\u0105 edycj\u0119 za pomoc\u0105 program\u00f3w do skanowania.", - "competence": 12, - "level": 3 - } - }, - { - "pk": 103, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie przetwarza\u0107 znalezione i przygotowane wcze\u015bniej rozbudowane kolekcje tre\u015bci medialnych z\u0142o\u017cone ze zdj\u0119\u0107, grafiki, film\u00f3w wideo, d\u017awi\u0119ku.\r\n- umie w grupie tworzy\u0107 rozbudowane cyfrowe narracje, filmy, hipermedialne projekty oparte na zmodyfikowanych przez cz\u0142onk\u00f3w grupy tre\u015bciach lub znalezionych, przetworzonych materia\u0142ach.\r\n- umie samodzielnie digitalizowa\u0107 tre\u015bci analogowe;\r\n\r\nnp. umie skanowa\u0107 ksi\u0105\u017cki, gazety, dokumenty, zdj\u0119cia.", - "competence": 12, - "level": 4 - } - }, - { - "pk": 104, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie na zaawansowanym poziomie modyfikowa\u0107 przygotowane i znalezione rozbudowane zasoby tre\u015bci multimedialnych i hipermedialnych.\r\n- umie w grupie tworzy\u0107 zaawansowane cyfrowe narracje, filmy, hipermedialne projekty oparte na zmodyfikowanych przez uczestnik\u00f3w grupy tre\u015bciach lub znalezionych, z\u0142o\u017conych komunikatach medialnych.\r\n- umie, dzia\u0142aj\u0105c w grupie, digitalizowa\u0107 analogowe tre\u015bci;\r\n\r\nnp. wsp\u00f3lnie z innymi realizuje projekt digitalizacyjny.", - "competence": 12, - "level": 5 - } - }, - { - "pk": 106, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie przetwarza\u0107 znalezione i przygotowane wcze\u015bniej rozbudowane kolekcje tre\u015bci medialnych z\u0142o\u017cone ze zdj\u0119\u0107, grafiki, film\u00f3w wideo, d\u017awi\u0119ku.\r\n- umie w grupie tworzy\u0107 proste cyfrowe narracje, filmy, hipermedialne projekty oparte na zmodyfikowanych przez uczestnik\u00f3w grupy tre\u015bciach lub znalezionych, przetworzonych materia\u0142ach.\r\n- umie samodzielnie digitalizowa\u0107 tre\u015bci analogowe: skanowa\u0107 ksi\u0105\u017cki, gazety, dokumenty, zdj\u0119cia.", - "competence": 12, - "level": 7 - } - }, - { - "pk": 107, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie na zaawansowanym poziomie modyfikowa\u0107 przygotowane i znalezione rozbudowane zasoby tre\u015bci multimedialnych i hipermedialnych.\r\n- umie w grupie tworzy\u0107 zaawansowane cyfrowe narracje, filmy, hipermedialne projekty oparte na zmodyfikowanych przez cz\u0142onk\u00f3w grupy tre\u015bciach lub znalezionych, z\u0142o\u017conych komunikatach medialnych.\r\n- umie, dzia\u0142aj\u0105c w grupie, digitalizowa\u0107 analogowe tre\u015bci.", - "competence": 12, - "level": 8 - } - }, - { - "pk": 108, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie rozwi\u0105zywa\u0107 problemy pojawiaj\u0105ce si\u0119 w trakcie zaawansowanego modyfikowania tre\u015bci multimedialnych i hipermedialnych.\r\n- umie przeprowadzi\u0107 warsztatowe szkolenie w zakresie modyfikacji tre\u015bci dla u\u017cytkownik\u00f3w od poziomu pocz\u0105tkuj\u0105cego do zaawansowanego.\r\n- umie koordynowa\u0107 dzia\u0142anie zespo\u0142u lub zespo\u0142\u00f3w tworz\u0105cych zaawansowane cyfrowe narracje, filmy, hipermedialne projekty oparte na zmodyfikowanych tre\u015bciach.\r\n- umie koordynowa\u0107 zaawansowane dzia\u0142ania w zakresie digitalizacji.", - "competence": 12, - "level": 9 - } - }, - { - "pk": 109, - "model": "curriculum.competencelevel", - "fields": { - "description": "- przy wsparciu osoby doros\u0142ej pokazuje grupie efekty pr\u00f3b samodzielnego tworzenia i przetwarzania komunikat\u00f3w.", - "competence": 13, - "level": 1 - } - }, - { - "pk": 110, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie zaprezentowa\u0107, z wykorzystaniem sprz\u0119tu multimedialnego (np. komputer z rzutnikiem multimedialnym), przygotowane indywidualnie lub w grupie tre\u015bci medialne.", - "competence": 13, - "level": 2 - } - }, - { - "pk": 111, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie obs\u0142ugiwa\u0107 rzutnik multimedialny lub inne narz\u0119dzie o podobnym zastosowaniu;\r\n\r\nnp. umie za jego pomoc\u0105 wy\u015bwietli\u0107 pojedyncze komunikaty \u2013 zdj\u0119cia, teksty, slajdy prezentacji multimedialnej, filmy, strony internetowe.\r\n- wie o istnieniu serwis\u00f3w internetowych, blog\u00f3w, narz\u0119dzi do kolektywnego tworzenia tre\u015bci on-line.", - "competence": 13, - "level": 3 - } - }, - { - "pk": 112, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie obs\u0142ugiwa\u0107 narz\u0119dzia do synchronicznego prezentowania tre\u015bci (prezentacje on-line w czasie rzeczywistym).\r\n- umie obs\u0142ugiwa\u0107 narz\u0119dzia do asynchronicznego prezentowania tre\u015bci (prezentacje multimedialne on-line i off-line).\r\n- umie obs\u0142ugiwa\u0107 narz\u0119dzia do prowadzenia zbiorowej komunikacji on-line z wykorzystaniem d\u017awi\u0119ku i wideo.\r\n- umie prezentowa\u0107 tre\u015bci na blogu, publikowa\u0107 za pomoc\u0105 narz\u0119dzi do kolektywnego tworzenia tre\u015bci, umie w grupie przygotowa\u0107 prezentacj\u0119 tre\u015bci za pomoc\u0105 systemu typu wiki oraz zak\u0142ada\u0107 i moderowa\u0107 dyskusje sieciowe za pomoc\u0105 listy dyskusyjnej, forum oraz serwis\u00f3w spo\u0142eczno\u015bciowych.\r\n- wie, jakie s\u0105 podstawy pracy dziennikarskiej w internecie i potrafi po wcze\u015bniejszym przygotowaniu publikowa\u0107 tre\u015bci na temat \u017cycia w spo\u0142eczno\u015bci lokalnej;\r\n\r\nnp. wie, czym jest \u201edziennikarstwo obywatelskie\u201d i pr\u00f3buje dzia\u0142a\u0107 jako dziennikarz obywatelski.\r\n- umie tworzy\u0107 proste archiwa cyfrowe z\u0142o\u017cone ze zdigitalizowanych materia\u0142\u00f3w.", - "competence": 13, - "level": 4 - } - }, - { - "pk": 113, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie obs\u0142ugiwa\u0107 systemy zarz\u0105dzania tre\u015bci\u0105, zarz\u0105dza\u0107 list\u0105 autor\u00f3w i publikowanymi tre\u015bciami, dodawa\u0107, edytowa\u0107 i usuwa\u0107 tre\u015bci przy u\u017cyciu narz\u0119dzi typu blog, sieciowy pakiet biurowy.\r\n- umie rozpowszechnia\u0107 informacje na temat w\u0142asnej lub grupowej tw\u00f3rczo\u015bci;\r\n\r\nnp. umie wykorzystywa\u0107 serwisy spo\u0142eczno\u015bciowe do tworzenia przestrzeni publikacji na okre\u015blony temat.\r\n- wie, jak funkcjonuje redakcja internetowa, potrafi wykorzysta\u0107 podstawy umiej\u0119tno\u015bci dziennikarskich do publikowania (wcze\u015bniej przygotowanych samodzielnie i/lub w grupie) bie\u017c\u0105cych informacji na temat \u017cycia spo\u0142eczno\u015bci lokalnej.\r\n- umie tworzy\u0107 rozbudowane archiwa cyfrowe z\u0142o\u017cone ze zdigitalizowanych materia\u0142\u00f3w.", - "competence": 13, - "level": 5 - } - }, - { - "pk": 115, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie obs\u0142ugiwa\u0107 narz\u0119dzia do synchronicznego prezentowania tre\u015bci (prezentacje on-line w czasie rzeczywistym).\r\n- umie obs\u0142ugiwa\u0107 narz\u0119dzia do asynchronicznego prezentowania tre\u015bci (prezentacje multimedialne on-line i off-line).\r\n- umie obs\u0142ugiwa\u0107 narz\u0119dzia do prowadzenia zbiorowej komunikacji on-line z wykorzystaniem d\u017awi\u0119ku i wideo.\r\n- umie prezentowa\u0107 tre\u015bci na blogu, publikowa\u0107 za pomoc\u0105 narz\u0119dzi do kolektywnego tworzenia tre\u015bci;\r\n\r\nnp. umie w grupie przygotowa\u0107 prezentacj\u0119 tre\u015bci za pomoc\u0105 systemu typu wiki oraz zak\u0142ada\u0107 i moderowa\u0107 dyskusje sieciowe za pomoc\u0105 listy dyskusyjnej, forum oraz serwis\u00f3w spo\u0142eczno\u015bciowych.\r\n- wie, jakie s\u0105 podstawy pracy dziennikarskiej w internecie i potrafi po wcze\u015bniejszym przygotowaniu publikowa\u0107 tre\u015bci na temat \u017cycia w spo\u0142eczno\u015bci lokalnej;\r\n\r\nnp. wie, czym jest \u201edziennikarstwo obywatelskie\u201d i pr\u00f3buje dzia\u0142a\u0107 jako dziennikarz obywatelski.\r\n- umie tworzy\u0107 proste archiwa cyfrowe z\u0142o\u017cone ze zdigitalizowanych materia\u0142\u00f3w.", - "competence": 13, - "level": 7 - } - }, - { - "pk": 116, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie obs\u0142ugiwa\u0107 systemy zarz\u0105dzania tre\u015bci\u0105, zarz\u0105dza\u0107 list\u0105 autor\u00f3w i publikowanymi tre\u015bciami, dodawa\u0107, edytowa\u0107 i usuwa\u0107 tre\u015bci przy u\u017cyciu narz\u0119dzi typu blog, sieciowy pakiet biurowy.\r\n- umie wykorzystywa\u0107 serwisy spo\u0142eczno\u015bciowe do tworzenia przestrzeni publikacji na okre\u015blony temat, umie rozpowszechnia\u0107 informacje na temat w\u0142asnej lub grupowej tw\u00f3rczo\u015bci.\r\n- wie, jak funkcjonuje redakcja internetowa, potrafi wykorzysta\u0107 podstawy umiej\u0119tno\u015bci dziennikarskich do publikowania (wcze\u015bniej przygotowanych samodzielnie i/lub w grupie) bie\u017c\u0105cych informacji na temat \u017cycia spo\u0142eczno\u015bci lokalnej.\r\n- umie tworzy\u0107 rozbudowane archiwa cyfrowe z\u0142o\u017cone ze zdigitalizowanych materia\u0142\u00f3w.", - "competence": 13, - "level": 8 - } - }, - { - "pk": 117, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie rozwi\u0105zywa\u0107 problemy zwi\u0105zane z obs\u0142ug\u0105 system\u00f3w zarz\u0105dzania tre\u015bci\u0105.\r\n- umie animowa\u0107 sieciowe spo\u0142eczno\u015bci i szkoli\u0107 na temat zarz\u0105dzania sieciowymi spo\u0142eczno\u015bciami inne osoby.\r\n- umie zorganizowa\u0107 internetow\u0105 redakcj\u0119, koordynowa\u0107 jej funkcjonowanie i aktywizowa\u0107 za jej pomoc\u0105 spo\u0142eczno\u015b\u0107 lokaln\u0105.\r\n- wie, jak stworzy\u0107 zaawansowane archiwa cyfrowe, umie przeprowadzi\u0107 szkolenie w zakresie tworzenia cyfrowych archiw\u00f3w od poziomu pocz\u0105tkuj\u0105cego do zaawansowanego.", - "competence": 13, - "level": 9 - } - }, - { - "pk": 136, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie na podstawowym poziomie rozr\u00f3\u017cni\u0107 dobro i z\u0142o w mediach i komunikacji;\r\nnp. potrafi wskaza\u0107 z\u0142e post\u0119powanie bohatera ogl\u0105danego filmu.", - "competence": 16, - "level": 1 - } - }, - { - "pk": 137, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce problem dobra i z\u0142a, k\u0142amstwa i prawdy dotyczy tak\u017ce medi\u00f3w i komunikacji;\r\nnp. wie, \u017ce w telewizji mo\u017cna us\u0142ysze\u0107 k\u0142amstwo albo \u017ce granie w okre\u015blone gry mo\u017ce by\u0107 z\u0142e.\r\n- wie, \u017ce zosta\u0142y ustalone okre\u015blone regu\u0142y komunikacji i korzystania z medi\u00f3w oraz \u017ce nale\u017cy si\u0119 do nich stosowa\u0107.\r\n- umie wskaza\u0107 zagro\u017cenia etyczne zwi\u0105zane z korzystaniem z medi\u00f3w;\r\nnp. umie opowiedzie\u0107 o problemie k\u0142amstwa w reklamie telewizyjnej.", - "competence": 16, - "level": 2 - } - }, - { - "pk": 138, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie, dlaczego normy moralne i warto\u015bci odnosz\u0105 si\u0119 tak\u017ce do medi\u00f3w i komunikacji przez media;\r\nnp. rozumie, dlaczego obra\u017canie kogo\u015b w internecie ma takie samo znaczenie jak obra\u017canie kogo\u015b twarz\u0105 w twarz.", - "competence": 16, - "level": 3 - } - }, - { - "pk": 139, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie stawia\u0107 pytania dotycz\u0105ce etycznych konsekwencji komunikacji i korzystania z medi\u00f3w w perspektywie w\u0142asnych zachowa\u0144 i do\u015bwiadcze\u0144;\r\nnp. potrafi zastanowi\u0107 si\u0119 nad konsekwencjami i moraln\u0105 ocen\u0105 propozycji radykalnych sposob\u00f3w odchudzania, kt\u00f3re publikuje na swoim blogu.\r\n- rozumie, \u017ce wyzwania etyczne w mediach i komunikacji istniej\u0105 tak\u017ce poza perspektyw\u0105 jego w\u0142asnych do\u015bwiadcze\u0144 i umie zadawa\u0107 pytania na ich temat;\r\nnp. potrafi opisa\u0107, na czym polega moralny problem kontroli aktywno\u015bci internetowych pracownika przez pracodawc\u0119 oraz zada\u0107 pytania dotycz\u0105ce natury tego problemu: granic prywatno\u015bci pracownika, wymog\u00f3w uczciwej i skutecznej pracy itp.", - "competence": 16, - "level": 4 - } - }, - { - "pk": 140, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie zdefiniowa\u0107 i zanalizowa\u0107 wyzwania etyczne w perspektywie medi\u00f3w i komunikacji niezale\u017cnie od w\u0142asnych do\u015bwiadcze\u0144 oraz potrafi znale\u017a\u0107 pomoc w ich krytycznej analizie i rozwi\u0105zywaniu;\r\nnp. potrafi krytycznie zanalizowa\u0107 etyczny problem zdrady on-line dzi\u0119ki znalezionym w internecie wypowiedziom psycholog\u00f3w, badaniom itp.\r\n- umie podj\u0105\u0107 refleksj\u0119 etyczn\u0105 nad komunikacj\u0105 i mediami z r\u00f3\u017cnych perspektyw, np. dzia\u0142alno\u015bci biznesowej, reklamy, polityki, edukacji, nauki, z punktu widzenia r\u00f3\u017cnych system\u00f3w moralnych.\r\n- rozumie problem j\u0119zyka w dyskusjach nad etyk\u0105 medi\u00f3w i komunikacji;\r\nnp. rozumie problem zdefiniowania poj\u0119cia piractwa komputerowego.\r\n- rozumie potrzeb\u0119 kszta\u0142towania swoich postaw w komunikacji i korzystaniu z medi\u00f3w w kierunku wykszta\u0142cenia w\u0142asnych zasad post\u0119powania opartych o sumienie.", - "competence": 16, - "level": 5 - } - }, - { - "pk": 141, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie wypracowa\u0107 subiektywne zasady etyczne dotycz\u0105ce komunikacji i korzystania z medi\u00f3w oraz stosowa\u0107 je na co dzie\u0144.", - "competence": 16, - "level": 6 - } - }, - { - "pk": 142, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie stawia\u0107 pytania dotycz\u0105ce etycznych konsekwencji komunikacji i korzystania z medi\u00f3w w perspektywie w\u0142asnych zachowa\u0144 i do\u015bwiadcze\u0144;\r\nnp. rozwa\u017ca: czy \u017ale zrobi\u0142em \u015bci\u0105gaj\u0105c ten plik?", - "competence": 16, - "level": 7 - } - }, - { - "pk": 143, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie zanalizowa\u0107 problemy etyczne w perspektywie medi\u00f3w i komunikacji niezale\u017cnie od w\u0142asnych do\u015bwiadcze\u0144 (na poziomie og\u00f3lnym, abstrakcyjnym) oraz potrafi znale\u017a\u0107 pomoc w ich krytycznej analizie i rozwi\u0105zywaniu;\r\nnp. zastanawia si\u0119: w jakich warunkach nielegalne \u015bci\u0105ganie plik\u00f3w z internetu mo\u017ce nie by\u0107 nieetyczne?\r\n\r\n- rozumie problem j\u0119zyka w dyskusjach nad etyk\u0105 medi\u00f3w.", - "competence": 16, - "level": 8 - } - }, - { - "pk": 144, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie zainicjowa\u0107 proces etycznej analizy medi\u00f3w i komunikacji w\u015br\u00f3d uczni\u00f3w, uczestnik\u00f3w warsztat\u00f3w itp.;\r\nnp. pyta: Czy kiedykolwiek ogl\u0105daj\u0105c \u201eWiadomo\u015bci, mieli\u015bcie poczucie, \u017ce jaki\u015b materia\u0142 nie powinien si\u0119 tam znale\u017a\u0107, poniewa\u017c by\u0142o to niestosowne albo krzywdz\u0105ce dla kogo\u015b?\r\n- umie wypracowa\u0107 subiektywne zasady etyczne dotycz\u0105ce komunikacji i korzystania z medi\u00f3w oraz stosowa\u0107 je na co dzie\u0144.", - "competence": 16, - "level": 9 - } - }, - { - "pk": 128, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie, \u017ce nale\u017cy stosowa\u0107 si\u0119 do ogranicze\u0144 w dost\u0119pie do tre\u015bci medi\u00f3w wprowadzonych dla jego dobra.\r\nnp. zakaz ogl\u0105dania niekt\u00f3rych program\u00f3w w telewizji", - "competence": 15, - "level": 2 - } - }, - { - "pk": 129, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce ma prawo dost\u0119pu do informacji i komunikacji.\r\n- rozumie, dlaczego korzystaj\u0105c z materia\u0142\u00f3w dost\u0119pnych w internecie, nale\u017cy szanowa\u0107 prac\u0119 innych;\r\nnp. rozumie, dlaczego wklejaj\u0105c do prezentacji multimedialnej obrazek \u015bci\u0105gni\u0119ty z internetu, nale\u017cy poda\u0107 jego \u017ar\u00f3d\u0142o.\r\n- umie wskaza\u0107 podstawowe warto\u015bci w przekazie medialnym;\r\nnp. wskaza\u0107, do jakich warto\u015bci odwo\u0142uje si\u0119 post\u0119powanie bohatera ogl\u0105danego filmu.\r\n- rozumie, \u017ce warto\u015bci promowane w tre\u015bci medi\u00f3w i komunikacji s\u0105 zale\u017cne od wielu czynnik\u00f3w;\r\nnp. rozumie, \u017ce reklama nie jest bezinteresownym informowaniem o produkcie, poniewa\u017c jej g\u0142\u00f3wn\u0105 funkcj\u0105 jest zach\u0119canie do kupna produktu, rozbudzanie potrzeb itp.\r\n- rozumie poj\u0119cie wolno\u015bci s\u0142owa w perspektywie medi\u00f3w i komunikacji.\r\n- rozumie potrzeb\u0119 krytycznej tolerancji i otwarto\u015bci (tak\u017ce na inne kultury) przy kontakcie z tre\u015bciami medi\u00f3w.", - "competence": 15, - "level": 3 - } - }, - { - "pk": 130, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie czynniki wp\u0142ywaj\u0105 na obecno\u015b\u0107 i kszta\u0142t okre\u015blonych warto\u015bci w mediach i komunikacji;\r\nnp. wie, \u017ce frakcja polityczna kontroluj\u0105ca media publiczne mo\u017ce mie\u0107 wp\u0142yw na warto\u015bci, jakie dominowa\u0107 b\u0119d\u0105 w przekazach tych medi\u00f3w.\r\n- umie krytycznie analizowa\u0107 warto\u015bci w tre\u015bci medi\u00f3w i komunikacji z uwzgl\u0119dnieniem tej wiedzy;\r\nnp. wiedz\u0105c o zasadach dzia\u0142ania tabloid\u00f3w, o modelu biznesowym tego gatunku medialnego, potrafi krytycznie opisa\u0107 warto\u015bci promowane na \u0142amach \u201eFaktu\u201d.\r\n- rozumie prawo do sprzeciwu lub czynnego oporu wobec tre\u015bci medialnych czy komunikacji;\r\nnp. rozumie, dlaczego mo\u017ce protestowa\u0107 przeciwko instalacji baner\u00f3w reklamowych w budynku szko\u0142y. Rozumie, \u017ce instalacja dodatku AdBlock w przegl\u0105darce wynika z jego prawa do kontrolowania tre\u015bci, kt\u00f3re odbiera.\r\n- wie o prawie dost\u0119pu do informacji, do d\u0105\u017cenia do jej uzyskania oraz ograniczeniach z tym zwi\u0105zanych;\r\nnp. zna warto\u015b\u0107 czyjej\u015b prywatno\u015bci i wie, \u017ce ogranicza ona jego prawo do dost\u0119pu do informacji. Zna poj\u0119cie informacji publicznej i wie o prawie dost\u0119pu do niej.\r\n- rozumie problem komunikowania tre\u015bci takich jak przemoc, nago\u015b\u0107, prywatno\u015b\u0107. Rozumie, \u017ce problem ten dotyczy\u0107 mo\u017ce tak\u017ce tre\u015bci o charakterze historycznym;\r\nnp. rozumie, \u017ce nale\u017cy zastanowi\u0107 si\u0119 nad form\u0105 i stylem fotografii dokumentuj\u0105cej wizyt\u0119 klasow\u0105 w Muzeum Auschwitz.\r\n- rozumie poj\u0119cie etyki dziennikarskiej i umie wskaza\u0107, jak odnosi si\u0119 ono do r\u00f3\u017cnych dostawc\u00f3w tre\u015bci.\r\n- umie przedstawi\u0107 pozytywn\u0105 interpretacj\u0119 poj\u0119cia hakowania jako dzia\u0142ania zmierzaj\u0105cego do dostosowania systemu (medium) do w\u0142asnych cel\u00f3w.", - "competence": 15, - "level": 4 - } - }, - { - "pk": 131, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie praktycznie rozpozna\u0107 wyzwania wobec etyki dziennikarskiej, obejmuj\u0105cej r\u00f3wnie\u017c innych nadawc\u00f3w tre\u015bci, z perspektywy r\u00f3\u017cnych system\u00f3w moralnych;\r\nnp. potrafi skonfrontowa\u0107 zasady etyki dziennikarskiej dotycz\u0105ce prezentowania scen przemocy z obejrzan\u0105 relacj\u0105 korespondenta wojennego.\r\n\r\n- umie odnie\u015b\u0107 problem wolno\u015bci s\u0142owa i pluralizmu medi\u00f3w do konkretnych zjawisk medialnych;\r\nnp. potrafi zanalizowa\u0107 funkcjonowanie Wikileaks w perspektywie wolno\u015bci s\u0142owa i polityki bezpiecze\u0144stwa pa\u0144stw.\r\n- umie odnie\u015b\u0107 problem dobra wsp\u00f3lnego do systemu medi\u00f3w i komunikacji z wykorzystaniem poj\u0119cia kultury (ekonomii) daru oraz poj\u0119\u0107 zwi\u0105zanych z ide\u0105 otwarto\u015bci tre\u015bci w internecie (Otwarta Nauka, Otwarte Zasoby Edukacyjne, wolne licencje itp.);\r\nnp. potrafi zanalizowa\u0107 model Wikipedii pod k\u0105tem dobra wsp\u00f3lnego, akcentuj\u0105c znaczenie licencji Creative Commons wykorzystywanej przez autor\u00f3w hase\u0142.\r\n\r\n- umie krytycznie zanalizowa\u0107 problem dobra wsp\u00f3lnego i otwarto\u015bci w perspektywie tre\u015bci medialnych;\r\nnp. potrafi wskaza\u0107 argumenty za udost\u0119pnianiem on-line wynik\u00f3w bada\u0144 naukowych. Potrafi krytycznie zanalizowa\u0107 problem abonamentu i funkcjonowania medi\u00f3w publicznych w perspektywie warto\u015bci dobra wsp\u00f3lnego.", - "competence": 15, - "level": 5 - } - }, - { - "pk": 133, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie o prawie dost\u0119pu do informacji oraz ograniczeniach z tym zwi\u0105zanych.\r\n- umie wskaza\u0107 podstawowe warto\u015bci w wybranym przekazie medialnym.\r\n- rozumie, \u017ce warto\u015bci obecne w tre\u015bci medi\u00f3w i komunikacji zale\u017c\u0105 od wielu czynnik\u00f3w.\r\n- wie, \u017ce korzystaj\u0105c z materia\u0142\u00f3w dost\u0119pnych w internecie nale\u017cy szanowa\u0107 prac\u0119 innych.\r\n- rozumie poj\u0119cie etyki dziennikarskiej.", - "competence": 15, - "level": 7 - } - }, - { - "pk": 134, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie czynniki wp\u0142ywaj\u0105 na obecno\u015b\u0107 i kszta\u0142t okre\u015blonych warto\u015bci w mediach i komunikacji.\r\n- umie krytycznie analizowa\u0107 warto\u015bci w tre\u015bci medi\u00f3w i komunikacji z uwzgl\u0119dnieniem tej wiedzy.\r\n- rozumie prawo do sprzeciwu lub czynnego oporu wobec tre\u015bci medialnych czy komunikacji.\r\n- rozumie problem komunikowania tre\u015bci takich jak przemoc, nago\u015b\u0107, prywatno\u015b\u0107 (tak\u017ce w odniesieniu do tre\u015bci o charakterze historycznym).\r\n- rozumie warto\u015b\u0107 r\u00f3wnego dost\u0119pu do informacji.\r\n- umie praktycznie rozpozna\u0107 wyzwania wobec etyki dziennikarskiej i odnie\u015b\u0107 je do innych dostawc\u00f3w tre\u015bci.", - "competence": 15, - "level": 8 - } - }, - { - "pk": 135, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie odnie\u015b\u0107 problem wolno\u015bci s\u0142owa i pluralizmu medi\u00f3w do konkretnych zjawisk medialnych.\r\n- umie odnie\u015b\u0107 problem dobra wsp\u00f3lnego do systemu medi\u00f3w i komunikacji z wykorzystaniem poj\u0119cia kultury (ekonomii) daru oraz poj\u0119\u0107 zwi\u0105zanych z ide\u0105 otwarto\u015bci tre\u015bci w internecie (Otwarta Nauka, Otwarte Zasoby Edukacyjne, wolne licencje itp.)\r\n- umie przedstawi\u0107 pozytywn\u0105 interpretacj\u0119 poj\u0119cia hakowania jako dzia\u0142ania zmierzaj\u0105cego do dostosowania systemu (medium) do w\u0142asnych cel\u00f3w.", - "competence": 15, - "level": 9 - } - }, - { - "pk": 146, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce ma prawo do zachowania anonimowo\u015bci i prywatno\u015bci;\r\nnp. wie, \u017ce nie musi si\u0119 zgadza\u0107 na to zrobienie sobie zdj\u0119cia przez kogo\u015b obcego. Wie, \u017ce nie musi podawa\u0107 swojego adresu domowego osobie spotkanej w internecie (i \u017ce to nie \u015bwiadczy o jej / jego z\u0142ym zachowaniu).\r\n- rozumie, \u017ce komunikacja w mediach to wci\u0105\u017c komunikacja mi\u0119dzy lud\u017ami;\r\nnp. rozumie, \u017ce po drugiej stronie ekranu siedzi inny cz\u0142owiek, kt\u00f3remu nale\u017cy si\u0119 szacunek.\r\n- rozumie, \u017ce komunikacja przez media nie mo\u017ce by\u0107 wystarczaj\u0105c\u0105 alternatyw\u0105 komunikacji interpersonalnej;\r\nnp. rozumie wady przyja\u017ani tylko przez internet.", - "competence": 17, - "level": 2 - } - }, - { - "pk": 147, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce prywatno\u015b\u0107 w\u0142asna i innych jest warto\u015bci\u0105;\r\nnp. wie, dlaczego nie nale\u017cy podawa\u0107 numeru telefonu znajomej osoby innym bez jej wyra\u017anej zgody.\r\n- umie stosowa\u0107 w komunikacji w internecie zasady netykiety.\r\n- rozumie postaw\u0119 krytycznej otwarto\u015bci i tolerancji w relacjach w mediach;\r\nnp. rozumie, \u017ce dyskutuj\u0105c on-line, nie zawsze ma si\u0119 racj\u0119 i czasem warto zaakceptowa\u0107 argument drugiej strony.", - "competence": 17, - "level": 3 - } - }, - { - "pk": 148, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie problem moralnej oceny zachowa\u0144 komunikacyjnych w mediach;\r\nnp. rozumie, \u017ce o\u015bmieszanie kogo\u015b w internecie ma tak\u0105 sam\u0105 warto\u015b\u0107 moraln\u0105 jak o\u015bmieszanie kogo\u015b w komunikacji bezpo\u015bredniej.\r\n- rozumie poj\u0119cie mowy nienawi\u015bci w internecie i potrafi je odnie\u015b\u0107 do wypowiedzi obserwowanych on-line oraz do idei wolno\u015bci s\u0142owa.\r\n- rozumie warto\u015b\u0107 wsp\u00f3\u0142pracy mi\u0119dzy u\u017cytkownikami internetu (w perspektywie zjawisk takich jak ruch open source, Wikipedia, crowdsourcing, peer-production itp.)", - "competence": 17, - "level": 4 - } - }, - { - "pk": 149, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie okre\u015bli\u0107 zasady ograniczania prawa do prywatno\u015bci w mediach;\r\nnp. umie poda\u0107 katalog warto\u015bci, wobec kt\u00f3rych prawo do prywatno\u015bci mo\u017ce by\u0107 zanegowane (np. wsp\u00f3lne bezpiecze\u0144stwo). Umie wskaza\u0107 i oceni\u0107 negatywne zjawiska ograniczania prawa do prywatno\u015bci (np. kontrola internaut\u00f3w w Chinach, problem ACTA).\r\n- potrafi krytycznie podej\u015b\u0107 do skodyfikowanych zasad netykiety.\r\n- potrafi wypracowa\u0107 w\u0142asne zasady kszta\u0142towania relacji w komunikacji przez media w oparciu o w\u0142asne do\u015bwiadczenia.", - "competence": 17, - "level": 5 - } - }, - { - "pk": 151, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce ma prawo do zachowania anonimowo\u015bci i prywatno\u015bci.\r\n- rozumie, \u017ce komunikacja w mediach to wci\u0105\u017c komunikacja mi\u0119dzy lud\u017ami.\r\n- wie, \u017ce nale\u017cy szanowa\u0107 prywatno\u015b\u0107 swoj\u0105 i innych.\r\n- umie stosowa\u0107 w komunikacji w internecie zasady netykiety.\r\n- rozumie postaw\u0119 krytycznej otwarto\u015bci i tolerancji w relacjach w mediach.", - "competence": 17, - "level": 7 - } - }, - { - "pk": 152, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie problem etycznej oceny zachowa\u0144 w komunikacji przez media.\r\n- rozumie poj\u0119cie mowy nienawi\u015bci w internecie i potrafi je odnie\u015b\u0107 do wypowiedzi obserwowanych on-line oraz do idei wolno\u015bci s\u0142owa.\r\n- rozumie warto\u015b\u0107 wsp\u00f3\u0142pracy mi\u0119dzy u\u017cytkownikami internetu (w perspektywie zjawisk takich jak ruch open source, Wikipedia, crowdsourcing, peer-production itp.)", - "competence": 17, - "level": 8 - } - }, - { - "pk": 153, - "model": "curriculum.competencelevel", - "fields": { - "description": "- potrafi krytycznie podej\u015b\u0107 do skodyfikowanych zasad netykiety.\r\n- potrafi wypracowa\u0107 w\u0142asne zasady kszta\u0142towania relacji w komunikacji przez media w oparciu o w\u0142asne do\u015bwiadczenia.", - "competence": 17, - "level": 9 - } - }, - { - "pk": 119, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce przepisy prawa stosuj\u0105 si\u0119 tak\u017ce do medi\u00f3w i komunikacji.\r\n- rozumie obowi\u0105zek przestrzegania prawa tak\u017ce w perspektywie medi\u00f3w i komunikacji;\r\nnp. potrafi wyja\u015bni\u0107, dlaczego kradzie\u017c w internecie ma taki sam status jak kradzie\u017c towaru ze sklepu.", - "competence": 14, - "level": 2 - } - }, - { - "pk": 121, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce system prawny nie zawsze odpowiednio szybko reaguje na nowe zjawiska w mediach;\r\nnp. zna poj\u0119cie stalkingu i wie, \u017ce jeszcze niedawno nie by\u0142o takiego przest\u0119pstwa w kodeksie karnym.\r\n- rozumie, \u017ce nie wszystkie zasady komunikacji i funkcjonowania w mediach musz\u0105 by\u0107 regulowane przez przepisy prawa;\r\nnp. umie wyja\u015bni\u0107 zasady i znaczenie kultury dyskusji na forach internetowych oraz pokaza\u0107, kt\u00f3re z tych zasad nie wynikaj\u0105 wprost z przepis\u00f3w prawa, a mimo to obowi\u0105zuj\u0105.", - "competence": 14, - "level": 4 - } - }, - { - "pk": 122, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie problem relacji mi\u0119dzy prawem stanowionym a moralno\u015bci\u0105 szczeg\u00f3lnie w odniesieniu do prawa autorskiego, prawa w\u0142asno\u015bci i prawa do prywatno\u015bci w mediach oraz rozumie problem j\u0119zyka w dyskusjach na ten temat;\r\nnp. rozumie z\u0142o\u017cono\u015b\u0107 moralnej oceny piractwa komputerowego, potrafi rozwa\u017ca\u0107, czy nielegalne korzystanie z program\u00f3w komputerowych do cel\u00f3w edukacyjnych jest etyczne, czy nie. Potrafi krytycznie zanalizowa\u0107 poj\u0119cie piractwa komputerowego.\r\n- rozumie, \u017ce normy funkcjonowania medi\u00f3w mog\u0105 by\u0107 r\u00f3\u017cne w r\u00f3\u017cnych systemach prawnych i normatywnych.\r\n- potrafi odnie\u015b\u0107 si\u0119 do tego problemu w pr\u00f3bie etycznej oceny zjawiska medialnego;\r\nnp. rozumie, \u017ce funkcjonowanie portalu Redwatch w kulturze prawnej USA jest dozwolone jako wyraz wolno\u015bci s\u0142owa, a w Polsce traktowane jako przest\u0119pstwo. Rozumie, jakie problemy rodzi zr\u00f3\u017cnicowanie system\u00f3w prawnych i normatywnych w pr\u00f3bie moralnej oceny tego zjawiska.", - "competence": 14, - "level": 5 - } - }, - { - "pk": 124, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie obowi\u0105zek przestrzegania prawa tak\u017ce w perspektywie medi\u00f3w i komunikacji.", - "competence": 14, - "level": 7 - } - }, - { - "pk": 125, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce system prawny nie zawsze odpowiednio szybko reaguje na nowe zjawiska w mediach.\r\n- rozumie, \u017ce nie wszystkie zasady komunikacji i funkcjonowania w mediach musz\u0105 by\u0107 regulowane przez przepisy prawa.\r\n- rozumie, \u017ce normy funkcjonowania medi\u00f3w mog\u0105 by\u0107 r\u00f3\u017cne w r\u00f3\u017cnych systemach prawnych i normatywnych.", - "competence": 14, - "level": 8 - } - }, - { - "pk": 126, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie problem relacji mi\u0119dzy prawem stanowionym a etyk\u0105, szczeg\u00f3lnie w odniesieniu do prawa autorskiego, prawa w\u0142asno\u015bci i prawa do prywatno\u015bci w mediach oraz rozumie problem j\u0119zyka w dyskusjach na ten temat.\r\n- potrafi odnie\u015b\u0107 problem r\u00f3\u017cnorodnych system\u00f3w prawnych i normatywnych do etycznej oceny zjawiska medialnego;\r\nnp. rozwa\u017ca: Czy skoro w USA nie jest zakazane propagowanie nazizmu (ze wzgl\u0119du na zasady wolno\u015bci s\u0142owa), oznacza to, \u017ce takie dzia\u0142anie w Polsce r\u00f3wnie\u017c powinno by\u0107 dozwolone?", - "competence": 14, - "level": 9 - } - }, - { - "pk": 181, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie zakomunikowa\u0107, \u017ce si\u0119 wstydzi i nie chce uczestniczy\u0107 w danej sytuacji komunikacyjnej;\r\nnp. nie chce by\u0107 nagrywane lub fotografowane, nie chce rozmawia\u0107 przez telefon.", - "competence": 21, - "level": 1 - } - }, - { - "pk": 182, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce pewnych informacji nie wolno udost\u0119pnia\u0107 obcym; w razie w\u0105tpliwo\u015bci pyta rodzic\u00f3w lub opiekun\u00f3w.\r\n- umie odr\u00f3\u017cni\u0107 uwiecznienie od upublicznienia.\r\n- umie sprzeciwi\u0107 si\u0119 innemu dziecku lub doros\u0142emu w kwestii publikacji swojego utworu lub zwi\u0105zanej z wizerunkiem;\r\nnp. pokazywanie filmu z jego udzia\u0142em.", - "competence": 21, - "level": 2 - } - }, - { - "pk": 183, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie wskaza\u0107 r\u00f3\u017cnice pomi\u0119dzy komunikacj\u0105 prywatn\u0105 i publiczn\u0105.", - "competence": 21, - "level": 3 - } - }, - { - "pk": 184, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie zdecydowa\u0107, czy w danej sytuacji komunikacja powinna by\u0107 prywatna czy publiczna.", - "competence": 21, - "level": 4 - } - }, - { - "pk": 185, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie poprawnie zidentyfikowa\u0107, czy dane narz\u0119dzia (np. czat na portalach spo\u0142eczno\u015bciowych) faktycznie oferuj\u0105 komunikacj\u0119 prywatn\u0105, czy tylko jej z\u0142udzenie.\r\n- umie pos\u0142u\u017cy\u0107 si\u0119 narz\u0119dziami zwi\u0119kszaj\u0105cymi prywatno\u015b\u0107,\r\nnp. rozszerzenia przegl\u0105darek, ustawienia prywatno\u015bci.\r\n- wie, do czego s\u0142u\u017c\u0105 regulaminy na stronach, z kt\u00f3rych korzysta.", - "competence": 21, - "level": 5 - } - }, - { - "pk": 186, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie p\u0142ynnie pos\u0142ugiwa\u0107 si\u0119 metodami i narz\u0119dziami ochrony prywatno\u015bci.\r\n- czyta ze zrozumieniem regulaminy stron, z kt\u00f3rych korzysta, i umie \u015bwiadomie podj\u0105\u0107 decyzje dotycz\u0105ce przyj\u0119cia lub odrzucenia ich postanowie\u0144.", - "competence": 21, - "level": 6 - } - }, - { - "pk": 187, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce prywatno\u015b\u0107 jest dobrem i \u017ce mamy do niej prawo.\r\n- wie, \u017ce ochrona wizerunku wymaga ochrony prywatno\u015bci.\r\n- wie, \u017ce dane prywatne mog\u0105 by\u0107 traktowane jak towar.\r\n- wie, \u017ce pewne komunikaty mog\u0105 by\u0107 przekazywane wy\u0142\u0105cznie prywatnie, a inne udost\u0119pniane publicznie.\r\n- rozumie, \u017ce bior\u0105c udzia\u0142 w komunikacji, potencjalnie odpowiada za wizerunek nie tylko sw\u00f3j, ale np. swojego pracodawcy, je\u015bli u\u017cywa np. firmowego adresu e-mail.", - "competence": 21, - "level": 7 - } - }, - { - "pk": 188, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie u\u017cywa\u0107 podstawowych narz\u0119dzi chroni\u0105cych prywatno\u015b\u0107, np. rozszerzenia do przegl\u0105darek, blokada ciasteczek.\r\n- umie precyzyjnie wskaza\u0107, kt\u00f3re, komunikaty mog\u0105 by\u0107 przekazywane wy\u0142\u0105cznie prywatnie, a kt\u00f3re udost\u0119pniane publicznie.\r\n- wie, \u017ce nawet dane anonimizowane zebrane w odpowiedniej ilo\u015bci mog\u0105 pozwoli\u0107 na naruszenie prywatno\u015bci.\r\n- wie, \u017ce jego decyzje dotycz\u0105ce prywatno\u015bci mog\u0105 r\u00f3\u017cni\u0107 si\u0119 od decyzji innych i umie to uszanowa\u0107.\r\n- umie dostosowa\u0107 sw\u00f3j wizerunek do sytuacji i roli.", - "competence": 21, - "level": 8 - } - }, - { - "pk": 189, - "model": "curriculum.competencelevel", - "fields": { - "description": "- \u015bwiadomie kreuje sw\u00f3j wizerunek on-line w r\u00f3\u017cnych kontekstach.\r\n- p\u0142ynnie pos\u0142uguje si\u0119 technikami i narz\u0119dziami ochrony prywatno\u015bci.\r\n- umie \u015bwiadomie podejmowa\u0107 decyzje dotycz\u0105ce udost\u0119pnienia b\u0105d\u017a nie danych swoich i swoich znajomych, uwzgl\u0119dniaj\u0105c ich preferencje w zakresie ochrony prywatno\u015bci i wizerunku.", - "competence": 21, - "level": 9 - } - }, - { - "pk": 173, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, co to znaczy \u201eanonimowo\u015b\u0107\u201d.", - "competence": 20, - "level": 2 - } - }, - { - "pk": 174, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce z sieci mo\u017cemy korzysta\u0107 anonimowo.\r\n- umie poda\u0107 przyk\u0142ad sytuacji, w kt\u00f3rej anonimowo\u015b\u0107 jest wskazana.", - "competence": 20, - "level": 3 - } - }, - { - "pk": 175, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce s\u0105 specjalne narz\u0119dzia do zwi\u0119kszania anonimowo\u015bci w sieci i umie o nie spyta\u0107.\r\n- wie, \u017ce anonimowo\u015b\u0107 w sieci mo\u017ce by\u0107 pozorna i \u017ce cz\u0119sto mo\u017cliwe jest ustalenie autora danej informacji nawet je\u017celi u\u017cywa\u0142 pseudonimu.\r\n- wie, \u017ce je\u017celi ujawni w tre\u015bci komunikacji dane identyfikuj\u0105ce, sam fakt komunikowania si\u0119 anonimowo (np. przy u\u017cyciu odpowiednich narz\u0119dzi) nie wystarczy do zachowania anonimowo\u015bci.", - "competence": 20, - "level": 4 - } - }, - { - "pk": 176, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie pos\u0142u\u017cy\u0107 si\u0119 narz\u0119dziami zwi\u0119kszaj\u0105cymi anonimowo\u015b\u0107; np. TOR, anonimowe proxy, dystrybucja Linuksa TAILS.", - "competence": 20, - "level": 5 - } - }, - { - "pk": 177, - "model": "curriculum.competencelevel", - "fields": { - "description": "- \u015bwiadomie i trafnie podejmuje decyzje dotycz\u0105ce anonimowo\u015bci w r\u00f3\u017cnych sytuacjach komunikacyjnych;\r\nnp. \u015bwiadomie w pewnych sytuacjach wy\u0142\u0105cza us\u0142ugi lokalizacyjne dost\u0119pne w przegl\u0105darce.", - "competence": 20, - "level": 6 - } - }, - { - "pk": 178, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce z sieci mo\u017cemy korzysta\u0107 anonimowo\r\n- wie, \u017ce korzystanie anonimowe nie wyklucza mo\u017cliwo\u015bci ustalenia autora.\r\n- wie, \u017ce istniej\u0105 metody \u015bledzenia os\u00f3b w sieci bez ich wiedzy, np. ciasteczka.", - "competence": 20, - "level": 7 - } - }, - { - "pk": 179, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce istniej\u0105 narz\u0119dzia zwi\u0119kszaj\u0105ce anonimowo\u015b\u0107 (jak rozszerzenia do przegl\u0105darek, systemy TOR, I2P, proxy).\r\n- umie znale\u017a\u0107 i dostosowa\u0107 do swoich potrzeb ustawienia przegl\u0105darek zwi\u0119kszaj\u0105ce anonimowo\u015b\u0107.", - "competence": 20, - "level": 8 - } - }, - { - "pk": 180, - "model": "curriculum.competencelevel", - "fields": { - "description": "- biegle korzysta z narz\u0119dzi i technik zapewniaj\u0105cych anonimowo\u015b\u0107 w sieci.\r\n- umie kompleksowo zadba\u0107 o zachowanie anonimowo\u015bci, korzystaj\u0105c z kombinacji narz\u0119dzi, np. tryb prywatny, TOR, blokada ciasteczek.", - "competence": 20, - "level": 9 - } - }, - { - "pk": 154, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie zakomunikowa\u0107, \u017ce dana tre\u015b\u0107 budzi strach lub poczucie zagro\u017cenia, ale niekoniecznie umie temu zaradzi\u0107, np. celowo prze\u0142\u0105czy\u0107 kana\u0142.", - "competence": 18, - "level": 1 - } - }, - { - "pk": 155, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie, co to \u201esekret\u201d, \u201etajemnica\u201d i umie jej dochowa\u0107, r\u00f3wnie\u017c w sytuacji komunikacyjnej.\r\n- umie selekcjonowa\u0107 tre\u015bci, kt\u00f3re odbiera\r\nnp. poprzez wy\u0142\u0105czenie telewizora, zmian\u0119 filmu, zmian\u0119 strony.", - "competence": 18, - "level": 2 - } - }, - { - "pk": 156, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce pewne informacje i rodzaje komunikacji powinny by\u0107 \u201etajemnic\u0105\u201d (np. has\u0142o do poczty).\r\n- wie, \u017ce istniej\u0105 sposoby zapewnienia tej \u201etajemnicy\u201d i umie o nie spyta\u0107.\r\n- wie, \u017ce zakupy mo\u017cna zrobi\u0107 w fizycznym sklepie, jak i w sklepie internetowym czy portalu aukcyjnym; potrafi poda\u0107 przyk\u0142ady.\r\n- wie, co to spam i umie rozpozna\u0107 bardziej oczywiste jego przyk\u0142ady.", - "competence": 18, - "level": 3 - } - }, - { - "pk": 157, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce dane prywatne mog\u0105 by\u0107 traktowane jak towar.\r\n- umie skorzysta\u0107 z podstawowych narz\u0119dzi zapewniaj\u0105cych bezpiecze\u0144stwo komunikacji;\r\nnp. korzysta z https na stronach bank\u00f3w czy portalach spo\u0142eczno\u015bciowych.\r\n- wie, \u017ce nale\u017cy wylogowa\u0107 si\u0119 z portali po zako\u0144czeniu pracy.\r\n- wie, \u017ce s\u0105 r\u00f3\u017cne formy p\u0142atno\u015bci w internecie o r\u00f3\u017cnym poziomie bezpiecze\u0144stwa.\r\n- zna podstawowe zasady bezpiecze\u0144stwa przy zakupach on-line.", - "competence": 18, - "level": 4 - } - }, - { - "pk": 158, - "model": "curriculum.competencelevel", - "fields": { - "description": "- z du\u017c\u0105 doz\u0105 pewno\u015bci rozpoznaje spam i pr\u00f3by phishingu;\r\nnp. zwraca uwag\u0119 na to, \u017ce nie zgadza si\u0119 adres strony bankowej.\r\n- zwraca uwag\u0119 na certyfikaty;\r\nnp. nie akceptuje automatycznie ka\u017cdego napotkanego b\u0142\u0119dnego certyfikatu zg\u0142oszonego przez przegl\u0105dark\u0119.\r\n- wie, \u017ce istniej\u0105 narz\u0119dzia dodatkowo zwi\u0119kszaj\u0105ce bezpiecze\u0144stwo komunikacji i umie do nich dotrze\u0107;\r\nnp. szyfrowanie end-to-end, poczty, PGP/GPG, OTR.", - "competence": 18, - "level": 5 - } - }, - { - "pk": 159, - "model": "curriculum.competencelevel", - "fields": { - "description": "- p\u0142ynnie pos\u0142uguje si\u0119 narz\u0119dziami zwi\u0119kszaj\u0105cymi bezpiecze\u0144stwo komunikacji.\r\n- zna narz\u0119dzia szyfrowania end-to-end i umie ich u\u017cy\u0107 np. PGP/GPG, OTR.", - "competence": 18, - "level": 6 - } - }, - { - "pk": 160, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie skorzysta\u0107 z podstawowych narz\u0119dzi zapewniaj\u0105cych bezpiecze\u0144stwo transmisji (https).\r\n- wie, \u017ce nale\u017cy wylogowa\u0107 si\u0119 po zako\u0144czeniu pracy na publicznym terminalu lub w sytuacji, w kt\u00f3rej inni b\u0119d\u0105 korzysta\u0107 z tego samego komputera.\r\n- zwraca uwag\u0119 na ostrze\u017cenia o wygas\u0142ych/nieprawid\u0142owych certyfikatach, w razie w\u0105tpliwo\u015bci pyta (nie akceptuje automatycznie).\r\n- docenia wag\u0119 traktowania pewnych informacji jako tajnych, zdaje sobie spraw\u0119, \u017ce dzielenie si\u0119 has\u0142ami (nawet je\u015bli np. zwi\u0119ksza wygod\u0119) jest niedopuszczalne.\r\n- potrafi zachowa\u0107 \u201ehigien\u0119 informatyczn\u0105\u201d, np. zwraca uwag\u0119 na komunikaty pojawiaj\u0105ce si\u0119 na ekranie i nie akceptuje rzeczy, kt\u00f3rych nie rozumie \u2013 w takich sytuacjach pyta; zdaje sobie spraw\u0119 z zagro\u017ce\u0144 takich jak wirusy; potrafi korzysta\u0107 z tzw. \u201etrybu prywatnego\u201d przegl\u0105darek.", - "competence": 18, - "level": 7 - } - }, - { - "pk": 161, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie samodzielnie podj\u0105\u0107 decyzj\u0119 dotycz\u0105c\u0105 bezpiecze\u0144stwa komunikacji w danym przypadku, np. decyduje o zaakceptowaniu b\u0105d\u017a nie wygas\u0142ego/nieprawid\u0142owego certyfikatu.\r\n- zdaje sobie spraw\u0119 z zagro\u017ce\u0144 zwi\u0105zanych ze scentralizowanymi sieciami i us\u0142ugami; umie poda\u0107 przyk\u0142ady sieci scentralizowanych (np. Facebook, Google) oraz zagro\u017ce\u0144 z nimi zwi\u0105zanych (np. utrata kontroli nad komunikacj\u0105, pods\u0142uch).", - "competence": 18, - "level": 8 - } - }, - { - "pk": 162, - "model": "curriculum.competencelevel", - "fields": { - "description": "- p\u0142ynnie pos\u0142uguje si\u0119 systemami szyfrowania end-to-end (PGP/GPG, OTR).\r\n- \u015bledzi najwa\u017cniejsze doniesienia dotycz\u0105ce narusze\u0144 bezpiecze\u0144stwa i umie wdro\u017cy\u0107 rozwi\u0105zania problem\u00f3w oraz sugerowane praktyki.\r\n- podejmuje \u015bwiadome, oparte na rzetelnych przes\u0142ankach decyzje dotycz\u0105ce narz\u0119dzi, kt\u00f3rych u\u017cywa, bior\u0105c pod uwag\u0119 r\u00f3wnie\u017c przes\u0142anki pozatechniczne;\r\nnp. bierze pod uwag\u0119 to, czy wszystkie kana\u0142y komunikacji, z kt\u00f3rych korzysta, mog\u0105 by\u0107 \u0142atwo kontrolowane przez jedn\u0105 organizacj\u0119.\r\n- rozumie zalety decentralizacji i umie je uwzgl\u0119dni\u0107 w podejmowanych decyzjach.\r\n- potrafi przeprowadzi\u0107 prosty, nieformalny audyt bezpiecze\u0144stwa, wskazuj\u0105c na braki w danej sytuacji;\r\nnp. doradza szyfrowanie.", - "competence": 18, - "level": 9 - } - }, - { - "pk": 192, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, co to znaczy \u201ecenzura\u201d.\r\n- wie, co to znaczy \u201epods\u0142uchiwa\u0107\u201d, r\u00f3wnie\u017c w kontek\u015bcie technologii i sieci;\r\nnp. wie, \u017ce kiedy pisze do kogo\u015b w internecie, czyta to te\u017c jeszcze kto\u015b inny.", - "competence": 22, - "level": 3 - } - }, - { - "pk": 193, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce sie\u0107 mo\u017ce by\u0107 nadzorowana.\r\n- wie, \u017ce nadz\u00f3r ten mo\u017ce mie\u0107 wiele form, w tym cenzury czy pods\u0142uchu.\r\n- wie, \u017ce nadz\u00f3r mo\u017ce nie by\u0107 zauwa\u017calny dla nadzorowanych;\r\nnp. zdaje sobie spraw\u0119, \u017ce skutkiem nadzoru mo\u017ce by\u0107 trudna do identyfikacji zmiana wynik\u00f3w wyszukiwania.", - "competence": 22, - "level": 4 - } - }, - { - "pk": 194, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce mog\u0105 by\u0107 r\u00f3\u017cne cele wprowadzania nadzoru i umie je wymieni\u0107;\r\nnp. ochrona dzieci w internecie; uzyskiwanie dodatkowych przychod\u00f3w przez dan\u0105 korporacj\u0119 ze sprzeda\u017cy prywatnych danych u\u017cytkownik\u00f3w.\r\n- wie, \u017ce nadz\u00f3r mo\u017ce by\u0107 legalny lub bezprawny; \u017ce mo\u017ce by\u0107 prowadzony przez organy pa\u0144stwowe (np. policj\u0119) i osoby prywatne czy korporacje;\r\n- wie, \u017ce istniej\u0105 metody obej\u015bcia / utrudnienia nadzoru, nie tylko techniczne;\r\nnp. potrafi wymieni\u0107 takie metody jak \u015bwiadome umieszczanie informacji fa\u0142szywych lub stosowanie szyfrowania nie tylko do tre\u015bci wra\u017cliwych, ale r\u00f3wnie\u017c banalnych, celem utrudnienia identyfikacji, kiedy zachodzi wa\u017cna / wra\u017cliwa komunikacja.", - "competence": 22, - "level": 5 - } - }, - { - "pk": 195, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie korzysta\u0107 z narz\u0119dzi obej\u015bcia / utrudnienia nadzoru.\r\n- \u015bwiadomie podejmuje decyzje o doborze narz\u0119dzi do konkretnych cel\u00f3w, bior\u0105c pod uwag\u0119 mo\u017cliwo\u015b\u0107 nadzoru os\u00f3b trzecich nad tymi narz\u0119dziami, oraz specyfik\u0119 tre\u015bci.", - "competence": 22, - "level": 6 - } - }, - { - "pk": 196, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce komunikacja w sieci mo\u017ce by\u0107 nadzorowana w spos\u00f3b niezauwa\u017calny dla korzystaj\u0105cego.\r\n- wie, \u017ce istniej\u0105 narz\u0119dzia obchodz\u0105ce nadz\u00f3r, umie znale\u017a\u0107 informacje na ich temat.\r\n- wie, \u017ce nadz\u00f3r mo\u017ce by\u0107 legalny lub bezprawny; prywatny i pa\u0144stwowy.\r\n- wie, \u017ce nadz\u00f3r mo\u017ce prowadzi\u0107 do cenzury.", - "competence": 22, - "level": 7 - } - }, - { - "pk": 197, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie skorzysta\u0107 samodzielnie z podstawowych narz\u0119dzi walki z potencjalnym nadzorem w sieci.\r\n- wie, \u017ce nadz\u00f3r nad komunikacj\u0105 w sieci jest wielopoziomowy.\r\n- umie rozpozna\u0107, kt\u00f3re kana\u0142y komunikacji s\u0105 bardziej podatne na nadz\u00f3r od innych.\r\n- umie poda\u0107 przyk\u0142ady sytuacji, w kt\u00f3rych nadz\u00f3r jest uzasadniony, i takich, w kt\u00f3rych nie jest.", - "competence": 22, - "level": 8 - } - }, - { - "pk": 198, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie aktywnie przeciwdzia\u0142a\u0107 nadzorowi w sieci, \u015bwiadomie stosuj\u0105c wiele technik w tym celu.\r\n- umie z du\u017c\u0105 doz\u0105 pewno\u015bci okre\u015bli\u0107, kt\u00f3re kana\u0142y komunikacji s\u0105 najprawdopodobniej nadzorowane i w jakich celach.", - "competence": 22, - "level": 9 - } - }, - { - "pk": 165, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie dostrzec sytuacje, w kt\u00f3rych przekroczone zostaj\u0105 granice higieny korzystania z medi\u00f3w;\r\nnp. mama za du\u017co gra w gry, kolega za du\u017co rozmawia przez telefon.\r\n- wie, \u017ce relacje przez media maj\u0105 wp\u0142yw na relacje bezpo\u015brednie, a czynno\u015bci dokonywane przez media mog\u0105 mie\u0107 bardzo realne konsekwencje (np. p\u0142atno\u015bci).", - "competence": 19, - "level": 3 - } - }, - { - "pk": 166, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce pewne wzorce zachowa\u0144 mog\u0105 prowadzi\u0107 do uzale\u017cnienia.\r\n- umie zidentyfikowa\u0107 niebezpieczne wzorce i ich unika\u0107.\r\n- wie, czym jest stalking (n\u0119kanie).", - "competence": 19, - "level": 4 - } - }, - { - "pk": 167, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie \u015bwiadomie kszta\u0142towa\u0107 swoje nawyki zwi\u0105zane z korzystaniem z technologii.\r\n- umie zaobserwowa\u0107 oznaki uzale\u017cnienia u siebie i u innych.\r\n- umie przewidzie\u0107 konsekwencje dzia\u0142a\u0144 w sieci, kt\u00f3re mog\u0105 spowodowa\u0107 gro\u017ane sytuacje tak\u017ce poza ni\u0105;\r\nnp. nie podaje publicznie informacji o planowanej d\u0142u\u017cszej nieobecno\u015bci w domu na portalu spo\u0142eczno\u015bciowym, na kt\u00f3rym podany jest r\u00f3wnie\u017c adres zamieszkania.\r\n- umie rozpozna\u0107 stalking (n\u0119kanie) i wie, jak si\u0119 przed nim broni\u0107.\r\n- umie zarz\u0105dza\u0107 wizerunkiem on-line; \u015bwiadomie podejmuje decyzj\u0119, na ile wizerunek on-line odzwierciedla jego prawdziw\u0105 to\u017csamo\u015b\u0107;\r\nnp. nie publikuje danych umo\u017cliwiaj\u0105cych odkrycie jego to\u017csamo\u015bci.", - "competence": 19, - "level": 5 - } - }, - { - "pk": 168, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie zareagowa\u0107 na negatywne wzorce zachowa\u0144 u innych, np. szukaj\u0105c pomocy specjalisty.\r\n- dostrzega powi\u0105zania pomi\u0119dzy swoimi dzia\u0142aniami w mediach a innymi sferami \u017cycia, umie tymi powi\u0105zaniami zarz\u0105dza\u0107.", - "competence": 19, - "level": 6 - } - }, - { - "pk": 169, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce pewne wzorce zachowa\u0144 mog\u0105 prowadzi\u0107 do uzale\u017cnienia.\r\n- wie, \u017ce relacje przez media maj\u0105 wp\u0142yw na relacje bezpo\u015brednie a czynno\u015bci dokonywane przez media maj\u0105 bardzo realne konsekwencje (np. p\u0142atno\u015bci).\r\n- umie przewidzie\u0107 konsekwencje dzia\u0142a\u0144 w sieci, kt\u00f3re mog\u0105 spowodowa\u0107 gro\u017ane sytuacje tak\u017ce poza ni\u0105.\r\n- wie,", - "competence": 19, - "level": 7 - } - }, - { - "pk": 170, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie zidentyfikowa\u0107 niebezpieczne wzorce zachowa\u0144 i unika\u0107 sytuacji, kt\u00f3re do nich prowadz\u0105.\r\n- umie \u015bwiadomie kszta\u0142towa\u0107 swoje nawyki zwi\u0105zane z korzystaniem z technologii.\r\n- umie zaobserwowa\u0107 oznaki uzale\u017cnienia u siebie i u innych.\r\n- zna podstawowe narz\u0119dzia i metody obrony przed zagro\u017ceniami zwi\u0105zanymi z komunikacj\u0105 przez media.", - "competence": 19, - "level": 8 - } - }, - { - "pk": 171, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie zareagowa\u0107 na negatywne wzorce zachowa\u0144, np. szukaj\u0105c pomocy specjalisty.\r\n- umie zidentyfikowa\u0107 pr\u00f3by aktywnych atak\u00f3w w \u015brodowisku medialnym (phishing targetowany) i si\u0119 przed nimi obroni\u0107.", - "competence": 19, - "level": 9 - } - }, - { - "pk": 199, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, co znaczy da\u0107 komu\u015b s\u0142owo, um\u00f3wi\u0107 si\u0119 na co\u015b\r\nnp. gdy obieca mamie, \u017ce posprz\u0105ta zabawki w pokoju.", - "competence": 23, - "level": 1 - } - }, - { - "pk": 200, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, czym s\u0105 zwyczajowe normy komunikacyjne i umie je zastosowa\u0107 w typowych sytuacjach;\r\nnp. wie, kiedy m\u00f3wi si\u0119 dzie\u0144 dobry, dobry wiecz\u00f3r, dzi\u0119kuj\u0119, przepraszam\r\n- wie, \u017ce prawo obowi\u0105zuje tak\u017ce w komunikacji z innymi, a naruszenie go jest karane.", - "competence": 23, - "level": 2 - } - }, - { - "pk": 201, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie poj\u0119cia wolno\u015bci s\u0142owa, prawa do prywatno\u015bci , ochrony dobrego imienia.\r\n- umie wskaza\u0107 przyk\u0142ady swoich praw i obowi\u0105zk\u00f3w w sferze komunikacji.\r\nnp. prawo do tajemnicy korespondencji\r\n- rozumie poj\u0119cie umowy.\r\n- wie, \u017ce korzystanie z us\u0142ug komunikacyjnych wi\u0105\u017ce si\u0119 z zawarciem umowy.", - "competence": 23, - "level": 3 - } - }, - { - "pk": 202, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce przed naruszeniem praw komunikacyjnych mo\u017cna si\u0119 broni\u0107 w s\u0105dzie.\r\n- wie, \u017ce istniej\u0105 regulacje prawne dotycz\u0105ce komunikacji przez media (prawo telekomunikacyjne, prawo autorskie, prawo prasowe, ochrona danych osobowych itd.)\r\n- wie, \u017ce zbiorem norm zwyczajowych w komunikacji on-line jest netykieta.", - "competence": 23, - "level": 4 - } - }, - { - "pk": 203, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie \u015bwiadomie zawrze\u0107 umow\u0119 na us\u0142ugi komunikacyjne, umie wskaza\u0107 wynikaj\u0105ce z niej swoje prawa i obowi\u0105zki.\r\n- umie egzekwowa\u0107 swoje prawa.\r\n- umie zwr\u00f3ci\u0107 si\u0119 o pomoc do organ\u00f3w regulacyjnych i rzecznik\u00f3w r\u00f3\u017cnych grup;\r\nnp. w przypadku naruszenia ochrony danych osobowych lub naruszenia praw autorskich.\r\n\r\n- umie zapisy traktatowe, konstytucyjne i ustawowe prze\u0142o\u017cy\u0107 na w\u0142asne otoczenie i dzia\u0142ania.", - "competence": 23, - "level": 5 - } - }, - { - "pk": 204, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie zinterpretowa\u0107 normy prawne i zastosowa\u0107 je w ci\u0105gle zmieniaj\u0105cym si\u0119 \u015brodowisku technologicznym.", - "competence": 23, - "level": 6 - } - }, - { - "pk": 205, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, czym s\u0105 zwyczajowe normy komunikacyjne.\r\n- wie, \u017ce prawo obowi\u0105zuje tak\u017ce w komunikacji z innymi, a naruszenie go jest karane.\r\n- wie, \u017ce narusze\u0144 praw komunikacyjnych mo\u017ce dochodzi\u0107 w s\u0105dzie.\r\n- rozumie poj\u0119cia wolno\u015bci s\u0142owa, prawa do prywatno\u015bci (tajemnica korespondencji), ochrony dobrego imienia.\r\n- umie wskaza\u0107 przyk\u0142ady swoich praw i obowi\u0105zk\u00f3w w sferze komunikacji.\r\n- rozumie poj\u0119cie umowy.\r\n- wie, \u017ce korzystanie z us\u0142ug komunikacyjnych wi\u0105\u017ce si\u0119 z zawarciem umowy.\r\n- wie, \u017ce zbiorem norm zwyczajowych w komunikacji on-line jest netykieta.", - "competence": 23, - "level": 7 - } - }, - { - "pk": 206, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie zapisy traktatowe, konstytucyjne i ustawowe prze\u0142o\u017cy\u0107 na w\u0142asne otoczenie i dzia\u0142ania.\r\n- wie, \u017ce istniej\u0105 regulacje prawne dotycz\u0105ce komunikacji przez media (prawo telekomunikacyjne, prawo autorskie, prawo prasowe, ochrona danych osobowych itd.)", - "competence": 23, - "level": 8 - } - }, - { - "pk": 207, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie egzekwowa\u0107 swoje prawa.\r\n- umie zwr\u00f3ci\u0107 si\u0119 o pomoc do organ\u00f3w regulacyjnych i rzecznik\u00f3w r\u00f3\u017cnych grup.\r\n- umie zinterpretowa\u0107 normy prawne i zastosowa\u0107 je w ci\u0105gle zmieniaj\u0105cym si\u0119 \u015brodowisku technologicznym.", - "competence": 23, - "level": 9 - } - }, - { - "pk": 244, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce media \u0142\u0105cz\u0105 z lud\u017ami;\r\nnp. mo\u017ce zadzwoni\u0107 do babci.\r\n- wie, \u017ce nie nale\u017cy ura\u017ca\u0107 innych, zar\u00f3wno w kontakcie bezpo\u015brednim, jak i przez media.\r\n- umie powiadomi\u0107 rodzic\u00f3w lub opiekun\u00f3w, gdy korzystaj\u0105c z medi\u00f3w spotyka si\u0119 z nieprzyjemn\u0105 sytuacj\u0105.", - "competence": 28, - "level": 1 - } - }, - { - "pk": 245, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce ma prawo do anonimowo\u015bci, ale nie do bezkarno\u015bci;\r\nnp. mo\u017ce podpisa\u0107 rysunek pseudonimem i nie musi ujawnia\u0107 prawdziwego imienia.\r\n- umie sprzeciwi\u0107 si\u0119 naruszaniu norm komunikacyjnych.\r\n- wie, \u017ce ka\u017cdy ma prawo dost\u0119pu do wiedzy.", - "competence": 28, - "level": 2 - } - }, - { - "pk": 246, - "model": "curriculum.competencelevel", - "fields": { - "description": "- zna swoje prawa komunikacyjne jako dziecka, ucznia i obywatela\r\n(prawo do uczestnictwa w kulturze, wolno\u015b\u0107 s\u0142owa itd.) i wie, dlaczego s\u0105 wa\u017cne;\r\nnp. wie, \u017ce ma prawo czyta\u0107 ksi\u0105\u017cki, ma prawo komunikowa\u0107 si\u0119 z innymi.\r\n- umie dostrzec naruszenia praw, wolno\u015bci, r\u00f3wno\u015bci i prywatno\u015bci w mediach.\r\n- rozumie, \u017ce prawo ma chroni\u0107 u\u017cytkownik\u00f3w medi\u00f3w.", - "competence": 28, - "level": 3 - } - }, - { - "pk": 247, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie konkretnie prawa dziecka, cz\u0142owieka i obywatela dotycz\u0105 medi\u00f3w.\r\nnp. tejemnica korespondencji.\r\n- wie, \u017ce prawa komunikacyjne wymagaj\u0105 ochrony.\r\n- umie opisa\u0107 naruszenia praw i swob\u00f3d oraz reaguje na nie.", - "competence": 28, - "level": 4 - } - }, - { - "pk": 248, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie s\u0105 zadania regulator\u00f3w medi\u00f3w,\r\nrzecznik\u00f3w praw oraz s\u0105d\u00f3w krajowych i europejskich;\r\nnp. odr\u00f3\u017cnia rol\u0119, zadania i obszar dzia\u0142ania Europejskiego Trybuna\u0142u Sprawiedliwo\u015bci od Europejskiego Trybuna\u0142u Praw Cz\u0142owieka.\r\n- umie zwr\u00f3ci\u0107 si\u0119 o wsparcie urz\u0119du, rzecznika lub s\u0105du dla ochrony praw swoich i innych.\r\n- rozumie potrzeb\u0119 aktywnej obrony praw i swob\u00f3d komunikacyjnych.", - "competence": 28, - "level": 5 - } - }, - { - "pk": 249, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie u\u017cy\u0107 medi\u00f3w do publicznej obrony praw swoich i innych.", - "competence": 28, - "level": 6 - } - }, - { - "pk": 250, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce ma prawo do anonimowo\u015bci, ale nie do bezkarno\u015bci.\r\n- umie godnie si\u0119 zachowa\u0107 w sytuacjach komunikacyjnych.\r\n- rozumie, \u017ce ka\u017cdy ma prawo do nauki i dost\u0119pu do wiedzy.\r\n- zna swoje prawa komunikacyjne wynikaj\u0105ce z praw cz\u0142owieka i obywatela.", - "competence": 28, - "level": 7 - } - }, - { - "pk": 251, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie dostrzec naruszenia praw, wolno\u015bci, r\u00f3wno\u015bci i prywatno\u015bci w mediach i reaguje na nie.\r\n- rozumie rol\u0119 prawa do edukacji i do udzia\u0142u w kulturze.\r\n- wie, jakie konkretnie prawa cz\u0142owieka i obywatela dotycz\u0105 medi\u00f3w.", - "competence": 28, - "level": 8 - } - }, - { - "pk": 252, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie s\u0105 zadania regulator\u00f3w medi\u00f3w, rzecznik\u00f3w i s\u0105d\u00f3w krajowych i europejskich.\r\n- umie zwr\u00f3ci\u0107 si\u0119 o wsparcie urz\u0119du, rzecznika lub s\u0105du dla ochrony praw swoich i innych os\u00f3b.\r\n- umie u\u017cy\u0107 medi\u00f3w do publicznej obrony praw swoich i innych.\r\n- rozumie potrzeb\u0119 aktywnej obrony praw i swob\u00f3d.", - "competence": 28, - "level": 9 - } - }, - { - "pk": 235, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce ka\u017cde dzie\u0142o ma autora;\r\nnp. umie wskaza\u0107, \u017ce to rysunek Kasi, a ten wierszyk wymy\u015bli\u0142 Tomek.\r\n- wie, \u017ce nie powinno si\u0119 przypisywa\u0107 sobie cudzych dzie\u0142.", - "competence": 27, - "level": 1 - } - }, - { - "pk": 236, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce jest autorem i u\u017cytkownikiem informacji, np. kiedy rysuje czy ogl\u0105da bajki.\r\n- wie, \u017ce o publikacji decyduje autor, np. sam mo\u017ce zadecydowa\u0107 kiedy rysunek jest gotowy i kiedy pokaza\u0107 go kolegom.\r\n- wie, co to jest plagiat; np. umie wskaza\u0107, \u017ce ten wierszyk napisa\u0142 Tuwim, a nie kolega.\r\n- wie, czym jest cytat.\r\n- umie wskaza\u0107 cytat we w\u0142asnej i cudzej wypowiedzi.", - "competence": 27, - "level": 2 - } - }, - { - "pk": 237, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce s\u0105 r\u00f3\u017cne prawa wy\u0142\u0105czne: autorskie, patentowe, do znak\u00f3w towarowych.\r\n- wie, co to jest\r\ndozwolony u\u017cytek osobisty i publiczny: np. biblioteka, prawo do czytania, prawo do kopiowania informacji.\r\n- umie poprawnie cytowa\u0107 i oznacza\u0107 autorstwo\r\n- umie opisa\u0107 przyk\u0142ad dzie\u0142a zale\u017cnego:\r\nnp. t\u0142umaczenia.", - "competence": 27, - "level": 3 - } - }, - { - "pk": 238, - "model": "curriculum.competencelevel", - "fields": { - "description": "- potrafi rozr\u00f3\u017cni\u0107 r\u00f3\u017cne rodzaje praw wy\u0142\u0105cznych i umie wskaza\u0107, jakiego rodzaju prawo dotyczy danej sytuacji.\r\n- rozumie, \u017ce prawa wy\u0142\u0105czne ograniczaj\u0105 wolno\u015b\u0107 u\u017cytkownik\u00f3w.\r\n- wie, czym jest licencja.\r\n- rozumie i umie stosowa\u0107 prawa osobiste autora: prawo do oznaczenia autorstwa i zachowania integralno\u015bci dzie\u0142a.\r\n- wie, \u017ce prawa wy\u0142\u0105czne s\u0105 ograniczone w czasie.\r\n- wie, czym s\u0105 i czemu s\u0142u\u017c\u0105 wolne licencje.\r\n- wie, co to jest domena publiczna.\r\n- rozumie granice cytatu i dozwolonego u\u017cytku.", - "competence": 27, - "level": 4 - } - }, - { - "pk": 239, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie cele istnienia prawa autorskiego.\r\n- wie, \u017ce monopol tw\u00f3rczy jest kompromisem pomi\u0119dzy prawami u\u017cytkownika a prawami autora.\r\n- umie opisa\u0107, jak powstaj\u0105 r\u00f3\u017cne prawa wy\u0142\u0105czne i jak d\u0142ugo trwa ich ochrona;\r\nnp. wie, \u017ce dzie\u0142o uzyskuje ochron\u0119 w chwili ustalenia, a patent i znak towarowy trzeba rejestrowa\u0107.\r\n- wie, jakie s\u0105 cele organizacji zbiorowego zarz\u0105du prawami.\r\n- umie opisa\u0107 obszary stosowania monopolu autorskiego i patentowego;\r\nnp. wie, \u017ce prawo autorskie nie dotyczy dokument\u00f3w urz\u0119dowych, a ochrona patentowa odkry\u0107 naukowych, matematyki i program\u00f3w komputerowych.\r\n- umie opisa\u0107 konflikt mi\u0119dzy ochron\u0105 praw wy\u0142\u0105cznych a wolno\u015bci\u0105 dost\u0119pu do tre\u015bci.\r\n- umie stosowa\u0107 i rozumie cele wolnych licencji.\r\n- wie, czym jest copyleft.", - "competence": 27, - "level": 5 - } - }, - { - "pk": 240, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie ustali\u0107 status prawny dzie\u0142a lub rozwi\u0105zania technicznego.\r\n- rozumie konflikt mi\u0119dzy monopolem rozpowszechniania a modelem komunikowania si\u0119 w sieci.\r\n- rozumie przes\u0142anki i skutki wyboru licencji dla swoich dzie\u0142.\r\n- rozumie istot\u0119 sporu o patenty na programy, o obowi\u0105zki po\u015brednik\u00f3w oraz o prawa i wolno\u015bci prywatnego uczestnika obiegu kultury.\r\n- rozumie zasady ochrony patentowej i znak\u00f3w towarowych.\r\n- wie, czym jest ochrona baz danych.", - "competence": 27, - "level": 6 - } - }, - { - "pk": 241, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce o publikacji decyduje autor.\r\n- wie, co to jest plagiat.\r\n- wie, \u017ce s\u0105 r\u00f3\u017cne prawa wy\u0142\u0105czne: autorskie, patentowe, do znak\u00f3w towarowych.\r\n- umie poprawnie cytowa\u0107 i oznacza\u0107 autorstwo.", - "competence": 27, - "level": 7 - } - }, - { - "pk": 242, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, czym jest licencja.\r\n- rozumie i umie stosowa\u0107 prawa osobiste autora: prawo do oznaczenia autorstwa i zachowania integralno\u015bci dzie\u0142a.\r\n- wie, co to jest domena publiczna.\r\n- wie, co to jest dozwolony u\u017cytek osobisty i publiczny.\r\n- wie, \u017ce prawa wy\u0142\u0105czne s\u0105 ograniczone w czasie.\r\n- wie, co to s\u0105 dzie\u0142a zale\u017cne.\r\n- umie wskaza\u0107, jaki rodzaj prawa wy\u0142\u0105cznego dotyczy danej sytuacji.\r\n- umie opisa\u0107, jak powstaj\u0105 r\u00f3\u017cne prawa wy\u0142\u0105czne i jak d\u0142ugo trwa ich ochrona.\r\n- wie, czym s\u0105 i czemu s\u0142u\u017c\u0105 wolne licencje oraz zna ich rodzaje.\r\n- umie post\u0105pi\u0107 w typowych sytuacjach zwi\u0105zanych z publikacj\u0105 w\u0142asnej i cudzej tw\u00f3rczo\u015bci.\r\n- rozumie granice cytatu i dozwolonego u\u017cytku.\r\n- rozumie, \u017ce prawa wy\u0142\u0105czne ograniczaj\u0105 wolno\u015b\u0107 u\u017cytkownik\u00f3w.", - "competence": 27, - "level": 8 - } - }, - { - "pk": 243, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie cele istnienia prawa autorskiego.\r\n- wie, \u017ce monopol tw\u00f3rczy jest kompromisem pomi\u0119dzy prawami u\u017cytkownika a prawami autora.\r\n- wie, jakie s\u0105 cele organizacji zbiorowego zarz\u0105du prawami.\r\n- umie opisa\u0107 konflikt mi\u0119dzy ochron\u0105 praw wy\u0142\u0105cznych a wolno\u015bci\u0105 dost\u0119pu do tre\u015bci.\r\n- umie stosowa\u0107 i rozumie cele wolnych licencji.\r\n- wie, czym jest copyleft.\r\n- umie prawid\u0142owo ustali\u0107 status prawny dzie\u0142a lub rozwi\u0105zania technicznego.\r\n- rozumie konflikt mi\u0119dzy monopolem rozpowszechniania a modelem komunikowania si\u0119 w sieci.\r\n- rozumie przes\u0142anki i skutki wyboru licencji dla swoich dzie\u0142.\r\n- rozumie istot\u0119 sporu o patenty na programy, o obowi\u0105zki po\u015brednik\u00f3w oraz o prawa i wolno\u015bci prywatnego uczestnika obiegu kultury.\r\n- rozumie zasady ochrony patentowej i znak\u00f3w towarowych.\r\n- wie, czym jest ochrona baz danych.", - "competence": 27, - "level": 9 - } - }, - { - "pk": 254, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie zg\u0142osi\u0107 doros\u0142emu problem techniczny i poprosi\u0107 o wsparcie.", - "competence": 29, - "level": 2 - } - }, - { - "pk": 255, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie opisa\u0107 r\u00f3\u017cnice mi\u0119dzy rodzajami us\u0142ug telekomunikacyjnych.\r\n- umie poda\u0107 przyk\u0142ady p\u0142atnych us\u0142ug.\r\n- wie, \u017ce operatorzy maj\u0105 obowi\u0105zki i potrafi wskaza\u0107 ich przyk\u0142ady.\r\n- wie, \u017ce nie mo\u017ce samodzielnie zawiera\u0107 um\u00f3w;\r\nnp. zak\u0142ada\u0107 kont w serwisach internetowych.\r\n- umie poprosi\u0107 opiekun\u00f3w o pomoc przy zak\u0142adaniu konta w serwisach internetowych.", - "competence": 29, - "level": 3 - } - }, - { - "pk": 256, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie opisa\u0107 rol\u0119 i zadania us\u0142ugodawcy sieciowego.\r\n- umie poda\u0107 przyk\u0142ady wzajemnych zobowi\u0105za\u0144 wynikaj\u0105cych z um\u00f3w zawartych z dostawcami us\u0142ug; np. na jaki okres zawarta jest umowa, jak j\u0105 mo\u017cna rozwi\u0105za\u0107, jakie s\u0105 standardy us\u0142ugi.", - "competence": 29, - "level": 4 - } - }, - { - "pk": 257, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, co to jest us\u0142uga powszechna.\r\n- umie broni\u0107 swych praw, gdy operator odetnie go od us\u0142ugi lub danych;\r\nnp. skierowa\u0107 pismo do urz\u0119du.\r\n- umie oceni\u0107 i sprawdzi\u0107 jako\u015b\u0107 us\u0142ugi.\r\n- wie, \u017ce us\u0142ugi podlegaj\u0105 regulacji, umie wskaza\u0107 powo\u0142ane do tego urz\u0119dy;\r\nnp. rozr\u00f3\u017cnia zadania UKE, UOKiK, KRRiT i GIODO.", - "competence": 29, - "level": 5 - } - }, - { - "pk": 258, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie \u017c\u0105da\u0107 dostarczenia us\u0142ug powszechnych.\r\n- rozumie obowi\u0105zki po\u015brednika wynikaj\u0105ce z\r\npowiadomienia o naruszeniu regulaminu lub prawa.", - "competence": 29, - "level": 6 - } - }, - { - "pk": 259, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce operatorzy maj\u0105 obowi\u0105zki i potrafi wskaza\u0107 ich przyk\u0142ady.\r\n- umie poda\u0107 przyk\u0142ady wzajemnych zobowi\u0105za\u0144 wynikaj\u0105cych z um\u00f3w zawartych z dostawcami us\u0142ug.\r\n- wie, co to jest us\u0142uga powszechna.", - "competence": 29, - "level": 7 - } - }, - { - "pk": 260, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce us\u0142ugi podlegaj\u0105 regulacji, umie wskaza\u0107 powo\u0142ane do tego urz\u0119dy\r\n- umie broni\u0107 swych praw, gdy operator odetnie go od us\u0142ugi lub danych.\r\n- umie oceni\u0107 i sprawdzi\u0107 jako\u015b\u0107 us\u0142ugi.", - "competence": 29, - "level": 8 - } - }, - { - "pk": 261, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie \u017c\u0105da\u0107 dostarczenia us\u0142ug powszechnych.\r\n- rozumie obowi\u0105zki po\u015brednika wynikaj\u0105ce z powiadomienia o naruszeniu.", - "competence": 29, - "level": 9 - } - }, - { - "pk": 217, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce gazeta, audycja i portal maj\u0105 redakcj\u0119.\r\n- wie, \u017ce s\u0105 ksi\u0105\u017cki, gazety, audycje i aplikacje przeznaczone dla dzieci.", - "competence": 25, - "level": 1 - } - }, - { - "pk": 218, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce w mediach za tre\u015b\u0107 odpowiada redaktor.\r\n- umie rozpozna\u0107 oznaczenie programu dla dzieci i m\u0142odzie\u017cy.", - "competence": 25, - "level": 2 - } - }, - { - "pk": 219, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce gazety i portale s\u0105 prywatne, a radio i telewizja mog\u0105 by\u0107 prywatne lub publiczne.\r\n- wie o prawie do autoryzacji i sprostowania.\r\n- wie, \u017ce materia\u0142y reklamowe i sponsorowane musz\u0105 by\u0107 odpowiednio oznaczone.\r\n- umie rozpozna\u0107 reklam\u0119.", - "competence": 25, - "level": 3 - } - }, - { - "pk": 220, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce radio i telewizja s\u0105 regulowane\r\nprzez KRRiT.\r\n- umie opisa\u0107 zadania medi\u00f3w publicznych, ich misj\u0119 oraz spos\u00f3b finansowania;\r\nnp. abonament, reklamy, datki.\r\n- umie opisa\u0107 modele zarabiania pieni\u0119dzy przez media prywatne\r\nnp. reklamy, abonament, dost\u0119p na \u017c\u0105danie, datki.\r\n- umie rozpozna\u0107 lokowanie produktu.", - "competence": 25, - "level": 4 - } - }, - { - "pk": 221, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, czym jest licencja programowa i przydzia\u0142 pasma.\r\n- umie rozpozna\u0107 ukryt\u0105 reklam\u0119 i przes\u0142anie marketingowe.\r\n- umie skorzysta\u0107 z prawa do sprostowania.\r\n- umie rozr\u00f3\u017cni\u0107 tre\u015bci informacyjne,\r\npublicystyczne i rozrywkowe.", - "competence": 25, - "level": 5 - } - }, - { - "pk": 222, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie przygotowa\u0107 komunikat medialny i wie, kt\u00f3re medium mo\u017ce lub musi go zamie\u015bci\u0107.\r\n- umie rozpozna\u0107 naruszenie obowi\u0105zk\u00f3w wydawcy lub nadawcy.\r\n- umie sprawdzi\u0107 dane rejestracyjne medium.", - "competence": 25, - "level": 6 - } - }, - { - "pk": 223, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce w mediach za tre\u015b\u0107 odpowiada redaktor.\r\n- umie rozpozna\u0107 oznaczenie programu dla dzieci i m\u0142odzie\u017cy.\r\n- wie, \u017ce gazety i portale s\u0105 prywatne, a radio i telewizja mog\u0105 by\u0107 prywatne lub publiczne.", - "competence": 25, - "level": 7 - } - }, - { - "pk": 224, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce radio i telewizja s\u0105 regulowane przez KRRiT.\r\n- wie o prawie do autoryzacji i sprostowania.\r\n- wie, \u017ce materia\u0142y reklamowe i sponsorowane musz\u0105 by\u0107 odpowiednio oznaczone.\r\n- umie rozpozna\u0107 reklam\u0119 i lokowanie produktu.\r\n- umie opisa\u0107 zadania medi\u00f3w publicznych, ich misj\u0119 oraz spos\u00f3b finansowania.\r\n- umie opisa\u0107 modele zarabiania przez media prywatne.", - "competence": 25, - "level": 8 - } - }, - { - "pk": 225, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, czym jest licencja programowa i przydzia\u0142 pasma.\r\n- umie skorzysta\u0107 z prawa do sprostowania.\r\n- umie przygotowa\u0107 komunikat medialny i wie, kt\u00f3re medium mo\u017ce lub musi go zamie\u015bci\u0107.\r\n- umie rozpozna\u0107 naruszenie obowi\u0105zk\u00f3w wydawcy lub nadawcy.\r\n- umie sprawdzi\u0107 dane rejestracyjne medium.", - "competence": 25, - "level": 9 - } - }, - { - "pk": 208, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce ka\u017cdy ma prawo do korzystania z medi\u00f3w, bez wzgl\u0119du na stopie\u0144 sprawno\u015bci.\r\n- wie, \u017ce osoby niepe\u0142nosprawne maj\u0105 trudno\u015bci w korzystaniu z medi\u00f3w;\r\nnp. zdaje sobie spraw\u0119, \u017ce babcia musi nastawia\u0107 g\u0142o\u015bno telewizor, tata zak\u0142ada okulary do czytania gazety, a niewidomi nie mog\u0105 czyta\u0107 drukowanych ksi\u0105\u017cek.", - "competence": 24, - "level": 1 - } - }, - { - "pk": 209, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce niepe\u0142nosprawny ma r\u00f3wne prawo do wypowiedzi w mediach.\r\n- umie poda\u0107 przyk\u0142ady barier w dost\u0119pie do edukacji, informacji i kultury.\r\n- umie poda\u0107 przyk\u0142ad u\u0142atwie\u0144 dla niepe\u0142nosprawnych;\r\nnp. wie, \u017ce mo\u017cna powi\u0119kszy\u0107 litery, aby ka\u017cdy m\u00f3g\u0142 je przeczyta\u0107, do film\u00f3w mo\u017cna doda\u0107 napisy.", - "competence": 24, - "level": 2 - } - }, - { - "pk": 210, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie rozpozna\u0107 typowe bariery dost\u0119pno\u015bci w danym przekazie medialnym.\r\n- umie rozpozna\u0107 \u0142amanie praw s\u0142abszych w tre\u015bci przekazu.\r\n- umie dostrzec i opisa\u0107 bezpo\u015brednie bariery dost\u0119pno\u015bci; np. brak napis\u00f3w pod filmem.", - "competence": 24, - "level": 3 - } - }, - { - "pk": 211, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, co to jest konwencja o prawach os\u00f3b niepe\u0142nosprawnych.\r\n- umie dostrzec i opisa\u0107 po\u015brednie bariery dost\u0119pno\u015bci; np. zbyt ma\u0142e czcionki, nieprawid\u0142owy kontrast, chaotyczny uk\u0142ad informacji.\r\n- umie reagowa\u0107 na \u0142amanie praw.", - "competence": 24, - "level": 4 - } - }, - { - "pk": 212, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie o ustawowych udogodnieniach dla niepe\u0142nosprawnych, kt\u00f3re musz\u0105 stosowa\u0107 wydawcy i nadawcy;\r\nnp. audiodeskrypcja, j\u0119zyk migowy, napisy pod filmem.\r\n- wie o istnieniu standard\u00f3w dost\u0119pno\u015bci i obowi\u0105zku ich stosowania;\r\nnp. znane mu s\u0105 Wytyczne dotycz\u0105ce dost\u0119pno\u015bci tre\u015bci internetowych (WCAG).\r\n- wie, \u017ce informacja przedstawiona w spos\u00f3b uniwersalny dociera do wi\u0119kszej liczby odbiorc\u00f3w, a niestosowanie standard\u00f3w dost\u0119pno\u015bci \u00a0powoduje wykluczenie cz\u0119\u015bci obywateli, np. os\u00f3b starszych.", - "competence": 24, - "level": 5 - } - }, - { - "pk": 213, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie sprawdzi\u0107 spe\u0142nienie wymog\u00f3w dost\u0119pno\u015bci;\r\nnp. korzysta z narz\u0119dzi do samodzielnego badania dost\u0119pno\u015bci.\r\n- umie skutecznie reagowa\u0107 na naruszenia wymog\u00f3w dost\u0119pno\u015bci.", - "competence": 24, - "level": 6 - } - }, - { - "pk": 214, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce niepe\u0142nosprawny ma r\u00f3wne prawo do wypowiedzi w mediach.\r\n- umie poda\u0107 przyk\u0142ady barier w dost\u0119pie do edukacji, informacji i kultury.", - "competence": 24, - "level": 7 - } - }, - { - "pk": 215, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie o istnieniu standard\u00f3w dost\u0119pno\u015bci.\r\n- wie, co to jest konwencja o prawach os\u00f3b niepe\u0142nosprawnych.\r\n- umie rozpozna\u0107 \u0142amanie praw s\u0142abszych w tre\u015bci przekazu.\r\n- umie dostrzec i opisa\u0107 bezpo\u015brednie i po\u015brednie bariery dost\u0119pno\u015bci.\r\n- umie reagowa\u0107 na \u0142amanie praw.", - "competence": 24, - "level": 8 - } - }, - { - "pk": 216, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie o ustawowych udogodnieniach dla niepe\u0142nosprawnych, kt\u00f3re musz\u0105 stosowa\u0107 wydawcy i nadawcy.\r\n- umie sprawdzi\u0107 spe\u0142nienie wymog\u00f3w dost\u0119pno\u015bci.\r\n- umie skutecznie reagowa\u0107 na naruszenia.", - "competence": 24, - "level": 9 - } - }, - { - "pk": 226, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce nie nale\u017cy m\u00f3wi\u0107 i pisa\u0107 o sobie i o rodzinie bez potrzeby;\r\nnp. nie m\u00f3wi obcym osobom, gdzie mieszka lub jaki samoch\u00f3d maj\u0105 rodzice.", - "competence": 26, - "level": 1 - } - }, - { - "pk": 227, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie ide\u0119 ochrony prywatno\u015bci, ochrony danych osobowych i swoje prawa do takiej ochrony.", - "competence": 26, - "level": 2 - } - }, - { - "pk": 228, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce komunikacja elektroniczna wi\u0105\u017ce si\u0119 z gromadzeniem i przechowywaniem informacji o u\u017cytkownikach.\r\n- umie rozpozna\u0107 sytuacje wymuszania danych osobowych.\r\n- umie odm\u00f3wi\u0107 podania danych osobowych.\r\n- umie zak\u0142ada\u0107 konta, korzystaj\u0105c z pseudonim\u00f3w.", - "competence": 26, - "level": 3 - } - }, - { - "pk": 229, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie poda\u0107 przyk\u0142ady gromadzenia i przechowywania informacji o u\u017cytkownikach;\r\nnp. billingi, dane geolokalizacyjne, emaile, wiadomo\u015bci, wpisy na forach i w mediach spo\u0142eczno\u015bciowych.\r\n- umie w praktyce chroni\u0107 prywatno\u015b\u0107 swoj\u0105 i innych.\r\n- wie o istnieniu obowi\u0105zk\u00f3w informacyjnych administrator\u00f3w danych np. wie, \u017ce mo\u017ce uzyska\u0107 informacj\u0119 na temat swoich danych przechowywanych przez w\u0142a\u015bciciela serwisu internetowego.\r\n- wie, czego dotyczy ustawa o ochronie danych osobowych.\r\n- umie opisa\u0107 obowi\u0105zki dostawc\u00f3w us\u0142ug w zakresie ochrony danych osobowych.\r\n- umie opisa\u0107 problemy zwi\u0105zane z ochron\u0105 danych;\r\nnp. bazy danych, wycieki, \u0142\u0105czenie danych z r\u00f3\u017cnych zasob\u00f3w, dane wra\u017cliwe.", - "competence": 26, - "level": 4 - } - }, - { - "pk": 230, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, czym jest polityka prywatno\u015bci.\r\n- umie opisa\u0107 tre\u015b\u0107 ustawy o ochronie danych osobowych.\r\n- rozumie poj\u0119cia przetwarzania danych osobowych i administratora danych.\r\n- wie, co to s\u0105 dane wra\u017cliwe.\r\n- wie, co to jest GIODO i jakie s\u0105 jego zadania.", - "competence": 26, - "level": 5 - } - }, - { - "pk": 231, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie polityk\u0119 prywatno\u015bci firm, z kt\u00f3rych us\u0142ug korzysta.\r\n- umie stosowa\u0107 zasady ochrony we w\u0142asnych publikacjach i us\u0142ugach.\r\n- umie zwr\u00f3ci\u0107 si\u0119 do GIODO z pro\u015bb\u0105 o interwencj\u0119 lub interpretacj\u0119.\r\n- umie sprawdzi\u0107 w\u0142asne dane w zbiorach, w kt\u00f3rych s\u0105 zawarte.\r\n- umie zarejestrowa\u0107 zbi\u00f3r i sprawdzi\u0107, czy dany zbi\u00f3r jest zarejestrowany.", - "competence": 26, - "level": 6 - } - }, - { - "pk": 232, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie dba\u0107 o prywatno\u015b\u0107.\r\n- rozumie ide\u0119 ochrony danych osobowych i swoje prawa do takiej ochrony.\r\n- wie, \u017ce komunikacja elektroniczna wi\u0105\u017ce si\u0119 z gromadzeniem i przechowywaniem informacji o u\u017cytkownikach.\r\n- umie rozpozna\u0107 sytuacje wymuszania danych osobowych.\r\n- umie odm\u00f3wi\u0107 podania danych osobowych.", - "competence": 26, - "level": 7 - } - }, - { - "pk": 233, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, co to jest polityka prywatno\u015bci.\r\n- wie, co to s\u0105 dane wra\u017cliwe.\r\n- wie, co to jest GIODO.\r\n- wie o istnieniu obowi\u0105zk\u00f3w informacyjnych administrator\u00f3w danych.\r\n- wie, co to jest powierzenie przetwarzania danych.\r\n- wie, czego dotyczy ustawa o ochronie danych osobowych.\r\n- umie opisa\u0107 obowi\u0105zki dostawc\u00f3w us\u0142ug w zakresie ochrony danych osobowych.\r\n- umie opisa\u0107 problemy zwi\u0105zane z ochron\u0105 danych.\r\n- umie w praktyce chroni\u0107 prywatno\u015b\u0107 swoj\u0105 i innych.", - "competence": 26, - "level": 8 - } - }, - { - "pk": 234, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, jakie dane i jak d\u0142ugo gromadzi i przechowuje operator us\u0142ugi.\r\n- umie opisa\u0107 tre\u015b\u0107 ustawy o ochronie danych osobowych.\r\n- umie stosowa\u0107 zasady ochrony we w\u0142asnych publikacjach i us\u0142ugach.\r\n- umie zwr\u00f3ci\u0107 si\u0119 do GIODO z pro\u015bb\u0105 o interwencj\u0119 lub interpretacj\u0119.\r\n- umie sprawdzi\u0107 w\u0142asne dane w zbiorach, w kt\u00f3rych s\u0105 zawarte.\r\n- umie zarejestrowa\u0107 zbi\u00f3r i sprawdzi\u0107, czy dany zbi\u00f3r jest zarejestrowany.\r\n- rozumie polityk\u0119 prywatno\u015bci firm, z kt\u00f3rymi zawiera umowy.", - "competence": 26, - "level": 9 - } - }, - { - "pk": 262, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce s\u0105 r\u00f3\u017cne rodzaje medi\u00f3w i umie to pokaza\u0107 na przyk\u0142adach;\r\nnp. umie wymieni\u0107: pismo dla dzieci do czytania, audycja telewizyjna do ogl\u0105dania, audiobook do s\u0142uchania, gra w internecie do grania itp.\r\n- wie, \u017ce media maj\u0105 odbiorc\u00f3w / u\u017cytkownik\u00f3w.", - "competence": 30, - "level": 1 - } - }, - { - "pk": 263, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce media tworz\u0105 wraz z ich u\u017cytkownikami tzw. rynek medi\u00f3w.\r\n- umie nazwa\u0107 tradycyjne rodzaje medi\u00f3w: prasa, radio, telewizja.\r\n- wie i rozumie, \u017ce internet to medium innego rodzaju.", - "competence": 30, - "level": 2 - } - }, - { - "pk": 264, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce s\u0105 r\u00f3\u017cne typologie medi\u00f3w: np. media tradycyjne i tzw. nowe media, mass-media i media spo\u0142eczno\u015bciowe; prasa drukowana i media elektroniczne; media publiczne i media prywatne.\r\n- umie wskaza\u0107 podstawowe r\u00f3\u017cnice mi\u0119dzy tymi typami medi\u00f3w.\r\n- wie, \u017ce w obszarze medi\u00f3w dzia\u0142aj\u0105 przedsi\u0119biorstwa: kto\u015b tam pracuje i w ten spos\u00f3b zarabia na \u017cycie, kto\u015b tym zarz\u0105dza.\r\n- rozumie \u00a0zale\u017cno\u015b\u0107 mi\u0119dzy mediami i ich u\u017cytkownikami (relacja wymiany, uczestnictwa i wsp\u00f3\u0142tworzenia).", - "competence": 30, - "level": 3 - } - }, - { - "pk": 265, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce rynek medi\u00f3w tworz\u0105 nie tylko media i ich u\u017cytkownicy, ale te\u017c instytucje publiczne powo\u0142ane do nadzoru i kontroli rynku.\r\n- wie, \u017ce przedsi\u0119biorstwa medialne maj\u0105: w\u0142a\u015bciciela, organ zarz\u0105dczy i okre\u015blon\u0105 form\u0119 prawn\u0105; maj\u0105 te\u017c okre\u015blon\u0105 lini\u0119 redakcyjn\u0105.", - "competence": 30, - "level": 4 - } - }, - { - "pk": 266, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie rozr\u00f3\u017cni\u0107 media publiczne od medi\u00f3w prywatnych i wie, jakie s\u0105 podstawowe konsekwencje tego podzia\u0142u; np. obowi\u0105zek uzyskania koncesji lub jego brak, r\u00f3\u017cnice w formie finansowania.\r\n- wie, \u017ce na rynku medi\u00f3w wyst\u0119puje zjawisko konkurencji i koncentracji.\r\n- umie wskaza\u0107 r\u00f3\u017cnice mi\u0119dzy mediami tradycyjnymi a nowymi mediami w zakresie regulacji\r\n- rozumie, \u017ce bariery wej\u015bcia na rynek s\u0105 tak\u017ce tworzone przez regulatora, np. wie, \u017ce opr\u00f3cz wymog\u00f3w kapita\u0142owych potrzebne jest zdobycie koncesji lub rejestracja.", - "competence": 30, - "level": 5 - } - }, - { - "pk": 267, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, czym jest pluralizm medi\u00f3w i rozumie, dlaczego nale\u017cy chroni\u0107 konkurencj\u0119 na rynku medi\u00f3w.\r\n- wie o istnieniu nieformalnej ekonomii medi\u00f3w, b\u0119d\u0105cej w du\u017cej cz\u0119\u015bci lub w ca\u0142o\u015bci poza zasi\u0119giem polityki pa\u0144stwa, jego regulacji i opodatkowania.\r\n- umie poda\u0107 przyk\u0142ady nieformalnej ekonomii medi\u00f3w; np. sie\u0107 wymiany plik\u00f3w.\r\n- wie, czym jest konsolidacja i koncentracja w\u0142asno\u015bci medi\u00f3w; rozumie ich podstawowe przyczyny i umie dostrzec efekty \u00a0(cho\u0107 nie musi zna\u0107 ich nazewnictwa; np. efekt skali, zakresu, czy synergii.\r\n- umie rozr\u00f3\u017cni\u0107: koncentracj\u0119 pionow\u0105, (wydawca gazety kupuje / tworzy radio) \u00a0od koncentracji poziomej (radio kupuje inne radio); np. wie, \u017ce Eurozet, kt\u00f3ry w 2008 r. naby\u0142 Radio J\u00f3zef to przyk\u0142ad koncentracji poziomej, a sp\u00f3\u0142ka Agora, do kt\u00f3rej nale\u017c\u0105 gazety, radio, portale internetowe i platformy blogerskie \u2013 koncentracji pionowej.\r\n- rozumie funkcjonowanie \u0142a\u0144cucha warto\u015bci w mediach i wie, \u017ce \u017caden z element\u00f3w nie pe\u0142ni w nim nadrz\u0119dnej roli (r\u00f3\u017cne etapy procesu s\u0105 wobec siebie komplementarne i \u201ewzajemnie si\u0119 karmi\u0105\u201d).", - "competence": 30, - "level": 6 - } - }, - { - "pk": 268, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce istniej\u0105 r\u00f3\u017cne rodzaje medi\u00f3w (radio, TV, internet, prasa).\r\n- wie, czym jest abonament radiowo-telewizyjny.\r\n- umie odr\u00f3\u017cni\u0107 media publiczne od prywatnych.\r\n- wie, \u017ce rynek medi\u00f3w jest regulowany.", - "competence": 30, - "level": 7 - } - }, - { - "pk": 269, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce prywatna stacja radiowa lub telewizyjna musi ubiega\u0107 si\u0119 o koncesj\u0119 na nadawanie, a publiczne stacje nie maj\u0105 tego obowi\u0105zku.\r\n- wie, \u017ce na rynku wyst\u0119puje zjawisko konkurencji i koncentracji i umie wskaza\u0107 ich przyk\u0142ady.\r\n- wie, \u017ce rynek medialny sk\u0142ada si\u0119 z medi\u00f3w, ich u\u017cytkownik\u00f3w oraz z otoczenia regulacyjnego.\r\n- umie wskaza\u0107 regulator\u00f3w medi\u00f3w (obecnie: KRRiT, UKE) oraz cia\u0142a samoreguluj\u0105ce (samorz\u0105dy bran\u017cowe, komisje etyki).", - "competence": 30, - "level": 8 - } - }, - { - "pk": 270, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie konsekwencje konsolidacji i koncentracji medi\u00f3w.\r\n- rozumie r\u00f3\u017cnice mi\u0119dzy koncentracj\u0105 poziom\u0105 i pionow\u0105.\r\n- umie wskaza\u0107 bariery wej\u015bcia na rynek medi\u00f3w.", - "competence": 30, - "level": 9 - } - }, - { - "pk": 271, - "model": "curriculum.competencelevel", - "fields": { - "description": "- intuicyjnie wie, czym jest informacja;\r\nnp. wie, na jakim kanale znajdzie ulubion\u0105 bajk\u0119, albo \u017ce ta bajka jest nadawana o takiej, a nie o innej porze dnia.\r\n- umie dzieli\u0107 si\u0119 informacjami z innymi.", - "competence": 31, - "level": 1 - } - }, - { - "pk": 272, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce informacj\u0119 mo\u017cna przekaza\u0107 bezpo\u015brednio lub po\u015brednio. Tym drugim zajmuj\u0105 si\u0119 media (prasa, media elektroniczne).\r\n- wie, \u017ce w j\u0119zyku medi\u00f3w informacje to: wydarzenia / newsy / wiadomo\u015bci.\r\n- rozumie poj\u0119cie reklamy. Wie, \u017ce s\u0105 komunikaty perswazyjne i informacyjne.", - "competence": 31, - "level": 2 - } - }, - { - "pk": 273, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie, \u017ce informacja ma sw\u00f3j kontekst, kt\u00f3ry decyduje, czy mamy do czynienia z przekazem perswazyjnym, czy czysto informacyjnym.\r\n- umie rozr\u00f3\u017cni\u0107 reklam\u0119 od przekazu informacyjnego.\r\n- wie, \u017ce r\u00f3wnie\u017c reklama zawiera element informacyjny, ale jest on podporz\u0105dkowany celowi perswazyjnemu.", - "competence": 31, - "level": 3 - } - }, - { - "pk": 274, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce informacja to dobro.\r\n- wie, \u017ce nie ka\u017cdy ma do niej dost\u0119p.\r\n- zna poj\u0119cie asymetrii informacji.\r\n- wie, \u017ce w cyfrowym \u015bwiecie informacja nie tylko nie traci na znaczeniu, ale zyskuje, tyle, \u017ce zmienia si\u0119 jej ekonomika (maleje / zanika asymetria informacyjna).\r\n- wie, \u017ce tworzenie informacji, jak r\u00f3wnie\u017c jej przekazywanie, niesie za sob\u0105 koszty. Te koszty nie s\u0105 dostrzegane przez bezpo\u015brednich odbiorc\u00f3w (czytelnik\u00f3w, s\u0142uchaczy, widz\u00f3w), bo ponosz\u0105 je np. producenci.\r\n- wie, \u017ce koszt wytworzenia danego dobra nie jest r\u00f3wnoznaczny z jego warto\u015bci\u0105 ani cen\u0105.\r\n- wie o istnieniu ekonomii daru i umie rozpozna\u0107 jej elementy w relacjach dotycz\u0105cych medi\u00f3w.\r\n- wie, \u017ce jedn\u0105 z zasad biznesu w sieci jest ekonomia uwagi i umie pokaza\u0107 ten mechanizm; np. na przyk\u0142adzie historii wyszukiwania w Google.\r\n- wie, \u017ce istnieje prawo w\u0142asno\u015bci intelektualnej (w tym w szczeg\u00f3lno\u015bci prawo autorskie) i wie, \u017ce przestrzeganie jego zasad ma wp\u0142yw na ekonomiczn\u0105 warto\u015b\u0107 oraz dost\u0119pno\u015b\u0107 danego dobra.\r\n- rozumie, \u017ce cena jest warto\u015bci\u0105 umown\u0105 \u2013 sprzedawca proponuje cen\u0119, a nabywca j\u0105 akceptuje lub odrzuca.", - "competence": 31, - "level": 4 - } - }, - { - "pk": 275, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce mi\u0119dzy mediami tradycyjnymi a odbiorcami odbywa si\u0119 wymiana na poziomie ekonomicznym (w sieci \u2013 na poziomie ekonomii uwagi), cho\u0107 odbiorca nie p\u0142aci bezpo\u015brednio za informacj\u0119, co wynika ze sposobu finansowania tych medi\u00f3w.\r\n- wie, \u017ce obowi\u0105zuj\u0105ce przepisy dot. w\u0142asno\u015bci intelektualnej mog\u0105 wp\u0142ywa\u0107 na postrzeganie informacji i cen\u0119 danego dobra np. wie, \u017ce idea nie ma w\u0142a\u015bciciela, ale zapisana na kartce papieru przez autora automatycznie podlega ochronie prawnej.\r\n- rozumie ekonomiczne i prawne konsekwencje obowi\u0105zuj\u0105cych przepis\u00f3w dotycz\u0105cych w\u0142asno\u015bci intelektualnej;\r\nnp. rozumie ograniczenie mo\u017cliwo\u015bci korzystania z prywatnej kopii filmu na DVD \u2013 mo\u017cna go ogl\u0105da\u0107 samemu w domu, ale wy\u015bwietlanie w szkole kopii bez licencji na publiczne odtwarzanie grozi konsekwencjami prawnymi i ekonomicznymi.\r\n- wie, czym jest informacja publiczna.", - "competence": 31, - "level": 5 - } - }, - { - "pk": 276, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie przeanalizowa\u0107 wp\u0142yw ustawodawstwa na polityk\u0119 informacyjn\u0105 i medialn\u0105.", - "competence": 31, - "level": 6 - } - }, - { - "pk": 277, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie kontekst informacji (umie przetwarza\u0107 informacje otrzymane za po\u015brednictwem\r\n- umie odr\u00f3\u017cni\u0107 przekaz informacyjny od reklamowego.\r\n- wie, \u017ce informacja to dobro i \u017ce cz\u0119\u015bciej si\u0119 p\u0142aci za dost\u0119p ni\u017c za sam\u0105 informacj\u0119; np. op\u0142ata za korzystanie z program\u00f3w TV w sieci kablowej.", - "competence": 31, - "level": 7 - } - }, - { - "pk": 278, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, co oznacza poj\u0119cie \u201easymetria informacji\u201d i wie, \u017ce jej znaczenie maleje w \u015brodowisku cyfrowym.\r\n- wie, \u017ce koszt wytworzenia danego dobra nie jest r\u00f3wnoznaczny z jego cen\u0105 ani warto\u015bci\u0105; np. wie \u017ce minimalny koszt wyprodukowania telefonu kom\u00f3rkowego jest inny ni\u017c jego cena rynkowa, kt\u00f3ra ulega zmianom, m.in. w promocjach cenowych.\r\n- wie, \u017ce istnieje w\u0142asno\u015b\u0107 intelektualna (w tym prawo autorskie) i rozumie jej prawne oraz ekonomiczne konsekwencje.\r\n- umie poda\u0107 przyk\u0142ady ekonomii uwagi i ekonomii daru.", - "competence": 31, - "level": 8 - } - }, - { - "pk": 279, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie, na czym w \u015brodowisku cyfrowym polega zmiana ekonomicznego uj\u0119cia \u201einformacji jako dobra\u201d.\r\n- rozumie, na czym polega ekonomia uwagi i ekonomia daru.\r\n- rozumie ekonomiczne konsekwencje przepis\u00f3w dot. w\u0142asno\u015bci intelektualnej.\r\n- wie, czym jest informacja publiczna i jak uzyska\u0107 do niej dost\u0119p.", - "competence": 31, - "level": 9 - } - }, - { - "pk": 280, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce w mediach s\u0105 reklamy; np. umie wskaza\u0107 reklamy w ulubionym pi\u015bmie albo mi\u0119dzy \u00a0bajkami w telewizji.\r\n- wie, \u017ce za dost\u0119p do medi\u00f3w si\u0119 p\u0142aci np. kupowanie gazety w kiosku.\r\n- wie, \u017ce dobra mo\u017cna nabywa\u0107 w sklepie, ale te\u017c przez internet.", - "competence": 32, - "level": 1 - } - }, - { - "pk": 281, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce s\u0105 takie gry sieciowe, w kt\u00f3rych podstawowa us\u0142uga jest bezp\u0142atna, ale trzeba p\u0142aci\u0107 za dodatkowe funkcjonalno\u015bci.\r\n- wie, \u017ce jako nieletni nie mo\u017ce dokonywa\u0107 samodzielnie transakcji w internecie.\r\n- umie wskaza\u0107 r\u00f3\u017cne sposoby nabywania d\u00f3br; np. sklep w galerii handlowej, sklep internetowy, aukcja.\r\n- rozumie, \u017ce za dost\u0119p do medi\u00f3w si\u0119 p\u0142aci.", - "competence": 32, - "level": 2 - } - }, - { - "pk": 282, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce s\u0105 np. takie hostingi plik\u00f3w,czy takie gry sieciowe, w kt\u00f3rych podstawowa us\u0142uga jest bezp\u0142atna, ale trzeba p\u0142aci\u0107 za dodatkowe funkcjonalno\u015bci; wie, \u017ce w \u015bwietle prawa nie \u00a0mo\u017ce dokonywa\u0107 takich p\u0142atno\u015bci.\r\n- wie, \u017ce czasem informacja o podwy\u017cszonej p\u0142atno\u015bci za skorzystanie z jakiej\u015b us\u0142ugi nie jest do\u015b\u0107 wyeksponowana i trzeba umie\u0107 j\u0105 rozkodowa\u0107: np. koszt SMS-\u00f3w w g\u0142osowaniach telewizyjnych czy regu\u0142a dla telefonicznych numer\u00f3w specjalnych, gdzie cena zakodowana jest w pierwszych cyfrach danego numeru.\r\n- wie o istnieniu ukrytych p\u0142atno\u015bci w internecie; np. w serwisie Pobieraczek.\r\n- wie, \u017ce w mediach p\u0142aci si\u0119 za dost\u0119p, a nie za tre\u015b\u0107, st\u0105d potrzeba finansowania medi\u00f3w z innych \u017ar\u00f3de\u0142; np. w TVP reklamy nie przerywaj\u0105 audycji, ale jest abonament.\r\n\r\n- wie zatem, \u017ce reklama s\u0142u\u017cy r\u00f3wnie\u017c finansowaniu medi\u00f3w.\r\n- rozumie, dlaczego nie mo\u017ce samodzielnie dokonywa\u0107 transakcji w internecie.", - "competence": 32, - "level": 3 - } - }, - { - "pk": 283, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce media dziel\u0105 si\u0119 na prywatne i publiczne ze wzgl\u0119du na spos\u00f3b ich finansowania.\r\n- wie, czym jest i do czego s\u0142u\u017cy abonament radiowo-telewizyjny.\r\n- wie, \u017ce niekt\u00f3re blogi s\u0105 sponsorowane przez firmy i umie odr\u00f3\u017cni\u0107 zach\u0119t\u0119 do zakupu danego dobra od informacji o tym dobru.", - "competence": 32, - "level": 4 - } - }, - { - "pk": 284, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce serwisy, w kt\u00f3rych sprzedaje si\u0119 tre\u015bci, to wyj\u0105tek, a nie zasada finansowania medi\u00f3w; np. wie, \u017ce w internecie mo\u017cna kupi\u0107 uprzywilejowany dost\u0119p i czas \u00a0- \u00a0abonament dot. notowa\u0144 na gie\u0142dzie.\r\n- wie, na czym polegaj\u0105 podstawowe zasady handlu w sieci i p\u0142atno\u015bci on-line; np. wie, jak dzia\u0142aj\u0105 aukcje on-line.\r\n- biegle umie pos\u0142ugiwa\u0107 si\u0119 terminami dot. nast\u0119puj\u0105cych zagadnie\u0144 finansowania medi\u00f3w i rozumie ich znaczenie oraz powi\u0105zania: przychody z reklam, dotacje, abonament.\r\n- rozumie powi\u0105zanie malej\u0105cej asymetrii informacyjnej w \u015brodowisku cyfrowym z cen\u0105 na niekt\u00f3re produkty nabywane w sieci np. rozumie wp\u0142yw wyszukiwarek internetowych, por\u00f3wnywarek cenowych i internetowych platform handlowych na obni\u017ck\u0119 mar\u017c produkt\u00f3w nabywanych w sieci.", - "competence": 32, - "level": 5 - } - }, - { - "pk": 286, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, na czym polegaj\u0105 podstawowe zasady handlu w sieci i p\u0142atno\u015bci on-line; np. wie, jak dzia\u0142aj\u0105 aukcje internetowe.\r\n- wie, \u017ce s\u0105 takie us\u0142ugi w internecie, gdzie podstawowa us\u0142uga jest bezp\u0142atna, ale trzeba p\u0142aci\u0107 za dodatkowe funkcjonalno\u015bci.\r\n- wie, \u017ce czasem us\u0142uga o podwy\u017cszonej p\u0142atno\u015bci nie jest do\u015b\u0107 wyeksponowana i trzeba umie\u0107 j\u0105 rozkodowa\u0107; np. koszt SMS-\u00f3w w g\u0142osowaniach telewizyjnych lub regu\u0142a telefonicznych numer\u00f3w specjalnych, w kt\u00f3rych cena jest zakodowana w pierwszych cyfrach danego numeru.\r\n- wie, \u017ce w mediach p\u0142aci si\u0119 za dost\u0119p, a nie za tre\u015b\u0107, st\u0105d potrzeba finansowania medi\u00f3w z innych \u017ar\u00f3de\u0142, takich jak reklama czy abonament rtv.\r\n- wie, \u017ce media dziel\u0105 si\u0119 na publiczne i prywatne ze wzgl\u0119du na spos\u00f3b finansowania.", - "competence": 32, - "level": 7 - } - }, - { - "pk": 287, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, czym jest i do czego s\u0142u\u017cy abonament rtv.\r\n- wie, \u017ce niekt\u00f3re blogi s\u0105 sponsorowane przez firmy i umie odr\u00f3\u017cni\u0107 zach\u0119t\u0119 do zakupu danego dobra od informacji o nim.\r\n- wie o ukrytych p\u0142atno\u015bciach w internecie.\r\n- umie dokonywa\u0107 bezpiecznych i skutecznych transakcji internetowych oraz rozumie zasady handlu w sieci i p\u0142atno\u015bci on-line.", - "competence": 32, - "level": 8 - } - }, - { - "pk": 288, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie wskaza\u0107 \u017ar\u00f3d\u0142a presji politycznej i ekonomicznej wywieranej na media ze wzgl\u0119du na model finansowania.\r\n- rozumie, \u017ce serwisy, w kt\u00f3rych sprzedaje si\u0119 tre\u015bci, to wyj\u0105tek, a nie zasada finansowania medi\u00f3w; np. internecie mo\u017cna sprzedawa\u0107 uprzywilejowany dost\u0119p i czas", - "competence": 32, - "level": 9 - } - }, - { - "pk": 291, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce polityka medialna to og\u00f3\u0142 dzia\u0142a\u0144 zwi\u0105zanych z funkcjonowaniem medi\u00f3w (ich regulacj\u0105, nadzorem i kontrol\u0105) i umie wskaza\u0107 elementy tej polityki; np. umie wskaza\u0107 przyk\u0142ady regulacji rynku.", - "competence": 33, - "level": 3 - } - }, - { - "pk": 292, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie poda\u0107 przyk\u0142ady / elementy polityki medialnej.\r\n- umie wyja\u015bni\u0107 r\u00f3\u017cnice mi\u0119dzy mediami publicznymi a prywatnymi w zakresie kontroli i regulacji (struktura w\u0142a\u015bcicielska).", - "competence": 33, - "level": 4 - } - }, - { - "pk": 293, - "model": "curriculum.competencelevel", - "fields": { - "description": "- umie wyja\u015bni\u0107 poj\u0119cie polityki medialnej oraz wymieni\u0107 jej wybrane cele i narz\u0119dzia; np. \u00a0 prawo medialne i telekomunikacyjne, regulacja i otoczenie instytucjonalne.", - "competence": 33, - "level": 5 - } - }, - { - "pk": 294, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie o istnieniu mi\u0119dzynarodowego wymiaru polityki medialnej; zna rol\u0119 organizacji mi\u0119dzynarodowych: UE, ITU, WTO, OECD.\r\n- umie wskaza\u0107 \u017ar\u00f3d\u0142a presji politycznej i ekonomicznej wywieranej na media ze wzgl\u0119du na model finansowania.\r\n- rozumie wp\u0142yw polityki medialnej na zjawiska natury ekonomicznej zachodz\u0105ce w mediach; np. tworzenie barier wej\u015bcia na rynek, koncentracja, finansowanie medi\u00f3w.", - "competence": 33, - "level": 6 - } - }, - { - "pk": 295, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie, \u017ce rynek medi\u00f3w podlega nadzorowi i kontroli.", - "competence": 33, - "level": 7 - } - }, - { - "pk": 296, - "model": "curriculum.competencelevel", - "fields": { - "description": "- wie o istnieniu nieformalnych system\u00f3w medialnych, b\u0119d\u0105cych w du\u017cej cz\u0119\u015bci lub w ca\u0142o\u015bci s\u0105 poza zasi\u0119giem polityki pa\u0144stwa.\r\n- wie o istnieniu mi\u0119dzynarodowego wymiaru polityki medialnej i umie poda\u0107 przyk\u0142ady organizacji mi\u0119dzynarodowych maj\u0105cych wp\u0142yw na ten wymiar.\r\n- umie rozpozna\u0107 elementy polityki medialnej.", - "competence": 33, - "level": 8 - } - }, - { - "pk": 297, - "model": "curriculum.competencelevel", - "fields": { - "description": "- rozumie podstawowe funkcje, cele i narz\u0119dzia polityki medialnej.\r\n- umie poda\u0107 przyk\u0142ady wp\u0142ywu polityki medialnej na funkcjonowanie medi\u00f3w (spos\u00f3b ich finansowania, tworzenie nowych medi\u00f3w).", - "competence": 33, - "level": 9 - } - } -] diff --git a/curriculum/fixtures/curriculum.json b/curriculum/fixtures/curriculum.json deleted file mode 100644 index dc62f07..0000000 --- a/curriculum/fixtures/curriculum.json +++ /dev/null @@ -1,567 +0,0 @@ -[ - { - "pk": 1, - "model": "curriculum.curriculumlevel", - "fields": { - "title": "III" - } - }, - { - "pk": 2, - "model": "curriculum.curriculumlevel", - "fields": { - "title": "IV" - } - }, - { - "pk": 1, - "model": "curriculum.curriculumcourse", - "fields": { - "accusative": "j\u0119zyk polski", - "slug": "polski", - "title": "J\u0119zyk polski" - } - }, - { - "pk": 2, - "model": "curriculum.curriculumcourse", - "fields": { - "accusative": "plastyk\u0119", - "slug": "plastyka", - "title": "Plastyka" - } - }, - { - "pk": 3, - "model": "curriculum.curriculumcourse", - "fields": { - "accusative": "wiedz\u0119 o spo\u0142ecze\u0144stwie", - "slug": "wos", - "title": "Wiedza o spo\u0142ecze\u0144stwie" - } - }, - { - "pk": 4, - "model": "curriculum.curriculumcourse", - "fields": { - "accusative": "informatyk\u0119", - "slug": "informatyka", - "title": "Informatyka" - } - }, - { - "pk": 5, - "model": "curriculum.curriculumcourse", - "fields": { - "accusative": "etyk\u0119", - "slug": "etyka", - "title": "Etyka" - } - }, - { - "pk": 1, - "model": "curriculum.curriculum", - "fields": { - "course": 1, - "level": 1, - "identifier": "2012/III/POLSKI/c1", - "type": "c", - "title": "I. Odbi\u00f3r wypowiedzi i wykorzystanie zawartych w nich informacji." - } - }, - { - "pk": 2, - "model": "curriculum.curriculum", - "fields": { - "course": 1, - "level": 1, - "identifier": "2012/III/POLSKI/c2", - "type": "c", - "title": "II. Analiza i interpretacja tekst\u00f3w kultury." - } - }, - { - "pk": 3, - "model": "curriculum.curriculum", - "fields": { - "course": 1, - "level": 1, - "identifier": "2012/III/POLSKI/c3", - "type": "c", - "title": "III. Tworzenie wypowiedzi." - } - }, - { - "pk": 4, - "model": "curriculum.curriculum", - "fields": { - "course": 2, - "level": 1, - "identifier": "2012/III/PLASTYKA/c1", - "type": "c", - "title": "I. Odbi\u00f3r wypowiedzi i wykorzystanie zawartych w nich informacji \u2013 percepcja sztuki." - } - }, - { - "pk": 5, - "model": "curriculum.curriculum", - "fields": { - "course": 2, - "level": 1, - "identifier": "2012/III/PLASTYKA/c2", - "type": "c", - "title": "II. Tworzenie wypowiedzi \u2013 ekspresja przez sztuk\u0119." - } - }, - { - "pk": 6, - "model": "curriculum.curriculum", - "fields": { - "course": 2, - "level": 1, - "identifier": "2012/III/PLASTYKA/c3", - "type": "c", - "title": "III. Analiza i interpretacja tekst\u00f3w kultury \u2013 recepcja sztuki." - } - }, - { - "pk": 7, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 1, - "identifier": "2012/III/WOS/c1", - "type": "c", - "title": "I. Wykorzystanie i tworzenie informacji." - } - }, - { - "pk": 8, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 1, - "identifier": "2012/III/WOS/c2", - "type": "c", - "title": "II. Rozpoznawanie i rozwi\u0105zywanie problem\u00f3w." - } - }, - { - "pk": 9, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 1, - "identifier": "2012/III/WOS/c3", - "type": "c", - "title": "III. Wsp\u00f3\u0142dzia\u0142anie w sprawach publicznych." - } - }, - { - "pk": 10, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 1, - "identifier": "2012/III/WOS/c4", - "type": "c", - "title": "IV. Znajomo\u015b\u0107 zasad i procedur demokracji." - } - }, - { - "pk": 11, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 1, - "identifier": "2012/III/WOS/c5", - "type": "c", - "title": "V. Znajomo\u015b\u0107 podstaw ustroju Rzeczypospolitej Polskiej." - } - }, - { - "pk": 12, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 1, - "identifier": "2012/III/WOS/t1", - "type": "t", - "title": "Podstawowe umiej\u0119tno\u015bci \u017cycia w grupie." - } - }, - { - "pk": 13, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 1, - "identifier": "2012/III/WOS/t2", - "type": "t", - "title": "\u017bycie spo\u0142eczne" - } - }, - { - "pk": 14, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 1, - "identifier": "2012/III/WOS/t3", - "type": "t", - "title": "Wsp\u00f3\u0142czesne spo\u0142ecze\u0144stwo polskie." - } - }, - { - "pk": 15, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 1, - "identifier": "2012/III/WOS/t4", - "type": "t", - "title": "By\u0107 obywatelem." - } - }, - { - "pk": 16, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 1, - "identifier": "2012/III/WOS/t5", - "type": "t", - "title": "Udzia\u0142 obywateli w \u017cyciu publicznym" - } - }, - { - "pk": 17, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 1, - "identifier": "2012/III/WOS/t6", - "type": "t", - "title": "\u015arodki masowego przekazu." - } - }, - { - "pk": 18, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 1, - "identifier": "2012/III/WOS/t9", - "type": "t", - "title": "Patriotyzm dzisiaj." - } - }, - { - "pk": 19, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 1, - "identifier": "2012/III/WOS/t10", - "type": "t", - "title": "Pa\u0144stwo i w\u0142adza demokratyczna." - } - }, - { - "pk": 20, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 1, - "identifier": "2012/III/WOS/t11", - "type": "t", - "title": "Rzeczpospolita Polska jako demokracja konstytucyjna." - } - }, - { - "pk": 21, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 1, - "identifier": "2012/III/WOS/t24", - "type": "t", - "title": "Praca i przedsi\u0119biorczo\u015b\u0107." - } - }, - { - "pk": 22, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 1, - "identifier": "2012/III/WOS/t25", - "type": "t", - "title": "Gospodarka rynkowa." - } - }, - { - "pk": 23, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 1, - "identifier": "2012/III/WOS/t26", - "type": "t", - "title": "Gospodarstwo domowe." - } - }, - { - "pk": 24, - "model": "curriculum.curriculum", - "fields": { - "course": 4, - "level": 1, - "identifier": "2012/III/INFORMATYKA/c1", - "type": "c", - "title": "I. Bezpieczne pos\u0142ugiwanie si\u0119 komputerem i jego oprogramowaniem, wykorzystanie sieci komputerowej; komunikowanie si\u0119 za pomoc\u0105 komputera i technologii informacyjno-komunikacyjnych." - } - }, - { - "pk": 25, - "model": "curriculum.curriculum", - "fields": { - "course": 4, - "level": 1, - "identifier": "2012/III/INFORMATYKA/c2", - "type": "c", - "title": "II. Wyszukiwanie, gromadzenie i przetwarzanie informacji z r\u00f3\u017cnych \u017ar\u00f3de\u0142; opracowywanie za pomoc\u0105 komputera: rysunk\u00f3w, tekst\u00f3w, danych liczbowych, motyw\u00f3w, animacji, prezentacji multimedialnych." - } - }, - { - "pk": 26, - "model": "curriculum.curriculum", - "fields": { - "course": 4, - "level": 1, - "identifier": "2012/III/INFORMATYKA/c5", - "type": "c", - "title": "V. Ocena zagro\u017ce\u0144 i ogranicze\u0144, docenianie spo\u0142ecznych aspekt\u00f3w rozwoju i zastosowa\u0144 informatyki." - } - }, - { - "pk": 27, - "model": "curriculum.curriculum", - "fields": { - "course": 5, - "level": 1, - "identifier": "2012/III/ETYKA/c1", - "type": "c", - "title": "I. Kszta\u0142towanie refleksyjnej postawy wobec cz\u0142owieka, jego natury, powinno\u015bci moralnych oraz wobec r\u00f3\u017cnych sytuacji \u017cyciowych." - } - }, - { - "pk": 28, - "model": "curriculum.curriculum", - "fields": { - "course": 5, - "level": 1, - "identifier": "2012/III/ETYKA/c4", - "type": "c", - "title": "IV. Podj\u0119cie odpowiedzialno\u015bci za siebie i innych oraz za dokonywane wybory moralne; rozstrzyganie w\u0105tpliwo\u015bci i problem\u00f3w moralnych zgodnie z przyj\u0119t\u0105 hierarchi\u0105 warto\u015bci i dobrem wsp\u00f3lnym." - } - }, - { - "pk": 29, - "model": "curriculum.curriculum", - "fields": { - "course": 5, - "level": 1, - "identifier": "2012/III/ETYKA/t1", - "type": "t", - "title": "Cz\u0142owiek jako osoba; natura i godno\u015b\u0107 cz\u0142owieka." - } - }, - { - "pk": 30, - "model": "curriculum.curriculum", - "fields": { - "course": 5, - "level": 1, - "identifier": "2012/III/ETYKA/t5", - "type": "t", - "title": "Cz\u0142owiek wobec warto\u015bci; cz\u0142owiek wobec cierpienia i \u015bmierci." - } - }, - { - "pk": 31, - "model": "curriculum.curriculum", - "fields": { - "course": 5, - "level": 1, - "identifier": "2012/III/ETYKA/t9", - "type": "t", - "title": "Normy i warto\u015bci demokratyczne le\u017c\u0105ce u podstaw aktywno\u015bci spo\u0142ecznej na poziomie ma\u0142ej grupy, szko\u0142y, spo\u0142eczno\u015bci lokalnej." - } - }, - { - "pk": 32, - "model": "curriculum.curriculum", - "fields": { - "course": 5, - "level": 1, - "identifier": "2012/III/ETYKA/t11", - "type": "t", - "title": "Praca i jej warto\u015b\u0107 dla cz\u0142owieka, znaczenie etyki zawodowej." - } - }, - { - "pk": 33, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 2, - "identifier": "2012/IV/WOS/c4", - "type": "c", - "title": "IV. Znajomo\u015b\u0107 zasad i procedur demokracji." - } - }, - { - "pk": 34, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 2, - "identifier": "2012/IV/WOS/c6", - "type": "c", - "title": "VI. Znajomo\u015b\u0107 praw cz\u0142owieka i sposob\u00f3w ich ochrony." - } - }, - { - "pk": 35, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 2, - "identifier": "2012/IV/WOS/t1", - "type": "t", - "title": "M\u0142ody obywatel w urz\u0119dzie." - } - }, - { - "pk": 36, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 2, - "identifier": "2012/IV/WOS/t2", - "type": "t", - "title": "Prawo i s\u0105dy." - } - }, - { - "pk": 37, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 2, - "identifier": "2012/IV/WOS/t5", - "type": "t", - "title": "Prawa cz\u0142owieka." - } - }, - { - "pk": 38, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 2, - "identifier": "2012/IV/WOS/t6", - "type": "t", - "title": "Ochrona praw i wolno\u015bci." - } - }, - { - "pk": 39, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 2, - "identifier": "2012/IV/WOS/t10/roz", - "type": "t", - "title": "Edukacja w XXI w. (zakres rozszerzony)" - } - }, - { - "pk": 40, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 2, - "identifier": "2012/IV/WOS/t14/roz", - "type": "t", - "title": "\u015arodki masowego przekazu. (zakres rozszerzony)" - } - }, - { - "pk": 41, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 2, - "identifier": "2012/IV/WOS/t15/roz", - "type": "t", - "title": "Demokracja \u2013 zasady i procedury. (zakres rozszerzony)" - } - }, - { - "pk": 42, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 2, - "identifier": "2012/IV/WOS/t27/roz", - "type": "t", - "title": "Organy kontroli pa\u0144stwowej, ochrony prawa i zaufania publicznego. (zakres rozszerzony)" - } - }, - { - "pk": 43, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 2, - "identifier": "2012/IV/WOS/t32/roz", - "type": "t", - "title": "Prawo cywilne i rodzinne. (zakres rozszerzony)" - } - }, - { - "pk": 44, - "model": "curriculum.curriculum", - "fields": { - "course": 3, - "level": 2, - "identifier": "2012/IV/WOS/t36/roz", - "type": "t", - "title": "Obywatel wobec prawa. (zakres rozszerzony)" - } - }, - { - "pk": 45, - "model": "curriculum.curriculum", - "fields": { - "course": 4, - "level": 2, - "identifier": "2012/IV/INFORMATYKA/c1", - "type": "c", - "title": "I. Bezpieczne pos\u0142ugiwanie si\u0119 komputerem i jego oprogramowaniem, wykorzystanie sieci komputerowej; komunikowanie si\u0119 za pomoc\u0105 komputera i technologii informacyjno-komunikacyjnych." - } - }, - { - "pk": 46, - "model": "curriculum.curriculum", - "fields": { - "course": 4, - "level": 2, - "identifier": "2012/IV/INFORMATYKA/c5", - "type": "c", - "title": "V. Ocena zagro\u017ce\u0144 i ogranicze\u0144, docenianie spo\u0142ecznych aspekt\u00f3w rozwoju i zastosowa\u0144 informatyki." - } - } -] diff --git a/curriculum/locale/pl/LC_MESSAGES/django.mo b/curriculum/locale/pl/LC_MESSAGES/django.mo deleted file mode 100644 index 16f5b9551866ab78a8e1215cc86fd7abea102c56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2152 zcmaKr-EJH;6vs_z`BxHm!k*su8e1pFQR82ksMc#gt3`8fg7 zyaB!oPJ<`GHIVc<_!0OsNPZuIAA*ld`@bMUV#g39#W4m_e&ZmP*ykYSH&b#Br1KU* ziti>!x^F>xLfT7ux=UPP(T?K(<#J4KL+x#J+J|jL9uxz`H-=94@*ev8=+sW27jFU5 zck>!LHF`J7`Bj?iYZM#B$u1e)x03t1m&jDczLJ*B4ktPHMJhvW$l4Av%#@CKByY=z zEy_TNPq~WMwdw6Fh&bSZ3RNm19;s9s;lsty8=R0o5$Q0KY(+-WPi3%Yovm!>KD((i z-pg#tZK2^J#gPJY9akdF`MS|Po^D8-Wz+hzx5>TH*V%4ZvNFU8Wp<-wTUoce0$4L+ zl%GXe4=H5E!q0xo9ue-NSC!Cwk6`CoD^3c7Wr4K5Q3+i=+f9RRxOj%AESAYT30{JQ zMrR3&MNcwq0%@4Vg_Dz#mMt0Gfz6o@oEy?utTp-4%wZ6*;f! z+=k;qH_`OYpLIRx7VyB%su8h`M5;}bFN;8S`RqV+x`Iy`5ooOR>waOl80)_F2hzqO z(UI+nx;9}wiKgKv4l@x-XH|+`lP}C%ox4u?Of4*2j15F(bl~{ba;1IXdTI}4C}UHRcuKQ6iNo4Oc#~eiF49XJyun`M}-~5xxcYn z-G$iS;EMY>s;-YUwwB*Q=CZO?;()H$enj7u9c=x?`y|=AUzPAdQLTCXDN(XNxH=nU zB&uT`3%;XPvSQye9%%$(O>j*?PwABRu`{r#=qt$+qeCNlx-UB;MSieE4|2aFp0Qpy zMr=dBf|W@fcxsXJ!AI&u*`bfhtL=ErM-M5P(SyF){sBdwB?3i1=+l)&vJ>m=hgLq`w}_(AMf5r`2YX_ diff --git a/curriculum/locale/pl/LC_MESSAGES/django.po b/curriculum/locale/pl/LC_MESSAGES/django.po deleted file mode 100644 index 04048df..0000000 --- a/curriculum/locale/pl/LC_MESSAGES/django.po +++ /dev/null @@ -1,131 +0,0 @@ -# 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: 2013-10-18 14:01+0200\n" -"PO-Revision-Date: 2013-02-08 13:16+0100\n" -"Last-Translator: Radek Czajka \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=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2)\n" - -#: models.py:9 models.py:33 models.py:68 -msgid "slug" -msgstr "" - -#: models.py:10 models.py:34 models.py:69 -msgid "order" -msgstr "kolejność" - -#: models.py:14 -msgid "section" -msgstr "dział" - -#: models.py:15 -msgid "sections" -msgstr "działy" - -#: models.py:27 models.py:63 models.py:80 -msgid "name" -msgstr "nazwa" - -#: models.py:38 -msgid "competence" -msgstr "kompetencja" - -#: models.py:39 -msgid "competences" -msgstr "kompetencje" - -#: models.py:73 -msgid "educational level" -msgstr "poziom edukacyjny" - -#: models.py:74 -msgid "educational levels" -msgstr "poziomy edukacyjne" - -#: models.py:81 -msgid "group" -msgstr "grupa" - -#: models.py:91 -msgid "competence on level" -msgstr "kompetencja na poziomie" - -#: models.py:92 -msgid "competences on levels" -msgstr "kompetencje na poziomach" - -#: models.py:101 -msgid "description" -msgstr "opis" - -#: models.py:109 -msgid "curriculum level" -msgstr "poziom w podstawie programowej" - -#: models.py:110 -msgid "curriculum levels" -msgstr "poziomy w podstawie programowej" - -#: models.py:122 -msgid "curriculum course" -msgstr "przedmiot w podstawie programowej" - -#: models.py:123 -msgid "curriculum courses" -msgstr "przedmioty w podstawie programowej" - -#: models.py:141 -msgid "curriculum item" -msgstr "pozycja w podstawie programowej" - -#: models.py:142 -msgid "curriculum items" -msgstr "podstawa programowa" - -#: views.py:51 -msgid "You must select at least one competency from the list." -msgstr "Proszę wybrać kompetencje z listy." - -#: views.py:53 -msgid "You must select at least one education level." -msgstr "Proszę wybrać poziom edukacyjny." - -#: templates/curriculum/competence_list.html:8 -msgid "Media, information and digital literacy competencies catalogue" -msgstr "Katalog kompetencji medialnych, informacyjnych i cyfrowych" - -#: templates/curriculum/competence_list.html:15 -msgid "Browse competencies" -msgstr "Przeglądaj kompetencje" - -#: templates/curriculum/competence_list.html:15 -msgid "expand" -msgstr "rozwiń" - -#: templates/curriculum/competence_list.html:18 -msgid "Education level" -msgstr "Poziom edukacyjny" - -#: templates/curriculum/competence_list.html:31 -msgid "Competency categories" -msgstr "Kategorie kompetencji" - -#: templates/curriculum/competence_list.html:49 -msgid "Show" -msgstr "Pokaż" - -#: templates/curriculum/competence_list.html:55 -msgid "Selected competencies" -msgstr "Wybrane kompetencje" diff --git a/curriculum/migrations/0001_initial.py b/curriculum/migrations/0001_initial.py deleted file mode 100644 index 6ac7f4f..0000000 --- a/curriculum/migrations/0001_initial.py +++ /dev/null @@ -1,95 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding model 'Section' - db.create_table('curriculum_section', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('name', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('slug', self.gf('django.db.models.fields.SlugField')(max_length=50)), - ('order', self.gf('django.db.models.fields.IntegerField')()), - )) - db.send_create_signal('curriculum', ['Section']) - - # Adding model 'Competence' - db.create_table('curriculum_competence', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('section', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['curriculum.Section'])), - ('name', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('slug', self.gf('django.db.models.fields.SlugField')(max_length=50)), - ('order', self.gf('django.db.models.fields.IntegerField')()), - )) - db.send_create_signal('curriculum', ['Competence']) - - # Adding model 'Level' - db.create_table('curriculum_level', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('name', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('slug', self.gf('django.db.models.fields.SlugField')(max_length=50)), - ('order', self.gf('django.db.models.fields.IntegerField')()), - )) - db.send_create_signal('curriculum', ['Level']) - - # Adding model 'CompetenceLevel' - db.create_table('curriculum_competencelevel', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('competence', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['curriculum.Competence'])), - ('level', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['curriculum.Level'])), - ('description', self.gf('django.db.models.fields.TextField')()), - )) - db.send_create_signal('curriculum', ['CompetenceLevel']) - - - def backwards(self, orm): - # Deleting model 'Section' - db.delete_table('curriculum_section') - - # Deleting model 'Competence' - db.delete_table('curriculum_competence') - - # Deleting model 'Level' - db.delete_table('curriculum_level') - - # Deleting model 'CompetenceLevel' - db.delete_table('curriculum_competencelevel') - - - models = { - 'curriculum.competence': { - 'Meta': {'ordering': "['order']", 'object_name': 'Competence'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - }, - 'curriculum.competencelevel': { - 'Meta': {'ordering': "['competence', 'level']", 'object_name': 'CompetenceLevel'}, - 'competence': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Competence']"}), - 'description': ('django.db.models.fields.TextField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}) - }, - 'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - }, - 'curriculum.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['curriculum'] \ No newline at end of file diff --git a/curriculum/migrations/0002_auto__add_field_level_group.py b/curriculum/migrations/0002_auto__add_field_level_group.py deleted file mode 100644 index 0f7cf5d..0000000 --- a/curriculum/migrations/0002_auto__add_field_level_group.py +++ /dev/null @@ -1,55 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Level.group' - db.add_column('curriculum_level', 'group', - self.gf('django.db.models.fields.CharField')(default='', max_length=255), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'Level.group' - db.delete_column('curriculum_level', 'group') - - - models = { - 'curriculum.competence': { - 'Meta': {'ordering': "['order']", 'object_name': 'Competence'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - }, - 'curriculum.competencelevel': { - 'Meta': {'ordering': "['competence', 'level']", 'object_name': 'CompetenceLevel'}, - 'competence': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Competence']"}), - 'description': ('django.db.models.fields.TextField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}) - }, - 'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - }, - 'curriculum.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['curriculum'] \ No newline at end of file diff --git a/curriculum/migrations/0003_auto__chg_field_level_slug.py b/curriculum/migrations/0003_auto__chg_field_level_slug.py deleted file mode 100644 index f22e753..0000000 --- a/curriculum/migrations/0003_auto__chg_field_level_slug.py +++ /dev/null @@ -1,59 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'Level.slug' - db.alter_column('curriculum_level', 'slug', self.gf('django.db.models.fields.CharField')(max_length=255)) - # Removing index on 'Level', fields ['slug'] - db.delete_index('curriculum_level', ['slug']) - - - def backwards(self, orm): - # Adding index on 'Level', fields ['slug'] - db.create_index('curriculum_level', ['slug']) - - - # Changing field 'Level.slug' - db.alter_column('curriculum_level', 'slug', self.gf('django.db.models.fields.SlugField')(max_length=50)) - - models = { - 'curriculum.competence': { - 'Meta': {'ordering': "['order']", 'object_name': 'Competence'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - }, - 'curriculum.competencelevel': { - 'Meta': {'ordering': "['competence', 'level']", 'object_name': 'CompetenceLevel'}, - 'competence': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Competence']"}), - 'description': ('django.db.models.fields.TextField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}) - }, - 'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'curriculum.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['curriculum'] \ No newline at end of file diff --git a/curriculum/migrations/0004_auto__add_curriculum__add_curriculumlevel__add_curriculumcourse.py b/curriculum/migrations/0004_auto__add_curriculum__add_curriculumlevel__add_curriculumcourse.py deleted file mode 100644 index 3a45ff5..0000000 --- a/curriculum/migrations/0004_auto__add_curriculum__add_curriculumlevel__add_curriculumcourse.py +++ /dev/null @@ -1,102 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding model 'Curriculum' - db.create_table('curriculum_curriculum', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('identifier', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)), - ('title', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('course', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['curriculum.CurriculumCourse'])), - ('level', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['curriculum.CurriculumLevel'])), - ('type', self.gf('django.db.models.fields.CharField')(max_length=16)), - )) - db.send_create_signal('curriculum', ['Curriculum']) - - # Adding model 'CurriculumLevel' - db.create_table('curriculum_curriculumlevel', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('title', self.gf('django.db.models.fields.CharField')(max_length=16, db_index=True)), - )) - db.send_create_signal('curriculum', ['CurriculumLevel']) - - # Adding model 'CurriculumCourse' - db.create_table('curriculum_curriculumcourse', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('title', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('slug', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)), - )) - db.send_create_signal('curriculum', ['CurriculumCourse']) - - - def backwards(self, orm): - # Deleting model 'Curriculum' - db.delete_table('curriculum_curriculum') - - # Deleting model 'CurriculumLevel' - db.delete_table('curriculum_curriculumlevel') - - # Deleting model 'CurriculumCourse' - db.delete_table('curriculum_curriculumcourse') - - - models = { - 'curriculum.competence': { - 'Meta': {'ordering': "['order']", 'object_name': 'Competence'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - }, - 'curriculum.competencelevel': { - 'Meta': {'ordering': "['competence', 'level']", 'object_name': 'CompetenceLevel'}, - 'competence': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Competence']"}), - 'description': ('django.db.models.fields.TextField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}) - }, - 'curriculum.curriculum': { - 'Meta': {'object_name': 'Curriculum'}, - 'course': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.CurriculumCourse']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.CurriculumLevel']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '16'}) - }, - 'curriculum.curriculumcourse': { - 'Meta': {'object_name': 'CurriculumCourse'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'curriculum.curriculumlevel': { - 'Meta': {'object_name': 'CurriculumLevel'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '16', 'db_index': 'True'}) - }, - 'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'curriculum.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['curriculum'] \ No newline at end of file diff --git a/curriculum/migrations/0005_auto__add_field_curriculumcourse_accusative.py b/curriculum/migrations/0005_auto__add_field_curriculumcourse_accusative.py deleted file mode 100644 index 0708f44..0000000 --- a/curriculum/migrations/0005_auto__add_field_curriculumcourse_accusative.py +++ /dev/null @@ -1,79 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'CurriculumCourse.accusative' - db.add_column('curriculum_curriculumcourse', 'accusative', - self.gf('django.db.models.fields.CharField')(default='', max_length=255), - keep_default=False) - - if not db.dry_run: - orm.CurriculumCourse.objects.all().update(accusative=models.F('title')) - - - def backwards(self, orm): - # Deleting field 'CurriculumCourse.accusative' - db.delete_column('curriculum_curriculumcourse', 'accusative') - - - models = { - 'curriculum.competence': { - 'Meta': {'ordering': "['order']", 'object_name': 'Competence'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - }, - 'curriculum.competencelevel': { - 'Meta': {'ordering': "['competence', 'level']", 'object_name': 'CompetenceLevel'}, - 'competence': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Competence']"}), - 'description': ('django.db.models.fields.TextField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.Level']"}) - }, - 'curriculum.curriculum': { - 'Meta': {'object_name': 'Curriculum'}, - 'course': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.CurriculumCourse']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['curriculum.CurriculumLevel']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '16'}) - }, - 'curriculum.curriculumcourse': { - 'Meta': {'object_name': 'CurriculumCourse'}, - 'accusative': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'curriculum.curriculumlevel': { - 'Meta': {'object_name': 'CurriculumLevel'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '16', 'db_index': 'True'}) - }, - 'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'curriculum.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['curriculum'] diff --git a/curriculum/migrations/0006_auto__add_field_competencelevel_description_pl__add_field_competencele.py b/curriculum/migrations/0006_auto__add_field_competencelevel_description_pl__add_field_competencele.py deleted file mode 100644 index d62e37a..0000000 --- a/curriculum/migrations/0006_auto__add_field_competencelevel_description_pl__add_field_competencele.py +++ /dev/null @@ -1,158 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'CompetenceLevel.description_pl' - db.add_column(u'curriculum_competencelevel', 'description_pl', - self.gf('django.db.models.fields.TextField')(null=True), - keep_default=False) - - # Adding field 'CompetenceLevel.description_en' - db.add_column(u'curriculum_competencelevel', 'description_en', - self.gf('django.db.models.fields.TextField')(null=True), - keep_default=False) - - # Adding field 'Section.name_pl' - db.add_column(u'curriculum_section', 'name_pl', - self.gf('django.db.models.fields.CharField')(max_length=255, null=True), - keep_default=False) - - # Adding field 'Section.name_en' - db.add_column(u'curriculum_section', 'name_en', - self.gf('django.db.models.fields.CharField')(max_length=255, null=True), - keep_default=False) - - # Adding field 'Competence.name_pl' - db.add_column(u'curriculum_competence', 'name_pl', - self.gf('django.db.models.fields.CharField')(max_length=255, null=True), - keep_default=False) - - # Adding field 'Competence.name_en' - db.add_column(u'curriculum_competence', 'name_en', - self.gf('django.db.models.fields.CharField')(max_length=255, null=True), - keep_default=False) - - # Adding field 'Level.name_pl' - db.add_column(u'curriculum_level', 'name_pl', - self.gf('django.db.models.fields.CharField')(max_length=255, null=True), - keep_default=False) - - # Adding field 'Level.name_en' - db.add_column(u'curriculum_level', 'name_en', - self.gf('django.db.models.fields.CharField')(max_length=255, null=True), - keep_default=False) - - # Adding field 'Level.group_pl' - db.add_column(u'curriculum_level', 'group_pl', - self.gf('django.db.models.fields.CharField')(max_length=255, null=True), - keep_default=False) - - # Adding field 'Level.group_en' - db.add_column(u'curriculum_level', 'group_en', - self.gf('django.db.models.fields.CharField')(max_length=255, null=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'CompetenceLevel.description_pl' - db.delete_column(u'curriculum_competencelevel', 'description_pl') - - # Deleting field 'CompetenceLevel.description_en' - db.delete_column(u'curriculum_competencelevel', 'description_en') - - # Deleting field 'Section.name_pl' - db.delete_column(u'curriculum_section', 'name_pl') - - # Deleting field 'Section.name_en' - db.delete_column(u'curriculum_section', 'name_en') - - # Deleting field 'Competence.name_pl' - db.delete_column(u'curriculum_competence', 'name_pl') - - # Deleting field 'Competence.name_en' - db.delete_column(u'curriculum_competence', 'name_en') - - # Deleting field 'Level.name_pl' - db.delete_column(u'curriculum_level', 'name_pl') - - # Deleting field 'Level.name_en' - db.delete_column(u'curriculum_level', 'name_en') - - # Deleting field 'Level.group_pl' - db.delete_column(u'curriculum_level', 'group_pl') - - # Deleting field 'Level.group_en' - db.delete_column(u'curriculum_level', 'group_en') - - - models = { - u'curriculum.competence': { - 'Meta': {'ordering': "['section', 'order']", 'object_name': 'Competence'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'name_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - }, - u'curriculum.competencelevel': { - 'Meta': {'ordering': "['competence', 'level']", 'object_name': 'CompetenceLevel'}, - 'competence': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Competence']"}), - 'description': ('django.db.models.fields.TextField', [], {}), - 'description_en': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'description_pl': ('django.db.models.fields.TextField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Level']"}) - }, - u'curriculum.curriculum': { - 'Meta': {'object_name': 'Curriculum'}, - 'course': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.CurriculumCourse']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.CurriculumLevel']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '16'}) - }, - u'curriculum.curriculumcourse': { - 'Meta': {'ordering': "['slug']", 'object_name': 'CurriculumCourse'}, - 'accusative': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.curriculumlevel': { - 'Meta': {'object_name': 'CurriculumLevel'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '16', 'db_index': 'True'}) - }, - u'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'group_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'group_pl': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'name_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'name_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['curriculum'] \ No newline at end of file diff --git a/curriculum/migrations/0007_translatable_fields_data_migration.py b/curriculum/migrations/0007_translatable_fields_data_migration.py deleted file mode 100644 index f881621..0000000 --- a/curriculum/migrations/0007_translatable_fields_data_migration.py +++ /dev/null @@ -1,92 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -class Migration(DataMigration): - - def forwards(self, orm): - for section in orm.Section.objects.all(): - section.name_pl = section.name_en = section.name - section.save() - for competence in orm.Competence.objects.all(): - competence.name_pl = competence.name_en = competence.name - competence.save() - for level in orm.Level.objects.all(): - level.name_pl = level.name_en = level.name - level.group_pl = level.group_en = level.group - level.save() - for competence_level in orm.CompetenceLevel.objects.all(): - competence_level.description_pl = competence_level.description_en = competence_level.description - competence_level.save() - - def backwards(self, orm): - raise RuntimeError("Cannot reverse this migration.") - - models = { - u'curriculum.competence': { - 'Meta': {'ordering': "['section', 'order']", 'object_name': 'Competence'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'name_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - }, - u'curriculum.competencelevel': { - 'Meta': {'ordering': "['competence', 'level']", 'object_name': 'CompetenceLevel'}, - 'competence': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Competence']"}), - 'description': ('django.db.models.fields.TextField', [], {}), - 'description_en': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'description_pl': ('django.db.models.fields.TextField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Level']"}) - }, - u'curriculum.curriculum': { - 'Meta': {'object_name': 'Curriculum'}, - 'course': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.CurriculumCourse']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.CurriculumLevel']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '16'}) - }, - u'curriculum.curriculumcourse': { - 'Meta': {'ordering': "['slug']", 'object_name': 'CurriculumCourse'}, - 'accusative': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.curriculumlevel': { - 'Meta': {'object_name': 'CurriculumLevel'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '16', 'db_index': 'True'}) - }, - u'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'group_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'group_pl': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'name_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'name_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['curriculum'] - symmetrical = True diff --git a/curriculum/migrations/0008_auto__del_field_competencelevel_description__del_field_section_name__d.py b/curriculum/migrations/0008_auto__del_field_competencelevel_description__del_field_section_name__d.py deleted file mode 100644 index 4c0a89a..0000000 --- a/curriculum/migrations/0008_auto__del_field_competencelevel_description__del_field_section_name__d.py +++ /dev/null @@ -1,103 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Deleting field 'CompetenceLevel.description' - db.delete_column(u'curriculum_competencelevel', 'description') - - # Deleting field 'Section.name' - db.delete_column(u'curriculum_section', 'name') - - # Deleting field 'Competence.name' - db.delete_column(u'curriculum_competence', 'name') - - # Deleting field 'Level.group' - db.delete_column(u'curriculum_level', 'group') - - # Deleting field 'Level.name' - db.delete_column(u'curriculum_level', 'name') - - - def backwards(self, orm): - - # User chose to not deal with backwards NULL issues for 'CompetenceLevel.description' - raise RuntimeError("Cannot reverse this migration. 'CompetenceLevel.description' and its values cannot be restored.") - - # User chose to not deal with backwards NULL issues for 'Section.name' - raise RuntimeError("Cannot reverse this migration. 'Section.name' and its values cannot be restored.") - - # User chose to not deal with backwards NULL issues for 'Competence.name' - raise RuntimeError("Cannot reverse this migration. 'Competence.name' and its values cannot be restored.") - - # User chose to not deal with backwards NULL issues for 'Level.group' - raise RuntimeError("Cannot reverse this migration. 'Level.group' and its values cannot be restored.") - - # User chose to not deal with backwards NULL issues for 'Level.name' - raise RuntimeError("Cannot reverse this migration. 'Level.name' and its values cannot be restored.") - - models = { - u'curriculum.competence': { - 'Meta': {'ordering': "['section', 'order']", 'object_name': 'Competence'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - }, - u'curriculum.competencelevel': { - 'Meta': {'ordering': "['competence', 'level']", 'object_name': 'CompetenceLevel'}, - 'competence': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Competence']"}), - 'description_en': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'description_pl': ('django.db.models.fields.TextField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Level']"}) - }, - u'curriculum.curriculum': { - 'Meta': {'object_name': 'Curriculum'}, - 'course': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.CurriculumCourse']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.CurriculumLevel']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '16'}) - }, - u'curriculum.curriculumcourse': { - 'Meta': {'ordering': "['slug']", 'object_name': 'CurriculumCourse'}, - 'accusative': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.curriculumlevel': { - 'Meta': {'object_name': 'CurriculumLevel'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '16', 'db_index': 'True'}) - }, - u'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'group_pl': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['curriculum'] \ No newline at end of file diff --git a/curriculum/migrations/0009_auto__chg_field_competencelevel_description_en__chg_field_competencele.py b/curriculum/migrations/0009_auto__chg_field_competencelevel_description_en__chg_field_competencele.py deleted file mode 100644 index 4fbdde5..0000000 --- a/curriculum/migrations/0009_auto__chg_field_competencelevel_description_en__chg_field_competencele.py +++ /dev/null @@ -1,133 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'CompetenceLevel.description_en' - db.alter_column(u'curriculum_competencelevel', 'description_en', self.gf('django.db.models.fields.TextField')()) - - # Changing field 'CompetenceLevel.description_pl' - db.alter_column(u'curriculum_competencelevel', 'description_pl', self.gf('django.db.models.fields.TextField')()) - - # Changing field 'Section.name_en' - db.alter_column(u'curriculum_section', 'name_en', self.gf('django.db.models.fields.CharField')(max_length=255)) - - # Changing field 'Section.name_pl' - db.alter_column(u'curriculum_section', 'name_pl', self.gf('django.db.models.fields.CharField')(max_length=255)) - - # Changing field 'Competence.name_pl' - db.alter_column(u'curriculum_competence', 'name_pl', self.gf('django.db.models.fields.CharField')(max_length=255)) - - # Changing field 'Competence.name_en' - db.alter_column(u'curriculum_competence', 'name_en', self.gf('django.db.models.fields.CharField')(max_length=255)) - - # Changing field 'Level.name_pl' - db.alter_column(u'curriculum_level', 'name_pl', self.gf('django.db.models.fields.CharField')(max_length=255)) - - # Changing field 'Level.group_pl' - db.alter_column(u'curriculum_level', 'group_pl', self.gf('django.db.models.fields.CharField')(max_length=255)) - - # Changing field 'Level.group_en' - db.alter_column(u'curriculum_level', 'group_en', self.gf('django.db.models.fields.CharField')(max_length=255)) - - # Changing field 'Level.name_en' - db.alter_column(u'curriculum_level', 'name_en', self.gf('django.db.models.fields.CharField')(max_length=255)) - - def backwards(self, orm): - - # Changing field 'CompetenceLevel.description_en' - db.alter_column(u'curriculum_competencelevel', 'description_en', self.gf('django.db.models.fields.TextField')(null=True)) - - # Changing field 'CompetenceLevel.description_pl' - db.alter_column(u'curriculum_competencelevel', 'description_pl', self.gf('django.db.models.fields.TextField')(null=True)) - - # Changing field 'Section.name_en' - db.alter_column(u'curriculum_section', 'name_en', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - # Changing field 'Section.name_pl' - db.alter_column(u'curriculum_section', 'name_pl', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - # Changing field 'Competence.name_pl' - db.alter_column(u'curriculum_competence', 'name_pl', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - # Changing field 'Competence.name_en' - db.alter_column(u'curriculum_competence', 'name_en', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - # Changing field 'Level.name_pl' - db.alter_column(u'curriculum_level', 'name_pl', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - # Changing field 'Level.group_pl' - db.alter_column(u'curriculum_level', 'group_pl', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - # Changing field 'Level.group_en' - db.alter_column(u'curriculum_level', 'group_en', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - # Changing field 'Level.name_en' - db.alter_column(u'curriculum_level', 'name_en', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - models = { - u'curriculum.competence': { - 'Meta': {'ordering': "['section', 'order']", 'object_name': 'Competence'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - }, - u'curriculum.competencelevel': { - 'Meta': {'ordering': "['competence', 'level']", 'object_name': 'CompetenceLevel'}, - 'competence': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Competence']"}), - 'description_en': ('django.db.models.fields.TextField', [], {'default': "''"}), - 'description_pl': ('django.db.models.fields.TextField', [], {'default': "''"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Level']"}) - }, - u'curriculum.curriculum': { - 'Meta': {'object_name': 'Curriculum'}, - 'course': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.CurriculumCourse']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.CurriculumLevel']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '16'}) - }, - u'curriculum.curriculumcourse': { - 'Meta': {'ordering': "['slug']", 'object_name': 'CurriculumCourse'}, - 'accusative': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.curriculumlevel': { - 'Meta': {'object_name': 'CurriculumLevel'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '16', 'db_index': 'True'}) - }, - u'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'group_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['curriculum'] \ No newline at end of file diff --git a/curriculum/migrations/0010_auto__add_field_level_meta_name.py b/curriculum/migrations/0010_auto__add_field_level_meta_name.py deleted file mode 100644 index 24fc996..0000000 --- a/curriculum/migrations/0010_auto__add_field_level_meta_name.py +++ /dev/null @@ -1,82 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Level.meta_name' - db.add_column(u'curriculum_level', 'meta_name', - self.gf('django.db.models.fields.CharField')(default=' ', max_length=255), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'Level.meta_name' - db.delete_column(u'curriculum_level', 'meta_name') - - - models = { - u'curriculum.competence': { - 'Meta': {'ordering': "['section', 'order']", 'object_name': 'Competence'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - }, - u'curriculum.competencelevel': { - 'Meta': {'ordering': "['competence', 'level']", 'object_name': 'CompetenceLevel'}, - 'competence': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Competence']"}), - 'description_en': ('django.db.models.fields.TextField', [], {'default': "''"}), - 'description_pl': ('django.db.models.fields.TextField', [], {'default': "''"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Level']"}) - }, - u'curriculum.curriculum': { - 'Meta': {'object_name': 'Curriculum'}, - 'course': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.CurriculumCourse']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.CurriculumLevel']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '16'}) - }, - u'curriculum.curriculumcourse': { - 'Meta': {'ordering': "['slug']", 'object_name': 'CurriculumCourse'}, - 'accusative': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.curriculumlevel': { - 'Meta': {'object_name': 'CurriculumLevel'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '16', 'db_index': 'True'}) - }, - u'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'group_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'meta_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['curriculum'] \ No newline at end of file diff --git a/curriculum/migrations/0011_meta_name.py b/curriculum/migrations/0011_meta_name.py deleted file mode 100644 index 0539ae7..0000000 --- a/curriculum/migrations/0011_meta_name.py +++ /dev/null @@ -1,77 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - orm.Level.objects.all().update(meta_name=models.F('slug')) - - def backwards(self, orm): - "Write your backwards methods here." - - models = { - u'curriculum.competence': { - 'Meta': {'ordering': "['section', 'order']", 'object_name': 'Competence'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - }, - u'curriculum.competencelevel': { - 'Meta': {'ordering': "['competence', 'level']", 'object_name': 'CompetenceLevel'}, - 'competence': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Competence']"}), - 'description_en': ('django.db.models.fields.TextField', [], {'default': "''"}), - 'description_pl': ('django.db.models.fields.TextField', [], {'default': "''"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Level']"}) - }, - u'curriculum.curriculum': { - 'Meta': {'object_name': 'Curriculum'}, - 'course': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.CurriculumCourse']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.CurriculumLevel']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '16'}) - }, - u'curriculum.curriculumcourse': { - 'Meta': {'ordering': "['slug']", 'object_name': 'CurriculumCourse'}, - 'accusative': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.curriculumlevel': { - 'Meta': {'object_name': 'CurriculumLevel'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '16', 'db_index': 'True'}) - }, - u'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'group_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'meta_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['curriculum'] - symmetrical = True diff --git a/curriculum/migrations/0012_auto__add_unique_level_meta_name__add_unique_level_slug.py b/curriculum/migrations/0012_auto__add_unique_level_meta_name__add_unique_level_slug.py deleted file mode 100644 index f9fa032..0000000 --- a/curriculum/migrations/0012_auto__add_unique_level_meta_name__add_unique_level_slug.py +++ /dev/null @@ -1,86 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding unique constraint on 'Level', fields ['meta_name'] - db.create_unique(u'curriculum_level', ['meta_name']) - - # Adding unique constraint on 'Level', fields ['slug'] - db.create_unique(u'curriculum_level', ['slug']) - - - def backwards(self, orm): - # Removing unique constraint on 'Level', fields ['slug'] - db.delete_unique(u'curriculum_level', ['slug']) - - # Removing unique constraint on 'Level', fields ['meta_name'] - db.delete_unique(u'curriculum_level', ['meta_name']) - - - models = { - u'curriculum.competence': { - 'Meta': {'ordering': "['section', 'order']", 'object_name': 'Competence'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - }, - u'curriculum.competencelevel': { - 'Meta': {'ordering': "['competence', 'level']", 'object_name': 'CompetenceLevel'}, - 'competence': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Competence']"}), - 'description_en': ('django.db.models.fields.TextField', [], {'default': "''"}), - 'description_pl': ('django.db.models.fields.TextField', [], {'default': "''"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Level']"}) - }, - u'curriculum.curriculum': { - 'Meta': {'object_name': 'Curriculum'}, - 'course': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.CurriculumCourse']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.CurriculumLevel']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '16'}) - }, - u'curriculum.curriculumcourse': { - 'Meta': {'ordering': "['slug']", 'object_name': 'CurriculumCourse'}, - 'accusative': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.curriculumlevel': { - 'Meta': {'object_name': 'CurriculumLevel'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '16', 'db_index': 'True'}) - }, - u'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'group_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'meta_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}) - }, - u'curriculum.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['curriculum'] \ No newline at end of file diff --git a/curriculum/migrations/0013_auto__add_field_level_package__add_field_level_student_package.py b/curriculum/migrations/0013_auto__add_field_level_package__add_field_level_student_package.py deleted file mode 100644 index 4e0ee70..0000000 --- a/curriculum/migrations/0013_auto__add_field_level_package__add_field_level_student_package.py +++ /dev/null @@ -1,92 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Level.package' - db.add_column(u'curriculum_level', 'package', - self.gf('django.db.models.fields.files.FileField')(max_length=255, null=True, blank=True), - keep_default=False) - - # Adding field 'Level.student_package' - db.add_column(u'curriculum_level', 'student_package', - self.gf('django.db.models.fields.files.FileField')(max_length=255, null=True, blank=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'Level.package' - db.delete_column(u'curriculum_level', 'package') - - # Deleting field 'Level.student_package' - db.delete_column(u'curriculum_level', 'student_package') - - - models = { - u'curriculum.competence': { - 'Meta': {'ordering': "['section', 'order']", 'object_name': 'Competence'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Section']"}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - }, - u'curriculum.competencelevel': { - 'Meta': {'ordering': "['competence', 'level']", 'object_name': 'CompetenceLevel'}, - 'competence': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Competence']"}), - 'description_en': ('django.db.models.fields.TextField', [], {'default': "''"}), - 'description_pl': ('django.db.models.fields.TextField', [], {'default': "''"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Level']"}) - }, - u'curriculum.curriculum': { - 'Meta': {'object_name': 'Curriculum'}, - 'course': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.CurriculumCourse']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.CurriculumLevel']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '16'}) - }, - u'curriculum.curriculumcourse': { - 'Meta': {'ordering': "['slug']", 'object_name': 'CurriculumCourse'}, - 'accusative': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.curriculumlevel': { - 'Meta': {'object_name': 'CurriculumLevel'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '16', 'db_index': 'True'}) - }, - u'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'group_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'meta_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) - }, - u'curriculum.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name_en': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'name_pl': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) - } - } - - complete_apps = ['curriculum'] \ No newline at end of file diff --git a/curriculum/migrations/__init__.py b/curriculum/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/curriculum/models.py b/curriculum/models.py deleted file mode 100644 index cfe5ffe..0000000 --- a/curriculum/models.py +++ /dev/null @@ -1,227 +0,0 @@ -# -*- coding: utf-8 -import re -from django.core.urlresolvers import reverse -from django.db import models -from django.utils.translation import ugettext_lazy as _, get_language -from fnpdjango.storage import BofhFileSystemStorage -from fnpdjango.utils.models.translation import add_translatable - -bofh_storage = BofhFileSystemStorage() - - -class Section(models.Model): - slug = models.SlugField(_('slug')) - order = models.IntegerField(_('order')) - - class Meta: - ordering = ['order'] - verbose_name = _('section') - verbose_name_plural = _('sections') - - def __unicode__(self): - return self.name - - def get_absolute_url(self): - return "%s?s=%d" % (reverse("curriculum"), self.pk) - - def url_for_level(self, level): - return "%s?s=%d&level=%s&d=1" % (reverse("curriculum"), self.pk, level.slug) - -add_translatable(Section, { - 'name': models.CharField(_('name'), max_length=255, default='') -}) - - -class Competence(models.Model): - section = models.ForeignKey(Section) - slug = models.SlugField(_('slug')) - order = models.IntegerField(_('order')) - - class Meta: - ordering = ['section', 'order'] - verbose_name = _('competence') - verbose_name_plural = _('competences') - - def __unicode__(self): - return self.name - - def get_absolute_url(self): - return "%s?c=%d" % (reverse("curriculum"), self.pk) - - def for_level(self, level): - return self.competencelevel_set.get(level=level) - - def url_for_level(self, level): - return self.for_level(level).get_absolute_url() - - @classmethod - def from_text(cls, text): - """Tries to return a Competence or a Section.""" - parts = re.split(ur'[-\u2013]', text, 1) - lookup_field_name = 'name_%s__iexact' % get_language() - if len(parts) == 1: - return Section.objects.get(**{lookup_field_name: text.strip()}) - else: - return cls.objects.get(**{lookup_field_name: parts[1].strip()}) - -add_translatable(Competence, { - 'name': models.CharField(_('name'), max_length=255, default='') -}) - - -class Level(models.Model): - slug = models.CharField(_('slug'), max_length=255, unique=True) - meta_name = models.CharField(_('meta name'), max_length=255, unique=True) - order = models.IntegerField(_('order')) - package = models.FileField( - upload_to=lambda i, f: "curriculum/pack/edukacjamedialna_%s.zip" % i.slug, - null=True, blank=True, max_length=255, storage=bofh_storage) - student_package = models.FileField( - upload_to=lambda i, f: "curriculum/pack/edukacjamedialna_%s_uczen.zip" % i.slug, - null=True, blank=True, max_length=255, storage=bofh_storage) - - class Meta: - ordering = ['order'] - verbose_name = _('educational level') - verbose_name_plural = _('educational levels') - - def __unicode__(self): - return self.name - - def length_course(self): - return self.lesson_set.filter(type='course').count() - - def length_synthetic(self): - return self.lesson_set.filter(type='synthetic').count() - - def build_package(self, student): - from StringIO import StringIO - import zipfile - from django.core.files.base import ContentFile - from catalogue.templatetags.catalogue_tags import level_box - from catalogue.models import Lesson - - buff = StringIO() - zipf = zipfile.ZipFile(buff, 'w', zipfile.ZIP_STORED) - - lessons = level_box(self)['lessons'] - for i, lesson in enumerate(lessons['synthetic']): - prefix = 'Skrocony kurs/%d %s/' % (i, lesson.slug) - lesson.add_to_zip(zipf, student, prefix) - for c, (section, clessons) in enumerate(lessons['course'].items()): - for i, lesson in enumerate(clessons): - prefix = 'Pelny kurs/%d %s/%d %s/' % (c, section.slug, i, lesson.slug) - lesson.add_to_zip(zipf, student, prefix) - for i, lesson in enumerate(lessons['project']): - prefix = 'Projekty/%d %s/' % (i, lesson.slug) - lesson.add_to_zip(zipf, student, prefix) - # Add all appendix lessons, from all levels. - for lesson in Lesson.objects.filter(type='appendix'): - prefix = '%s/' % lesson.slug - lesson.add_to_zip(zipf, student, prefix) - zipf.close() - - fieldname = "student_package" if student else "package" - getattr(self, fieldname).save(None, ContentFile(buff.getvalue())) - - def build_packages(self): - self.build_package(False) - self.build_package(True) - - -add_translatable(Level, { - 'name': models.CharField(_('name'), max_length=255, default=''), - 'group': models.CharField(_('group'), max_length=255, default='') -}) - - -class CompetenceLevel(models.Model): - competence = models.ForeignKey(Competence) - level = models.ForeignKey(Level) - - class Meta: - ordering = ['competence', 'level'] - verbose_name = _('competence on level') - verbose_name_plural = _('competences on levels') - - def __unicode__(self): - return u"%s/%s" % (self.competence, self.level) - - def get_absolute_url(self): - return "%s?c=%d&level=%s&d=1" % (reverse("curriculum"), self.competence.pk, self.level.slug) - -add_translatable(CompetenceLevel, { - 'description': models.TextField(_('description'), default='') -}) - - -class CurriculumLevel(models.Model): - title = models.CharField(max_length=16, db_index=True) - - class Meta: - verbose_name = _("curriculum level") - verbose_name_plural = _("curriculum levels") - - def __unicode__(self): - return self.title - - -class CurriculumCourse(models.Model): - title = models.CharField(max_length=255) - accusative = models.CharField(max_length=255) - slug = models.CharField(max_length=255, db_index=True) - - class Meta: - verbose_name = _("curriculum course") - verbose_name_plural = _("curriculum courses") - ordering = ['slug'] - - def __unicode__(self): - return self.title - - -class Curriculum(models.Model): - """Official curriculum.""" - TYPES = {'c': u'Cele kształcenia', 't': u'Treści nauczania'} - - identifier = models.CharField(max_length=255, db_index=True) - title = models.CharField(max_length=255) - course = models.ForeignKey(CurriculumCourse) - level = models.ForeignKey(CurriculumLevel) - type = models.CharField(max_length=16, choices=TYPES.items()) - - class Meta: - verbose_name = _("curriculum item") - verbose_name_plural = _("curriculum items") - - def __unicode__(self): - return self.identifier - - @classmethod - def from_text(cls, identifier, title): - m = re.match(r"^\d+/(?P[^/]+)/(?P[^/]+)/" - r"(?P(?:%s))[^/]+(?P/roz)?" % "|".join(cls.TYPES), identifier) - assert m is not None, "Curriculum identifier doesn't match template." - level, created = CurriculumLevel.objects.get_or_create( - title=m.group('level')) - def_title = m.group('course').title() - course, created = CurriculumCourse.objects.get_or_create( - slug=m.group('course').lower(), - defaults={ - 'title': def_title, - 'accusative': def_title, - }) - type_ = m.group('type') - if m.group('roz'): - title += " (zakres rozszerzony)" - - try: - curr = cls.objects.get(identifier=identifier) - except cls.DoesNotExist: - curr = cls(identifier=identifier) - curr.title = title - curr.course = course - curr.level = level - curr.type = type_ - curr.save() - return curr diff --git a/curriculum/static/curriculum/curriculum.css b/curriculum/static/curriculum/curriculum.css deleted file mode 100644 index 9ae2e35..0000000 --- a/curriculum/static/curriculum/curriculum.css +++ /dev/null @@ -1,40 +0,0 @@ -.curriculum-form { - border: 1px solid #ddd; - padding: 1em; - border-radius: 0.688em; - background: #ADAEAF; - color: white; } - .curriculum-form a { - cursor: pointer; } - .curriculum-form a:hover { - text-decoration: underline; } - .curriculum-form .error { - padding-left: 1em; - border-radius: .5em; - background: #ed7831; - color: white; - font-weight: bold; } - .curriculum-form h2 { - margin: 0; } - .curriculum-form h2 a { - display: block; - color: white; } - .curriculum-form h2 a span { - display: none; } - .curriculum-form strong { - display: inline-block; - vertical-align: top; - width: 12em; } - .curriculum-form .curriculum-levels { - display: inline-block; - list-style: none; - padding: 0; - margin: 0; - width: 40em; - vertical-align: top; } - .curriculum-form .curriculum-levels li { - display: inline-block; - width: 13em; } - .curriculum-form .curriculum-section-toggler { - display: none; - color: white; } diff --git a/curriculum/static/curriculum/curriculum.js b/curriculum/static/curriculum/curriculum.js deleted file mode 100755 index 0bdafc2..0000000 --- a/curriculum/static/curriculum/curriculum.js +++ /dev/null @@ -1,43 +0,0 @@ -$(function() { - if (typeof(curriculum_hide_form) != "undefined") { - $('.curriculum-form form').hide(); - $('.curriculum-form h2 a span').show(); - } - $('.curriculum-form h2 a').click(function() { - $('.curriculum-form form').toggle('fast'); - $('span', this).toggle(); - }); - - /* show togglers */ - $('.curriculum-section-toggler').show(); - - $('.curriculum-section').each(function() { - var category = this; - - /* set up togglers */ - $('.curriculum-section-toggler', this).click(function() { - $('ul', category).toggle('fast'); - }); - - /* set up section checkboxes */ - $('.s', category).change(function() { - if ($(this).attr('checked')) { - $('ul input', category).attr('checked', 'checked'); - } - else { - $('ul input', category).removeAttr('checked'); - } - }); - - /* unset section checkbox on unselect single competence */ - $('ul input', category).change(function() { - if (!$(this).attr('checked')) { - $('.s', category).removeAttr('checked', 'checked'); - } - }); - - /* hide unused section details on start */ - if ($('.s', category).attr('checked') || !$('ul input[checked]', category).length) - $('ul', category).hide(); - }); -}); diff --git a/curriculum/static/curriculum/curriculum.scss b/curriculum/static/curriculum/curriculum.scss deleted file mode 100755 index 355a6c5..0000000 --- a/curriculum/static/curriculum/curriculum.scss +++ /dev/null @@ -1,67 +0,0 @@ -$px: 0.0625em; -$oranji: #ed7831; -$ciemny: #363a3e; -$zielony: #16a487; - -.curriculum-form { - border: 1px solid #ddd; - padding: 1em; - border-radius: 11*$px; - background: #ADAEAF; - color: white; - - a { - cursor: pointer; - } - a:hover { - text-decoration: underline; - } - - .error { - padding-left: 1em; - border-radius: .5em; - background: $oranji; - color: white; - font-weight: bold; - - } - - h2 { - margin: 0; - a { - display: block; - color: white; - span {display: none;} - } - } - - strong { - display: inline-block; - vertical-align: top; - width: 12em; - } - - .curriculum-levels { - display: inline-block; - list-style: none; - padding: 0; - margin: 0; - width: 40em; - vertical-align: top; - - li { - display: inline-block; - width: 13em; - } - } - - .curriculum-section-toggler { - display: none; - color: white; - } - - .categories { - - } - -} diff --git a/curriculum/templates/curriculum/competence_detail.html b/curriculum/templates/curriculum/competence_detail.html deleted file mode 100755 index 7bb76e1..0000000 --- a/curriculum/templates/curriculum/competence_detail.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends base_template %} - -{% block title %}{{ object }}{% endblock %} - -{% block body %} -

    {{ object }}

    - -{% for cl in object.competencelevel_set.all %} -

    {{ cl }}

    - {{ cl.description|linebreaksbr }} -{% endfor %} - -{% endblock %} diff --git a/curriculum/templates/curriculum/competence_list.html b/curriculum/templates/curriculum/competence_list.html deleted file mode 100755 index cea4d4e..0000000 --- a/curriculum/templates/curriculum/competence_list.html +++ /dev/null @@ -1,73 +0,0 @@ -{% extends base_template %} -{% load chunks %} -{% load i18n %} - -{% block title %}{% trans 'Media, information and digital literacy competencies catalogue' %}{% endblock %} - -{% block body %} -

    {% trans 'Media, information and digital literacy competencies catalogue' %}

    - -{% if request.LANGUAGE_CODE == 'pl' %} - {% chunk 'katalog_kompetencji' %} -{% endif %} - -
    -

    {% trans 'Browse competencies' %} ({% trans 'expand' %})

    -
    - -

    {% trans 'Education level' %}:

    -{% if errors.level %}

    {{ errors.level }}

    {% endif %} -{% for lev_group, levels in levels.items %} - {{ lev_group }} -
      - {% for lev in levels %} -
      • - {% endfor %} -
    -{% endfor %} - -

    {% trans 'Competency categories' %}:

    -{% if errors.competences %}

    {{ errors.competences }}

    {% endif %} -
      -{% for section in sections %} -
    • - - ({% trans 'expand' %}) -
        - {% for competence in section.competence_set.all %} -
        • - {% endfor %} -
      -
      • -{% endfor %} -
    - -
    -
    - -{% if chosen_competences %} - -

    {% trans 'Selected competencies' %} – {{ level }}

    - -{% for section, competences in chosen_competences.items %} -

    {{ section }}

    - {% for competence in competences %} -

    {{ competence }}

    - {{ competence.for_level_.description|linebreaksbr }} - {% endfor %} -{% endfor %} - -{% endif %} - - -{% if request.GET.d %} - -{% endif %} -{% endblock %} diff --git a/curriculum/templates/curriculum/snippets/competence.html b/curriculum/templates/curriculum/snippets/competence.html deleted file mode 100755 index 7f62ac8..0000000 --- a/curriculum/templates/curriculum/snippets/competence.html +++ /dev/null @@ -1,12 +0,0 @@ -{% load url_for_level from curriculum_tags %} -{% if comps %} - {% for competence in comps %} -
  3. - {{ competence }}
    4. - {% endfor %} -{% else %} - {% for text in texts %} -
  4. {{ text }}
    5. - {% endfor %} -{% endif %} - diff --git a/curriculum/templates/curriculum/snippets/course_box.html b/curriculum/templates/curriculum/snippets/course_box.html deleted file mode 100755 index f1bd074..0000000 --- a/curriculum/templates/curriculum/snippets/course_box.html +++ /dev/null @@ -1,35 +0,0 @@ -{% for level, types in lessons.items %} -{% if level.slug == "liceum" %} -

    {{ course }}: poziom zaawansowany - wróć do spisu treści -

    -{% endif %} -
    - {% spaceless %} - {% for lesson_type, lesson_list in types.items %} -
    - {% if lesson_type == 'synthetic' %} -

    Lekcje syntetyczne

    - {% elif lesson_type == 'project' %} -

    Projekty

    - {% else %} -

    Lekcje z pełnych kursów

    - {% endif %} - {% if lesson_list %} - - {% else %} -

    (W przygotowaniu)

    - {% endif %} -
    - {% endfor %} - {% endspaceless %} -
    -{% endfor %} diff --git a/curriculum/templates/curriculum/snippets/course_boxes.html b/curriculum/templates/curriculum/snippets/course_boxes.html deleted file mode 100755 index c998121..0000000 --- a/curriculum/templates/curriculum/snippets/course_boxes.html +++ /dev/null @@ -1,8 +0,0 @@ -{% load course_box from curriculum_tags %} -{% for course in object_list %} -
    - wróć do spisu treści -
    -

    {{ course }}

    - {% course_box course %} -{% endfor %} diff --git a/curriculum/templates/curriculum/snippets/course_boxes_toc.html b/curriculum/templates/curriculum/snippets/course_boxes_toc.html deleted file mode 100755 index 0c22785..0000000 --- a/curriculum/templates/curriculum/snippets/course_boxes_toc.html +++ /dev/null @@ -1,14 +0,0 @@ -{% url "catalogue_lessons" as lessons_url %} -{% for level, course_list in object_list %} -
    {{ level }}: - -
    -{% endfor %} diff --git a/curriculum/templates/curriculum/snippets/curriculum.html b/curriculum/templates/curriculum/snippets/curriculum.html deleted file mode 100755 index ea4f3fb..0000000 --- a/curriculum/templates/curriculum/snippets/curriculum.html +++ /dev/null @@ -1,17 +0,0 @@ -{% if currset %} - {% for what, types in currset.items %} -
  5. - {{ what.0 }}, {{ what.1 }} poziom edukacyjny
    - {% for type, currs in types.items %} - {{ type }}:
    - {% for curr in currs %} - {{ curr.title }}
    - {% endfor %} - {% endfor %} -
    6. - {% endfor %} -{% else %} - {% for identifier in identifiers %} -
  6. {{ identifier }}
    7. - {% endfor %} -{% endif %} diff --git a/curriculum/templatetags/__init__.py b/curriculum/templatetags/__init__.py deleted file mode 100755 index e69de29..0000000 diff --git a/curriculum/templatetags/curriculum_tags.py b/curriculum/templatetags/curriculum_tags.py deleted file mode 100755 index cc37d0e..0000000 --- a/curriculum/templatetags/curriculum_tags.py +++ /dev/null @@ -1,96 +0,0 @@ -# -*- coding: utf-8 -*- -from django import template -from django.utils.datastructures import SortedDict -from ..models import Competence, Curriculum, CurriculumCourse -from catalogue.models import Lesson - -register = template.Library() - - -@register.inclusion_tag("curriculum/snippets/competence.html") -def competence(texts, level): - try: - comps = [Competence.from_text(text) for text in texts] - except: - # WTF - return {'texts': texts} - return { - 'comps': comps, - 'level': level, - } - - -@register.inclusion_tag("curriculum/snippets/curriculum.html") -def curriculum(identifiers): - try: - currs = [Curriculum.objects.get(identifier__iexact=identifier.replace(' ', '')) - for identifier in identifiers] - except Curriculum.DoesNotExist: - return {'identifiers': identifiers} - - currset = SortedDict() - for curr in currs: - k = curr.course, curr.level - if k not in currset: - currset[k] = SortedDict() - typename = Curriculum.TYPES[curr.type] - if typename not in currset[k]: - currset[k][typename] = [] - currset[k][typename].append(curr) - - return { - 'currset': currset, - } - - -@register.filter -def url_for_level(comp, level): - try: - return comp.url_for_level(level) - except: - # WTF - return comp.get_absolute_url() - - -@register.inclusion_tag("curriculum/snippets/course_box.html") -def course_box(course): - lessons = SortedDict() - for lesson in course.lesson_set.all(): - if lesson.level not in lessons: - newdict = SortedDict() - newdict['synthetic'] = [] - newdict['course'] = [] - lessons[lesson.level] = newdict - if lesson.type not in lessons[lesson.level]: - lessons[lesson.level][lesson.type] = [] - lessons[lesson.level][lesson.type].append(lesson) - return { - "course": course, - "lessons": lessons, - } - - -@register.inclusion_tag("curriculum/snippets/course_boxes.html") -def course_boxes(): - return {'object_list': CurriculumCourse.objects.all()} - - -@register.inclusion_tag("curriculum/snippets/course_boxes_toc.html") -def course_boxes_toc(accusative=False): - last = None, None - object_list = [] - lessons = Lesson.curriculum_courses.through.objects\ - .select_related('lesson__level', 'curriculumcourse')\ - .order_by('lesson__level', 'curriculumcourse') - for l in lessons: - level, course = l.lesson.level, l.curriculumcourse - if (level, course) == last: - continue - if level != last[0]: - object_list.append((level, [])) - object_list[-1][1].append(course) - last = (level, course) - return { - 'object_list': object_list, - 'accusative': accusative, - } diff --git a/curriculum/tests.py b/curriculum/tests.py deleted file mode 100644 index b967c44..0000000 --- a/curriculum/tests.py +++ /dev/null @@ -1,17 +0,0 @@ -# -*- coding: utf-8 -*- -""" -This file demonstrates writing tests using the unittest module. These will pass -when you run "manage.py test". - -Replace this with more appropriate tests for your application. -""" - -from django.test import TestCase - - -class SimpleTest(TestCase): - def test_basic_addition(self): - """ - Tests that 1 + 1 always equals 2. - """ - self.assertEqual(1 + 1, 2) diff --git a/curriculum/urls.py b/curriculum/urls.py deleted file mode 100755 index 7553a66..0000000 --- a/curriculum/urls.py +++ /dev/null @@ -1,9 +0,0 @@ -# -*- coding: utf-8 -*- -from django.conf.urls import patterns, url -from .views import CompetenceDetailView, CompetencesView - -urlpatterns = patterns( - '', - url(r'^$', CompetencesView.as_view(), name='curriculum'), - url(r'^(?P[^/]+)/$', CompetenceDetailView.as_view(), name='curriculum_competence'), -) diff --git a/curriculum/views.py b/curriculum/views.py deleted file mode 100644 index 25606f1..0000000 --- a/curriculum/views.py +++ /dev/null @@ -1,66 +0,0 @@ -# -*- coding: utf-8 -from django.db import models -from django.views.generic import DetailView, ListView -from django.utils.datastructures import SortedDict -from django.utils.translation import ugettext as _ - -from .models import Competence, Section, Level, CompetenceLevel - - -class CompetenceDetailView(DetailView): - model = Competence - - -class CompetencesView(ListView): - model = Competence - - def get_context_data(self, **kwargs): - context = super(CompetencesView, self).get_context_data(**kwargs) - - context['levels'] = SortedDict() - for level in Level.objects.all(): - context['levels'].setdefault(level.group, []).append(level) - - context['sections'] = Section.objects.all() - - errors = {} - - try: - level = Level.objects.get(slug=self.request.GET.get('level')) - except Level.DoesNotExist: - level = None - context['level'] = level - - comp_ids = set() - for c in self.request.GET.getlist('c'): - try: - comp_ids.add(int(c)) - except ValueError: - pass - context['comp_ids'] = comp_ids - sect_ids = set() - for c in self.request.GET.getlist('s'): - try: - sect_ids.add(int(c)) - except ValueError: - pass - context['sect_ids'] = sect_ids - - if not (comp_ids or sect_ids): - if level: - errors["competences"] = _('You must select at least one competency from the list.') - elif level is None: - errors["level"] = _('You must select at least one education level.') - else: - chosen_competences = SortedDict() - for competence in Competence.objects.filter( - models.Q(pk__in=comp_ids) | models.Q(section__pk__in=sect_ids)): - try: - competence.for_level_ = competence.for_level(level) - except CompetenceLevel.DoesNotExist: - pass - chosen_competences.setdefault(competence.section, []).append(competence) - context['chosen_competences'] = chosen_competences - - context["errors"] = errors - return context diff --git a/edumed/context_processors.py b/edumed/context_processors.py deleted file mode 100644 index ed57c24..0000000 --- a/edumed/context_processors.py +++ /dev/null @@ -1,4 +0,0 @@ -# -*- coding: utf-8 -*- -def base_template(request): - base_template = 'base_mil.html' if request.META.get('HTTP_HOST').startswith('katalog') else 'base.html' - return dict(base_template = base_template) diff --git a/edumed/forms.py b/edumed/forms.py deleted file mode 100644 index 650197b..0000000 --- a/edumed/forms.py +++ /dev/null @@ -1,17 +0,0 @@ -# -*- coding: utf-8 -*- -from django import forms -from django.utils.translation import ugettext_lazy as _ -from pybb.forms import EditProfileForm -from pybb import util - - -class AvatarlessEditProfileForm(EditProfileForm): - signature = forms.CharField( - widget=forms.Textarea(attrs={'rows': 2, 'cols:': 60}), - required=False, - label=_('Signature') - ) - - class Meta: - model = util.get_pybb_profile_model() - fields = ['signature', 'time_zone', 'language', 'show_signatures'] diff --git a/edumed/forum.py b/edumed/forum.py deleted file mode 100644 index 86cfb0c..0000000 --- a/edumed/forum.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -from pybb.permissions import DefaultPermissionHandler - - -class ForumPermissionHandler(DefaultPermissionHandler): - def may_post_as_admin(self, user): - """ return True if `user` may post as admin """ - return False - - def may_create_topic(self, user, forum): - """ return True if `user` is allowed to create a new topic in `forum` """ - return user.is_authenticated() - - def may_create_post(self, user, topic): - """ return True if `user` is allowed to create a new post in `topic` """ - - if topic.forum.hidden and (not user.is_staff): - # if topic is hidden, only staff may post - return False - - if topic.closed and (not user.is_staff): - # if topic is closed, only staff may post - return False - - return user.is_authenticated() diff --git a/edumed/locale-contrib/django.pot b/edumed/locale-contrib/django.pot deleted file mode 100644 index c231cd9..0000000 --- a/edumed/locale-contrib/django.pot +++ /dev/null @@ -1,715 +0,0 @@ -# Translations template for PROJECT. -# Copyright (C) 2013 ORGANIZATION -# This file is distributed under the same license as the PROJECT project. -# FIRST AUTHOR , 2013. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-08-09 11:40+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" - -#: pybb/admin.py:40 -#: pybb/admin.py:66 -#: pybb/admin.py:94 -#: pybb/admin.py:116 -msgid "Additional options" -msgstr "" - -#: pybb/admin.py:99 -#: pybb/models.py:254 -msgid "Message" -msgstr "" - -#: pybb/admin.py:130 -msgid "View post" -msgstr "" - -#: pybb/admin.py:135 -msgid "Edit post" -msgstr "" - -#: pybb/feeds.py:25 -#: pybb/feeds.py:26 -#: pybb/templates/pybb/base.html:12 -msgid "Latest posts on forum" -msgstr "" - -#: pybb/feeds.py:35 -#: pybb/feeds.py:36 -#: pybb/templates/pybb/base.html:13 -msgid "Latest topics on forum" -msgstr "" - -#: pybb/forms.py:27 -msgid "Attachment is too big" -msgstr "" - -#: pybb/forms.py:47 -#, python-format -msgid "You cant add more than %s answers for poll" -msgstr "" - -#: pybb/forms.py:49 -msgid "Add two or more answers for this poll" -msgstr "" - -#: pybb/forms.py:109 -msgid "Polls question is required when adding a poll" -msgstr "" - -#: pybb/forms.py:192 -#, python-format -msgid "Avatar is too large, max size: %s bytes" -msgstr "" - -#: pybb/models.py:68 -#: pybb/models.py:99 -msgid "Name" -msgstr "" - -#: pybb/models.py:69 -#: pybb/models.py:100 -msgid "Position" -msgstr "" - -#: pybb/models.py:70 -#: pybb/models.py:106 -#: pybb/templates/pybb/category.html:5 -#: pybb/templates/pybb/category.html:28 -msgid "Hidden" -msgstr "" - -#: pybb/models.py:71 -msgid "If checked, this category will be visible only for staff" -msgstr "" - -#: pybb/models.py:76 -#: pybb/models.py:98 -msgid "Category" -msgstr "" - -#: pybb/models.py:77 -msgid "Categories" -msgstr "" - -#: pybb/models.py:101 -msgid "Description" -msgstr "" - -#: pybb/models.py:102 -msgid "Moderators" -msgstr "" - -#: pybb/models.py:103 -#: pybb/models.py:165 -#: pybb/models.py:270 -msgid "Updated" -msgstr "" - -#: pybb/models.py:104 -#: pybb/models.py:172 -#: pybb/models.py:357 -msgid "Post count" -msgstr "" - -#: pybb/models.py:105 -msgid "Topic count" -msgstr "" - -#: pybb/models.py:108 -msgid "Headline" -msgstr "" - -#: pybb/models.py:112 -#: pybb/models.py:162 -#: pybb/templates/pybb/category.html:10 -msgid "Forum" -msgstr "" - -#: pybb/models.py:113 -msgid "Forums" -msgstr "" - -#: pybb/models.py:157 -msgid "None" -msgstr "" - -#: pybb/models.py:158 -msgid "Single answer" -msgstr "" - -#: pybb/models.py:159 -msgid "Multiple answers" -msgstr "" - -#: pybb/models.py:163 -msgid "Subject" -msgstr "" - -#: pybb/models.py:164 -#: pybb/models.py:269 -msgid "Created" -msgstr "" - -#: pybb/models.py:166 -#: pybb/models.py:268 -#: pybb/models.py:381 -#: pybb/models.py:512 -#: pybb/templates/pybb/mail_templates/subscription_email_body.html:3 -msgid "User" -msgstr "" - -#: pybb/models.py:167 -msgid "Views count" -msgstr "" - -#: pybb/models.py:168 -#: pybb/templates/pybb/topic_list.html:27 -msgid "Sticky" -msgstr "" - -#: pybb/models.py:169 -#: pybb/templates/pybb/topic_list.html:28 -msgid "Closed" -msgstr "" - -#: pybb/models.py:170 -#: pybb/templates/pybb/topic.html:92 -msgid "Subscribers" -msgstr "" - -#: pybb/models.py:174 -#: pybb/models.py:272 -msgid "On moderation" -msgstr "" - -#: pybb/models.py:175 -msgid "Poll type" -msgstr "" - -#: pybb/models.py:176 -msgid "Poll question" -msgstr "" - -#: pybb/models.py:180 -#: pybb/models.py:267 -#: pybb/models.py:489 -#: pybb/templates/pybb/topic_list.html:7 -msgid "Topic" -msgstr "" - -#: pybb/models.py:181 -#: pybb/templates/pybb/category.html:13 -msgid "Topics" -msgstr "" - -#: pybb/models.py:255 -msgid "HTML version" -msgstr "" - -#: pybb/models.py:256 -msgid "Text version" -msgstr "" - -#: pybb/models.py:271 -msgid "User IP" -msgstr "" - -#: pybb/models.py:276 -#: pybb/models.py:397 -msgid "Post" -msgstr "" - -#: pybb/models.py:277 -#: pybb/templates/pybb/category.html:16 -#: pybb/templates/pybb/topic_list.html:10 -msgid "Posts" -msgstr "" - -#: pybb/models.py:346 -msgid "Signature" -msgstr "" - -#: pybb/models.py:348 -msgid "Signature HTML Version" -msgstr "" - -#: pybb/models.py:350 -msgid "Time zone" -msgstr "" - -#: pybb/models.py:352 -msgid "Language" -msgstr "" - -#: pybb/models.py:355 -msgid "Show signatures" -msgstr "" - -#: pybb/models.py:358 -msgid "Avatar" -msgstr "" - -#: pybb/models.py:360 -msgid "Automatically subscribe" -msgstr "" - -#: pybb/models.py:361 -msgid "Automatically subscribe to topics that you answer" -msgstr "" - -#: pybb/models.py:384 -msgid "Profile" -msgstr "" - -#: pybb/models.py:385 -msgid "Profiles" -msgstr "" - -#: pybb/models.py:394 -#: pybb/templates/pybb/post_template.html:73 -msgid "Attachment" -msgstr "" - -#: pybb/models.py:395 -msgid "Attachments" -msgstr "" - -#: pybb/models.py:398 -msgid "Size" -msgstr "" - -#: pybb/models.py:399 -msgid "File" -msgstr "" - -#: pybb/models.py:447 -msgid "Topic read tracker" -msgstr "" - -#: pybb/models.py:448 -msgid "Topic read trackers" -msgstr "" - -#: pybb/models.py:483 -msgid "Forum read tracker" -msgstr "" - -#: pybb/models.py:484 -msgid "Forum read trackers" -msgstr "" - -#: pybb/models.py:490 -msgid "Text" -msgstr "" - -#: pybb/models.py:493 -#: pybb/models.py:511 -msgid "Poll answer" -msgstr "" - -#: pybb/models.py:494 -msgid "Polls answers" -msgstr "" - -#: pybb/models.py:516 -msgid "Poll answer user" -msgstr "" - -#: pybb/models.py:517 -msgid "Polls answers users" -msgstr "" - -#: pybb/util.py:58 -msgid "Can't get profile for anonymous user" -msgstr "" - -#: pybb/views.py:648 -msgid "All forums marked as read" -msgstr "" - -#: pybb/views.py:668 -msgid "User successfuly blocked" -msgstr "" - -#: pybb/templates/pybb/_button_new_topic.html:2 -#: pybb/templates/pybb/add_post.html:24 -msgid "New topic" -msgstr "" - -#: pybb/templates/pybb/_button_save.html:1 -msgid "Save" -msgstr "" - -#: pybb/templates/pybb/_button_submit.html:1 -msgid "Submit" -msgstr "" - -#: pybb/templates/pybb/_markitup.html:15 -msgid "Bold" -msgstr "" - -#: pybb/templates/pybb/_markitup.html:16 -msgid "Italic" -msgstr "" - -#: pybb/templates/pybb/_markitup.html:17 -msgid "Underline" -msgstr "" - -#: pybb/templates/pybb/_markitup.html:18 -msgid "Stroke" -msgstr "" - -#: pybb/templates/pybb/_markitup.html:20 -msgid "Picture" -msgstr "" - -#: pybb/templates/pybb/_markitup.html:21 -msgid "Link" -msgstr "" - -#: pybb/templates/pybb/_markitup.html:23 -msgid "Bulleted list" -msgstr "" - -#: pybb/templates/pybb/_markitup.html:24 -msgid "Numeric list" -msgstr "" - -#: pybb/templates/pybb/_markitup.html:25 -msgid "List item" -msgstr "" - -#: pybb/templates/pybb/_markitup.html:27 -msgid "Quotes" -msgstr "" - -#: pybb/templates/pybb/_markitup.html:28 -msgid "Code" -msgstr "" - -#: pybb/templates/pybb/_markitup.html:30 -msgid "Clean" -msgstr "" - -#: pybb/templates/pybb/_markitup.html:31 -msgid "Preview" -msgstr "" - -#: pybb/templates/pybb/_need_to_login_message.html:3 -msgid "Register" -msgstr "" - -#: pybb/templates/pybb/_need_to_login_message.html:3 -msgid "or" -msgstr "" - -#: pybb/templates/pybb/_need_to_login_message.html:3 -msgid "login" -msgstr "" - -#: pybb/templates/pybb/_need_to_login_message.html:3 -msgid "to create to post a reply" -msgstr "" - -#: pybb/templates/pybb/add_post.html:24 -msgid "New reply" -msgstr "" - -#: pybb/templates/pybb/attachments_formset.html:4 -msgid "Add attachments" -msgstr "" - -#: pybb/templates/pybb/attachments_formset.html:10 -#: pybb/templates/pybb/edit_profile.html:27 -msgid "delete" -msgstr "" - -#: pybb/templates/pybb/breadcrumb.html:5 -msgid "Home" -msgstr "" - -#: pybb/templates/pybb/category.html:19 -msgid "Last posts" -msgstr "" - -#: pybb/templates/pybb/category.html:44 -msgid "No forums created" -msgstr "" - -#: pybb/templates/pybb/category.html:45 -msgid "Add forum now" -msgstr "" - -#: pybb/templates/pybb/delete_post.html:5 -msgid "Are you sure you want to delete this message?" -msgstr "" - -#: pybb/templates/pybb/delete_post.html:12 -msgid "No, take me back" -msgstr "" - -#: pybb/templates/pybb/delete_post.html:13 -msgid "Yes, I am sure" -msgstr "" - -#: pybb/templates/pybb/edit_post.html:4 -#: pybb/templates/pybb/edit_post.html:13 -msgid "Editing the post" -msgstr "" - -#: pybb/templates/pybb/edit_profile.html:7 -#: pybb/templates/pybb/edit_profile.html:10 -#: pybb/templates/pybb/edit_profile.html:15 -msgid "Profile editing" -msgstr "" - -#: pybb/templates/pybb/edit_profile.html:20 -msgid "Subscriptions on topics" -msgstr "" - -#: pybb/templates/pybb/index.html:19 -msgid "Forum categories are not created" -msgstr "" - -#: pybb/templates/pybb/index.html:20 -msgid "Add a category now" -msgstr "" - -#: pybb/templates/pybb/index.html:25 -#: pybb/templates/pybb/latest_topics.html:7 -#: pybb/templates/pybb/latest_topics.html:17 -msgid "Last updates in topics" -msgstr "" - -#: pybb/templates/pybb/index.html:28 -msgid "Mark all forums as read" -msgstr "" - -#: pybb/templates/pybb/latest_topics.html:10 -msgid "\"Last updates in topics\"" -msgstr "" - -#: pybb/templates/pybb/latest_topics.html:33 -msgid "Mark all topics as read" -msgstr "" - -#: pybb/templates/pybb/pagination.html:7 -msgid "previous page" -msgstr "" - -#: pybb/templates/pybb/pagination.html:21 -msgid "next page" -msgstr "" - -#: pybb/templates/pybb/poll.html:5 -msgid "Poll" -msgstr "" - -#: pybb/templates/pybb/poll.html:37 -msgid "'Cancel my poll vote'" -msgstr "" - -#: pybb/templates/pybb/poll_edit_form.html:7 -msgid "Poll answers" -msgstr "" - -#: pybb/templates/pybb/poll_edit_form.html:20 -msgid "remove answer" -msgstr "" - -#: pybb/templates/pybb/poll_edit_form.html:21 -msgid "add answer" -msgstr "" - -#: pybb/templates/pybb/post_template.html:25 -msgid "Rank" -msgstr "" - -#: pybb/templates/pybb/post_template.html:38 -#: pybb/templates/pybb/user.html:41 -msgid "Edit" -msgstr "" - -#: pybb/templates/pybb/post_template.html:42 -msgid "Delete post?" -msgstr "" - -#: pybb/templates/pybb/post_template.html:43 -msgid "Delete" -msgstr "" - -#: pybb/templates/pybb/post_template.html:45 -msgid "Approve post" -msgstr "" - -#: pybb/templates/pybb/post_template.html:50 -#: pybb/templates/pybb/topic.html:63 -msgid "Admin" -msgstr "" - -#: pybb/templates/pybb/post_template.html:66 -msgid "Edited" -msgstr "" - -#: pybb/templates/pybb/post_template.html:78 -msgid "quote" -msgstr "" - -#: pybb/templates/pybb/topic.html:24 -#: pybb/templates/pybb/topic.html:44 -#: pybb/templates/pybb/user_posts.html:8 -msgid "'Posts'" -msgstr "" - -#: pybb/templates/pybb/topic.html:52 -msgid "Unstick topic" -msgstr "" - -#: pybb/templates/pybb/topic.html:54 -msgid "Stick topic" -msgstr "" - -#: pybb/templates/pybb/topic.html:58 -msgid "Open topic" -msgstr "" - -#: pybb/templates/pybb/topic.html:60 -msgid "Close topic" -msgstr "" - -#: pybb/templates/pybb/topic.html:66 -msgid "Merge topics" -msgstr "" - -#: pybb/templates/pybb/topic.html:71 -msgid "Unsubscribe" -msgstr "" - -#: pybb/templates/pybb/topic.html:73 -msgid "Subscribe" -msgstr "" - -#: pybb/templates/pybb/topic_list.html:13 -msgid "Views" -msgstr "" - -#: pybb/templates/pybb/topic_list.html:16 -msgid "Last post" -msgstr "" - -#: pybb/templates/pybb/topic_list.html:26 -msgid "Go to first unread post" -msgstr "" - -#: pybb/templates/pybb/topic_list.html:32 -msgid "pages" -msgstr "" - -#: pybb/templates/pybb/user.html:15 -msgid "Statistics" -msgstr "" - -#: pybb/templates/pybb/user.html:18 -msgid "Number of topics" -msgstr "" - -#: pybb/templates/pybb/user.html:24 -msgid "Number of posts" -msgstr "" - -#: pybb/templates/pybb/user.html:28 -msgid "Date of registration" -msgstr "" - -#: pybb/templates/pybb/user.html:35 -msgid "Block" -msgstr "" - -#: pybb/templates/pybb/user.html:36 -msgid "Block and delete all messages" -msgstr "" - -#: pybb/templates/pybb/user_posts.html:13 -msgid "All posts created by" -msgstr "" - -#: pybb/templates/pybb/user_topics.html:8 -msgid "'Topics'" -msgstr "" - -#: pybb/templates/pybb/user_topics.html:11 -#: pybb/templates/pybb/user_topics.html:15 -msgid "All topics created by" -msgstr "" - -#: pybb/templates/pybb/users.html:8 -msgid "Users" -msgstr "" - -#: pybb/templates/pybb/users.html:12 -msgid "Search" -msgstr "" - -#: pybb/templates/pybb/users.html:24 -msgid "'Users'" -msgstr "" - -#: pybb/templates/pybb/mail_templates/subscription_email_body.html:3 -msgid "replied in topic to which you are subscribed." -msgstr "" - -#: pybb/templates/pybb/mail_templates/subscription_email_body.html:4 -msgid "Link to post:" -msgstr "" - -#: pybb/templates/pybb/mail_templates/subscription_email_body.html:5 -msgid "Link to topic:" -msgstr "" - -#: pybb/templates/pybb/mail_templates/subscription_email_body.html:8 -msgid "" -"If you don't want to recive notifications on new messages in this topic " -"visit following link:" -msgstr "" - -#: pybb/templates/pybb/mail_templates/subscription_email_subject.html:2 -msgid "New answer in topic that you subscribed." -msgstr "" - -#: pybb/templatetags/pybb_tags.py:61 -msgid "seconds ago,seconds ago,seconds ago" -msgstr "" - -#: pybb/templatetags/pybb_tags.py:64 -msgid "seconds ago" -msgstr "" - -#: pybb/templatetags/pybb_tags.py:70 -msgid "minutes ago,minutes ago,minutes ago" -msgstr "" - -#: pybb/templatetags/pybb_tags.py:73 -msgid "minutes ago" -msgstr "" - -#: pybb/templatetags/pybb_tags.py:83 -#, python-format -msgid "today, %s" -msgstr "" - -#: pybb/templatetags/pybb_tags.py:85 -#, python-format -msgid "yesterday, %s" -msgstr "" - diff --git a/edumed/locale-contrib/pl/LC_MESSAGES/django.mo b/edumed/locale-contrib/pl/LC_MESSAGES/django.mo deleted file mode 100644 index dce9c5abc4fab4c82215f45b97ecaf4aeaa20225..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1685 zcmZvb&u<$=6vv0sLTd_?0)+!rM?y5Isx|8*6{!=4B#v8|#{S4tx>30-gouW^xF=0eKm`47R}2U;@4jW;6Kuphv8!KWbA@e4?Ce*>w%Q%F7!UI1SOZ-N)VCP?;s zAm#0YaA66EANw4CRL295;(QI#$VvA)HZ7VX&4%is*-?C2^gd{jALV$B1T3nbW=ija zW=M6=qC6Peq#u$?*i;KGs%^67>Ow~{<->w!CQbQ$lo)9*fW`m=wa7M3vR$9 zBOQ;d6kf)>U$D*8LDZ=8W44*6q=|W|oM&|tOLp6EZ}`5l z&huO&T0Du&nqH(TV%vhwvlvMnR~oid3EPH0S6&WTOIRdDrm2Pt$0-PFNjs4LnBUEZ z(yC~hwxc4STgf_B-dA$OKF-msV>@b~#YC~=tw|)?)v>gx(qw54WaNWp9Na_y%IGTZ zblV>_>OFq1(cNjb@0PkUGu8(!H&Ah~nGamhGgaPbZ8W#nH@3FAjh&rRr`-$cG%!R6 zw$M_QFNBrFAY2Z@o4it~E``^_g)oF+&_!{S>3{4Ns+A9}hZWe-bb_80+NHu9TjgC5 z%Y@g*;vf-x)r#0aGb%@ugLQ32CK^kp1zxgCMA_IuIZM|NM-Otmrl2Rqu*$QPuWoOz zr-}^LN}V*fA`NaCJ9Jg9vx(?xiz_fBO>JJ+Y8Cz=4>{EDRl>E}0>657^0-=CqQ`kU z4p%E7fB0~6PB!5+_*CGtaBZd3YPK3D)2)=lQr&1THTo+u49d#~{{1W!O0V$fGhv-hK@|E^q|U@`^uMYOD!#Zq`_uU<(s09@4Ql8EPWcxG&H!5k+JeP zzfoQ)u??N4`2in3`~H9rjvpDvNBFQ4B_k!Lx1yk1A&0`#!|w5qg-^^#s|eyJZd^DI zJ*PYzDVkB4_5xiE04^3R`E7U1a3+@hzXN^=2 zG33e3C|G-}DeOr>Q!9QT5;LiOngBP#96vfbB-5iqv^pzO(>0qG+3s60mI(~wL3(r; ZvpOpCBxcItLP2Nc@#A#TBu@V&{S7mvs$2j7 diff --git a/edumed/locale-contrib/pl/LC_MESSAGES/django.po b/edumed/locale-contrib/pl/LC_MESSAGES/django.po deleted file mode 100644 index f2768dd..0000000 --- a/edumed/locale-contrib/pl/LC_MESSAGES/django.po +++ /dev/null @@ -1,677 +0,0 @@ -# Polish translations for PROJECT. -# Copyright (C) 2013 ORGANIZATION -# This file is distributed under the same license as the PROJECT project. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-08-09 11:40+0200\n" -"PO-Revision-Date: 2013-08-09 12:17+0100\n" -"Last-Translator: Radek Czajka \n" -"Language-Team: pl \n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" -"X-Generator: Poedit 1.5.4\n" - -#: pybb/admin.py:40 pybb/admin.py:66 pybb/admin.py:94 pybb/admin.py:116 -msgid "Additional options" -msgstr "" - -#: pybb/admin.py:99 pybb/models.py:254 -msgid "Message" -msgstr "" - -#: pybb/admin.py:130 -msgid "View post" -msgstr "" - -#: pybb/admin.py:135 -msgid "Edit post" -msgstr "" - -#: pybb/feeds.py:25 pybb/feeds.py:26 pybb/templates/pybb/base.html:12 -msgid "Latest posts on forum" -msgstr "" - -#: pybb/feeds.py:35 pybb/feeds.py:36 pybb/templates/pybb/base.html:13 -msgid "Latest topics on forum" -msgstr "" - -#: pybb/forms.py:27 -msgid "Attachment is too big" -msgstr "" - -#: pybb/forms.py:47 -#, python-format -msgid "You cant add more than %s answers for poll" -msgstr "" - -#: pybb/forms.py:49 -msgid "Add two or more answers for this poll" -msgstr "" - -#: pybb/forms.py:109 -msgid "Polls question is required when adding a poll" -msgstr "" - -#: pybb/forms.py:192 -#, python-format -msgid "Avatar is too large, max size: %s bytes" -msgstr "" - -#: pybb/models.py:68 pybb/models.py:99 -msgid "Name" -msgstr "" - -#: pybb/models.py:69 pybb/models.py:100 -msgid "Position" -msgstr "" - -#: pybb/models.py:70 pybb/models.py:106 pybb/templates/pybb/category.html:5 -#: pybb/templates/pybb/category.html:28 -msgid "Hidden" -msgstr "" - -#: pybb/models.py:71 -msgid "If checked, this category will be visible only for staff" -msgstr "" - -#: pybb/models.py:76 pybb/models.py:98 -msgid "Category" -msgstr "" - -#: pybb/models.py:77 -msgid "Categories" -msgstr "" - -#: pybb/models.py:101 -msgid "Description" -msgstr "" - -#: pybb/models.py:102 -msgid "Moderators" -msgstr "" - -#: pybb/models.py:103 pybb/models.py:165 pybb/models.py:270 -msgid "Updated" -msgstr "" - -#: pybb/models.py:104 pybb/models.py:172 pybb/models.py:357 -msgid "Post count" -msgstr "" - -#: pybb/models.py:105 -msgid "Topic count" -msgstr "" - -#: pybb/models.py:108 -msgid "Headline" -msgstr "" - -#: pybb/models.py:112 pybb/models.py:162 pybb/templates/pybb/category.html:10 -msgid "Forum" -msgstr "" - -#: pybb/models.py:113 -msgid "Forums" -msgstr "" - -#: pybb/models.py:157 -msgid "None" -msgstr "" - -#: pybb/models.py:158 -msgid "Single answer" -msgstr "" - -#: pybb/models.py:159 -msgid "Multiple answers" -msgstr "" - -#: pybb/models.py:163 -msgid "Subject" -msgstr "" - -#: pybb/models.py:164 pybb/models.py:269 -msgid "Created" -msgstr "" - -#: pybb/models.py:166 pybb/models.py:268 pybb/models.py:381 pybb/models.py:512 -#: pybb/templates/pybb/mail_templates/subscription_email_body.html:3 -msgid "User" -msgstr "" - -#: pybb/models.py:167 -msgid "Views count" -msgstr "" - -#: pybb/models.py:168 pybb/templates/pybb/topic_list.html:27 -msgid "Sticky" -msgstr "" - -#: pybb/models.py:169 pybb/templates/pybb/topic_list.html:28 -msgid "Closed" -msgstr "" - -#: pybb/models.py:170 pybb/templates/pybb/topic.html:92 -msgid "Subscribers" -msgstr "" - -#: pybb/models.py:174 pybb/models.py:272 -msgid "On moderation" -msgstr "" - -#: pybb/models.py:175 -msgid "Poll type" -msgstr "" - -#: pybb/models.py:176 -msgid "Poll question" -msgstr "" - -#: pybb/models.py:180 pybb/models.py:267 pybb/models.py:489 -#: pybb/templates/pybb/topic_list.html:7 -msgid "Topic" -msgstr "" - -#: pybb/models.py:181 pybb/templates/pybb/category.html:13 -msgid "Topics" -msgstr "" - -#: pybb/models.py:255 -msgid "HTML version" -msgstr "" - -#: pybb/models.py:256 -msgid "Text version" -msgstr "" - -#: pybb/models.py:271 -msgid "User IP" -msgstr "" - -#: pybb/models.py:276 pybb/models.py:397 -msgid "Post" -msgstr "" - -#: pybb/models.py:277 pybb/templates/pybb/category.html:16 -#: pybb/templates/pybb/topic_list.html:10 -msgid "Posts" -msgstr "" - -#: pybb/models.py:346 -msgid "Signature" -msgstr "Podpis" - -#: pybb/models.py:348 -msgid "Signature HTML Version" -msgstr "" - -#: pybb/models.py:350 -msgid "Time zone" -msgstr "" - -#: pybb/models.py:352 -msgid "Language" -msgstr "" - -#: pybb/models.py:355 -msgid "Show signatures" -msgstr "" - -#: pybb/models.py:358 -msgid "Avatar" -msgstr "" - -#: pybb/models.py:360 -msgid "Automatically subscribe" -msgstr "" - -#: pybb/models.py:361 -msgid "Automatically subscribe to topics that you answer" -msgstr "" - -#: pybb/models.py:384 -msgid "Profile" -msgstr "" - -#: pybb/models.py:385 -msgid "Profiles" -msgstr "" - -#: pybb/models.py:394 pybb/templates/pybb/post_template.html:73 -msgid "Attachment" -msgstr "" - -#: pybb/models.py:395 -msgid "Attachments" -msgstr "" - -#: pybb/models.py:398 -msgid "Size" -msgstr "" - -#: pybb/models.py:399 -msgid "File" -msgstr "" - -#: pybb/models.py:447 -msgid "Topic read tracker" -msgstr "" - -#: pybb/models.py:448 -msgid "Topic read trackers" -msgstr "" - -#: pybb/models.py:483 -msgid "Forum read tracker" -msgstr "" - -#: pybb/models.py:484 -msgid "Forum read trackers" -msgstr "" - -#: pybb/models.py:490 -msgid "Text" -msgstr "" - -#: pybb/models.py:493 pybb/models.py:511 -msgid "Poll answer" -msgstr "" - -#: pybb/models.py:494 -msgid "Polls answers" -msgstr "" - -#: pybb/models.py:516 -msgid "Poll answer user" -msgstr "" - -#: pybb/models.py:517 -msgid "Polls answers users" -msgstr "" - -#: pybb/util.py:58 -msgid "Can't get profile for anonymous user" -msgstr "" - -#: pybb/views.py:648 -msgid "All forums marked as read" -msgstr "" - -#: pybb/views.py:668 -msgid "User successfuly blocked" -msgstr "" - -#: pybb/templates/pybb/_button_new_topic.html:2 -#: pybb/templates/pybb/add_post.html:24 -msgid "New topic" -msgstr "" - -#: pybb/templates/pybb/_button_save.html:1 -msgid "Save" -msgstr "" - -#: pybb/templates/pybb/_button_submit.html:1 -msgid "Submit" -msgstr "" - -#: pybb/templates/pybb/_markitup.html:15 -msgid "Bold" -msgstr "Pogrubienie" - -#: pybb/templates/pybb/_markitup.html:16 -msgid "Italic" -msgstr "Kursywa" - -#: pybb/templates/pybb/_markitup.html:17 -msgid "Underline" -msgstr "Podkreślenie" - -#: pybb/templates/pybb/_markitup.html:18 -msgid "Stroke" -msgstr "Przekreślenie" - -#: pybb/templates/pybb/_markitup.html:20 -msgid "Picture" -msgstr "Obrazek" - -#: pybb/templates/pybb/_markitup.html:21 -msgid "Link" -msgstr "" - -#: pybb/templates/pybb/_markitup.html:23 -msgid "Bulleted list" -msgstr "Lista wypunktowana" - -#: pybb/templates/pybb/_markitup.html:24 -msgid "Numeric list" -msgstr "Lista numerowana" - -#: pybb/templates/pybb/_markitup.html:25 -msgid "List item" -msgstr "Element listy" - -#: pybb/templates/pybb/_markitup.html:27 -msgid "Quotes" -msgstr "Cytat" - -#: pybb/templates/pybb/_markitup.html:28 -msgid "Code" -msgstr "Kod" - -#: pybb/templates/pybb/_markitup.html:30 -msgid "Clean" -msgstr "" - -#: pybb/templates/pybb/_markitup.html:31 -msgid "Preview" -msgstr "Podgląd" - -#: pybb/templates/pybb/_need_to_login_message.html:3 -msgid "Register" -msgstr "" - -#: pybb/templates/pybb/_need_to_login_message.html:3 -msgid "or" -msgstr "" - -#: pybb/templates/pybb/_need_to_login_message.html:3 -msgid "login" -msgstr "" - -#: pybb/templates/pybb/_need_to_login_message.html:3 -msgid "to create to post a reply" -msgstr "" - -#: pybb/templates/pybb/add_post.html:24 -msgid "New reply" -msgstr "" - -#: pybb/templates/pybb/attachments_formset.html:4 -msgid "Add attachments" -msgstr "" - -#: pybb/templates/pybb/attachments_formset.html:10 -#: pybb/templates/pybb/edit_profile.html:27 -msgid "delete" -msgstr "" - -#: pybb/templates/pybb/breadcrumb.html:5 -msgid "Home" -msgstr "" - -#: pybb/templates/pybb/category.html:19 -msgid "Last posts" -msgstr "" - -#: pybb/templates/pybb/category.html:44 -msgid "No forums created" -msgstr "" - -#: pybb/templates/pybb/category.html:45 -msgid "Add forum now" -msgstr "" - -#: pybb/templates/pybb/delete_post.html:5 -msgid "Are you sure you want to delete this message?" -msgstr "" - -#: pybb/templates/pybb/delete_post.html:12 -msgid "No, take me back" -msgstr "" - -#: pybb/templates/pybb/delete_post.html:13 -msgid "Yes, I am sure" -msgstr "" - -#: pybb/templates/pybb/edit_post.html:4 pybb/templates/pybb/edit_post.html:13 -msgid "Editing the post" -msgstr "" - -#: pybb/templates/pybb/edit_profile.html:7 -#: pybb/templates/pybb/edit_profile.html:10 -#: pybb/templates/pybb/edit_profile.html:15 -msgid "Profile editing" -msgstr "" - -#: pybb/templates/pybb/edit_profile.html:20 -msgid "Subscriptions on topics" -msgstr "" - -#: pybb/templates/pybb/index.html:19 -msgid "Forum categories are not created" -msgstr "" - -#: pybb/templates/pybb/index.html:20 -msgid "Add a category now" -msgstr "" - -#: pybb/templates/pybb/index.html:25 pybb/templates/pybb/latest_topics.html:7 -#: pybb/templates/pybb/latest_topics.html:17 -msgid "Last updates in topics" -msgstr "Ostatnio modyfikowane tematy" - -#: pybb/templates/pybb/index.html:28 -msgid "Mark all forums as read" -msgstr "" - -#: pybb/templates/pybb/latest_topics.html:10 -msgid "\"Last updates in topics\"" -msgstr "" - -#: pybb/templates/pybb/latest_topics.html:33 -msgid "Mark all topics as read" -msgstr "Oznacz wszystkie tematy jako przeczytane" - -#: pybb/templates/pybb/pagination.html:7 -msgid "previous page" -msgstr "" - -#: pybb/templates/pybb/pagination.html:21 -msgid "next page" -msgstr "" - -#: pybb/templates/pybb/poll.html:5 -msgid "Poll" -msgstr "" - -#: pybb/templates/pybb/poll.html:37 -msgid "'Cancel my poll vote'" -msgstr "Anuluj mój głos w ankiecie" - -#: pybb/templates/pybb/poll_edit_form.html:7 -msgid "Poll answers" -msgstr "" - -#: pybb/templates/pybb/poll_edit_form.html:20 -msgid "remove answer" -msgstr "" - -#: pybb/templates/pybb/poll_edit_form.html:21 -msgid "add answer" -msgstr "" - -#: pybb/templates/pybb/post_template.html:25 -msgid "Rank" -msgstr "" - -#: pybb/templates/pybb/post_template.html:38 pybb/templates/pybb/user.html:41 -msgid "Edit" -msgstr "" - -#: pybb/templates/pybb/post_template.html:42 -msgid "Delete post?" -msgstr "" - -#: pybb/templates/pybb/post_template.html:43 -msgid "Delete" -msgstr "" - -#: pybb/templates/pybb/post_template.html:45 -msgid "Approve post" -msgstr "" - -#: pybb/templates/pybb/post_template.html:50 pybb/templates/pybb/topic.html:63 -msgid "Admin" -msgstr "" - -#: pybb/templates/pybb/post_template.html:66 -msgid "Edited" -msgstr "" - -#: pybb/templates/pybb/post_template.html:78 -msgid "quote" -msgstr "" - -#: pybb/templates/pybb/topic.html:24 pybb/templates/pybb/topic.html:44 -#: pybb/templates/pybb/user_posts.html:8 -msgid "'Posts'" -msgstr "'Posty'" - -#: pybb/templates/pybb/topic.html:52 -msgid "Unstick topic" -msgstr "" - -#: pybb/templates/pybb/topic.html:54 -msgid "Stick topic" -msgstr "" - -#: pybb/templates/pybb/topic.html:58 -msgid "Open topic" -msgstr "" - -#: pybb/templates/pybb/topic.html:60 -msgid "Close topic" -msgstr "" - -#: pybb/templates/pybb/topic.html:66 -msgid "Merge topics" -msgstr "Połącz wątki" - -#: pybb/templates/pybb/topic.html:71 -msgid "Unsubscribe" -msgstr "" - -#: pybb/templates/pybb/topic.html:73 -msgid "Subscribe" -msgstr "" - -#: pybb/templates/pybb/topic_list.html:13 -msgid "Views" -msgstr "" - -#: pybb/templates/pybb/topic_list.html:16 -msgid "Last post" -msgstr "" - -#: pybb/templates/pybb/topic_list.html:26 -msgid "Go to first unread post" -msgstr "Zobacz pierwszy nieprzeczytany post" - -#: pybb/templates/pybb/topic_list.html:32 -msgid "pages" -msgstr "" - -#: pybb/templates/pybb/user.html:15 -msgid "Statistics" -msgstr "" - -#: pybb/templates/pybb/user.html:18 -msgid "Number of topics" -msgstr "" - -#: pybb/templates/pybb/user.html:24 -msgid "Number of posts" -msgstr "" - -#: pybb/templates/pybb/user.html:28 -msgid "Date of registration" -msgstr "" - -#: pybb/templates/pybb/user.html:35 -msgid "Block" -msgstr "" - -#: pybb/templates/pybb/user.html:36 -msgid "Block and delete all messages" -msgstr "Zablokuj i usuń wszystkie posty" - -#: pybb/templates/pybb/user_posts.html:13 -msgid "All posts created by" -msgstr "Wszystkie posty utworzone przez" - -#: pybb/templates/pybb/user_topics.html:8 -msgid "'Topics'" -msgstr "'Tematy'" - -#: pybb/templates/pybb/user_topics.html:11 -#: pybb/templates/pybb/user_topics.html:15 -msgid "All topics created by" -msgstr "" - -#: pybb/templates/pybb/users.html:8 -msgid "Users" -msgstr "" - -#: pybb/templates/pybb/users.html:12 -msgid "Search" -msgstr "" - -#: pybb/templates/pybb/users.html:24 -msgid "'Users'" -msgstr "'Użytkownicy'" - -#: pybb/templates/pybb/mail_templates/subscription_email_body.html:3 -msgid "replied in topic to which you are subscribed." -msgstr "" - -#: pybb/templates/pybb/mail_templates/subscription_email_body.html:4 -msgid "Link to post:" -msgstr "" - -#: pybb/templates/pybb/mail_templates/subscription_email_body.html:5 -msgid "Link to topic:" -msgstr "" - -#: pybb/templates/pybb/mail_templates/subscription_email_body.html:8 -msgid "" -"If you don't want to recive notifications on new messages in this topic " -"visit following link:" -msgstr "" - -#: pybb/templates/pybb/mail_templates/subscription_email_subject.html:2 -msgid "New answer in topic that you subscribed." -msgstr "" - -#: pybb/templatetags/pybb_tags.py:61 -msgid "seconds ago,seconds ago,seconds ago" -msgstr "" - -#: pybb/templatetags/pybb_tags.py:64 -msgid "seconds ago" -msgstr "" - -#: pybb/templatetags/pybb_tags.py:70 -msgid "minutes ago,minutes ago,minutes ago" -msgstr "" - -#: pybb/templatetags/pybb_tags.py:73 -msgid "minutes ago" -msgstr "" - -#: pybb/templatetags/pybb_tags.py:83 -#, python-format -msgid "today, %s" -msgstr "" - -#: pybb/templatetags/pybb_tags.py:85 -#, python-format -msgid "yesterday, %s" -msgstr "" diff --git a/edumed/milurls.py b/edumed/milurls.py deleted file mode 100644 index dea2558..0000000 --- a/edumed/milurls.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- -from django.conf.urls import include, url, patterns -from django.conf import settings - -from fnpdjango.utils.urls import i18n_patterns -from .views import mil_home_view, mil_contact_view, mil_knowledge_base_view - - -urlpatterns = i18n_patterns( - '', - url(r'^$', mil_home_view, name="mil_home"), - url(r'^kompetencje/', include('curriculum.urls')), - url(r'^wez-udzial/', include('comment.urls')), - url(r'^zglos/', include('contact.urls')), - url(r'^kontakt/$', mil_contact_view, name='mil_contact'), - url(r'^bazawiedzy/(?P.*)$', mil_knowledge_base_view, - name="knowledge_base"), -) - -handler404 = 'edumed.views.mil_404_view' - -if settings.DEBUG: - urlpatterns += patterns( - '', - url(r'^media/(?P.*)$', 'django.views.static.serve', { - 'document_root': settings.MEDIA_ROOT, - }), - ) diff --git a/edumed/settings/apps.py b/edumed/settings/apps.py index 0234807..2bd13bc 100644 --- a/edumed/settings/apps.py +++ b/edumed/settings/apps.py @@ -2,13 +2,8 @@ INSTALLED_APPS = ( 'edumed', - # 'curriculum', - # 'catalogue', - # 'comment', 'wtem', 'stage2', - # 'publishers', - # 'api', 'fnpdjango', 'south', @@ -23,12 +18,9 @@ INSTALLED_APPS = ( 'haystack', 'chunks', 'contact', - # 'forum', - # 'pybb', 'django_libravatar', 'sorl.thumbnail', 'subdomains', - # 'piston', 'django.contrib.auth', 'django.contrib.contenttypes', diff --git a/edumed/settings/context.py b/edumed/settings/context.py index bff5838..8c44e0e 100644 --- a/edumed/settings/context.py +++ b/edumed/settings/context.py @@ -10,6 +10,4 @@ TEMPLATE_CONTEXT_PROCESSORS = process_app_deps(( "django.core.context_processors.tz", ("django.contrib.messages.context_processors.messages", 'django.contrib.messages'), "django.core.context_processors.request", - 'pybb.context_processors.processor', - 'edumed.context_processors.base_template', )) diff --git a/edumed/settings/contrib.py b/edumed/settings/contrib.py index d7ea957..f918f49 100644 --- a/edumed/settings/contrib.py +++ b/edumed/settings/contrib.py @@ -6,13 +6,5 @@ CAS_VERSION = '3' SPONSORS_THUMB_WIDTH = 100 SPONSORS_THUMB_HEIGHT = 56 -PYBB_TEMPLATE = "base_forum.html" -PYBB_SMILES = {} -PYBB_ENABLE_ANONYMOUS_POST = False - -PYBB_DEFAULT_TITLE = u'Forum' -PYBB_DEFAULT_TIME_ZONE = 1 -PYBB_PERMISSION_HANDLER = 'edumed.forum.ForumPermissionHandler' - THUMBNAIL_ENGINE = 'sorl.thumbnail.engines.convert_engine.Engine' THUMBNAIL_CONVERT = 'convert -density 300 -background white -alpha off' diff --git a/edumed/settings/custom.py b/edumed/settings/custom.py index 3be9e89..604e1d2 100644 --- a/edumed/settings/custom.py +++ b/edumed/settings/custom.py @@ -4,5 +4,5 @@ CONTACT_FORMS_MODULE = 'edumed.contact_forms' MAX_UPLOAD_SIZE = 20 * 1024 * 1024 -OLIMPIADA_START = (2017, 11, 23, 10) +OLIMPIADA_START = (2017, 11, 13, 10) OLIMPIADA_END = (2017, 11, 23, 11) diff --git a/edumed/settings/locale.py b/edumed/settings/locale.py index 6aa42c7..8bedb46 100644 --- a/edumed/settings/locale.py +++ b/edumed/settings/locale.py @@ -33,7 +33,6 @@ USE_L10N = True USE_TZ = True CONTRIB_LOCALE_APPS = ( - 'pybb', ) LOCALE_PATHS = ( os.path.join(PROJECT_DIR, 'edumed/locale-contrib'), diff --git a/edumed/settings/middleware.py b/edumed/settings/middleware.py index 3f46f7c..f719614 100644 --- a/edumed/settings/middleware.py +++ b/edumed/settings/middleware.py @@ -18,7 +18,5 @@ MIDDLEWARE_CLASSES = process_app_deps(( ('pagination.middleware.PaginationMiddleware', 'pagination'), 'django.middleware.cache.FetchFromCacheMiddleware', 'fnpdjango.middleware.SetRemoteAddrFromXRealIP', - # 'pybb.middleware.PybbMiddleware', - # 'forum.middleware.ForumMiddleware', 'wtem.middleware.ThreadLocalMiddleware' )) diff --git a/edumed/settings/static.py b/edumed/settings/static.py index 98da70c..f4020ee 100644 --- a/edumed/settings/static.py +++ b/edumed/settings/static.py @@ -23,17 +23,10 @@ PIPELINE_CSS = { 'css/base.scss', 'css/main.scss', 'css/form.scss', - 'catalogue/css/carousel.scss', 'catalogue/css/layout.scss', - 'catalogue/css/lesson.scss', 'catalogue/css/exercise.scss', - 'catalogue/css/section_list.scss', - 'curriculum/curriculum.scss', 'jquery/colorbox/colorbox.css', 'fnpdjango/annoy/annoy.css', - - 'css/forum.scss', - 'css/mil.scss' ), 'output_filename': 'compressed/base.css', }, @@ -41,18 +34,11 @@ PIPELINE_CSS = { PIPELINE_JS = { 'base': { 'source_filenames': ( - 'catalogue/js/jquery-ui-1.10.0.custom.js', - 'catalogue/js/jquery.cycle.all.js', 'jquery/colorbox/jquery.colorbox-min.js', 'jquery/colorbox/jquery.colorbox-pl.js', - 'catalogue/js/carousel.js', 'catalogue/js/edumed.js', - 'catalogue/js/lesson.js', - 'catalogue/js/lesson-list.js', 'sponsors/js/sponsors.js', - 'curriculum/curriculum.js', 'js/formset.js', - 'pybb/js/pybbjs.js', 'fnpdjango/annoy/annoy.js', 'js/checkfile.js', ), @@ -60,7 +46,7 @@ PIPELINE_JS = { }, 'wtem': { 'source_filenames': ( - 'catalogue/js/jquery-ui-1.10.0.custom.js', + 'js/jquery-ui-1.10.0.custom.js', 'wtem/edumed.js', 'wtem/wtem.js', 'wtem/json2.js' diff --git a/edumed/static/catalogue/css/carousel.css b/edumed/static/catalogue/css/carousel.css deleted file mode 100644 index 992e285..0000000 --- a/edumed/static/catalogue/css/carousel.css +++ /dev/null @@ -1,110 +0,0 @@ -#catalogue-carousel { - float: left; - position: relative; - width: 43.75em; - height: 14.6875em; - overflow: hidden; - border-radius: 0.9375em; -} - #catalogue-carousel #catalogue-carousel-links { - width: 28.75em; - height: 14.6875em; - list-style: none; - margin: 0; - padding: 0; } - #catalogue-carousel #catalogue-carousel-links li { - display: block; - position: absolute; - top: 0; - left: 0; - height: 100%; - background-size: 100% 100%; - border-top-left-radius: 0.9375em 6.38%; - border-bottom-left-radius: 0.9375em 6.38%; - z-index: 100; - background-color: #888; } - #catalogue-carousel #catalogue-carousel-links li a.catalogue-carousel-link { - display: block; - overflow: hidden; - width: 28.75em; - height: 100%; - background: url(/static/catalogue/img/carousel-left.png) 100% 0 no-repeat; - background-size: 4.375em 100%; } - #catalogue-carousel #catalogue-carousel-links li a.catalogue-carousel-link .catalogue-carousel-note { - position: relative; - height: 100%; - color: white; - margin-top: 8.5em; } - #catalogue-carousel #catalogue-carousel-links li a.catalogue-carousel-link .catalogue-carousel-note div:before { - content: " "; - display: block; - position: absolute; - height: 100%; - width: 100%; - z-index: -1; - background-color: black; - opacity: 0.6; } - #catalogue-carousel #catalogue-carousel-links li a.catalogue-carousel-link .catalogue-carousel-note div p { - padding: .4em 3em 0 .5em; } - #catalogue-carousel #catalogue-carousel-links li a.catalogue-carousel-link .catalogue-carousel-note div p strong { - font-size: 1.2em; - display: block; } - #catalogue-carousel #catalogue-carousel-links li a.catalogue-carousel-link .catalogue-carousel-note div p .more { - position: absolute; - right: 4em; - top: 4.5em; } - #catalogue-carousel #catalogue-carousel-links li a.catalogue-carousel-link:active { - outline: none; } - #catalogue-carousel #catalogue-carousel-links li .attribution { - text-align: right; - font-size: .75em; - position: absolute; - right: 5em; - top: .1em; - color: white; - font-weight: bold; - text-shadow: 0 0 5px #000; } - #catalogue-carousel #catalogue-carousel-switcher { - margin: 0; - padding: 0.1875em 0 0 3.625em; - width: 11.375em; - height: 14.6875em; - position: absolute; - right: 0; - top: 0; - list-style: none; - border-radius: 0 0.9375em 0.9375em 0; - background-color: #ed7831; - background-image: url(/static/catalogue/img/carousel-right.png); - background-position: 0 0; - background-repeat: no-repeat; - background-size: auto 14.6875em; - /* right part of mask as background */ } - #catalogue-carousel #catalogue-carousel-switcher li { - margin-bottom: .4em; - font-size: .85em; - line-height: 1em; } - #catalogue-carousel #catalogue-carousel-switcher li a { - text-transform: uppercase; - color: #363a3e; } - #catalogue-carousel #catalogue-carousel-switcher li a:before { - vertical-align: top; - margin-right: 1.5em; } - #catalogue-carousel #catalogue-carousel-switcher li .knowledge:before { - content: url(/static/img/icons/knowledge_dark.png); } - #catalogue-carousel #catalogue-carousel-switcher li .activity:before { - content: url(/static/img/icons/activity_dark.png); } - #catalogue-carousel #catalogue-carousel-switcher li .lesson-plan:before { - content: url(/static/img/icons/lesson-plan_dark.png); } - #catalogue-carousel #catalogue-carousel-switcher li .reference:before { - content: url(/static/img/icons/reference_dark.png); } - #catalogue-carousel #catalogue-carousel-switcher li.activeSlide a { - color: white; } - #catalogue-carousel #catalogue-carousel-switcher li.activeSlide .knowledge:before { - content: url(/static/img/icons/knowledge_white.png); } - #catalogue-carousel #catalogue-carousel-switcher li.activeSlide .activity:before { - content: url(/static/img/icons/activity_white.png); } - #catalogue-carousel #catalogue-carousel-switcher li.activeSlide .lesson-plan:before { - content: url(/static/img/icons/lesson-plan_white.png); } - #catalogue-carousel #catalogue-carousel-switcher li.activeSlide .reference:before { - content: url(/static/img/icons/reference_white.png); } diff --git a/edumed/static/catalogue/css/carousel.scss b/edumed/static/catalogue/css/carousel.scss deleted file mode 100755 index 299f95b..0000000 --- a/edumed/static/catalogue/css/carousel.scss +++ /dev/null @@ -1,140 +0,0 @@ -$px: .0625em; - -$ciemny: #363a3e; - - -#catalogue-carousel { - float: left; - position: relative; - width: 700*$px; - height: 235*$px; - overflow: hidden; - border-radius: 15*$px; - - #catalogue-carousel-links { - width: 460*$px; - height: 235*$px; - list-style: none; - margin: 0; - padding: 0; - - li { - display: block; - position: absolute; - top: 0; - left: 0; - height: 100%; - background-size: 100% 100%; - border-top-left-radius: 15*$px 6.38%; - border-bottom-left-radius: 15*$px 6.38%; - z-index: 100; - background-color: #888; - - a.catalogue-carousel-link { - display: block; - overflow: hidden; - width: 460*$px; - height: 100%; - background: url(/static/catalogue/img/carousel-left.png) 100% 0 no-repeat; - background-size: 70*$px 100%; - - .catalogue-carousel-note { - position: relative; - height: 100%; - color: white; - margin-top: 8.5em; - - div { - &:before { - content: " "; - display: block; - position: absolute; - height: 100%; - width: 100%; - z-index: -1; - background-color: black; - opacity: 0.6; - } - - p { - padding: .4em 3em 0 .5em; - - strong { - font-size: 1.2em; - display: block; - } - - .more { - position: absolute; - right: 4em; - top: 4.5em; - } - } - } - } - } - a.catalogue-carousel-link:active { - outline: none; - } - .attribution { - text-align: right; - font-size: .75em; - position: absolute; - right: 5em; - top: .1em; - color: white; - font-weight: bold; - text-shadow: 0 0 5px #000; - } - - } - } - #catalogue-carousel-switcher { - margin: 0; - padding: 3*$px 0 0 58*$px; - width: 240*$px - 58*$px; - height: 243*$px - 8*$px; - position: absolute; - right: 0; - top: 0; - list-style: none; - border-radius: 0 15*$px 15*$px 0; - background-color: #ed7831; - background-image: url(/static/catalogue/img/carousel-right.png); - background-position: 0 0; - background-repeat: no-repeat; - background-size: auto 235*$px; - - /* right part of mask as background */ - - li { - margin-bottom: .4em; - font-size: .85em; - line-height: 1em; - - a { - text-transform: uppercase; - color: $ciemny; - } - a:before { - vertical-align: top; - margin-right: 1.5em; - } - .knowledge:before {content: url(/static/img/icons/knowledge_dark.png);} - .activity:before {content: url(/static/img/icons/activity_dark.png);} - .lesson-plan:before {content: url(/static/img/icons/lesson-plan_dark.png);} - .reference:before {content: url(/static/img/icons/reference_dark.png);} - } - li.activeSlide { - a { - color: white; - } - .knowledge:before {content: url(/static/img/icons/knowledge_white.png);} - .activity:before {content: url(/static/img/icons/activity_white.png);} - .lesson-plan:before {content: url(/static/img/icons/lesson-plan_white.png);} - .reference:before {content: url(/static/img/icons/reference_white.png);} - } - } - - -} diff --git a/edumed/static/catalogue/css/lesson.css b/edumed/static/catalogue/css/lesson.css deleted file mode 100644 index c8e73c4..0000000 --- a/edumed/static/catalogue/css/lesson.css +++ /dev/null @@ -1,254 +0,0 @@ -/* =================================================== */ -/* = Common elements: headings, paragraphs and lines = */ -/* =================================================== */ -/*h1 { - font-size: 3em; - margin: 1.5em 0; - text-align: center; - line-height: 1.5em; - font-weight: bold; -} - -h2 { - font-size: 2em; - margin: 1.5em 0 0; - font-weight: bold; - line-height: 1.5em; -} - -h3 { - font-size: 1.5em; - margin: 1.5em 0 0; - font-weight: normal; - line-height: 1.5em; -} - -h4 { - font-size: 1em; - margin: 1.5em 0 0; - line-height: 1.5em; -} - -p { - margin: 0; -} -*/ -/* ======================== */ -/* = Footnotes and themes = */ -/* ======================== */ -.annotation { - font-style: normal; - font-weight: normal; - font-size: 12px; - padding-left: 2px; - position: relative; - top: -4px; } - -#footnotes { - margin-top: 3em; } - -#footnotes .annotation { - display: block; - float: left; - width: 2.5em; - clear: both; } - -#footnotes div { - margin: 1.5em 0 0 0; } - -#footnotes p, #footnotes ul { - margin-left: 2.5em; - font-size: 0.875em; } - -#footnotes .permalink { - font-size: .75em; } - -blockquote { - font-size: 0.875em; } - -/* ============= */ -/* = Numbering = */ -/* ============= */ -.verse, .paragraph { - position: relative; } - -.anchor { - position: absolute; - margin: -0.25em -0.5em; - left: -3em; - color: #777; - font-size: 12px; - width: 2em; - text-align: center; - padding: 0.25em 0.5em; - line-height: 1.5em; } - -.anchor:hover, #book-text .anchor:active { - color: #FFF; - background-color: #CCC; } - -/* =================== */ -/* = Custom elements = */ -/* =================== */ -span.author { - font-size: 0.5em; - display: block; - line-height: 1.5em; - margin-bottom: 0.25em; } - -span.collection { - font-size: 0.375em; - display: block; - line-height: 1.5em; - margin-bottom: -0.25em; } - -span.subtitle { - font-size: 0.5em; - display: block; - line-height: 1.5em; - margin-top: -0.25em; } - -span.translator { - font-size: 0.375em; - display: block; - line-height: 1.5em; - margin-top: 0.25em; } - -div.didaskalia { - font-style: italic; - margin: 0.5em 0 0 1.5em; } - -div.kwestia { - margin: 0.5em 0 0; } - -div.stanza { - margin: 1.5em 0 0; } - -div.kwestia div.stanza { - margin: 0; } - -p.paragraph { - text-align: justify; - margin: 1.5em 0 0; } - -p.motto { - text-align: justify; - font-style: italic; - margin: 1.5em 0 0; } - -p.motto_podpis { - font-size: 0.875em; - text-align: right; } - -div.fragment { - border-bottom: 0.1em solid #999; - padding-bottom: 1.5em; } - -div.note p, div.dedication p, div.note p.paragraph, div.dedication p.paragraph { - text-align: right; - font-style: italic; } - -hr.spacer { - height: 3em; - visibility: hidden; } - -hr.spacer-line { - margin: 1.5em 0; - border: none; - border-bottom: 0.1em solid #000; } - -p.spacer-asterisk { - padding: 0; - margin: 1.5em 0; - text-align: center; } - -div.person-list ol { - list-style: none; - padding: 0 0 0 1.5em; } - -p.place-and-time { - font-style: italic; } - -em.math, em.foreign-word, em.book-title, em.didaskalia { - font-style: italic; } - -em.author-emphasis { - letter-spacing: 0.1em; } - -em.person { - font-style: normal; - font-variant: small-caps; } - -.verse:after { - content: "\feff"; } - -/* =================================== */ -/* = Hide some elements for printing = */ -/* =================================== */ -@media print { - #menu { - display: none; } } -.activity { - clear: both; } - -.activity .text { - width: 27.5em; - margin-right: 20px; - float: left; } - -.activity .description p:first-child { - margin-top: 0; } - -.activity { - margin-top: 2em; } - .activity .act_counter { - float: left; - margin-right: .5em; - font-size: 2em; } - .activity .info { - float: right; - width: 8.4375em; } - .activity .info .infobox { - padding: 1em 0; - border-top: 1px solid #c9ccce; } - .activity .info .infobox h1 { - text-transform: uppercase; - font-weight: bold; - margin: 0 0 0.5em -2.1875em; - padding-left: 2.1875em; - line-height: 24px; - font-size: 1em; } - .activity .info .infobox p { - margin: 0; } - .activity .info .time h1 { - background: url(/static/img/icons/activity-time.png) 0 0 no-repeat; } - .activity .info .kind h1 { - background: url(/static/img/icons/activity-kind.png) 0 0 no-repeat; } - .activity .info .materials h1 { - background: url(/static/img/icons/activity-tools.png) 0 0 no-repeat; } - -.lista .paragraph { - margin: .3em 0; } -.lista li { - margin: .75em 0; } - -.clearboth { - clear: both; } - -#book-text .caption { - margin: 1.5em; } - #book-text .caption p { - margin: 0; } - -/* utils */ -.clr { - clear: both; } - -#book-text .top-link { - margin-top: 1em; } - -.help { - font-size: .7em; - padding: 0 .5em; - color: #888; - vertical-align: super; } diff --git a/edumed/static/catalogue/css/lesson.scss b/edumed/static/catalogue/css/lesson.scss deleted file mode 100755 index d98f1a3..0000000 --- a/edumed/static/catalogue/css/lesson.scss +++ /dev/null @@ -1,327 +0,0 @@ -$px: .0625em; - -/* =================================================== */ -/* = Common elements: headings, paragraphs and lines = */ -/* =================================================== */ - -/*h1 { - font-size: 3em; - margin: 1.5em 0; - text-align: center; - line-height: 1.5em; - font-weight: bold; -} - -h2 { - font-size: 2em; - margin: 1.5em 0 0; - font-weight: bold; - line-height: 1.5em; -} - -h3 { - font-size: 1.5em; - margin: 1.5em 0 0; - font-weight: normal; - line-height: 1.5em; -} - -h4 { - font-size: 1em; - margin: 1.5em 0 0; - line-height: 1.5em; -} - -p { - margin: 0; -} -*/ - -/* ======================== */ -/* = Footnotes and themes = */ -/* ======================== */ - -.annotation { - font-style: normal; - font-weight: normal; - font-size: 12px; - padding-left: 2px; - position: relative; - top: -4px; -} - -#footnotes { - margin-top: 3em; -} - -#footnotes .annotation { - display: block; - float: left; - width: 2.5em; - clear: both; -} - -#footnotes div { - margin: 1.5em 0 0 0; -} - -#footnotes p, #footnotes ul { - margin-left: 2.5em; - font-size: 0.875em; -} - -#footnotes .permalink { - font-size: .75em; -} - -blockquote { - font-size: 0.875em; -} - -/* ============= */ -/* = Numbering = */ -/* ============= */ -.verse, .paragraph { - position:relative; -} -.anchor { - position: absolute; - margin: -0.25em -0.5em; - left: -3em; - color: #777; - font-size: 12px; - width: 2em; - text-align: center; - padding: 0.25em 0.5em; - line-height: 1.5em; -} - -.anchor:hover, #book-text .anchor:active { - color: #FFF; - background-color: #CCC; -} - -/* =================== */ -/* = Custom elements = */ -/* =================== */ -span.author { - font-size: 0.5em; - display: block; - line-height: 1.5em; - margin-bottom: 0.25em; -} - -span.collection { - font-size: 0.375em; - display: block; - line-height: 1.5em; - margin-bottom: -0.25em; -} - -span.subtitle { - font-size: 0.5em; - display: block; - line-height: 1.5em; - margin-top: -0.25em; -} - -span.translator { - font-size: 0.375em; - display: block; - line-height: 1.5em; - margin-top: 0.25em; -} - -div.didaskalia { - font-style: italic; - margin: 0.5em 0 0 1.5em; -} - -div.kwestia { - margin: 0.5em 0 0; -} - -div.stanza { - margin: 1.5em 0 0; -} - -div.kwestia div.stanza { - margin: 0; -} - -p.paragraph { - text-align: justify; - margin: 1.5em 0 0; -} - -p.motto { - text-align: justify; - font-style: italic; - margin: 1.5em 0 0; -} - -p.motto_podpis { - font-size: 0.875em; - text-align: right; -} - -div.fragment { - border-bottom: 0.1em solid #999; - padding-bottom: 1.5em; -} - -div.note p, div.dedication p, div.note p.paragraph, div.dedication p.paragraph { - text-align: right; - font-style: italic; -} - -hr.spacer { - height: 3em; - visibility: hidden; -} - -hr.spacer-line { - margin: 1.5em 0; - border: none; - border-bottom: 0.1em solid #000; -} - -p.spacer-asterisk { - padding: 0; - margin: 1.5em 0; - text-align: center; -} - -div.person-list ol { - list-style: none; - padding: 0 0 0 1.5em; -} - -p.place-and-time { - font-style: italic; -} - -em.math, em.foreign-word, em.book-title, em.didaskalia { - font-style: italic; -} - -em.author-emphasis { - letter-spacing: 0.1em; -} - -em.person { - font-style: normal; - font-variant: small-caps; -} - -.verse:after { - content: "\feff"; -} - - -/* =================================== */ -/* = Hide some elements for printing = */ -/* =================================== */ - -@media print { - #menu {display: none;} -} - - - -.activity { - clear:both; -} - -.activity .text { - width: 440*$px; - margin-right: 20px; - float: left; -} - -.activity .description p:first-child { - margin-top: 0; -} - - - -.activity { - margin-top: 2em; - - .act_counter { - float: left; - margin-right: .5em; - font-size: 2em; - } - - .info { - float: right; - width: 135*$px; - - .infobox { - padding: 1em 0; - border-top: 1px solid #c9ccce; - h1 { - text-transform: uppercase; - font-weight: bold; - margin: 0 0 .5em -35*$px; - padding-left: 35*$px; - line-height: 24px; - font-size: 1em; - } - p { - margin: 0; - } - - } - .time h1 { - background: url(/static/img/icons/activity-time.png) 0 0 no-repeat; - } - .kind h1 { - background: url(/static/img/icons/activity-kind.png) 0 0 no-repeat; - } - .materials h1 { - background: url(/static/img/icons/activity-tools.png) 0 0 no-repeat; - } - } -} - -.lista { - .paragraph { - margin: .3em 0; - } - li { - margin: .75em 0; - } -} - - -.clearboth { - clear: both; -} - -#book-text { - .caption { - margin: 1.5em; - p { - margin: 0; - } - } -} - -/* utils */ - -.clr { - clear: both; -} - -#book-text .top-link { - margin-top: 1em; -} - -.help { - font-size: .7em; - padding: 0 .5em; - color: #888; - vertical-align: super; -} diff --git a/edumed/static/catalogue/css/section_list.css b/edumed/static/catalogue/css/section_list.css deleted file mode 100644 index bd68dee..0000000 --- a/edumed/static/catalogue/css/section_list.css +++ /dev/null @@ -1,58 +0,0 @@ -#level-chooser-place { - min-height: 5.9375em; - margin-top: 2em; } - #level-chooser-place ul#level-chooser { - margin: 0; - padding: 1em 0 1em 8.75em; - background-color: white; - width: 31.25em; - z-index: 300; - position: relative; - text-transform: uppercase; - text-align: right; } - #level-chooser-place ul#level-chooser .home { - display: none; - position: absolute; - top: 1.5em; - left: 0; } - #level-chooser-place ul#level-chooser .home a { - background: none; - padding: 0; } - #level-chooser-place ul#level-chooser .home a img { - width: 7.5em; } - #level-chooser-place ul#level-chooser.fixed { - position: fixed; - top: 0; - border-bottom: 1px solid #c9ccce; } - #level-chooser-place ul#level-chooser.fixed .home { - display: block; } - #level-chooser-place ul#level-chooser li { - display: inline-block; - list-style: none; - max-width: 175px; } - #level-chooser-place ul#level-chooser li a { - display: table-cell; - padding: .5em 1em; - border-radius: 0.3125em; - background: #eee; - height: 2.625em; - vertical-align: middle; } - #level-chooser-place ul#level-chooser li a.active { - color: white; - background: #ED7831; } - -.level .link-list { - margin-left: 1em; } -.level .level-toc { - overflow: hidden; - /* Because we're changing bg color lower. */ } - .level .level-toc.fixed { - position: fixed; } - .level .level-toc .link-list { - margin-left: 1em; } - .level .level-toc .link-list li { - margin-bottom: 0; } - .level .level-toc .link-list li.curriculumcourses { - margin: 10px -17px -17px; - padding: 10px 16px 16px; - background-color: #eee; } diff --git a/edumed/static/catalogue/css/section_list.scss b/edumed/static/catalogue/css/section_list.scss deleted file mode 100755 index fda2be3..0000000 --- a/edumed/static/catalogue/css/section_list.scss +++ /dev/null @@ -1,90 +0,0 @@ -$px: 0.0625em; - -#level-chooser-place { - min-height: 95*$px; - margin-top: 2em; - - ul#level-chooser { - margin: 0; - padding: 16*$px 0 16*$px 140*$px; - background-color: white; - width: 500*$px; - z-index: 300; - position: relative; - text-transform: uppercase; - text-align: right; - - .home { - display: none; - position: absolute; - top: 1.5em; - left: 0; - - a { - background: none; - padding: 0; - img { - width: 120*$px; - } - } - } - - &.fixed { - position: fixed; - top: 0; - border-bottom: 1px solid #c9ccce; - - .home { - display: block; - } - } - - li { - display: inline-block; - list-style: none; - max-width: 175px; - - a { - display: table-cell; - padding: .5em 1em; - border-radius: 5*$px; - background: #eee; - height: 42*$px; - vertical-align: middle; - - &.active { - color: white; - background: #ED7831; - } - } - } - } -} - -.level { - .link-list { - margin-left: 1em; - } - - .level-toc { - overflow: hidden; /* Because we're changing bg color lower. */ - - &.fixed { - position: fixed; - } - - .link-list { - margin-left: 1em; - - li { - margin-bottom: 0; - - &.curriculumcourses { - margin: 10px -17px -17px; - padding: 10px 16px 16px; - background-color: #eee; - } - } - } - } -} diff --git a/edumed/static/catalogue/img/carousel-left.png b/edumed/static/catalogue/img/carousel-left.png deleted file mode 100644 index 3f6090bd6a38d9b2b521e2c0f88ea9f697e7acfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2139 zcmV-h2&DIkP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00+ZKL_t(|+U=cPh*eb>hM%=( z)I=v6XBxG#ES0F#$sf#&D9XC2D76SHDf7aMH0vfJ6se2A5G>es`FsT|&?x!gd9Pq6g<65)R&TZ5fk2RM9Th$o1 zwgWp9j2ovDz~dSvf1J(&egOukF==ZK0WYXAerqNHUxo5|f-uI`R{JqQqjXA~jsvSS zO8z(v2fhKi)R?q2eZYGfC4a32jwu+oz65qE82?OoH6S|px`XgAU_UTOjY(T`79T{?Z9|7#+?a2 zrN)$>3Gb!JC#~jfj5#?I{!oqaTQd>(TEX}S;k}g3#ndQy+7W7u$C?h{cQwYf<_M+p zz10|xHBIXYC*-?!0NWIdza8;}MydQv_$S~DHO8F@uTx|E)?7}h^=Z_YbZxdbjgn^& zep;jCkJE7b_T8<|WILiT##n2n0-w=Okx26L)SnHf7DJmG- z6MjXF@mo`KPdK62wSyYBVktBj+m2YSQS!&B6aPBlsH1dpiQ21Zd99fuBFCkQN+Myi zi7J`eF~jZ!*J zCxDeY`1-9GMrjwdfoe?Jn!^ONflp}GOwhr%{2;ssI7c;c;mlWK{9yWBC!E9z#`c8Q zX?Fb9Tvjehv4d$7k!=db4`-f&@q_6Ukw0VY;Pp2MYfrczYo>_E35}9}5ZZOO2Q9ky;3OC zj!+7IFavZRzU$d@9(cDYi4*+JGN`^G^4>u^BUy3U?uj4a`z1{Awho^R9brj0USQ>AIs* zDA5=rBJGqmT_0EJV`4F8S~XB&0<)yr2gI=BP&e>vwU3LznA>W3P|>%0YXf#u!)e4t zH>Q^w&#f*xm}Rv-u*iFD_S@5q*_e6tJh-U)`JT3?8>=zXsk5hBR4~ixeS#wHGT#mS zOr1+oi)hTf=#?zIGu`ij(e*x8(Tus03L4!pf?3k26cp+DNZOcP}uq(a)WCV|tqb zr3he_H|vQ_j$>3;Pq)a%+|$e_H#xPX?w)Q@jhRl9*XiaJ%<^U*z~nGS-FEIWNR4p^ z-9c)MJJa0-oZswY<;|Fxz`3nBP~N~)yiPZoDA}Iw?pBO1c{65CtDxk@m|E89#$wFm zRzk@Wn1@?^K$C+Qb=eP$s4?l9oy9>-;I_0;x&-_PH6~q|?Y$5>m=#$a*aRG-ruKC6 zY|PzR9^3?KOVfM0c{OGR8SlLiDwyS2zW@_pj4IlDAx2~7XALDdV{Cij8{opMUrT7l zTmg&;;e~_-W@#uEn}A}}L+PuLA!5xEBVm>iU8A(U=PZOdG2Nu9I^%0OTv zIohW?X#tdW;7#Bva#Tr^p|k<712>VgGEIiEfs9r}1qnt(I)Hb8YsqPuCP0~B-;%q? zaU~6gazC&+?@$_MjEIZ^)&VzAkV@(VGDJjHP+FZ(7$`LxBO-%=+kxk)VuSKRg0Vf6 z3BUqMmk%63fy-1dl^<{4b{7E?iKLAE<2&qlGYaSdt^=+IE}^vVQ*>9=`3E0vOHfq% R>G}Ww002ovPDHLkV1h}}+wlMZ diff --git a/edumed/static/catalogue/img/carousel-right.png b/edumed/static/catalogue/img/carousel-right.png deleted file mode 100644 index 3987678a4884608a201cedfa6e6541f88b1393c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1794 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
    - value = parseInt( elem.css( "zIndex" ), 10 ); - if ( !isNaN( value ) && value !== 0 ) { - return value; - } - } - elem = elem.parent(); - } - } - - return 0; - }, - - uniqueId: function() { - return this.each(function() { - if ( !this.id ) { - this.id = "ui-id-" + (++uuid); - } - }); - }, - - removeUniqueId: function() { - return this.each(function() { - if ( runiqueId.test( this.id ) ) { - $( this ).removeAttr( "id" ); - } - }); - } -}); - -// selectors -function focusable( element, isTabIndexNotNaN ) { - var map, mapName, img, - nodeName = element.nodeName.toLowerCase(); - if ( "area" === nodeName ) { - map = element.parentNode; - mapName = map.name; - if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) { - return false; - } - img = $( "img[usemap=#" + mapName + "]" )[0]; - return !!img && visible( img ); - } - return ( /input|select|textarea|button|object/.test( nodeName ) ? - !element.disabled : - "a" === nodeName ? - element.href || isTabIndexNotNaN : - isTabIndexNotNaN) && - // the element and all of its ancestors must be visible - visible( element ); -} - -function visible( element ) { - return $.expr.filters.visible( element ) && - !$( element ).parents().addBack().filter(function() { - return $.css( this, "visibility" ) === "hidden"; - }).length; -} - -$.extend( $.expr[ ":" ], { - data: $.expr.createPseudo ? - $.expr.createPseudo(function( dataName ) { - return function( elem ) { - return !!$.data( elem, dataName ); - }; - }) : - // support: jQuery <1.8 - function( elem, i, match ) { - return !!$.data( elem, match[ 3 ] ); - }, - - focusable: function( element ) { - return focusable( element, !isNaN( $.attr( element, "tabindex" ) ) ); - }, - - tabbable: function( element ) { - var tabIndex = $.attr( element, "tabindex" ), - isTabIndexNaN = isNaN( tabIndex ); - return ( isTabIndexNaN || tabIndex >= 0 ) && focusable( element, !isTabIndexNaN ); - } -}); - -// support: jQuery <1.8 -if ( !$( "" ).outerWidth( 1 ).jquery ) { - $.each( [ "Width", "Height" ], function( i, name ) { - var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ], - type = name.toLowerCase(), - orig = { - innerWidth: $.fn.innerWidth, - innerHeight: $.fn.innerHeight, - outerWidth: $.fn.outerWidth, - outerHeight: $.fn.outerHeight - }; - - function reduce( elem, size, border, margin ) { - $.each( side, function() { - size -= parseFloat( $.css( elem, "padding" + this ) ) || 0; - if ( border ) { - size -= parseFloat( $.css( elem, "border" + this + "Width" ) ) || 0; - } - if ( margin ) { - size -= parseFloat( $.css( elem, "margin" + this ) ) || 0; - } - }); - return size; - } - - $.fn[ "inner" + name ] = function( size ) { - if ( size === undefined ) { - return orig[ "inner" + name ].call( this ); - } - - return this.each(function() { - $( this ).css( type, reduce( this, size ) + "px" ); - }); - }; - - $.fn[ "outer" + name] = function( size, margin ) { - if ( typeof size !== "number" ) { - return orig[ "outer" + name ].call( this, size ); - } - - return this.each(function() { - $( this).css( type, reduce( this, size, true, margin ) + "px" ); - }); - }; - }); -} - -// support: jQuery <1.8 -if ( !$.fn.addBack ) { - $.fn.addBack = function( selector ) { - return this.add( selector == null ? - this.prevObject : this.prevObject.filter( selector ) - ); - }; -} - -// support: jQuery 1.6.1, 1.6.2 (http://bugs.jquery.com/ticket/9413) -if ( $( "" ).data( "a-b", "a" ).removeData( "a-b" ).data( "a-b" ) ) { - $.fn.removeData = (function( removeData ) { - return function( key ) { - if ( arguments.length ) { - return removeData.call( this, $.camelCase( key ) ); - } else { - return removeData.call( this ); - } - }; - })( $.fn.removeData ); -} - - - - - -// deprecated -$.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() ); - -$.support.selectstart = "onselectstart" in document.createElement( "div" ); -$.fn.extend({ - disableSelection: function() { - return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) + - ".ui-disableSelection", function( event ) { - event.preventDefault(); - }); - }, - - enableSelection: function() { - return this.unbind( ".ui-disableSelection" ); - } -}); - -$.extend( $.ui, { - // $.ui.plugin is deprecated. Use the proxy pattern instead. - plugin: { - add: function( module, option, set ) { - var i, - proto = $.ui[ module ].prototype; - for ( i in set ) { - proto.plugins[ i ] = proto.plugins[ i ] || []; - proto.plugins[ i ].push( [ option, set[ i ] ] ); - } - }, - call: function( instance, name, args ) { - var i, - set = instance.plugins[ name ]; - if ( !set || !instance.element[ 0 ].parentNode || instance.element[ 0 ].parentNode.nodeType === 11 ) { - return; - } - - for ( i = 0; i < set.length; i++ ) { - if ( instance.options[ set[ i ][ 0 ] ] ) { - set[ i ][ 1 ].apply( instance.element, args ); - } - } - } - }, - - // only used by resizable - hasScroll: function( el, a ) { - - //If overflow is hidden, the element might have extra content, but the user wants to hide it - if ( $( el ).css( "overflow" ) === "hidden") { - return false; - } - - var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop", - has = false; - - if ( el[ scroll ] > 0 ) { - return true; - } - - // TODO: determine which cases actually cause this to happen - // if the element doesn't have the scroll set, see if it's possible to - // set the scroll - el[ scroll ] = 1; - has = ( el[ scroll ] > 0 ); - el[ scroll ] = 0; - return has; - } -}); - -})( jQuery ); -(function( $, undefined ) { - -var uuid = 0, - slice = Array.prototype.slice, - _cleanData = $.cleanData; -$.cleanData = function( elems ) { - for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) { - try { - $( elem ).triggerHandler( "remove" ); - // http://bugs.jquery.com/ticket/8235 - } catch( e ) {} - } - _cleanData( elems ); -}; - -$.widget = function( name, base, prototype ) { - var fullName, existingConstructor, constructor, basePrototype, - // proxiedPrototype allows the provided prototype to remain unmodified - // so that it can be used as a mixin for multiple widgets (#8876) - proxiedPrototype = {}, - namespace = name.split( "." )[ 0 ]; - - name = name.split( "." )[ 1 ]; - fullName = namespace + "-" + name; - - if ( !prototype ) { - prototype = base; - base = $.Widget; - } - - // create selector for plugin - $.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) { - return !!$.data( elem, fullName ); - }; - - $[ namespace ] = $[ namespace ] || {}; - existingConstructor = $[ namespace ][ name ]; - constructor = $[ namespace ][ name ] = function( options, element ) { - // allow instantiation without "new" keyword - if ( !this._createWidget ) { - return new constructor( options, element ); - } - - // allow instantiation without initializing for simple inheritance - // must use "new" keyword (the code above always passes args) - if ( arguments.length ) { - this._createWidget( options, element ); - } - }; - // extend with the existing constructor to carry over any static properties - $.extend( constructor, existingConstructor, { - version: prototype.version, - // copy the object used to create the prototype in case we need to - // redefine the widget later - _proto: $.extend( {}, prototype ), - // track widgets that inherit from this widget in case this widget is - // redefined after a widget inherits from it - _childConstructors: [] - }); - - basePrototype = new base(); - // we need to make the options hash a property directly on the new instance - // otherwise we'll modify the options hash on the prototype that we're - // inheriting from - basePrototype.options = $.widget.extend( {}, basePrototype.options ); - $.each( prototype, function( prop, value ) { - if ( !$.isFunction( value ) ) { - proxiedPrototype[ prop ] = value; - return; - } - proxiedPrototype[ prop ] = (function() { - var _super = function() { - return base.prototype[ prop ].apply( this, arguments ); - }, - _superApply = function( args ) { - return base.prototype[ prop ].apply( this, args ); - }; - return function() { - var __super = this._super, - __superApply = this._superApply, - returnValue; - - this._super = _super; - this._superApply = _superApply; - - returnValue = value.apply( this, arguments ); - - this._super = __super; - this._superApply = __superApply; - - return returnValue; - }; - })(); - }); - constructor.prototype = $.widget.extend( basePrototype, { - // TODO: remove support for widgetEventPrefix - // always use the name + a colon as the prefix, e.g., draggable:start - // don't prefix for widgets that aren't DOM-based - widgetEventPrefix: existingConstructor ? basePrototype.widgetEventPrefix : name - }, proxiedPrototype, { - constructor: constructor, - namespace: namespace, - widgetName: name, - widgetFullName: fullName - }); - - // If this widget is being redefined then we need to find all widgets that - // are inheriting from it and redefine all of them so that they inherit from - // the new version of this widget. We're essentially trying to replace one - // level in the prototype chain. - if ( existingConstructor ) { - $.each( existingConstructor._childConstructors, function( i, child ) { - var childPrototype = child.prototype; - - // redefine the child widget using the same prototype that was - // originally used, but inherit from the new version of the base - $.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto ); - }); - // remove the list of existing child constructors from the old constructor - // so the old child constructors can be garbage collected - delete existingConstructor._childConstructors; - } else { - base._childConstructors.push( constructor ); - } - - $.widget.bridge( name, constructor ); -}; - -$.widget.extend = function( target ) { - var input = slice.call( arguments, 1 ), - inputIndex = 0, - inputLength = input.length, - key, - value; - for ( ; inputIndex < inputLength; inputIndex++ ) { - for ( key in input[ inputIndex ] ) { - value = input[ inputIndex ][ key ]; - if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) { - // Clone objects - if ( $.isPlainObject( value ) ) { - target[ key ] = $.isPlainObject( target[ key ] ) ? - $.widget.extend( {}, target[ key ], value ) : - // Don't extend strings, arrays, etc. with objects - $.widget.extend( {}, value ); - // Copy everything else by reference - } else { - target[ key ] = value; - } - } - } - } - return target; -}; - -$.widget.bridge = function( name, object ) { - var fullName = object.prototype.widgetFullName || name; - $.fn[ name ] = function( options ) { - var isMethodCall = typeof options === "string", - args = slice.call( arguments, 1 ), - returnValue = this; - - // allow multiple hashes to be passed on init - options = !isMethodCall && args.length ? - $.widget.extend.apply( null, [ options ].concat(args) ) : - options; - - if ( isMethodCall ) { - this.each(function() { - var methodValue, - instance = $.data( this, fullName ); - if ( !instance ) { - return $.error( "cannot call methods on " + name + " prior to initialization; " + - "attempted to call method '" + options + "'" ); - } - if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) { - return $.error( "no such method '" + options + "' for " + name + " widget instance" ); - } - methodValue = instance[ options ].apply( instance, args ); - if ( methodValue !== instance && methodValue !== undefined ) { - returnValue = methodValue && methodValue.jquery ? - returnValue.pushStack( methodValue.get() ) : - methodValue; - return false; - } - }); - } else { - this.each(function() { - var instance = $.data( this, fullName ); - if ( instance ) { - instance.option( options || {} )._init(); - } else { - $.data( this, fullName, new object( options, this ) ); - } - }); - } - - return returnValue; - }; -}; - -$.Widget = function( /* options, element */ ) {}; -$.Widget._childConstructors = []; - -$.Widget.prototype = { - widgetName: "widget", - widgetEventPrefix: "", - defaultElement: "
    ", - options: { - disabled: false, - - // callbacks - create: null - }, - _createWidget: function( options, element ) { - element = $( element || this.defaultElement || this )[ 0 ]; - this.element = $( element ); - this.uuid = uuid++; - this.eventNamespace = "." + this.widgetName + this.uuid; - this.options = $.widget.extend( {}, - this.options, - this._getCreateOptions(), - options ); - - this.bindings = $(); - this.hoverable = $(); - this.focusable = $(); - - if ( element !== this ) { - $.data( element, this.widgetFullName, this ); - this._on( true, this.element, { - remove: function( event ) { - if ( event.target === element ) { - this.destroy(); - } - } - }); - this.document = $( element.style ? - // element within the document - element.ownerDocument : - // element is window or document - element.document || element ); - this.window = $( this.document[0].defaultView || this.document[0].parentWindow ); - } - - this._create(); - this._trigger( "create", null, this._getCreateEventData() ); - this._init(); - }, - _getCreateOptions: $.noop, - _getCreateEventData: $.noop, - _create: $.noop, - _init: $.noop, - - destroy: function() { - this._destroy(); - // we can probably remove the unbind calls in 2.0 - // all event bindings should go through this._on() - this.element - .unbind( this.eventNamespace ) - // 1.9 BC for #7810 - // TODO remove dual storage - .removeData( this.widgetName ) - .removeData( this.widgetFullName ) - // support: jquery <1.6.3 - // http://bugs.jquery.com/ticket/9413 - .removeData( $.camelCase( this.widgetFullName ) ); - this.widget() - .unbind( this.eventNamespace ) - .removeAttr( "aria-disabled" ) - .removeClass( - this.widgetFullName + "-disabled " + - "ui-state-disabled" ); - - // clean up events and states - this.bindings.unbind( this.eventNamespace ); - this.hoverable.removeClass( "ui-state-hover" ); - this.focusable.removeClass( "ui-state-focus" ); - }, - _destroy: $.noop, - - widget: function() { - return this.element; - }, - - option: function( key, value ) { - var options = key, - parts, - curOption, - i; - - if ( arguments.length === 0 ) { - // don't return a reference to the internal hash - return $.widget.extend( {}, this.options ); - } - - if ( typeof key === "string" ) { - // handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } } - options = {}; - parts = key.split( "." ); - key = parts.shift(); - if ( parts.length ) { - curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] ); - for ( i = 0; i < parts.length - 1; i++ ) { - curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {}; - curOption = curOption[ parts[ i ] ]; - } - key = parts.pop(); - if ( value === undefined ) { - return curOption[ key ] === undefined ? null : curOption[ key ]; - } - curOption[ key ] = value; - } else { - if ( value === undefined ) { - return this.options[ key ] === undefined ? null : this.options[ key ]; - } - options[ key ] = value; - } - } - - this._setOptions( options ); - - return this; - }, - _setOptions: function( options ) { - var key; - - for ( key in options ) { - this._setOption( key, options[ key ] ); - } - - return this; - }, - _setOption: function( key, value ) { - this.options[ key ] = value; - - if ( key === "disabled" ) { - this.widget() - .toggleClass( this.widgetFullName + "-disabled ui-state-disabled", !!value ) - .attr( "aria-disabled", value ); - this.hoverable.removeClass( "ui-state-hover" ); - this.focusable.removeClass( "ui-state-focus" ); - } - - return this; - }, - - enable: function() { - return this._setOption( "disabled", false ); - }, - disable: function() { - return this._setOption( "disabled", true ); - }, - - _on: function( suppressDisabledCheck, element, handlers ) { - var delegateElement, - instance = this; - - // no suppressDisabledCheck flag, shuffle arguments - if ( typeof suppressDisabledCheck !== "boolean" ) { - handlers = element; - element = suppressDisabledCheck; - suppressDisabledCheck = false; - } - - // no element argument, shuffle and use this.element - if ( !handlers ) { - handlers = element; - element = this.element; - delegateElement = this.widget(); - } else { - // accept selectors, DOM elements - element = delegateElement = $( element ); - this.bindings = this.bindings.add( element ); - } - - $.each( handlers, function( event, handler ) { - function handlerProxy() { - // allow widgets to customize the disabled handling - // - disabled as an array instead of boolean - // - disabled class as method for disabling individual parts - if ( !suppressDisabledCheck && - ( instance.options.disabled === true || - $( this ).hasClass( "ui-state-disabled" ) ) ) { - return; - } - return ( typeof handler === "string" ? instance[ handler ] : handler ) - .apply( instance, arguments ); - } - - // copy the guid so direct unbinding works - if ( typeof handler !== "string" ) { - handlerProxy.guid = handler.guid = - handler.guid || handlerProxy.guid || $.guid++; - } - - var match = event.match( /^(\w+)\s*(.*)$/ ), - eventName = match[1] + instance.eventNamespace, - selector = match[2]; - if ( selector ) { - delegateElement.delegate( selector, eventName, handlerProxy ); - } else { - element.bind( eventName, handlerProxy ); - } - }); - }, - - _off: function( element, eventName ) { - eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace; - element.unbind( eventName ).undelegate( eventName ); - }, - - _delay: function( handler, delay ) { - function handlerProxy() { - return ( typeof handler === "string" ? instance[ handler ] : handler ) - .apply( instance, arguments ); - } - var instance = this; - return setTimeout( handlerProxy, delay || 0 ); - }, - - _hoverable: function( element ) { - this.hoverable = this.hoverable.add( element ); - this._on( element, { - mouseenter: function( event ) { - $( event.currentTarget ).addClass( "ui-state-hover" ); - }, - mouseleave: function( event ) { - $( event.currentTarget ).removeClass( "ui-state-hover" ); - } - }); - }, - - _focusable: function( element ) { - this.focusable = this.focusable.add( element ); - this._on( element, { - focusin: function( event ) { - $( event.currentTarget ).addClass( "ui-state-focus" ); - }, - focusout: function( event ) { - $( event.currentTarget ).removeClass( "ui-state-focus" ); - } - }); - }, - - _trigger: function( type, event, data ) { - var prop, orig, - callback = this.options[ type ]; - - data = data || {}; - event = $.Event( event ); - event.type = ( type === this.widgetEventPrefix ? - type : - this.widgetEventPrefix + type ).toLowerCase(); - // the original event may come from any element - // so we need to reset the target on the new event - event.target = this.element[ 0 ]; - - // copy original event properties over to the new event - orig = event.originalEvent; - if ( orig ) { - for ( prop in orig ) { - if ( !( prop in event ) ) { - event[ prop ] = orig[ prop ]; - } - } - } - - this.element.trigger( event, data ); - return !( $.isFunction( callback ) && - callback.apply( this.element[0], [ event ].concat( data ) ) === false || - event.isDefaultPrevented() ); - } -}; - -$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) { - $.Widget.prototype[ "_" + method ] = function( element, options, callback ) { - if ( typeof options === "string" ) { - options = { effect: options }; - } - var hasOptions, - effectName = !options ? - method : - options === true || typeof options === "number" ? - defaultEffect : - options.effect || defaultEffect; - options = options || {}; - if ( typeof options === "number" ) { - options = { duration: options }; - } - hasOptions = !$.isEmptyObject( options ); - options.complete = callback; - if ( options.delay ) { - element.delay( options.delay ); - } - if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) { - element[ method ]( options ); - } else if ( effectName !== method && element[ effectName ] ) { - element[ effectName ]( options.duration, options.easing, callback ); - } else { - element.queue(function( next ) { - $( this )[ method ](); - if ( callback ) { - callback.call( element[ 0 ] ); - } - next(); - }); - } - }; -}); - -})( jQuery ); -(function( $, undefined ) { - -var mouseHandled = false; -$( document ).mouseup( function() { - mouseHandled = false; -}); - -$.widget("ui.mouse", { - version: "1.10.0", - options: { - cancel: "input,textarea,button,select,option", - distance: 1, - delay: 0 - }, - _mouseInit: function() { - var that = this; - - this.element - .bind("mousedown."+this.widgetName, function(event) { - return that._mouseDown(event); - }) - .bind("click."+this.widgetName, function(event) { - if (true === $.data(event.target, that.widgetName + ".preventClickEvent")) { - $.removeData(event.target, that.widgetName + ".preventClickEvent"); - event.stopImmediatePropagation(); - return false; - } - }); - - this.started = false; - }, - - // TODO: make sure destroying one instance of mouse doesn't mess with - // other instances of mouse - _mouseDestroy: function() { - this.element.unbind("."+this.widgetName); - if ( this._mouseMoveDelegate ) { - $(document) - .unbind("mousemove."+this.widgetName, this._mouseMoveDelegate) - .unbind("mouseup."+this.widgetName, this._mouseUpDelegate); - } - }, - - _mouseDown: function(event) { - // don't let more than one widget handle mouseStart - if( mouseHandled ) { return; } - - // we may have missed mouseup (out of window) - (this._mouseStarted && this._mouseUp(event)); - - this._mouseDownEvent = event; - - var that = this, - btnIsLeft = (event.which === 1), - // event.target.nodeName works around a bug in IE 8 with - // disabled inputs (#7620) - elIsCancel = (typeof this.options.cancel === "string" && event.target.nodeName ? $(event.target).closest(this.options.cancel).length : false); - if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) { - return true; - } - - this.mouseDelayMet = !this.options.delay; - if (!this.mouseDelayMet) { - this._mouseDelayTimer = setTimeout(function() { - that.mouseDelayMet = true; - }, this.options.delay); - } - - if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) { - this._mouseStarted = (this._mouseStart(event) !== false); - if (!this._mouseStarted) { - event.preventDefault(); - return true; - } - } - - // Click event may never have fired (Gecko & Opera) - if (true === $.data(event.target, this.widgetName + ".preventClickEvent")) { - $.removeData(event.target, this.widgetName + ".preventClickEvent"); - } - - // these delegates are required to keep context - this._mouseMoveDelegate = function(event) { - return that._mouseMove(event); - }; - this._mouseUpDelegate = function(event) { - return that._mouseUp(event); - }; - $(document) - .bind("mousemove."+this.widgetName, this._mouseMoveDelegate) - .bind("mouseup."+this.widgetName, this._mouseUpDelegate); - - event.preventDefault(); - - mouseHandled = true; - return true; - }, - - _mouseMove: function(event) { - // IE mouseup check - mouseup happened when mouse was out of window - if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) { - return this._mouseUp(event); - } - - if (this._mouseStarted) { - this._mouseDrag(event); - return event.preventDefault(); - } - - if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) { - this._mouseStarted = - (this._mouseStart(this._mouseDownEvent, event) !== false); - (this._mouseStarted ? this._mouseDrag(event) : this._mouseUp(event)); - } - - return !this._mouseStarted; - }, - - _mouseUp: function(event) { - $(document) - .unbind("mousemove."+this.widgetName, this._mouseMoveDelegate) - .unbind("mouseup."+this.widgetName, this._mouseUpDelegate); - - if (this._mouseStarted) { - this._mouseStarted = false; - - if (event.target === this._mouseDownEvent.target) { - $.data(event.target, this.widgetName + ".preventClickEvent", true); - } - - this._mouseStop(event); - } - - return false; - }, - - _mouseDistanceMet: function(event) { - return (Math.max( - Math.abs(this._mouseDownEvent.pageX - event.pageX), - Math.abs(this._mouseDownEvent.pageY - event.pageY) - ) >= this.options.distance - ); - }, - - _mouseDelayMet: function(/* event */) { - return this.mouseDelayMet; - }, - - // These are placeholder methods, to be overriden by extending plugin - _mouseStart: function(/* event */) {}, - _mouseDrag: function(/* event */) {}, - _mouseStop: function(/* event */) {}, - _mouseCapture: function(/* event */) { return true; } -}); - -})(jQuery); -(function( $, undefined ) { - -$.widget("ui.draggable", $.ui.mouse, { - version: "1.10.0", - widgetEventPrefix: "drag", - options: { - addClasses: true, - appendTo: "parent", - axis: false, - connectToSortable: false, - containment: false, - cursor: "auto", - cursorAt: false, - grid: false, - handle: false, - helper: "original", - iframeFix: false, - opacity: false, - refreshPositions: false, - revert: false, - revertDuration: 500, - scope: "default", - scroll: true, - scrollSensitivity: 20, - scrollSpeed: 20, - snap: false, - snapMode: "both", - snapTolerance: 20, - stack: false, - zIndex: false, - - // callbacks - drag: null, - start: null, - stop: null - }, - _create: function() { - - if (this.options.helper === "original" && !(/^(?:r|a|f)/).test(this.element.css("position"))) { - this.element[0].style.position = "relative"; - } - if (this.options.addClasses){ - this.element.addClass("ui-draggable"); - } - if (this.options.disabled){ - this.element.addClass("ui-draggable-disabled"); - } - - this._mouseInit(); - - }, - - _destroy: function() { - this.element.removeClass( "ui-draggable ui-draggable-dragging ui-draggable-disabled" ); - this._mouseDestroy(); - }, - - _mouseCapture: function(event) { - - var o = this.options; - - // among others, prevent a drag on a resizable-handle - if (this.helper || o.disabled || $(event.target).closest(".ui-resizable-handle").length > 0) { - return false; - } - - //Quit if we're not on a valid handle - this.handle = this._getHandle(event); - if (!this.handle) { - return false; - } - - $(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() { - $("
    ") - .css({ - width: this.offsetWidth+"px", height: this.offsetHeight+"px", - position: "absolute", opacity: "0.001", zIndex: 1000 - }) - .css($(this).offset()) - .appendTo("body"); - }); - - return true; - - }, - - _mouseStart: function(event) { - - var o = this.options; - - //Create and append the visible helper - this.helper = this._createHelper(event); - - this.helper.addClass("ui-draggable-dragging"); - - //Cache the helper size - this._cacheHelperProportions(); - - //If ddmanager is used for droppables, set the global draggable - if($.ui.ddmanager) { - $.ui.ddmanager.current = this; - } - - /* - * - Position generation - - * This block generates everything position related - it's the core of draggables. - */ - - //Cache the margins of the original element - this._cacheMargins(); - - //Store the helper's css position - this.cssPosition = this.helper.css("position"); - this.scrollParent = this.helper.scrollParent(); - - //The element's absolute position on the page minus margins - this.offset = this.positionAbs = this.element.offset(); - this.offset = { - top: this.offset.top - this.margins.top, - left: this.offset.left - this.margins.left - }; - - $.extend(this.offset, { - click: { //Where the click happened, relative to the element - left: event.pageX - this.offset.left, - top: event.pageY - this.offset.top - }, - parent: this._getParentOffset(), - relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper - }); - - //Generate the original position - this.originalPosition = this.position = this._generatePosition(event); - this.originalPageX = event.pageX; - this.originalPageY = event.pageY; - - //Adjust the mouse offset relative to the helper if "cursorAt" is supplied - (o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt)); - - //Set a containment if given in the options - if(o.containment) { - this._setContainment(); - } - - //Trigger event + callbacks - if(this._trigger("start", event) === false) { - this._clear(); - return false; - } - - //Recache the helper size - this._cacheHelperProportions(); - - //Prepare the droppable offsets - if ($.ui.ddmanager && !o.dropBehaviour) { - $.ui.ddmanager.prepareOffsets(this, event); - } - - - this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position - - //If the ddmanager is used for droppables, inform the manager that dragging has started (see #5003) - if ( $.ui.ddmanager ) { - $.ui.ddmanager.dragStart(this, event); - } - - return true; - }, - - _mouseDrag: function(event, noPropagation) { - - //Compute the helpers position - this.position = this._generatePosition(event); - this.positionAbs = this._convertPositionTo("absolute"); - - //Call plugins and callbacks and use the resulting position if something is returned - if (!noPropagation) { - var ui = this._uiHash(); - if(this._trigger("drag", event, ui) === false) { - this._mouseUp({}); - return false; - } - this.position = ui.position; - } - - if(!this.options.axis || this.options.axis !== "y") { - this.helper[0].style.left = this.position.left+"px"; - } - if(!this.options.axis || this.options.axis !== "x") { - this.helper[0].style.top = this.position.top+"px"; - } - if($.ui.ddmanager) { - $.ui.ddmanager.drag(this, event); - } - - return false; - }, - - _mouseStop: function(event) { - - //If we are using droppables, inform the manager about the drop - var element, - that = this, - elementInDom = false, - dropped = false; - if ($.ui.ddmanager && !this.options.dropBehaviour) { - dropped = $.ui.ddmanager.drop(this, event); - } - - //if a drop comes from outside (a sortable) - if(this.dropped) { - dropped = this.dropped; - this.dropped = false; - } - - //if the original element is no longer in the DOM don't bother to continue (see #8269) - element = this.element[0]; - while ( element && (element = element.parentNode) ) { - if (element === document ) { - elementInDom = true; - } - } - if ( !elementInDom && this.options.helper === "original" ) { - return false; - } - - if((this.options.revert === "invalid" && !dropped) || (this.options.revert === "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) { - $(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10), function() { - if(that._trigger("stop", event) !== false) { - that._clear(); - } - }); - } else { - if(this._trigger("stop", event) !== false) { - this._clear(); - } - } - - return false; - }, - - _mouseUp: function(event) { - //Remove frame helpers - $("div.ui-draggable-iframeFix").each(function() { - this.parentNode.removeChild(this); - }); - - //If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003) - if( $.ui.ddmanager ) { - $.ui.ddmanager.dragStop(this, event); - } - - return $.ui.mouse.prototype._mouseUp.call(this, event); - }, - - cancel: function() { - - if(this.helper.is(".ui-draggable-dragging")) { - this._mouseUp({}); - } else { - this._clear(); - } - - return this; - - }, - - _getHandle: function(event) { - - var handle = !this.options.handle || !$(this.options.handle, this.element).length ? true : false; - $(this.options.handle, this.element) - .find("*") - .addBack() - .each(function() { - if(this === event.target) { - handle = true; - } - }); - - return handle; - - }, - - _createHelper: function(event) { - - var o = this.options, - helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper === "clone" ? this.element.clone().removeAttr("id") : this.element); - - if(!helper.parents("body").length) { - helper.appendTo((o.appendTo === "parent" ? this.element[0].parentNode : o.appendTo)); - } - - if(helper[0] !== this.element[0] && !(/(fixed|absolute)/).test(helper.css("position"))) { - helper.css("position", "absolute"); - } - - return helper; - - }, - - _adjustOffsetFromHelper: function(obj) { - if (typeof obj === "string") { - obj = obj.split(" "); - } - if ($.isArray(obj)) { - obj = {left: +obj[0], top: +obj[1] || 0}; - } - if ("left" in obj) { - this.offset.click.left = obj.left + this.margins.left; - } - if ("right" in obj) { - this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left; - } - if ("top" in obj) { - this.offset.click.top = obj.top + this.margins.top; - } - if ("bottom" in obj) { - this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top; - } - }, - - _getParentOffset: function() { - - //Get the offsetParent and cache its position - this.offsetParent = this.helper.offsetParent(); - var po = this.offsetParent.offset(); - - // This is a special case where we need to modify a offset calculated on start, since the following happened: - // 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent - // 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that - // the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag - if(this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) { - po.left += this.scrollParent.scrollLeft(); - po.top += this.scrollParent.scrollTop(); - } - - //This needs to be actually done for all browsers, since pageX/pageY includes this information - //Ugly IE fix - if((this.offsetParent[0] === document.body) || - (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) { - po = { top: 0, left: 0 }; - } - - return { - top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0), - left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0) - }; - - }, - - _getRelativeOffset: function() { - - if(this.cssPosition === "relative") { - var p = this.element.position(); - return { - top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(), - left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft() - }; - } else { - return { top: 0, left: 0 }; - } - - }, - - _cacheMargins: function() { - this.margins = { - left: (parseInt(this.element.css("marginLeft"),10) || 0), - top: (parseInt(this.element.css("marginTop"),10) || 0), - right: (parseInt(this.element.css("marginRight"),10) || 0), - bottom: (parseInt(this.element.css("marginBottom"),10) || 0) - }; - }, - - _cacheHelperProportions: function() { - this.helperProportions = { - width: this.helper.outerWidth(), - height: this.helper.outerHeight() - }; - }, - - _setContainment: function() { - - var over, c, ce, - o = this.options; - - if(o.containment === "parent") { - o.containment = this.helper[0].parentNode; - } - if(o.containment === "document" || o.containment === "window") { - this.containment = [ - o.containment === "document" ? 0 : $(window).scrollLeft() - this.offset.relative.left - this.offset.parent.left, - o.containment === "document" ? 0 : $(window).scrollTop() - this.offset.relative.top - this.offset.parent.top, - (o.containment === "document" ? 0 : $(window).scrollLeft()) + $(o.containment === "document" ? document : window).width() - this.helperProportions.width - this.margins.left, - (o.containment === "document" ? 0 : $(window).scrollTop()) + ($(o.containment === "document" ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top - ]; - } - - if(!(/^(document|window|parent)$/).test(o.containment) && o.containment.constructor !== Array) { - c = $(o.containment); - ce = c[0]; - - if(!ce) { - return; - } - - over = ($(ce).css("overflow") !== "hidden"); - - this.containment = [ - (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0), - (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0), - (over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left - this.margins.right, - (over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top - this.margins.bottom - ]; - this.relative_container = c; - - } else if(o.containment.constructor === Array) { - this.containment = o.containment; - } - - }, - - _convertPositionTo: function(d, pos) { - - if(!pos) { - pos = this.position; - } - - var mod = d === "absolute" ? 1 : -1, - scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName); - - return { - top: ( - pos.top + // The absolute mouse position - this.offset.relative.top * mod + // Only for relative positioned nodes: Relative offset from element to offset parent - this.offset.parent.top * mod - // The offsetParent's offset without borders (offset + border) - ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod) - ), - left: ( - pos.left + // The absolute mouse position - this.offset.relative.left * mod + // Only for relative positioned nodes: Relative offset from element to offset parent - this.offset.parent.left * mod - // The offsetParent's offset without borders (offset + border) - ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod) - ) - }; - - }, - - _generatePosition: function(event) { - - var containment, co, top, left, - o = this.options, - scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, - scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName), - pageX = event.pageX, - pageY = event.pageY; - - /* - * - Position constraining - - * Constrain the position to a mix of grid, containment. - */ - - if(this.originalPosition) { //If we are not dragging yet, we won't check for options - if(this.containment) { - if (this.relative_container){ - co = this.relative_container.offset(); - containment = [ this.containment[0] + co.left, - this.containment[1] + co.top, - this.containment[2] + co.left, - this.containment[3] + co.top ]; - } - else { - containment = this.containment; - } - - if(event.pageX - this.offset.click.left < containment[0]) { - pageX = containment[0] + this.offset.click.left; - } - if(event.pageY - this.offset.click.top < containment[1]) { - pageY = containment[1] + this.offset.click.top; - } - if(event.pageX - this.offset.click.left > containment[2]) { - pageX = containment[2] + this.offset.click.left; - } - if(event.pageY - this.offset.click.top > containment[3]) { - pageY = containment[3] + this.offset.click.top; - } - } - - if(o.grid) { - //Check for grid elements set to 0 to prevent divide by 0 error causing invalid argument errors in IE (see ticket #6950) - top = o.grid[1] ? this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1] : this.originalPageY; - pageY = containment ? ((top - this.offset.click.top >= containment[1] || top - this.offset.click.top > containment[3]) ? top : ((top - this.offset.click.top >= containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top; - - left = o.grid[0] ? this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0] : this.originalPageX; - pageX = containment ? ((left - this.offset.click.left >= containment[0] || left - this.offset.click.left > containment[2]) ? left : ((left - this.offset.click.left >= containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left; - } - - } - - return { - top: ( - pageY - // The absolute mouse position - this.offset.click.top - // Click offset (relative to the element) - this.offset.relative.top - // Only for relative positioned nodes: Relative offset from element to offset parent - this.offset.parent.top + // The offsetParent's offset without borders (offset + border) - ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) )) - ), - left: ( - pageX - // The absolute mouse position - this.offset.click.left - // Click offset (relative to the element) - this.offset.relative.left - // Only for relative positioned nodes: Relative offset from element to offset parent - this.offset.parent.left + // The offsetParent's offset without borders (offset + border) - ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() )) - ) - }; - - }, - - _clear: function() { - this.helper.removeClass("ui-draggable-dragging"); - if(this.helper[0] !== this.element[0] && !this.cancelHelperRemoval) { - this.helper.remove(); - } - this.helper = null; - this.cancelHelperRemoval = false; - }, - - // From now on bulk stuff - mainly helpers - - _trigger: function(type, event, ui) { - ui = ui || this._uiHash(); - $.ui.plugin.call(this, type, [event, ui]); - //The absolute position has to be recalculated after plugins - if(type === "drag") { - this.positionAbs = this._convertPositionTo("absolute"); - } - return $.Widget.prototype._trigger.call(this, type, event, ui); - }, - - plugins: {}, - - _uiHash: function() { - return { - helper: this.helper, - position: this.position, - originalPosition: this.originalPosition, - offset: this.positionAbs - }; - } - -}); - -$.ui.plugin.add("draggable", "connectToSortable", { - start: function(event, ui) { - - var inst = $(this).data("ui-draggable"), o = inst.options, - uiSortable = $.extend({}, ui, { item: inst.element }); - inst.sortables = []; - $(o.connectToSortable).each(function() { - var sortable = $.data(this, "ui-sortable"); - if (sortable && !sortable.options.disabled) { - inst.sortables.push({ - instance: sortable, - shouldRevert: sortable.options.revert - }); - sortable.refreshPositions(); // Call the sortable's refreshPositions at drag start to refresh the containerCache since the sortable container cache is used in drag and needs to be up to date (this will ensure it's initialised as well as being kept in step with any changes that might have happened on the page). - sortable._trigger("activate", event, uiSortable); - } - }); - - }, - stop: function(event, ui) { - - //If we are still over the sortable, we fake the stop event of the sortable, but also remove helper - var inst = $(this).data("ui-draggable"), - uiSortable = $.extend({}, ui, { item: inst.element }); - - $.each(inst.sortables, function() { - if(this.instance.isOver) { - - this.instance.isOver = 0; - - inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance - this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work) - - //The sortable revert is supported, and we have to set a temporary dropped variable on the draggable to support revert: "valid/invalid" - if(this.shouldRevert) { - this.instance.options.revert = true; - } - - //Trigger the stop of the sortable - this.instance._mouseStop(event); - - this.instance.options.helper = this.instance.options._helper; - - //If the helper has been the original item, restore properties in the sortable - if(inst.options.helper === "original") { - this.instance.currentItem.css({ top: "auto", left: "auto" }); - } - - } else { - this.instance.cancelHelperRemoval = false; //Remove the helper in the sortable instance - this.instance._trigger("deactivate", event, uiSortable); - } - - }); - - }, - drag: function(event, ui) { - - var inst = $(this).data("ui-draggable"), that = this; - - $.each(inst.sortables, function() { - - var innermostIntersecting = false, - thisSortable = this; - - //Copy over some variables to allow calling the sortable's native _intersectsWith - this.instance.positionAbs = inst.positionAbs; - this.instance.helperProportions = inst.helperProportions; - this.instance.offset.click = inst.offset.click; - - if(this.instance._intersectsWith(this.instance.containerCache)) { - innermostIntersecting = true; - $.each(inst.sortables, function () { - this.instance.positionAbs = inst.positionAbs; - this.instance.helperProportions = inst.helperProportions; - this.instance.offset.click = inst.offset.click; - if (this !== thisSortable && - this.instance._intersectsWith(this.instance.containerCache) && - $.ui.contains(thisSortable.instance.element[0], this.instance.element[0]) - ) { - innermostIntersecting = false; - } - return innermostIntersecting; - }); - } - - - if(innermostIntersecting) { - //If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once - if(!this.instance.isOver) { - - this.instance.isOver = 1; - //Now we fake the start of dragging for the sortable instance, - //by cloning the list group item, appending it to the sortable and using it as inst.currentItem - //We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one) - this.instance.currentItem = $(that).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item", true); - this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it - this.instance.options.helper = function() { return ui.helper[0]; }; - - event.target = this.instance.currentItem[0]; - this.instance._mouseCapture(event, true); - this.instance._mouseStart(event, true, true); - - //Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes - this.instance.offset.click.top = inst.offset.click.top; - this.instance.offset.click.left = inst.offset.click.left; - this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left; - this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top; - - inst._trigger("toSortable", event); - inst.dropped = this.instance.element; //draggable revert needs that - //hack so receive/update callbacks work (mostly) - inst.currentItem = inst.element; - this.instance.fromOutside = inst; - - } - - //Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable - if(this.instance.currentItem) { - this.instance._mouseDrag(event); - } - - } else { - - //If it doesn't intersect with the sortable, and it intersected before, - //we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval - if(this.instance.isOver) { - - this.instance.isOver = 0; - this.instance.cancelHelperRemoval = true; - - //Prevent reverting on this forced stop - this.instance.options.revert = false; - - // The out event needs to be triggered independently - this.instance._trigger("out", event, this.instance._uiHash(this.instance)); - - this.instance._mouseStop(event, true); - this.instance.options.helper = this.instance.options._helper; - - //Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size - this.instance.currentItem.remove(); - if(this.instance.placeholder) { - this.instance.placeholder.remove(); - } - - inst._trigger("fromSortable", event); - inst.dropped = false; //draggable revert needs that - } - - } - - }); - - } -}); - -$.ui.plugin.add("draggable", "cursor", { - start: function() { - var t = $("body"), o = $(this).data("ui-draggable").options; - if (t.css("cursor")) { - o._cursor = t.css("cursor"); - } - t.css("cursor", o.cursor); - }, - stop: function() { - var o = $(this).data("ui-draggable").options; - if (o._cursor) { - $("body").css("cursor", o._cursor); - } - } -}); - -$.ui.plugin.add("draggable", "opacity", { - start: function(event, ui) { - var t = $(ui.helper), o = $(this).data("ui-draggable").options; - if(t.css("opacity")) { - o._opacity = t.css("opacity"); - } - t.css("opacity", o.opacity); - }, - stop: function(event, ui) { - var o = $(this).data("ui-draggable").options; - if(o._opacity) { - $(ui.helper).css("opacity", o._opacity); - } - } -}); - -$.ui.plugin.add("draggable", "scroll", { - start: function() { - var i = $(this).data("ui-draggable"); - if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== "HTML") { - i.overflowOffset = i.scrollParent.offset(); - } - }, - drag: function( event ) { - - var i = $(this).data("ui-draggable"), o = i.options, scrolled = false; - - if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== "HTML") { - - if(!o.axis || o.axis !== "x") { - if((i.overflowOffset.top + i.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) { - i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop + o.scrollSpeed; - } else if(event.pageY - i.overflowOffset.top < o.scrollSensitivity) { - i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop - o.scrollSpeed; - } - } - - if(!o.axis || o.axis !== "y") { - if((i.overflowOffset.left + i.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) { - i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft + o.scrollSpeed; - } else if(event.pageX - i.overflowOffset.left < o.scrollSensitivity) { - i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft - o.scrollSpeed; - } - } - - } else { - - if(!o.axis || o.axis !== "x") { - if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) { - scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed); - } else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) { - scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed); - } - } - - if(!o.axis || o.axis !== "y") { - if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) { - scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed); - } else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) { - scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed); - } - } - - } - - if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) { - $.ui.ddmanager.prepareOffsets(i, event); - } - - } -}); - -$.ui.plugin.add("draggable", "snap", { - start: function() { - - var i = $(this).data("ui-draggable"), - o = i.options; - - i.snapElements = []; - - $(o.snap.constructor !== String ? ( o.snap.items || ":data(ui-draggable)" ) : o.snap).each(function() { - var $t = $(this), - $o = $t.offset(); - if(this !== i.element[0]) { - i.snapElements.push({ - item: this, - width: $t.outerWidth(), height: $t.outerHeight(), - top: $o.top, left: $o.left - }); - } - }); - - }, - drag: function(event, ui) { - - var ts, bs, ls, rs, l, r, t, b, i, first, - inst = $(this).data("ui-draggable"), - o = inst.options, - d = o.snapTolerance, - x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width, - y1 = ui.offset.top, y2 = y1 + inst.helperProportions.height; - - for (i = inst.snapElements.length - 1; i >= 0; i--){ - - l = inst.snapElements[i].left; - r = l + inst.snapElements[i].width; - t = inst.snapElements[i].top; - b = t + inst.snapElements[i].height; - - //Yes, I know, this is insane ;) - if(!((l-d < x1 && x1 < r+d && t-d < y1 && y1 < b+d) || (l-d < x1 && x1 < r+d && t-d < y2 && y2 < b+d) || (l-d < x2 && x2 < r+d && t-d < y1 && y1 < b+d) || (l-d < x2 && x2 < r+d && t-d < y2 && y2 < b+d))) { - if(inst.snapElements[i].snapping) { - (inst.options.snap.release && inst.options.snap.release.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item }))); - } - inst.snapElements[i].snapping = false; - continue; - } - - if(o.snapMode !== "inner") { - ts = Math.abs(t - y2) <= d; - bs = Math.abs(b - y1) <= d; - ls = Math.abs(l - x2) <= d; - rs = Math.abs(r - x1) <= d; - if(ts) { - ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top - inst.margins.top; - } - if(bs) { - ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top - inst.margins.top; - } - if(ls) { - ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left - inst.margins.left; - } - if(rs) { - ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left - inst.margins.left; - } - } - - first = (ts || bs || ls || rs); - - if(o.snapMode !== "outer") { - ts = Math.abs(t - y1) <= d; - bs = Math.abs(b - y2) <= d; - ls = Math.abs(l - x1) <= d; - rs = Math.abs(r - x2) <= d; - if(ts) { - ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top - inst.margins.top; - } - if(bs) { - ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top - inst.margins.top; - } - if(ls) { - ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left - inst.margins.left; - } - if(rs) { - ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left - inst.margins.left; - } - } - - if(!inst.snapElements[i].snapping && (ts || bs || ls || rs || first)) { - (inst.options.snap.snap && inst.options.snap.snap.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item }))); - } - inst.snapElements[i].snapping = (ts || bs || ls || rs || first); - - } - - } -}); - -$.ui.plugin.add("draggable", "stack", { - start: function() { - - var min, - o = $(this).data("ui-draggable").options, - group = $.makeArray($(o.stack)).sort(function(a,b) { - return (parseInt($(a).css("zIndex"),10) || 0) - (parseInt($(b).css("zIndex"),10) || 0); - }); - - if (!group.length) { return; } - - min = parseInt(group[0].style.zIndex, 10) || 0; - $(group).each(function(i) { - this.style.zIndex = min + i; - }); - - this[0].style.zIndex = min + group.length; - - } -}); - -$.ui.plugin.add("draggable", "zIndex", { - start: function(event, ui) { - var t = $(ui.helper), o = $(this).data("ui-draggable").options; - if(t.css("zIndex")) { - o._zIndex = t.css("zIndex"); - } - t.css("zIndex", o.zIndex); - }, - stop: function(event, ui) { - var o = $(this).data("ui-draggable").options; - if(o._zIndex) { - $(ui.helper).css("zIndex", o._zIndex); - } - } -}); - -})(jQuery); -(function( $, undefined ) { - -function isOverAxis( x, reference, size ) { - return ( x > reference ) && ( x < ( reference + size ) ); -} - -$.widget("ui.droppable", { - version: "1.10.0", - widgetEventPrefix: "drop", - options: { - accept: "*", - activeClass: false, - addClasses: true, - greedy: false, - hoverClass: false, - scope: "default", - tolerance: "intersect", - - // callbacks - activate: null, - deactivate: null, - drop: null, - out: null, - over: null - }, - _create: function() { - - var o = this.options, - accept = o.accept; - - this.isover = false; - this.isout = true; - - this.accept = $.isFunction(accept) ? accept : function(d) { - return d.is(accept); - }; - - //Store the droppable's proportions - this.proportions = { width: this.element[0].offsetWidth, height: this.element[0].offsetHeight }; - - // Add the reference and positions to the manager - $.ui.ddmanager.droppables[o.scope] = $.ui.ddmanager.droppables[o.scope] || []; - $.ui.ddmanager.droppables[o.scope].push(this); - - (o.addClasses && this.element.addClass("ui-droppable")); - - }, - - _destroy: function() { - var i = 0, - drop = $.ui.ddmanager.droppables[this.options.scope]; - - for ( ; i < drop.length; i++ ) { - if ( drop[i] === this ) { - drop.splice(i, 1); - } - } - - this.element.removeClass("ui-droppable ui-droppable-disabled"); - }, - - _setOption: function(key, value) { - - if(key === "accept") { - this.accept = $.isFunction(value) ? value : function(d) { - return d.is(value); - }; - } - $.Widget.prototype._setOption.apply(this, arguments); - }, - - _activate: function(event) { - var draggable = $.ui.ddmanager.current; - if(this.options.activeClass) { - this.element.addClass(this.options.activeClass); - } - if(draggable){ - this._trigger("activate", event, this.ui(draggable)); - } - }, - - _deactivate: function(event) { - var draggable = $.ui.ddmanager.current; - if(this.options.activeClass) { - this.element.removeClass(this.options.activeClass); - } - if(draggable){ - this._trigger("deactivate", event, this.ui(draggable)); - } - }, - - _over: function(event) { - - var draggable = $.ui.ddmanager.current; - - // Bail if draggable and droppable are same element - if (!draggable || (draggable.currentItem || draggable.element)[0] === this.element[0]) { - return; - } - - if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) { - if(this.options.hoverClass) { - this.element.addClass(this.options.hoverClass); - } - this._trigger("over", event, this.ui(draggable)); - } - - }, - - _out: function(event) { - - var draggable = $.ui.ddmanager.current; - - // Bail if draggable and droppable are same element - if (!draggable || (draggable.currentItem || draggable.element)[0] === this.element[0]) { - return; - } - - if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) { - if(this.options.hoverClass) { - this.element.removeClass(this.options.hoverClass); - } - this._trigger("out", event, this.ui(draggable)); - } - - }, - - _drop: function(event,custom) { - - var draggable = custom || $.ui.ddmanager.current, - childrenIntersection = false; - - // Bail if draggable and droppable are same element - if (!draggable || (draggable.currentItem || draggable.element)[0] === this.element[0]) { - return false; - } - - this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function() { - var inst = $.data(this, "ui-droppable"); - if( - inst.options.greedy && - !inst.options.disabled && - inst.options.scope === draggable.options.scope && - inst.accept.call(inst.element[0], (draggable.currentItem || draggable.element)) && - $.ui.intersect(draggable, $.extend(inst, { offset: inst.element.offset() }), inst.options.tolerance) - ) { childrenIntersection = true; return false; } - }); - if(childrenIntersection) { - return false; - } - - if(this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) { - if(this.options.activeClass) { - this.element.removeClass(this.options.activeClass); - } - if(this.options.hoverClass) { - this.element.removeClass(this.options.hoverClass); - } - this._trigger("drop", event, this.ui(draggable)); - return this.element; - } - - return false; - - }, - - ui: function(c) { - return { - draggable: (c.currentItem || c.element), - helper: c.helper, - position: c.position, - offset: c.positionAbs - }; - } - -}); - -$.ui.intersect = function(draggable, droppable, toleranceMode) { - - if (!droppable.offset) { - return false; - } - - var draggableLeft, draggableTop, - x1 = (draggable.positionAbs || draggable.position.absolute).left, x2 = x1 + draggable.helperProportions.width, - y1 = (draggable.positionAbs || draggable.position.absolute).top, y2 = y1 + draggable.helperProportions.height, - l = droppable.offset.left, r = l + droppable.proportions.width, - t = droppable.offset.top, b = t + droppable.proportions.height; - - switch (toleranceMode) { - case "fit": - return (l <= x1 && x2 <= r && t <= y1 && y2 <= b); - case "intersect": - return (l < x1 + (draggable.helperProportions.width / 2) && // Right Half - x2 - (draggable.helperProportions.width / 2) < r && // Left Half - t < y1 + (draggable.helperProportions.height / 2) && // Bottom Half - y2 - (draggable.helperProportions.height / 2) < b ); // Top Half - case "pointer": - draggableLeft = ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left); - draggableTop = ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top); - return isOverAxis( draggableTop, t, droppable.proportions.height ) && isOverAxis( draggableLeft, l, droppable.proportions.width ); - case "touch": - return ( - (y1 >= t && y1 <= b) || // Top edge touching - (y2 >= t && y2 <= b) || // Bottom edge touching - (y1 < t && y2 > b) // Surrounded vertically - ) && ( - (x1 >= l && x1 <= r) || // Left edge touching - (x2 >= l && x2 <= r) || // Right edge touching - (x1 < l && x2 > r) // Surrounded horizontally - ); - default: - return false; - } - -}; - -/* - This manager tracks offsets of draggables and droppables -*/ -$.ui.ddmanager = { - current: null, - droppables: { "default": [] }, - prepareOffsets: function(t, event) { - - var i, j, - m = $.ui.ddmanager.droppables[t.options.scope] || [], - type = event ? event.type : null, // workaround for #2317 - list = (t.currentItem || t.element).find(":data(ui-droppable)").addBack(); - - droppablesLoop: for (i = 0; i < m.length; i++) { - - //No disabled and non-accepted - if(m[i].options.disabled || (t && !m[i].accept.call(m[i].element[0],(t.currentItem || t.element)))) { - continue; - } - - // Filter out elements in the current dragged item - for (j=0; j < list.length; j++) { - if(list[j] === m[i].element[0]) { - m[i].proportions.height = 0; - continue droppablesLoop; - } - } - - m[i].visible = m[i].element.css("display") !== "none"; - if(!m[i].visible) { - continue; - } - - //Activate the droppable if used directly from draggables - if(type === "mousedown") { - m[i]._activate.call(m[i], event); - } - - m[i].offset = m[i].element.offset(); - m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight }; - - } - - }, - drop: function(draggable, event) { - - var dropped = false; - $.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() { - - if(!this.options) { - return; - } - if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance)) { - dropped = this._drop.call(this, event) || dropped; - } - - if (!this.options.disabled && this.visible && this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) { - this.isout = true; - this.isover = false; - this._deactivate.call(this, event); - } - - }); - return dropped; - - }, - dragStart: function( draggable, event ) { - //Listen for scrolling so that if the dragging causes scrolling the position of the droppables can be recalculated (see #5003) - draggable.element.parentsUntil( "body" ).bind( "scroll.droppable", function() { - if( !draggable.options.refreshPositions ) { - $.ui.ddmanager.prepareOffsets( draggable, event ); - } - }); - }, - drag: function(draggable, event) { - - //If you have a highly dynamic page, you might try this option. It renders positions every time you move the mouse. - if(draggable.options.refreshPositions) { - $.ui.ddmanager.prepareOffsets(draggable, event); - } - - //Run through all droppables and check their positions based on specific tolerance options - $.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() { - - if(this.options.disabled || this.greedyChild || !this.visible) { - return; - } - - var parentInstance, scope, parent, - intersects = $.ui.intersect(draggable, this, this.options.tolerance), - c = !intersects && this.isover ? "isout" : (intersects && !this.isover ? "isover" : null); - if(!c) { - return; - } - - if (this.options.greedy) { - // find droppable parents with same scope - scope = this.options.scope; - parent = this.element.parents(":data(ui-droppable)").filter(function () { - return $.data(this, "ui-droppable").options.scope === scope; - }); - - if (parent.length) { - parentInstance = $.data(parent[0], "ui-droppable"); - parentInstance.greedyChild = (c === "isover"); - } - } - - // we just moved into a greedy child - if (parentInstance && c === "isover") { - parentInstance.isover = false; - parentInstance.isout = true; - parentInstance._out.call(parentInstance, event); - } - - this[c] = true; - this[c === "isout" ? "isover" : "isout"] = false; - this[c === "isover" ? "_over" : "_out"].call(this, event); - - // we just moved out of a greedy child - if (parentInstance && c === "isout") { - parentInstance.isout = false; - parentInstance.isover = true; - parentInstance._over.call(parentInstance, event); - } - }); - - }, - dragStop: function( draggable, event ) { - draggable.element.parentsUntil( "body" ).unbind( "scroll.droppable" ); - //Call prepareOffsets one final time since IE does not fire return scroll events when overflow was caused by drag (see #5003) - if( !draggable.options.refreshPositions ) { - $.ui.ddmanager.prepareOffsets( draggable, event ); - } - } -}; - -})(jQuery); -(function( $, undefined ) { - -$.widget("ui.selectable", $.ui.mouse, { - version: "1.10.0", - options: { - appendTo: "body", - autoRefresh: true, - distance: 0, - filter: "*", - tolerance: "touch", - - // callbacks - selected: null, - selecting: null, - start: null, - stop: null, - unselected: null, - unselecting: null - }, - _create: function() { - var selectees, - that = this; - - this.element.addClass("ui-selectable"); - - this.dragged = false; - - // cache selectee children based on filter - this.refresh = function() { - selectees = $(that.options.filter, that.element[0]); - selectees.addClass("ui-selectee"); - selectees.each(function() { - var $this = $(this), - pos = $this.offset(); - $.data(this, "selectable-item", { - element: this, - $element: $this, - left: pos.left, - top: pos.top, - right: pos.left + $this.outerWidth(), - bottom: pos.top + $this.outerHeight(), - startselected: false, - selected: $this.hasClass("ui-selected"), - selecting: $this.hasClass("ui-selecting"), - unselecting: $this.hasClass("ui-unselecting") - }); - }); - }; - this.refresh(); - - this.selectees = selectees.addClass("ui-selectee"); - - this._mouseInit(); - - this.helper = $("
    "); - }, - - _destroy: function() { - this.selectees - .removeClass("ui-selectee") - .removeData("selectable-item"); - this.element - .removeClass("ui-selectable ui-selectable-disabled"); - this._mouseDestroy(); - }, - - _mouseStart: function(event) { - var that = this, - options = this.options; - - this.opos = [event.pageX, event.pageY]; - - if (this.options.disabled) { - return; - } - - this.selectees = $(options.filter, this.element[0]); - - this._trigger("start", event); - - $(options.appendTo).append(this.helper); - // position helper (lasso) - this.helper.css({ - "left": event.pageX, - "top": event.pageY, - "width": 0, - "height": 0 - }); - - if (options.autoRefresh) { - this.refresh(); - } - - this.selectees.filter(".ui-selected").each(function() { - var selectee = $.data(this, "selectable-item"); - selectee.startselected = true; - if (!event.metaKey && !event.ctrlKey) { - selectee.$element.removeClass("ui-selected"); - selectee.selected = false; - selectee.$element.addClass("ui-unselecting"); - selectee.unselecting = true; - // selectable UNSELECTING callback - that._trigger("unselecting", event, { - unselecting: selectee.element - }); - } - }); - - $(event.target).parents().addBack().each(function() { - var doSelect, - selectee = $.data(this, "selectable-item"); - if (selectee) { - doSelect = (!event.metaKey && !event.ctrlKey) || !selectee.$element.hasClass("ui-selected"); - selectee.$element - .removeClass(doSelect ? "ui-unselecting" : "ui-selected") - .addClass(doSelect ? "ui-selecting" : "ui-unselecting"); - selectee.unselecting = !doSelect; - selectee.selecting = doSelect; - selectee.selected = doSelect; - // selectable (UN)SELECTING callback - if (doSelect) { - that._trigger("selecting", event, { - selecting: selectee.element - }); - } else { - that._trigger("unselecting", event, { - unselecting: selectee.element - }); - } - return false; - } - }); - - }, - - _mouseDrag: function(event) { - - this.dragged = true; - - if (this.options.disabled) { - return; - } - - var tmp, - that = this, - options = this.options, - x1 = this.opos[0], - y1 = this.opos[1], - x2 = event.pageX, - y2 = event.pageY; - - if (x1 > x2) { tmp = x2; x2 = x1; x1 = tmp; } - if (y1 > y2) { tmp = y2; y2 = y1; y1 = tmp; } - this.helper.css({left: x1, top: y1, width: x2-x1, height: y2-y1}); - - this.selectees.each(function() { - var selectee = $.data(this, "selectable-item"), - hit = false; - - //prevent helper from being selected if appendTo: selectable - if (!selectee || selectee.element === that.element[0]) { - return; - } - - if (options.tolerance === "touch") { - hit = ( !(selectee.left > x2 || selectee.right < x1 || selectee.top > y2 || selectee.bottom < y1) ); - } else if (options.tolerance === "fit") { - hit = (selectee.left > x1 && selectee.right < x2 && selectee.top > y1 && selectee.bottom < y2); - } - - if (hit) { - // SELECT - if (selectee.selected) { - selectee.$element.removeClass("ui-selected"); - selectee.selected = false; - } - if (selectee.unselecting) { - selectee.$element.removeClass("ui-unselecting"); - selectee.unselecting = false; - } - if (!selectee.selecting) { - selectee.$element.addClass("ui-selecting"); - selectee.selecting = true; - // selectable SELECTING callback - that._trigger("selecting", event, { - selecting: selectee.element - }); - } - } else { - // UNSELECT - if (selectee.selecting) { - if ((event.metaKey || event.ctrlKey) && selectee.startselected) { - selectee.$element.removeClass("ui-selecting"); - selectee.selecting = false; - selectee.$element.addClass("ui-selected"); - selectee.selected = true; - } else { - selectee.$element.removeClass("ui-selecting"); - selectee.selecting = false; - if (selectee.startselected) { - selectee.$element.addClass("ui-unselecting"); - selectee.unselecting = true; - } - // selectable UNSELECTING callback - that._trigger("unselecting", event, { - unselecting: selectee.element - }); - } - } - if (selectee.selected) { - if (!event.metaKey && !event.ctrlKey && !selectee.startselected) { - selectee.$element.removeClass("ui-selected"); - selectee.selected = false; - - selectee.$element.addClass("ui-unselecting"); - selectee.unselecting = true; - // selectable UNSELECTING callback - that._trigger("unselecting", event, { - unselecting: selectee.element - }); - } - } - } - }); - - return false; - }, - - _mouseStop: function(event) { - var that = this; - - this.dragged = false; - - $(".ui-unselecting", this.element[0]).each(function() { - var selectee = $.data(this, "selectable-item"); - selectee.$element.removeClass("ui-unselecting"); - selectee.unselecting = false; - selectee.startselected = false; - that._trigger("unselected", event, { - unselected: selectee.element - }); - }); - $(".ui-selecting", this.element[0]).each(function() { - var selectee = $.data(this, "selectable-item"); - selectee.$element.removeClass("ui-selecting").addClass("ui-selected"); - selectee.selecting = false; - selectee.selected = true; - selectee.startselected = true; - that._trigger("selected", event, { - selected: selectee.element - }); - }); - this._trigger("stop", event); - - this.helper.remove(); - - return false; - } - -}); - -})(jQuery); -(function( $, undefined ) { - -/*jshint loopfunc: true */ - -function isOverAxis( x, reference, size ) { - return ( x > reference ) && ( x < ( reference + size ) ); -} - -$.widget("ui.sortable", $.ui.mouse, { - version: "1.10.0", - widgetEventPrefix: "sort", - ready: false, - options: { - appendTo: "parent", - axis: false, - connectWith: false, - containment: false, - cursor: "auto", - cursorAt: false, - dropOnEmpty: true, - forcePlaceholderSize: false, - forceHelperSize: false, - grid: false, - handle: false, - helper: "original", - items: "> *", - opacity: false, - placeholder: false, - revert: false, - scroll: true, - scrollSensitivity: 20, - scrollSpeed: 20, - scope: "default", - tolerance: "intersect", - zIndex: 1000, - - // callbacks - activate: null, - beforeStop: null, - change: null, - deactivate: null, - out: null, - over: null, - receive: null, - remove: null, - sort: null, - start: null, - stop: null, - update: null - }, - _create: function() { - - var o = this.options; - this.containerCache = {}; - this.element.addClass("ui-sortable"); - - //Get the items - this.refresh(); - - //Let's determine if the items are being displayed horizontally - this.floating = this.items.length ? o.axis === "x" || (/left|right/).test(this.items[0].item.css("float")) || (/inline|table-cell/).test(this.items[0].item.css("display")) : false; - - //Let's determine the parent's offset - this.offset = this.element.offset(); - - //Initialize mouse events for interaction - this._mouseInit(); - - //We're ready to go - this.ready = true; - - }, - - _destroy: function() { - this.element - .removeClass("ui-sortable ui-sortable-disabled"); - this._mouseDestroy(); - - for ( var i = this.items.length - 1; i >= 0; i-- ) { - this.items[i].item.removeData(this.widgetName + "-item"); - } - - return this; - }, - - _setOption: function(key, value){ - if ( key === "disabled" ) { - this.options[ key ] = value; - - this.widget().toggleClass( "ui-sortable-disabled", !!value ); - } else { - // Don't call widget base _setOption for disable as it adds ui-state-disabled class - $.Widget.prototype._setOption.apply(this, arguments); - } - }, - - _mouseCapture: function(event, overrideHandle) { - var currentItem = null, - validHandle = false, - that = this; - - if (this.reverting) { - return false; - } - - if(this.options.disabled || this.options.type === "static") { - return false; - } - - //We have to refresh the items data once first - this._refreshItems(event); - - //Find out if the clicked node (or one of its parents) is a actual item in this.items - $(event.target).parents().each(function() { - if($.data(this, that.widgetName + "-item") === that) { - currentItem = $(this); - return false; - } - }); - if($.data(event.target, that.widgetName + "-item") === that) { - currentItem = $(event.target); - } - - if(!currentItem) { - return false; - } - if(this.options.handle && !overrideHandle) { - $(this.options.handle, currentItem).find("*").addBack().each(function() { - if(this === event.target) { - validHandle = true; - } - }); - if(!validHandle) { - return false; - } - } - - this.currentItem = currentItem; - this._removeCurrentsFromItems(); - return true; - - }, - - _mouseStart: function(event, overrideHandle, noActivation) { - - var i, - o = this.options; - - this.currentContainer = this; - - //We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture - this.refreshPositions(); - - //Create and append the visible helper - this.helper = this._createHelper(event); - - //Cache the helper size - this._cacheHelperProportions(); - - /* - * - Position generation - - * This block generates everything position related - it's the core of draggables. - */ - - //Cache the margins of the original element - this._cacheMargins(); - - //Get the next scrolling parent - this.scrollParent = this.helper.scrollParent(); - - //The element's absolute position on the page minus margins - this.offset = this.currentItem.offset(); - this.offset = { - top: this.offset.top - this.margins.top, - left: this.offset.left - this.margins.left - }; - - $.extend(this.offset, { - click: { //Where the click happened, relative to the element - left: event.pageX - this.offset.left, - top: event.pageY - this.offset.top - }, - parent: this._getParentOffset(), - relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper - }); - - // Only after we got the offset, we can change the helper's position to absolute - // TODO: Still need to figure out a way to make relative sorting possible - this.helper.css("position", "absolute"); - this.cssPosition = this.helper.css("position"); - - //Generate the original position - this.originalPosition = this._generatePosition(event); - this.originalPageX = event.pageX; - this.originalPageY = event.pageY; - - //Adjust the mouse offset relative to the helper if "cursorAt" is supplied - (o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt)); - - //Cache the former DOM position - this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] }; - - //If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way - if(this.helper[0] !== this.currentItem[0]) { - this.currentItem.hide(); - } - - //Create the placeholder - this._createPlaceholder(); - - //Set a containment if given in the options - if(o.containment) { - this._setContainment(); - } - - if(o.cursor) { // cursor option - if ($("body").css("cursor")) { - this._storedCursor = $("body").css("cursor"); - } - $("body").css("cursor", o.cursor); - } - - if(o.opacity) { // opacity option - if (this.helper.css("opacity")) { - this._storedOpacity = this.helper.css("opacity"); - } - this.helper.css("opacity", o.opacity); - } - - if(o.zIndex) { // zIndex option - if (this.helper.css("zIndex")) { - this._storedZIndex = this.helper.css("zIndex"); - } - this.helper.css("zIndex", o.zIndex); - } - - //Prepare scrolling - if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") { - this.overflowOffset = this.scrollParent.offset(); - } - - //Call callbacks - this._trigger("start", event, this._uiHash()); - - //Recache the helper size - if(!this._preserveHelperProportions) { - this._cacheHelperProportions(); - } - - - //Post "activate" events to possible containers - if( !noActivation ) { - for ( i = this.containers.length - 1; i >= 0; i-- ) { - this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) ); - } - } - - //Prepare possible droppables - if($.ui.ddmanager) { - $.ui.ddmanager.current = this; - } - - if ($.ui.ddmanager && !o.dropBehaviour) { - $.ui.ddmanager.prepareOffsets(this, event); - } - - this.dragging = true; - - this.helper.addClass("ui-sortable-helper"); - this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position - return true; - - }, - - _mouseDrag: function(event) { - var i, item, itemElement, intersection, - o = this.options, - scrolled = false; - - //Compute the helpers position - this.position = this._generatePosition(event); - this.positionAbs = this._convertPositionTo("absolute"); - - if (!this.lastPositionAbs) { - this.lastPositionAbs = this.positionAbs; - } - - //Do scrolling - if(this.options.scroll) { - if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") { - - if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) { - this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed; - } else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity) { - this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed; - } - - if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) { - this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed; - } else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity) { - this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed; - } - - } else { - - if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) { - scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed); - } else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) { - scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed); - } - - if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) { - scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed); - } else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) { - scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed); - } - - } - - if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) { - $.ui.ddmanager.prepareOffsets(this, event); - } - } - - //Regenerate the absolute position used for position checks - this.positionAbs = this._convertPositionTo("absolute"); - - //Set the helper position - if(!this.options.axis || this.options.axis !== "y") { - this.helper[0].style.left = this.position.left+"px"; - } - if(!this.options.axis || this.options.axis !== "x") { - this.helper[0].style.top = this.position.top+"px"; - } - - //Rearrange - for (i = this.items.length - 1; i >= 0; i--) { - - //Cache variables and intersection, continue if no intersection - item = this.items[i]; - itemElement = item.item[0]; - intersection = this._intersectsWithPointer(item); - if (!intersection) { - continue; - } - - // Only put the placeholder inside the current Container, skip all - // items form other containers. This works because when moving - // an item from one container to another the - // currentContainer is switched before the placeholder is moved. - // - // Without this moving items in "sub-sortables" can cause the placeholder to jitter - // beetween the outer and inner container. - if (item.instance !== this.currentContainer) { - continue; - } - - // cannot intersect with itself - // no useless actions that have been done before - // no action if the item moved is the parent of the item checked - if (itemElement !== this.currentItem[0] && - this.placeholder[intersection === 1 ? "next" : "prev"]()[0] !== itemElement && - !$.contains(this.placeholder[0], itemElement) && - (this.options.type === "semi-dynamic" ? !$.contains(this.element[0], itemElement) : true) - ) { - - this.direction = intersection === 1 ? "down" : "up"; - - if (this.options.tolerance === "pointer" || this._intersectsWithSides(item)) { - this._rearrange(event, item); - } else { - break; - } - - this._trigger("change", event, this._uiHash()); - break; - } - } - - //Post events to containers - this._contactContainers(event); - - //Interconnect with droppables - if($.ui.ddmanager) { - $.ui.ddmanager.drag(this, event); - } - - //Call callbacks - this._trigger("sort", event, this._uiHash()); - - this.lastPositionAbs = this.positionAbs; - return false; - - }, - - _mouseStop: function(event, noPropagation) { - - if(!event) { - return; - } - - //If we are using droppables, inform the manager about the drop - if ($.ui.ddmanager && !this.options.dropBehaviour) { - $.ui.ddmanager.drop(this, event); - } - - if(this.options.revert) { - var that = this, - cur = this.placeholder.offset(); - - this.reverting = true; - - $(this.helper).animate({ - left: cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollLeft), - top: cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollTop) - }, parseInt(this.options.revert, 10) || 500, function() { - that._clear(event); - }); - } else { - this._clear(event, noPropagation); - } - - return false; - - }, - - cancel: function() { - - if(this.dragging) { - - this._mouseUp({ target: null }); - - if(this.options.helper === "original") { - this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"); - } else { - this.currentItem.show(); - } - - //Post deactivating events to containers - for (var i = this.containers.length - 1; i >= 0; i--){ - this.containers[i]._trigger("deactivate", null, this._uiHash(this)); - if(this.containers[i].containerCache.over) { - this.containers[i]._trigger("out", null, this._uiHash(this)); - this.containers[i].containerCache.over = 0; - } - } - - } - - if (this.placeholder) { - //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node! - if(this.placeholder[0].parentNode) { - this.placeholder[0].parentNode.removeChild(this.placeholder[0]); - } - if(this.options.helper !== "original" && this.helper && this.helper[0].parentNode) { - this.helper.remove(); - } - - $.extend(this, { - helper: null, - dragging: false, - reverting: false, - _noFinalSort: null - }); - - if(this.domPosition.prev) { - $(this.domPosition.prev).after(this.currentItem); - } else { - $(this.domPosition.parent).prepend(this.currentItem); - } - } - - return this; - - }, - - serialize: function(o) { - - var items = this._getItemsAsjQuery(o && o.connected), - str = []; - o = o || {}; - - $(items).each(function() { - var res = ($(o.item || this).attr(o.attribute || "id") || "").match(o.expression || (/(.+)[\-=_](.+)/)); - if (res) { - str.push((o.key || res[1]+"[]")+"="+(o.key && o.expression ? res[1] : res[2])); - } - }); - - if(!str.length && o.key) { - str.push(o.key + "="); - } - - return str.join("&"); - - }, - - toArray: function(o) { - - var items = this._getItemsAsjQuery(o && o.connected), - ret = []; - - o = o || {}; - - items.each(function() { ret.push($(o.item || this).attr(o.attribute || "id") || ""); }); - return ret; - - }, - - /* Be careful with the following core functions */ - _intersectsWith: function(item) { - - var x1 = this.positionAbs.left, - x2 = x1 + this.helperProportions.width, - y1 = this.positionAbs.top, - y2 = y1 + this.helperProportions.height, - l = item.left, - r = l + item.width, - t = item.top, - b = t + item.height, - dyClick = this.offset.click.top, - dxClick = this.offset.click.left, - isOverElement = (y1 + dyClick) > t && (y1 + dyClick) < b && (x1 + dxClick) > l && (x1 + dxClick) < r; - - if ( this.options.tolerance === "pointer" || - this.options.forcePointerForContainers || - (this.options.tolerance !== "pointer" && this.helperProportions[this.floating ? "width" : "height"] > item[this.floating ? "width" : "height"]) - ) { - return isOverElement; - } else { - - return (l < x1 + (this.helperProportions.width / 2) && // Right Half - x2 - (this.helperProportions.width / 2) < r && // Left Half - t < y1 + (this.helperProportions.height / 2) && // Bottom Half - y2 - (this.helperProportions.height / 2) < b ); // Top Half - - } - }, - - _intersectsWithPointer: function(item) { - - var isOverElementHeight = (this.options.axis === "x") || isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height), - isOverElementWidth = (this.options.axis === "y") || isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width), - isOverElement = isOverElementHeight && isOverElementWidth, - verticalDirection = this._getDragVerticalDirection(), - horizontalDirection = this._getDragHorizontalDirection(); - - if (!isOverElement) { - return false; - } - - return this.floating ? - ( ((horizontalDirection && horizontalDirection === "right") || verticalDirection === "down") ? 2 : 1 ) - : ( verticalDirection && (verticalDirection === "down" ? 2 : 1) ); - - }, - - _intersectsWithSides: function(item) { - - var isOverBottomHalf = isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height), - isOverRightHalf = isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width), - verticalDirection = this._getDragVerticalDirection(), - horizontalDirection = this._getDragHorizontalDirection(); - - if (this.floating && horizontalDirection) { - return ((horizontalDirection === "right" && isOverRightHalf) || (horizontalDirection === "left" && !isOverRightHalf)); - } else { - return verticalDirection && ((verticalDirection === "down" && isOverBottomHalf) || (verticalDirection === "up" && !isOverBottomHalf)); - } - - }, - - _getDragVerticalDirection: function() { - var delta = this.positionAbs.top - this.lastPositionAbs.top; - return delta !== 0 && (delta > 0 ? "down" : "up"); - }, - - _getDragHorizontalDirection: function() { - var delta = this.positionAbs.left - this.lastPositionAbs.left; - return delta !== 0 && (delta > 0 ? "right" : "left"); - }, - - refresh: function(event) { - this._refreshItems(event); - this.refreshPositions(); - return this; - }, - - _connectWith: function() { - var options = this.options; - return options.connectWith.constructor === String ? [options.connectWith] : options.connectWith; - }, - - _getItemsAsjQuery: function(connected) { - - var i, j, cur, inst, - items = [], - queries = [], - connectWith = this._connectWith(); - - if(connectWith && connected) { - for (i = connectWith.length - 1; i >= 0; i--){ - cur = $(connectWith[i]); - for ( j = cur.length - 1; j >= 0; j--){ - inst = $.data(cur[j], this.widgetFullName); - if(inst && inst !== this && !inst.options.disabled) { - queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), inst]); - } - } - } - } - - queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), this]); - - for (i = queries.length - 1; i >= 0; i--){ - queries[i][0].each(function() { - items.push(this); - }); - } - - return $(items); - - }, - - _removeCurrentsFromItems: function() { - - var list = this.currentItem.find(":data(" + this.widgetName + "-item)"); - - this.items = $.grep(this.items, function (item) { - for (var j=0; j < list.length; j++) { - if(list[j] === item.item[0]) { - return false; - } - } - return true; - }); - - }, - - _refreshItems: function(event) { - - this.items = []; - this.containers = [this]; - - var i, j, cur, inst, targetData, _queries, item, queriesLength, - items = this.items, - queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]], - connectWith = this._connectWith(); - - if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down - for (i = connectWith.length - 1; i >= 0; i--){ - cur = $(connectWith[i]); - for (j = cur.length - 1; j >= 0; j--){ - inst = $.data(cur[j], this.widgetFullName); - if(inst && inst !== this && !inst.options.disabled) { - queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]); - this.containers.push(inst); - } - } - } - } - - for (i = queries.length - 1; i >= 0; i--) { - targetData = queries[i][1]; - _queries = queries[i][0]; - - for (j=0, queriesLength = _queries.length; j < queriesLength; j++) { - item = $(_queries[j]); - - item.data(this.widgetName + "-item", targetData); // Data for target checking (mouse manager) - - items.push({ - item: item, - instance: targetData, - width: 0, height: 0, - left: 0, top: 0 - }); - } - } - - }, - - refreshPositions: function(fast) { - - //This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change - if(this.offsetParent && this.helper) { - this.offset.parent = this._getParentOffset(); - } - - var i, item, t, p; - - for (i = this.items.length - 1; i >= 0; i--){ - item = this.items[i]; - - //We ignore calculating positions of all connected containers when we're not over them - if(item.instance !== this.currentContainer && this.currentContainer && item.item[0] !== this.currentItem[0]) { - continue; - } - - t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item; - - if (!fast) { - item.width = t.outerWidth(); - item.height = t.outerHeight(); - } - - p = t.offset(); - item.left = p.left; - item.top = p.top; - } - - if(this.options.custom && this.options.custom.refreshContainers) { - this.options.custom.refreshContainers.call(this); - } else { - for (i = this.containers.length - 1; i >= 0; i--){ - p = this.containers[i].element.offset(); - this.containers[i].containerCache.left = p.left; - this.containers[i].containerCache.top = p.top; - this.containers[i].containerCache.width = this.containers[i].element.outerWidth(); - this.containers[i].containerCache.height = this.containers[i].element.outerHeight(); - } - } - - return this; - }, - - _createPlaceholder: function(that) { - that = that || this; - var className, - o = that.options; - - if(!o.placeholder || o.placeholder.constructor === String) { - className = o.placeholder; - o.placeholder = { - element: function() { - - var el = $(document.createElement(that.currentItem[0].nodeName)) - .addClass(className || that.currentItem[0].className+" ui-sortable-placeholder") - .removeClass("ui-sortable-helper")[0]; - - if(!className) { - el.style.visibility = "hidden"; - } - - return el; - }, - update: function(container, p) { - - // 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that - // 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified - if(className && !o.forcePlaceholderSize) { - return; - } - - //If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item - if(!p.height()) { p.height(that.currentItem.innerHeight() - parseInt(that.currentItem.css("paddingTop")||0, 10) - parseInt(that.currentItem.css("paddingBottom")||0, 10)); } - if(!p.width()) { p.width(that.currentItem.innerWidth() - parseInt(that.currentItem.css("paddingLeft")||0, 10) - parseInt(that.currentItem.css("paddingRight")||0, 10)); } - } - }; - } - - //Create the placeholder - that.placeholder = $(o.placeholder.element.call(that.element, that.currentItem)); - - //Append it after the actual current item - that.currentItem.after(that.placeholder); - - //Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317) - o.placeholder.update(that, that.placeholder); - - }, - - _contactContainers: function(event) { - var i, j, dist, itemWithLeastDistance, posProperty, sizeProperty, base, cur, nearBottom, - innermostContainer = null, - innermostIndex = null; - - // get innermost container that intersects with item - for (i = this.containers.length - 1; i >= 0; i--) { - - // never consider a container that's located within the item itself - if($.contains(this.currentItem[0], this.containers[i].element[0])) { - continue; - } - - if(this._intersectsWith(this.containers[i].containerCache)) { - - // if we've already found a container and it's more "inner" than this, then continue - if(innermostContainer && $.contains(this.containers[i].element[0], innermostContainer.element[0])) { - continue; - } - - innermostContainer = this.containers[i]; - innermostIndex = i; - - } else { - // container doesn't intersect. trigger "out" event if necessary - if(this.containers[i].containerCache.over) { - this.containers[i]._trigger("out", event, this._uiHash(this)); - this.containers[i].containerCache.over = 0; - } - } - - } - - // if no intersecting containers found, return - if(!innermostContainer) { - return; - } - - // move the item into the container if it's not there already - if(this.containers.length === 1) { - this.containers[innermostIndex]._trigger("over", event, this._uiHash(this)); - this.containers[innermostIndex].containerCache.over = 1; - } else { - - //When entering a new container, we will find the item with the least distance and append our item near it - dist = 10000; - itemWithLeastDistance = null; - posProperty = this.containers[innermostIndex].floating ? "left" : "top"; - sizeProperty = this.containers[innermostIndex].floating ? "width" : "height"; - base = this.positionAbs[posProperty] + this.offset.click[posProperty]; - for (j = this.items.length - 1; j >= 0; j--) { - if(!$.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) { - continue; - } - if(this.items[j].item[0] === this.currentItem[0]) { - continue; - } - cur = this.items[j].item.offset()[posProperty]; - nearBottom = false; - if(Math.abs(cur - base) > Math.abs(cur + this.items[j][sizeProperty] - base)){ - nearBottom = true; - cur += this.items[j][sizeProperty]; - } - - if(Math.abs(cur - base) < dist) { - dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j]; - this.direction = nearBottom ? "up": "down"; - } - } - - //Check if dropOnEmpty is enabled - if(!itemWithLeastDistance && !this.options.dropOnEmpty) { - return; - } - - this.currentContainer = this.containers[innermostIndex]; - itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true); - this._trigger("change", event, this._uiHash()); - this.containers[innermostIndex]._trigger("change", event, this._uiHash(this)); - - //Update the placeholder - this.options.placeholder.update(this.currentContainer, this.placeholder); - - this.containers[innermostIndex]._trigger("over", event, this._uiHash(this)); - this.containers[innermostIndex].containerCache.over = 1; - } - - - }, - - _createHelper: function(event) { - - var o = this.options, - helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper === "clone" ? this.currentItem.clone() : this.currentItem); - - //Add the helper to the DOM if that didn't happen already - if(!helper.parents("body").length) { - $(o.appendTo !== "parent" ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]); - } - - if(helper[0] === this.currentItem[0]) { - this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") }; - } - - if(!helper[0].style.width || o.forceHelperSize) { - helper.width(this.currentItem.width()); - } - if(!helper[0].style.height || o.forceHelperSize) { - helper.height(this.currentItem.height()); - } - - return helper; - - }, - - _adjustOffsetFromHelper: function(obj) { - if (typeof obj === "string") { - obj = obj.split(" "); - } - if ($.isArray(obj)) { - obj = {left: +obj[0], top: +obj[1] || 0}; - } - if ("left" in obj) { - this.offset.click.left = obj.left + this.margins.left; - } - if ("right" in obj) { - this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left; - } - if ("top" in obj) { - this.offset.click.top = obj.top + this.margins.top; - } - if ("bottom" in obj) { - this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top; - } - }, - - _getParentOffset: function() { - - - //Get the offsetParent and cache its position - this.offsetParent = this.helper.offsetParent(); - var po = this.offsetParent.offset(); - - // This is a special case where we need to modify a offset calculated on start, since the following happened: - // 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent - // 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that - // the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag - if(this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) { - po.left += this.scrollParent.scrollLeft(); - po.top += this.scrollParent.scrollTop(); - } - - // This needs to be actually done for all browsers, since pageX/pageY includes this information - // with an ugly IE fix - if( this.offsetParent[0] === document.body || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) { - po = { top: 0, left: 0 }; - } - - return { - top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0), - left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0) - }; - - }, - - _getRelativeOffset: function() { - - if(this.cssPosition === "relative") { - var p = this.currentItem.position(); - return { - top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(), - left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft() - }; - } else { - return { top: 0, left: 0 }; - } - - }, - - _cacheMargins: function() { - this.margins = { - left: (parseInt(this.currentItem.css("marginLeft"),10) || 0), - top: (parseInt(this.currentItem.css("marginTop"),10) || 0) - }; - }, - - _cacheHelperProportions: function() { - this.helperProportions = { - width: this.helper.outerWidth(), - height: this.helper.outerHeight() - }; - }, - - _setContainment: function() { - - var ce, co, over, - o = this.options; - if(o.containment === "parent") { - o.containment = this.helper[0].parentNode; - } - if(o.containment === "document" || o.containment === "window") { - this.containment = [ - 0 - this.offset.relative.left - this.offset.parent.left, - 0 - this.offset.relative.top - this.offset.parent.top, - $(o.containment === "document" ? document : window).width() - this.helperProportions.width - this.margins.left, - ($(o.containment === "document" ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top - ]; - } - - if(!(/^(document|window|parent)$/).test(o.containment)) { - ce = $(o.containment)[0]; - co = $(o.containment).offset(); - over = ($(ce).css("overflow") !== "hidden"); - - this.containment = [ - co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left, - co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top, - co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left, - co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top - ]; - } - - }, - - _convertPositionTo: function(d, pos) { - - if(!pos) { - pos = this.position; - } - var mod = d === "absolute" ? 1 : -1, - scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, - scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName); - - return { - top: ( - pos.top + // The absolute mouse position - this.offset.relative.top * mod + // Only for relative positioned nodes: Relative offset from element to offset parent - this.offset.parent.top * mod - // The offsetParent's offset without borders (offset + border) - ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod) - ), - left: ( - pos.left + // The absolute mouse position - this.offset.relative.left * mod + // Only for relative positioned nodes: Relative offset from element to offset parent - this.offset.parent.left * mod - // The offsetParent's offset without borders (offset + border) - ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod) - ) - }; - - }, - - _generatePosition: function(event) { - - var top, left, - o = this.options, - pageX = event.pageX, - pageY = event.pageY, - scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName); - - // This is another very weird special case that only happens for relative elements: - // 1. If the css position is relative - // 2. and the scroll parent is the document or similar to the offset parent - // we have to refresh the relative offset during the scroll so there are no jumps - if(this.cssPosition === "relative" && !(this.scrollParent[0] !== document && this.scrollParent[0] !== this.offsetParent[0])) { - this.offset.relative = this._getRelativeOffset(); - } - - /* - * - Position constraining - - * Constrain the position to a mix of grid, containment. - */ - - if(this.originalPosition) { //If we are not dragging yet, we won't check for options - - if(this.containment) { - if(event.pageX - this.offset.click.left < this.containment[0]) { - pageX = this.containment[0] + this.offset.click.left; - } - if(event.pageY - this.offset.click.top < this.containment[1]) { - pageY = this.containment[1] + this.offset.click.top; - } - if(event.pageX - this.offset.click.left > this.containment[2]) { - pageX = this.containment[2] + this.offset.click.left; - } - if(event.pageY - this.offset.click.top > this.containment[3]) { - pageY = this.containment[3] + this.offset.click.top; - } - } - - if(o.grid) { - top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1]; - pageY = this.containment ? ( (top - this.offset.click.top >= this.containment[1] && top - this.offset.click.top <= this.containment[3]) ? top : ((top - this.offset.click.top >= this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top; - - left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0]; - pageX = this.containment ? ( (left - this.offset.click.left >= this.containment[0] && left - this.offset.click.left <= this.containment[2]) ? left : ((left - this.offset.click.left >= this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left; - } - - } - - return { - top: ( - pageY - // The absolute mouse position - this.offset.click.top - // Click offset (relative to the element) - this.offset.relative.top - // Only for relative positioned nodes: Relative offset from element to offset parent - this.offset.parent.top + // The offsetParent's offset without borders (offset + border) - ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) )) - ), - left: ( - pageX - // The absolute mouse position - this.offset.click.left - // Click offset (relative to the element) - this.offset.relative.left - // Only for relative positioned nodes: Relative offset from element to offset parent - this.offset.parent.left + // The offsetParent's offset without borders (offset + border) - ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() )) - ) - }; - - }, - - _rearrange: function(event, i, a, hardRefresh) { - - a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction === "down" ? i.item[0] : i.item[0].nextSibling)); - - //Various things done here to improve the performance: - // 1. we create a setTimeout, that calls refreshPositions - // 2. on the instance, we have a counter variable, that get's higher after every append - // 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same - // 4. this lets only the last addition to the timeout stack through - this.counter = this.counter ? ++this.counter : 1; - var counter = this.counter; - - this._delay(function() { - if(counter === this.counter) { - this.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove - } - }); - - }, - - _clear: function(event, noPropagation) { - - this.reverting = false; - // We delay all events that have to be triggered to after the point where the placeholder has been removed and - // everything else normalized again - var i, - delayedTriggers = []; - - // We first have to update the dom position of the actual currentItem - // Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088) - if(!this._noFinalSort && this.currentItem.parent().length) { - this.placeholder.before(this.currentItem); - } - this._noFinalSort = null; - - if(this.helper[0] === this.currentItem[0]) { - for(i in this._storedCSS) { - if(this._storedCSS[i] === "auto" || this._storedCSS[i] === "static") { - this._storedCSS[i] = ""; - } - } - this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"); - } else { - this.currentItem.show(); - } - - if(this.fromOutside && !noPropagation) { - delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); }); - } - if((this.fromOutside || this.domPosition.prev !== this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent !== this.currentItem.parent()[0]) && !noPropagation) { - delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed - } - - // Check if the items Container has Changed and trigger appropriate - // events. - if (this !== this.currentContainer) { - if(!noPropagation) { - delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); }); - delayedTriggers.push((function(c) { return function(event) { c._trigger("receive", event, this._uiHash(this)); }; }).call(this, this.currentContainer)); - delayedTriggers.push((function(c) { return function(event) { c._trigger("update", event, this._uiHash(this)); }; }).call(this, this.currentContainer)); - } - } - - - //Post events to containers - for (i = this.containers.length - 1; i >= 0; i--){ - if(!noPropagation) { - delayedTriggers.push((function(c) { return function(event) { c._trigger("deactivate", event, this._uiHash(this)); }; }).call(this, this.containers[i])); - } - if(this.containers[i].containerCache.over) { - delayedTriggers.push((function(c) { return function(event) { c._trigger("out", event, this._uiHash(this)); }; }).call(this, this.containers[i])); - this.containers[i].containerCache.over = 0; - } - } - - //Do what was originally in plugins - if(this._storedCursor) { - $("body").css("cursor", this._storedCursor); - } - if(this._storedOpacity) { - this.helper.css("opacity", this._storedOpacity); - } - if(this._storedZIndex) { - this.helper.css("zIndex", this._storedZIndex === "auto" ? "" : this._storedZIndex); - } - - this.dragging = false; - if(this.cancelHelperRemoval) { - if(!noPropagation) { - this._trigger("beforeStop", event, this._uiHash()); - for (i=0; i < delayedTriggers.length; i++) { - delayedTriggers[i].call(this, event); - } //Trigger all delayed events - this._trigger("stop", event, this._uiHash()); - } - - this.fromOutside = false; - return false; - } - - if(!noPropagation) { - this._trigger("beforeStop", event, this._uiHash()); - } - - //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node! - this.placeholder[0].parentNode.removeChild(this.placeholder[0]); - - if(this.helper[0] !== this.currentItem[0]) { - this.helper.remove(); - } - this.helper = null; - - if(!noPropagation) { - for (i=0; i < delayedTriggers.length; i++) { - delayedTriggers[i].call(this, event); - } //Trigger all delayed events - this._trigger("stop", event, this._uiHash()); - } - - this.fromOutside = false; - return true; - - }, - - _trigger: function() { - if ($.Widget.prototype._trigger.apply(this, arguments) === false) { - this.cancel(); - } - }, - - _uiHash: function(_inst) { - var inst = _inst || this; - return { - helper: inst.helper, - placeholder: inst.placeholder || $([]), - position: inst.position, - originalPosition: inst.originalPosition, - offset: inst.positionAbs, - item: inst.currentItem, - sender: _inst ? _inst.element : null - }; - } - -}); - -})(jQuery); -;(jQuery.effects || (function($, undefined) { - -var dataSpace = "ui-effects-"; - -$.effects = { - effect: {} -}; - -/*! - * jQuery Color Animations v2.1.2 - * https://github.com/jquery/jquery-color - * - * Copyright 2013 jQuery Foundation and other contributors - * Released under the MIT license. - * http://jquery.org/license - * - * Date: Wed Jan 16 08:47:09 2013 -0600 - */ -(function( jQuery, undefined ) { - - var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor", - - // plusequals test for += 100 -= 100 - rplusequals = /^([\-+])=\s*(\d+\.?\d*)/, - // a set of RE's that can match strings and generate color tuples. - stringParsers = [{ - re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/, - parse: function( execResult ) { - return [ - execResult[ 1 ], - execResult[ 2 ], - execResult[ 3 ], - execResult[ 4 ] - ]; - } - }, { - re: /rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/, - parse: function( execResult ) { - return [ - execResult[ 1 ] * 2.55, - execResult[ 2 ] * 2.55, - execResult[ 3 ] * 2.55, - execResult[ 4 ] - ]; - } - }, { - // this regex ignores A-F because it's compared against an already lowercased string - re: /#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/, - parse: function( execResult ) { - return [ - parseInt( execResult[ 1 ], 16 ), - parseInt( execResult[ 2 ], 16 ), - parseInt( execResult[ 3 ], 16 ) - ]; - } - }, { - // this regex ignores A-F because it's compared against an already lowercased string - re: /#([a-f0-9])([a-f0-9])([a-f0-9])/, - parse: function( execResult ) { - return [ - parseInt( execResult[ 1 ] + execResult[ 1 ], 16 ), - parseInt( execResult[ 2 ] + execResult[ 2 ], 16 ), - parseInt( execResult[ 3 ] + execResult[ 3 ], 16 ) - ]; - } - }, { - re: /hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/, - space: "hsla", - parse: function( execResult ) { - return [ - execResult[ 1 ], - execResult[ 2 ] / 100, - execResult[ 3 ] / 100, - execResult[ 4 ] - ]; - } - }], - - // jQuery.Color( ) - color = jQuery.Color = function( color, green, blue, alpha ) { - return new jQuery.Color.fn.parse( color, green, blue, alpha ); - }, - spaces = { - rgba: { - props: { - red: { - idx: 0, - type: "byte" - }, - green: { - idx: 1, - type: "byte" - }, - blue: { - idx: 2, - type: "byte" - } - } - }, - - hsla: { - props: { - hue: { - idx: 0, - type: "degrees" - }, - saturation: { - idx: 1, - type: "percent" - }, - lightness: { - idx: 2, - type: "percent" - } - } - } - }, - propTypes = { - "byte": { - floor: true, - max: 255 - }, - "percent": { - max: 1 - }, - "degrees": { - mod: 360, - floor: true - } - }, - support = color.support = {}, - - // element for support tests - supportElem = jQuery( "

    " )[ 0 ], - - // colors = jQuery.Color.names - colors, - - // local aliases of functions called often - each = jQuery.each; - -// determine rgba support immediately -supportElem.style.cssText = "background-color:rgba(1,1,1,.5)"; -support.rgba = supportElem.style.backgroundColor.indexOf( "rgba" ) > -1; - -// define cache name and alpha properties -// for rgba and hsla spaces -each( spaces, function( spaceName, space ) { - space.cache = "_" + spaceName; - space.props.alpha = { - idx: 3, - type: "percent", - def: 1 - }; -}); - -function clamp( value, prop, allowEmpty ) { - var type = propTypes[ prop.type ] || {}; - - if ( value == null ) { - return (allowEmpty || !prop.def) ? null : prop.def; - } - - // ~~ is an short way of doing floor for positive numbers - value = type.floor ? ~~value : parseFloat( value ); - - // IE will pass in empty strings as value for alpha, - // which will hit this case - if ( isNaN( value ) ) { - return prop.def; - } - - if ( type.mod ) { - // we add mod before modding to make sure that negatives values - // get converted properly: -10 -> 350 - return (value + type.mod) % type.mod; - } - - // for now all property types without mod have min and max - return 0 > value ? 0 : type.max < value ? type.max : value; -} - -function stringParse( string ) { - var inst = color(), - rgba = inst._rgba = []; - - string = string.toLowerCase(); - - each( stringParsers, function( i, parser ) { - var parsed, - match = parser.re.exec( string ), - values = match && parser.parse( match ), - spaceName = parser.space || "rgba"; - - if ( values ) { - parsed = inst[ spaceName ]( values ); - - // if this was an rgba parse the assignment might happen twice - // oh well.... - inst[ spaces[ spaceName ].cache ] = parsed[ spaces[ spaceName ].cache ]; - rgba = inst._rgba = parsed._rgba; - - // exit each( stringParsers ) here because we matched - return false; - } - }); - - // Found a stringParser that handled it - if ( rgba.length ) { - - // if this came from a parsed string, force "transparent" when alpha is 0 - // chrome, (and maybe others) return "transparent" as rgba(0,0,0,0) - if ( rgba.join() === "0,0,0,0" ) { - jQuery.extend( rgba, colors.transparent ); - } - return inst; - } - - // named colors - return colors[ string ]; -} - -color.fn = jQuery.extend( color.prototype, { - parse: function( red, green, blue, alpha ) { - if ( red === undefined ) { - this._rgba = [ null, null, null, null ]; - return this; - } - if ( red.jquery || red.nodeType ) { - red = jQuery( red ).css( green ); - green = undefined; - } - - var inst = this, - type = jQuery.type( red ), - rgba = this._rgba = []; - - // more than 1 argument specified - assume ( red, green, blue, alpha ) - if ( green !== undefined ) { - red = [ red, green, blue, alpha ]; - type = "array"; - } - - if ( type === "string" ) { - return this.parse( stringParse( red ) || colors._default ); - } - - if ( type === "array" ) { - each( spaces.rgba.props, function( key, prop ) { - rgba[ prop.idx ] = clamp( red[ prop.idx ], prop ); - }); - return this; - } - - if ( type === "object" ) { - if ( red instanceof color ) { - each( spaces, function( spaceName, space ) { - if ( red[ space.cache ] ) { - inst[ space.cache ] = red[ space.cache ].slice(); - } - }); - } else { - each( spaces, function( spaceName, space ) { - var cache = space.cache; - each( space.props, function( key, prop ) { - - // if the cache doesn't exist, and we know how to convert - if ( !inst[ cache ] && space.to ) { - - // if the value was null, we don't need to copy it - // if the key was alpha, we don't need to copy it either - if ( key === "alpha" || red[ key ] == null ) { - return; - } - inst[ cache ] = space.to( inst._rgba ); - } - - // this is the only case where we allow nulls for ALL properties. - // call clamp with alwaysAllowEmpty - inst[ cache ][ prop.idx ] = clamp( red[ key ], prop, true ); - }); - - // everything defined but alpha? - if ( inst[ cache ] && jQuery.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) { - // use the default of 1 - inst[ cache ][ 3 ] = 1; - if ( space.from ) { - inst._rgba = space.from( inst[ cache ] ); - } - } - }); - } - return this; - } - }, - is: function( compare ) { - var is = color( compare ), - same = true, - inst = this; - - each( spaces, function( _, space ) { - var localCache, - isCache = is[ space.cache ]; - if (isCache) { - localCache = inst[ space.cache ] || space.to && space.to( inst._rgba ) || []; - each( space.props, function( _, prop ) { - if ( isCache[ prop.idx ] != null ) { - same = ( isCache[ prop.idx ] === localCache[ prop.idx ] ); - return same; - } - }); - } - return same; - }); - return same; - }, - _space: function() { - var used = [], - inst = this; - each( spaces, function( spaceName, space ) { - if ( inst[ space.cache ] ) { - used.push( spaceName ); - } - }); - return used.pop(); - }, - transition: function( other, distance ) { - var end = color( other ), - spaceName = end._space(), - space = spaces[ spaceName ], - startColor = this.alpha() === 0 ? color( "transparent" ) : this, - start = startColor[ space.cache ] || space.to( startColor._rgba ), - result = start.slice(); - - end = end[ space.cache ]; - each( space.props, function( key, prop ) { - var index = prop.idx, - startValue = start[ index ], - endValue = end[ index ], - type = propTypes[ prop.type ] || {}; - - // if null, don't override start value - if ( endValue === null ) { - return; - } - // if null - use end - if ( startValue === null ) { - result[ index ] = endValue; - } else { - if ( type.mod ) { - if ( endValue - startValue > type.mod / 2 ) { - startValue += type.mod; - } else if ( startValue - endValue > type.mod / 2 ) { - startValue -= type.mod; - } - } - result[ index ] = clamp( ( endValue - startValue ) * distance + startValue, prop ); - } - }); - return this[ spaceName ]( result ); - }, - blend: function( opaque ) { - // if we are already opaque - return ourself - if ( this._rgba[ 3 ] === 1 ) { - return this; - } - - var rgb = this._rgba.slice(), - a = rgb.pop(), - blend = color( opaque )._rgba; - - return color( jQuery.map( rgb, function( v, i ) { - return ( 1 - a ) * blend[ i ] + a * v; - })); - }, - toRgbaString: function() { - var prefix = "rgba(", - rgba = jQuery.map( this._rgba, function( v, i ) { - return v == null ? ( i > 2 ? 1 : 0 ) : v; - }); - - if ( rgba[ 3 ] === 1 ) { - rgba.pop(); - prefix = "rgb("; - } - - return prefix + rgba.join() + ")"; - }, - toHslaString: function() { - var prefix = "hsla(", - hsla = jQuery.map( this.hsla(), function( v, i ) { - if ( v == null ) { - v = i > 2 ? 1 : 0; - } - - // catch 1 and 2 - if ( i && i < 3 ) { - v = Math.round( v * 100 ) + "%"; - } - return v; - }); - - if ( hsla[ 3 ] === 1 ) { - hsla.pop(); - prefix = "hsl("; - } - return prefix + hsla.join() + ")"; - }, - toHexString: function( includeAlpha ) { - var rgba = this._rgba.slice(), - alpha = rgba.pop(); - - if ( includeAlpha ) { - rgba.push( ~~( alpha * 255 ) ); - } - - return "#" + jQuery.map( rgba, function( v ) { - - // default to 0 when nulls exist - v = ( v || 0 ).toString( 16 ); - return v.length === 1 ? "0" + v : v; - }).join(""); - }, - toString: function() { - return this._rgba[ 3 ] === 0 ? "transparent" : this.toRgbaString(); - } -}); -color.fn.parse.prototype = color.fn; - -// hsla conversions adapted from: -// https://code.google.com/p/maashaack/source/browse/packages/graphics/trunk/src/graphics/colors/HUE2RGB.as?r=5021 - -function hue2rgb( p, q, h ) { - h = ( h + 1 ) % 1; - if ( h * 6 < 1 ) { - return p + (q - p) * h * 6; - } - if ( h * 2 < 1) { - return q; - } - if ( h * 3 < 2 ) { - return p + (q - p) * ((2/3) - h) * 6; - } - return p; -} - -spaces.hsla.to = function ( rgba ) { - if ( rgba[ 0 ] == null || rgba[ 1 ] == null || rgba[ 2 ] == null ) { - return [ null, null, null, rgba[ 3 ] ]; - } - var r = rgba[ 0 ] / 255, - g = rgba[ 1 ] / 255, - b = rgba[ 2 ] / 255, - a = rgba[ 3 ], - max = Math.max( r, g, b ), - min = Math.min( r, g, b ), - diff = max - min, - add = max + min, - l = add * 0.5, - h, s; - - if ( min === max ) { - h = 0; - } else if ( r === max ) { - h = ( 60 * ( g - b ) / diff ) + 360; - } else if ( g === max ) { - h = ( 60 * ( b - r ) / diff ) + 120; - } else { - h = ( 60 * ( r - g ) / diff ) + 240; - } - - // chroma (diff) == 0 means greyscale which, by definition, saturation = 0% - // otherwise, saturation is based on the ratio of chroma (diff) to lightness (add) - if ( diff === 0 ) { - s = 0; - } else if ( l <= 0.5 ) { - s = diff / add; - } else { - s = diff / ( 2 - add ); - } - return [ Math.round(h) % 360, s, l, a == null ? 1 : a ]; -}; - -spaces.hsla.from = function ( hsla ) { - if ( hsla[ 0 ] == null || hsla[ 1 ] == null || hsla[ 2 ] == null ) { - return [ null, null, null, hsla[ 3 ] ]; - } - var h = hsla[ 0 ] / 360, - s = hsla[ 1 ], - l = hsla[ 2 ], - a = hsla[ 3 ], - q = l <= 0.5 ? l * ( 1 + s ) : l + s - l * s, - p = 2 * l - q; - - return [ - Math.round( hue2rgb( p, q, h + ( 1 / 3 ) ) * 255 ), - Math.round( hue2rgb( p, q, h ) * 255 ), - Math.round( hue2rgb( p, q, h - ( 1 / 3 ) ) * 255 ), - a - ]; -}; - - -each( spaces, function( spaceName, space ) { - var props = space.props, - cache = space.cache, - to = space.to, - from = space.from; - - // makes rgba() and hsla() - color.fn[ spaceName ] = function( value ) { - - // generate a cache for this space if it doesn't exist - if ( to && !this[ cache ] ) { - this[ cache ] = to( this._rgba ); - } - if ( value === undefined ) { - return this[ cache ].slice(); - } - - var ret, - type = jQuery.type( value ), - arr = ( type === "array" || type === "object" ) ? value : arguments, - local = this[ cache ].slice(); - - each( props, function( key, prop ) { - var val = arr[ type === "object" ? key : prop.idx ]; - if ( val == null ) { - val = local[ prop.idx ]; - } - local[ prop.idx ] = clamp( val, prop ); - }); - - if ( from ) { - ret = color( from( local ) ); - ret[ cache ] = local; - return ret; - } else { - return color( local ); - } - }; - - // makes red() green() blue() alpha() hue() saturation() lightness() - each( props, function( key, prop ) { - // alpha is included in more than one space - if ( color.fn[ key ] ) { - return; - } - color.fn[ key ] = function( value ) { - var vtype = jQuery.type( value ), - fn = ( key === "alpha" ? ( this._hsla ? "hsla" : "rgba" ) : spaceName ), - local = this[ fn ](), - cur = local[ prop.idx ], - match; - - if ( vtype === "undefined" ) { - return cur; - } - - if ( vtype === "function" ) { - value = value.call( this, cur ); - vtype = jQuery.type( value ); - } - if ( value == null && prop.empty ) { - return this; - } - if ( vtype === "string" ) { - match = rplusequals.exec( value ); - if ( match ) { - value = cur + parseFloat( match[ 2 ] ) * ( match[ 1 ] === "+" ? 1 : -1 ); - } - } - local[ prop.idx ] = value; - return this[ fn ]( local ); - }; - }); -}); - -// add cssHook and .fx.step function for each named hook. -// accept a space separated string of properties -color.hook = function( hook ) { - var hooks = hook.split( " " ); - each( hooks, function( i, hook ) { - jQuery.cssHooks[ hook ] = { - set: function( elem, value ) { - var parsed, curElem, - backgroundColor = ""; - - if ( value !== "transparent" && ( jQuery.type( value ) !== "string" || ( parsed = stringParse( value ) ) ) ) { - value = color( parsed || value ); - if ( !support.rgba && value._rgba[ 3 ] !== 1 ) { - curElem = hook === "backgroundColor" ? elem.parentNode : elem; - while ( - (backgroundColor === "" || backgroundColor === "transparent") && - curElem && curElem.style - ) { - try { - backgroundColor = jQuery.css( curElem, "backgroundColor" ); - curElem = curElem.parentNode; - } catch ( e ) { - } - } - - value = value.blend( backgroundColor && backgroundColor !== "transparent" ? - backgroundColor : - "_default" ); - } - - value = value.toRgbaString(); - } - try { - elem.style[ hook ] = value; - } catch( e ) { - // wrapped to prevent IE from throwing errors on "invalid" values like 'auto' or 'inherit' - } - } - }; - jQuery.fx.step[ hook ] = function( fx ) { - if ( !fx.colorInit ) { - fx.start = color( fx.elem, hook ); - fx.end = color( fx.end ); - fx.colorInit = true; - } - jQuery.cssHooks[ hook ].set( fx.elem, fx.start.transition( fx.end, fx.pos ) ); - }; - }); - -}; - -color.hook( stepHooks ); - -jQuery.cssHooks.borderColor = { - expand: function( value ) { - var expanded = {}; - - each( [ "Top", "Right", "Bottom", "Left" ], function( i, part ) { - expanded[ "border" + part + "Color" ] = value; - }); - return expanded; - } -}; - -// Basic color names only. -// Usage of any of the other color names requires adding yourself or including -// jquery.color.svg-names.js. -colors = jQuery.Color.names = { - // 4.1. Basic color keywords - aqua: "#00ffff", - black: "#000000", - blue: "#0000ff", - fuchsia: "#ff00ff", - gray: "#808080", - green: "#008000", - lime: "#00ff00", - maroon: "#800000", - navy: "#000080", - olive: "#808000", - purple: "#800080", - red: "#ff0000", - silver: "#c0c0c0", - teal: "#008080", - white: "#ffffff", - yellow: "#ffff00", - - // 4.2.3. "transparent" color keyword - transparent: [ null, null, null, 0 ], - - _default: "#ffffff" -}; - -})( jQuery ); - - -/******************************************************************************/ -/****************************** CLASS ANIMATIONS ******************************/ -/******************************************************************************/ -(function() { - -var classAnimationActions = [ "add", "remove", "toggle" ], - shorthandStyles = { - border: 1, - borderBottom: 1, - borderColor: 1, - borderLeft: 1, - borderRight: 1, - borderTop: 1, - borderWidth: 1, - margin: 1, - padding: 1 - }; - -$.each([ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ], function( _, prop ) { - $.fx.step[ prop ] = function( fx ) { - if ( fx.end !== "none" && !fx.setAttr || fx.pos === 1 && !fx.setAttr ) { - jQuery.style( fx.elem, prop, fx.end ); - fx.setAttr = true; - } - }; -}); - -function getElementStyles( elem ) { - var key, len, - style = elem.ownerDocument.defaultView ? - elem.ownerDocument.defaultView.getComputedStyle( elem, null ) : - elem.currentStyle, - styles = {}; - - if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) { - len = style.length; - while ( len-- ) { - key = style[ len ]; - if ( typeof style[ key ] === "string" ) { - styles[ $.camelCase( key ) ] = style[ key ]; - } - } - // support: Opera, IE <9 - } else { - for ( key in style ) { - if ( typeof style[ key ] === "string" ) { - styles[ key ] = style[ key ]; - } - } - } - - return styles; -} - - -function styleDifference( oldStyle, newStyle ) { - var diff = {}, - name, value; - - for ( name in newStyle ) { - value = newStyle[ name ]; - if ( oldStyle[ name ] !== value ) { - if ( !shorthandStyles[ name ] ) { - if ( $.fx.step[ name ] || !isNaN( parseFloat( value ) ) ) { - diff[ name ] = value; - } - } - } - } - - return diff; -} - -// support: jQuery <1.8 -if ( !$.fn.addBack ) { - $.fn.addBack = function( selector ) { - return this.add( selector == null ? - this.prevObject : this.prevObject.filter( selector ) - ); - }; -} - -$.effects.animateClass = function( value, duration, easing, callback ) { - var o = $.speed( duration, easing, callback ); - - return this.queue( function() { - var animated = $( this ), - baseClass = animated.attr( "class" ) || "", - applyClassChange, - allAnimations = o.children ? animated.find( "*" ).addBack() : animated; - - // map the animated objects to store the original styles. - allAnimations = allAnimations.map(function() { - var el = $( this ); - return { - el: el, - start: getElementStyles( this ) - }; - }); - - // apply class change - applyClassChange = function() { - $.each( classAnimationActions, function(i, action) { - if ( value[ action ] ) { - animated[ action + "Class" ]( value[ action ] ); - } - }); - }; - applyClassChange(); - - // map all animated objects again - calculate new styles and diff - allAnimations = allAnimations.map(function() { - this.end = getElementStyles( this.el[ 0 ] ); - this.diff = styleDifference( this.start, this.end ); - return this; - }); - - // apply original class - animated.attr( "class", baseClass ); - - // map all animated objects again - this time collecting a promise - allAnimations = allAnimations.map(function() { - var styleInfo = this, - dfd = $.Deferred(), - opts = $.extend({}, o, { - queue: false, - complete: function() { - dfd.resolve( styleInfo ); - } - }); - - this.el.animate( this.diff, opts ); - return dfd.promise(); - }); - - // once all animations have completed: - $.when.apply( $, allAnimations.get() ).done(function() { - - // set the final class - applyClassChange(); - - // for each animated element, - // clear all css properties that were animated - $.each( arguments, function() { - var el = this.el; - $.each( this.diff, function(key) { - el.css( key, "" ); - }); - }); - - // this is guarnteed to be there if you use jQuery.speed() - // it also handles dequeuing the next anim... - o.complete.call( animated[ 0 ] ); - }); - }); -}; - -$.fn.extend({ - _addClass: $.fn.addClass, - addClass: function( classNames, speed, easing, callback ) { - return speed ? - $.effects.animateClass.call( this, - { add: classNames }, speed, easing, callback ) : - this._addClass( classNames ); - }, - - _removeClass: $.fn.removeClass, - removeClass: function( classNames, speed, easing, callback ) { - return speed ? - $.effects.animateClass.call( this, - { remove: classNames }, speed, easing, callback ) : - this._removeClass( classNames ); - }, - - _toggleClass: $.fn.toggleClass, - toggleClass: function( classNames, force, speed, easing, callback ) { - if ( typeof force === "boolean" || force === undefined ) { - if ( !speed ) { - // without speed parameter - return this._toggleClass( classNames, force ); - } else { - return $.effects.animateClass.call( this, - (force ? { add: classNames } : { remove: classNames }), - speed, easing, callback ); - } - } else { - // without force parameter - return $.effects.animateClass.call( this, - { toggle: classNames }, force, speed, easing ); - } - }, - - switchClass: function( remove, add, speed, easing, callback) { - return $.effects.animateClass.call( this, { - add: add, - remove: remove - }, speed, easing, callback ); - } -}); - -})(); - -/******************************************************************************/ -/*********************************** EFFECTS **********************************/ -/******************************************************************************/ - -(function() { - -$.extend( $.effects, { - version: "1.10.0", - - // Saves a set of properties in a data storage - save: function( element, set ) { - for( var i=0; i < set.length; i++ ) { - if ( set[ i ] !== null ) { - element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] ); - } - } - }, - - // Restores a set of previously saved properties from a data storage - restore: function( element, set ) { - var val, i; - for( i=0; i < set.length; i++ ) { - if ( set[ i ] !== null ) { - val = element.data( dataSpace + set[ i ] ); - // support: jQuery 1.6.2 - // http://bugs.jquery.com/ticket/9917 - // jQuery 1.6.2 incorrectly returns undefined for any falsy value. - // We can't differentiate between "" and 0 here, so we just assume - // empty string since it's likely to be a more common value... - if ( val === undefined ) { - val = ""; - } - element.css( set[ i ], val ); - } - } - }, - - setMode: function( el, mode ) { - if (mode === "toggle") { - mode = el.is( ":hidden" ) ? "show" : "hide"; - } - return mode; - }, - - // Translates a [top,left] array into a baseline value - // this should be a little more flexible in the future to handle a string & hash - getBaseline: function( origin, original ) { - var y, x; - switch ( origin[ 0 ] ) { - case "top": y = 0; break; - case "middle": y = 0.5; break; - case "bottom": y = 1; break; - default: y = origin[ 0 ] / original.height; - } - switch ( origin[ 1 ] ) { - case "left": x = 0; break; - case "center": x = 0.5; break; - case "right": x = 1; break; - default: x = origin[ 1 ] / original.width; - } - return { - x: x, - y: y - }; - }, - - // Wraps the element around a wrapper that copies position properties - createWrapper: function( element ) { - - // if the element is already wrapped, return it - if ( element.parent().is( ".ui-effects-wrapper" )) { - return element.parent(); - } - - // wrap the element - var props = { - width: element.outerWidth(true), - height: element.outerHeight(true), - "float": element.css( "float" ) - }, - wrapper = $( "

    " ) - .addClass( "ui-effects-wrapper" ) - .css({ - fontSize: "100%", - background: "transparent", - border: "none", - margin: 0, - padding: 0 - }), - // Store the size in case width/height are defined in % - Fixes #5245 - size = { - width: element.width(), - height: element.height() - }, - active = document.activeElement; - - // support: Firefox - // Firefox incorrectly exposes anonymous content - // https://bugzilla.mozilla.org/show_bug.cgi?id=561664 - try { - active.id; - } catch( e ) { - active = document.body; - } - - element.wrap( wrapper ); - - // Fixes #7595 - Elements lose focus when wrapped. - if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) { - $( active ).focus(); - } - - wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually lose the reference to the wrapped element - - // transfer positioning properties to the wrapper - if ( element.css( "position" ) === "static" ) { - wrapper.css({ position: "relative" }); - element.css({ position: "relative" }); - } else { - $.extend( props, { - position: element.css( "position" ), - zIndex: element.css( "z-index" ) - }); - $.each([ "top", "left", "bottom", "right" ], function(i, pos) { - props[ pos ] = element.css( pos ); - if ( isNaN( parseInt( props[ pos ], 10 ) ) ) { - props[ pos ] = "auto"; - } - }); - element.css({ - position: "relative", - top: 0, - left: 0, - right: "auto", - bottom: "auto" - }); - } - element.css(size); - - return wrapper.css( props ).show(); - }, - - removeWrapper: function( element ) { - var active = document.activeElement; - - if ( element.parent().is( ".ui-effects-wrapper" ) ) { - element.parent().replaceWith( element ); - - // Fixes #7595 - Elements lose focus when wrapped. - if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) { - $( active ).focus(); - } - } - - - return element; - }, - - setTransition: function( element, list, factor, value ) { - value = value || {}; - $.each( list, function( i, x ) { - var unit = element.cssUnit( x ); - if ( unit[ 0 ] > 0 ) { - value[ x ] = unit[ 0 ] * factor + unit[ 1 ]; - } - }); - return value; - } -}); - -// return an effect options object for the given parameters: -function _normalizeArguments( effect, options, speed, callback ) { - - // allow passing all options as the first parameter - if ( $.isPlainObject( effect ) ) { - options = effect; - effect = effect.effect; - } - - // convert to an object - effect = { effect: effect }; - - // catch (effect, null, ...) - if ( options == null ) { - options = {}; - } - - // catch (effect, callback) - if ( $.isFunction( options ) ) { - callback = options; - speed = null; - options = {}; - } - - // catch (effect, speed, ?) - if ( typeof options === "number" || $.fx.speeds[ options ] ) { - callback = speed; - speed = options; - options = {}; - } - - // catch (effect, options, callback) - if ( $.isFunction( speed ) ) { - callback = speed; - speed = null; - } - - // add options to effect - if ( options ) { - $.extend( effect, options ); - } - - speed = speed || options.duration; - effect.duration = $.fx.off ? 0 : - typeof speed === "number" ? speed : - speed in $.fx.speeds ? $.fx.speeds[ speed ] : - $.fx.speeds._default; - - effect.complete = callback || options.complete; - - return effect; -} - -function standardSpeed( speed ) { - // valid standard speeds - if ( !speed || typeof speed === "number" || $.fx.speeds[ speed ] ) { - return true; - } - - // invalid strings - treat as "normal" speed - return typeof speed === "string" && !$.effects.effect[ speed ]; -} - -$.fn.extend({ - effect: function( /* effect, options, speed, callback */ ) { - var args = _normalizeArguments.apply( this, arguments ), - mode = args.mode, - queue = args.queue, - effectMethod = $.effects.effect[ args.effect ]; - - if ( $.fx.off || !effectMethod ) { - // delegate to the original method (e.g., .show()) if possible - if ( mode ) { - return this[ mode ]( args.duration, args.complete ); - } else { - return this.each( function() { - if ( args.complete ) { - args.complete.call( this ); - } - }); - } - } - - function run( next ) { - var elem = $( this ), - complete = args.complete, - mode = args.mode; - - function done() { - if ( $.isFunction( complete ) ) { - complete.call( elem[0] ); - } - if ( $.isFunction( next ) ) { - next(); - } - } - - // if the element is hiddden and mode is hide, - // or element is visible and mode is show - if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) { - done(); - } else { - effectMethod.call( elem[0], args, done ); - } - } - - return queue === false ? this.each( run ) : this.queue( queue || "fx", run ); - }, - - _show: $.fn.show, - show: function( speed ) { - if ( standardSpeed( speed ) ) { - return this._show.apply( this, arguments ); - } else { - var args = _normalizeArguments.apply( this, arguments ); - args.mode = "show"; - return this.effect.call( this, args ); - } - }, - - _hide: $.fn.hide, - hide: function( speed ) { - if ( standardSpeed( speed ) ) { - return this._hide.apply( this, arguments ); - } else { - var args = _normalizeArguments.apply( this, arguments ); - args.mode = "hide"; - return this.effect.call( this, args ); - } - }, - - // jQuery core overloads toggle and creates _toggle - __toggle: $.fn.toggle, - toggle: function( speed ) { - if ( standardSpeed( speed ) || typeof speed === "boolean" || $.isFunction( speed ) ) { - return this.__toggle.apply( this, arguments ); - } else { - var args = _normalizeArguments.apply( this, arguments ); - args.mode = "toggle"; - return this.effect.call( this, args ); - } - }, - - // helper functions - cssUnit: function(key) { - var style = this.css( key ), - val = []; - - $.each( [ "em", "px", "%", "pt" ], function( i, unit ) { - if ( style.indexOf( unit ) > 0 ) { - val = [ parseFloat( style ), unit ]; - } - }); - return val; - } -}); - -})(); - -/******************************************************************************/ -/*********************************** EASING ***********************************/ -/******************************************************************************/ - -(function() { - -// based on easing equations from Robert Penner (http://www.robertpenner.com/easing) - -var baseEasings = {}; - -$.each( [ "Quad", "Cubic", "Quart", "Quint", "Expo" ], function( i, name ) { - baseEasings[ name ] = function( p ) { - return Math.pow( p, i + 2 ); - }; -}); - -$.extend( baseEasings, { - Sine: function ( p ) { - return 1 - Math.cos( p * Math.PI / 2 ); - }, - Circ: function ( p ) { - return 1 - Math.sqrt( 1 - p * p ); - }, - Elastic: function( p ) { - return p === 0 || p === 1 ? p : - -Math.pow( 2, 8 * (p - 1) ) * Math.sin( ( (p - 1) * 80 - 7.5 ) * Math.PI / 15 ); - }, - Back: function( p ) { - return p * p * ( 3 * p - 2 ); - }, - Bounce: function ( p ) { - var pow2, - bounce = 4; - - while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {} - return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 ); - } -}); - -$.each( baseEasings, function( name, easeIn ) { - $.easing[ "easeIn" + name ] = easeIn; - $.easing[ "easeOut" + name ] = function( p ) { - return 1 - easeIn( 1 - p ); - }; - $.easing[ "easeInOut" + name ] = function( p ) { - return p < 0.5 ? - easeIn( p * 2 ) / 2 : - 1 - easeIn( p * -2 + 2 ) / 2; - }; -}); - -})(); - -})(jQuery)); diff --git a/edumed/static/catalogue/js/jquery.cycle.all.js b/edumed/static/catalogue/js/jquery.cycle.all.js deleted file mode 100644 index 666afda..0000000 --- a/edumed/static/catalogue/js/jquery.cycle.all.js +++ /dev/null @@ -1,1538 +0,0 @@ -/*! - * jQuery Cycle Plugin (with Transition Definitions) - * Examples and documentation at: http://jquery.malsup.com/cycle/ - * Copyright (c) 2007-2012 M. Alsup - * Version: 2.9999.81 (15-JAN-2013) - * Dual licensed under the MIT and GPL licenses. - * http://jquery.malsup.com/license.html - * Requires: jQuery v1.7.1 or later - */ -;(function($, undefined) { -"use strict"; - -var ver = '2.9999.81'; - -function debug(s) { - if ($.fn.cycle.debug) - log(s); -} -function log() { - if (window.console && console.log) - console.log('[cycle] ' + Array.prototype.join.call(arguments,' ')); -} -$.expr[':'].paused = function(el) { - return el.cyclePause; -}; - - -// the options arg can be... -// a number - indicates an immediate transition should occur to the given slide index -// a string - 'pause', 'resume', 'toggle', 'next', 'prev', 'stop', 'destroy' or the name of a transition effect (ie, 'fade', 'zoom', etc) -// an object - properties to control the slideshow -// -// the arg2 arg can be... -// the name of an fx (only used in conjunction with a numeric value for 'options') -// the value true (only used in first arg == 'resume') and indicates -// that the resume should occur immediately (not wait for next timeout) - -$.fn.cycle = function(options, arg2) { - var o = { s: this.selector, c: this.context }; - - // in 1.3+ we can fix mistakes with the ready state - if (this.length === 0 && options != 'stop') { - if (!$.isReady && o.s) { - log('DOM not ready, queuing slideshow'); - $(function() { - $(o.s,o.c).cycle(options,arg2); - }); - return this; - } - // is your DOM ready? http://docs.jquery.com/Tutorials:Introducing_$(document).ready() - log('terminating; zero elements found by selector' + ($.isReady ? '' : ' (DOM not ready)')); - return this; - } - - // iterate the matched nodeset - return this.each(function() { - var opts = handleArguments(this, options, arg2); - if (opts === false) - return; - - opts.updateActivePagerLink = opts.updateActivePagerLink || $.fn.cycle.updateActivePagerLink; - - // stop existing slideshow for this container (if there is one) - if (this.cycleTimeout) - clearTimeout(this.cycleTimeout); - this.cycleTimeout = this.cyclePause = 0; - this.cycleStop = 0; // issue #108 - - var $cont = $(this); - var $slides = opts.slideExpr ? $(opts.slideExpr, this) : $cont.children(); - var els = $slides.get(); - - if (els.length < 2) { - log('terminating; too few slides: ' + els.length); - return; - } - - var opts2 = buildOptions($cont, $slides, els, opts, o); - if (opts2 === false) - return; - - var startTime = opts2.continuous ? 10 : getTimeout(els[opts2.currSlide], els[opts2.nextSlide], opts2, !opts2.backwards); - - // if it's an auto slideshow, kick it off - if (startTime) { - startTime += (opts2.delay || 0); - if (startTime < 10) - startTime = 10; - debug('first timeout: ' + startTime); - this.cycleTimeout = setTimeout(function(){go(els,opts2,0,!opts.backwards);}, startTime); - } - }); -}; - -function triggerPause(cont, byHover, onPager) { - var opts = $(cont).data('cycle.opts'); - if (!opts) - return; - var paused = !!cont.cyclePause; - if (paused && opts.paused) - opts.paused(cont, opts, byHover, onPager); - else if (!paused && opts.resumed) - opts.resumed(cont, opts, byHover, onPager); -} - -// process the args that were passed to the plugin fn -function handleArguments(cont, options, arg2) { - if (cont.cycleStop === undefined) - cont.cycleStop = 0; - if (options === undefined || options === null) - options = {}; - if (options.constructor == String) { - switch(options) { - case 'destroy': - case 'stop': - var opts = $(cont).data('cycle.opts'); - if (!opts) - return false; - cont.cycleStop++; // callbacks look for change - if (cont.cycleTimeout) - clearTimeout(cont.cycleTimeout); - cont.cycleTimeout = 0; - if (opts.elements) - $(opts.elements).stop(); - $(cont).removeData('cycle.opts'); - if (options == 'destroy') - destroy(cont, opts); - return false; - case 'toggle': - cont.cyclePause = (cont.cyclePause === 1) ? 0 : 1; - checkInstantResume(cont.cyclePause, arg2, cont); - triggerPause(cont); - return false; - case 'pause': - cont.cyclePause = 1; - triggerPause(cont); - return false; - case 'resume': - cont.cyclePause = 0; - checkInstantResume(false, arg2, cont); - triggerPause(cont); - return false; - case 'prev': - case 'next': - opts = $(cont).data('cycle.opts'); - if (!opts) { - log('options not found, "prev/next" ignored'); - return false; - } - $.fn.cycle[options](opts); - return false; - default: - options = { fx: options }; - } - return options; - } - else if (options.constructor == Number) { - // go to the requested slide - var num = options; - options = $(cont).data('cycle.opts'); - if (!options) { - log('options not found, can not advance slide'); - return false; - } - if (num < 0 || num >= options.elements.length) { - log('invalid slide index: ' + num); - return false; - } - options.nextSlide = num; - if (cont.cycleTimeout) { - clearTimeout(cont.cycleTimeout); - cont.cycleTimeout = 0; - } - if (typeof arg2 == 'string') - options.oneTimeFx = arg2; - go(options.elements, options, 1, num >= options.currSlide); - return false; - } - return options; - - function checkInstantResume(isPaused, arg2, cont) { - if (!isPaused && arg2 === true) { // resume now! - var options = $(cont).data('cycle.opts'); - if (!options) { - log('options not found, can not resume'); - return false; - } - if (cont.cycleTimeout) { - clearTimeout(cont.cycleTimeout); - cont.cycleTimeout = 0; - } - go(options.elements, options, 1, !options.backwards); - } - } -} - -function removeFilter(el, opts) { - if (!$.support.opacity && opts.cleartype && el.style.filter) { - try { el.style.removeAttribute('filter'); } - catch(smother) {} // handle old opera versions - } -} - -// unbind event handlers -function destroy(cont, opts) { - if (opts.next) - $(opts.next).unbind(opts.prevNextEvent); - if (opts.prev) - $(opts.prev).unbind(opts.prevNextEvent); - - if (opts.pager || opts.pagerAnchorBuilder) - $.each(opts.pagerAnchors || [], function() { - this.unbind().remove(); - }); - opts.pagerAnchors = null; - $(cont).unbind('mouseenter.cycle mouseleave.cycle'); - if (opts.destroy) // callback - opts.destroy(opts); -} - -// one-time initialization -function buildOptions($cont, $slides, els, options, o) { - var startingSlideSpecified; - // support metadata plugin (v1.0 and v2.0) - var opts = $.extend({}, $.fn.cycle.defaults, options || {}, $.metadata ? $cont.metadata() : $.meta ? $cont.data() : {}); - var meta = $.isFunction($cont.data) ? $cont.data(opts.metaAttr) : null; - if (meta) - opts = $.extend(opts, meta); - if (opts.autostop) - opts.countdown = opts.autostopCount || els.length; - - var cont = $cont[0]; - $cont.data('cycle.opts', opts); - opts.$cont = $cont; - opts.stopCount = cont.cycleStop; - opts.elements = els; - opts.before = opts.before ? [opts.before] : []; - opts.after = opts.after ? [opts.after] : []; - - // push some after callbacks - if (!$.support.opacity && opts.cleartype) - opts.after.push(function() { removeFilter(this, opts); }); - if (opts.continuous) - opts.after.push(function() { go(els,opts,0,!opts.backwards); }); - - saveOriginalOpts(opts); - - // clearType corrections - if (!$.support.opacity && opts.cleartype && !opts.cleartypeNoBg) - clearTypeFix($slides); - - // container requires non-static position so that slides can be position within - if ($cont.css('position') == 'static') - $cont.css('position', 'relative'); - if (opts.width) - $cont.width(opts.width); - if (opts.height && opts.height != 'auto') - $cont.height(opts.height); - - if (opts.startingSlide !== undefined) { - opts.startingSlide = parseInt(opts.startingSlide,10); - if (opts.startingSlide >= els.length || opts.startSlide < 0) - opts.startingSlide = 0; // catch bogus input - else - startingSlideSpecified = true; - } - else if (opts.backwards) - opts.startingSlide = els.length - 1; - else - opts.startingSlide = 0; - - // if random, mix up the slide array - if (opts.random) { - opts.randomMap = []; - for (var i = 0; i < els.length; i++) - opts.randomMap.push(i); - opts.randomMap.sort(function(a,b) {return Math.random() - 0.5;}); - if (startingSlideSpecified) { - // try to find the specified starting slide and if found set start slide index in the map accordingly - for ( var cnt = 0; cnt < els.length; cnt++ ) { - if ( opts.startingSlide == opts.randomMap[cnt] ) { - opts.randomIndex = cnt; - } - } - } - else { - opts.randomIndex = 1; - opts.startingSlide = opts.randomMap[1]; - } - } - else if (opts.startingSlide >= els.length) - opts.startingSlide = 0; // catch bogus input - opts.currSlide = opts.startingSlide || 0; - var first = opts.startingSlide; - - // set position and zIndex on all the slides - $slides.css({position: 'absolute', top:0, left:0}).hide().each(function(i) { - var z; - if (opts.backwards) - z = first ? i <= first ? els.length + (i-first) : first-i : els.length-i; - else - z = first ? i >= first ? els.length - (i-first) : first-i : els.length-i; - $(this).css('z-index', z); - }); - - // make sure first slide is visible - $(els[first]).css('opacity',1).show(); // opacity bit needed to handle restart use case - removeFilter(els[first], opts); - - // stretch slides - if (opts.fit) { - if (!opts.aspect) { - if (opts.width) - $slides.width(opts.width); - if (opts.height && opts.height != 'auto') - $slides.height(opts.height); - } else { - $slides.each(function(){ - var $slide = $(this); - var ratio = (opts.aspect === true) ? $slide.width()/$slide.height() : opts.aspect; - if( opts.width && $slide.width() != opts.width ) { - $slide.width( opts.width ); - $slide.height( opts.width / ratio ); - } - - if( opts.height && $slide.height() < opts.height ) { - $slide.height( opts.height ); - $slide.width( opts.height * ratio ); - } - }); - } - } - - if (opts.center && ((!opts.fit) || opts.aspect)) { - $slides.each(function(){ - var $slide = $(this); - $slide.css({ - "margin-left": opts.width ? - ((opts.width - $slide.width()) / 2) + "px" : - 0, - "margin-top": opts.height ? - ((opts.height - $slide.height()) / 2) + "px" : - 0 - }); - }); - } - - if (opts.center && !opts.fit && !opts.slideResize) { - $slides.each(function(){ - var $slide = $(this); - $slide.css({ - "margin-left": opts.width ? ((opts.width - $slide.width()) / 2) + "px" : 0, - "margin-top": opts.height ? ((opts.height - $slide.height()) / 2) + "px" : 0 - }); - }); - } - - // stretch container - var reshape = (opts.containerResize || opts.containerResizeHeight) && !$cont.innerHeight(); - if (reshape) { // do this only if container has no size http://tinyurl.com/da2oa9 - var maxw = 0, maxh = 0; - for(var j=0; j < els.length; j++) { - var $e = $(els[j]), e = $e[0], w = $e.outerWidth(), h = $e.outerHeight(); - if (!w) w = e.offsetWidth || e.width || $e.attr('width'); - if (!h) h = e.offsetHeight || e.height || $e.attr('height'); - maxw = w > maxw ? w : maxw; - maxh = h > maxh ? h : maxh; - } - if (opts.containerResize && maxw > 0 && maxh > 0) - $cont.css({width:maxw+'px',height:maxh+'px'}); - if (opts.containerResizeHeight && maxh > 0) - $cont.css({height:maxh+'px'}); - } - - var pauseFlag = false; // https://github.com/malsup/cycle/issues/44 - if (opts.pause) - $cont.bind('mouseenter.cycle', function(){ - pauseFlag = true; - this.cyclePause++; - triggerPause(cont, true); - }).bind('mouseleave.cycle', function(){ - if (pauseFlag) - this.cyclePause--; - triggerPause(cont, true); - }); - - if (supportMultiTransitions(opts) === false) - return false; - - // apparently a lot of people use image slideshows without height/width attributes on the images. - // Cycle 2.50+ requires the sizing info for every slide; this block tries to deal with that. - var requeue = false; - options.requeueAttempts = options.requeueAttempts || 0; - $slides.each(function() { - // try to get height/width of each slide - var $el = $(this); - this.cycleH = (opts.fit && opts.height) ? opts.height : ($el.height() || this.offsetHeight || this.height || $el.attr('height') || 0); - this.cycleW = (opts.fit && opts.width) ? opts.width : ($el.width() || this.offsetWidth || this.width || $el.attr('width') || 0); - - if ( $el.is('img') ) { - var loading = (this.cycleH === 0 && this.cycleW === 0 && !this.complete); - // don't requeue for images that are still loading but have a valid size - if (loading) { - if (o.s && opts.requeueOnImageNotLoaded && ++options.requeueAttempts < 100) { // track retry count so we don't loop forever - log(options.requeueAttempts,' - img slide not loaded, requeuing slideshow: ', this.src, this.cycleW, this.cycleH); - setTimeout(function() {$(o.s,o.c).cycle(options);}, opts.requeueTimeout); - requeue = true; - return false; // break each loop - } - else { - log('could not determine size of image: '+this.src, this.cycleW, this.cycleH); - } - } - } - return true; - }); - - if (requeue) - return false; - - opts.cssBefore = opts.cssBefore || {}; - opts.cssAfter = opts.cssAfter || {}; - opts.cssFirst = opts.cssFirst || {}; - opts.animIn = opts.animIn || {}; - opts.animOut = opts.animOut || {}; - - $slides.not(':eq('+first+')').css(opts.cssBefore); - $($slides[first]).css(opts.cssFirst); - - if (opts.timeout) { - opts.timeout = parseInt(opts.timeout,10); - // ensure that timeout and speed settings are sane - if (opts.speed.constructor == String) - opts.speed = $.fx.speeds[opts.speed] || parseInt(opts.speed,10); - if (!opts.sync) - opts.speed = opts.speed / 2; - - var buffer = opts.fx == 'none' ? 0 : opts.fx == 'shuffle' ? 500 : 250; - while((opts.timeout - opts.speed) < buffer) // sanitize timeout - opts.timeout += opts.speed; - } - if (opts.easing) - opts.easeIn = opts.easeOut = opts.easing; - if (!opts.speedIn) - opts.speedIn = opts.speed; - if (!opts.speedOut) - opts.speedOut = opts.speed; - - opts.slideCount = els.length; - opts.currSlide = opts.lastSlide = first; - if (opts.random) { - if (++opts.randomIndex == els.length) - opts.randomIndex = 0; - opts.nextSlide = opts.randomMap[opts.randomIndex]; - } - else if (opts.backwards) - opts.nextSlide = opts.startingSlide === 0 ? (els.length-1) : opts.startingSlide-1; - else - opts.nextSlide = opts.startingSlide >= (els.length-1) ? 0 : opts.startingSlide+1; - - // run transition init fn - if (!opts.multiFx) { - var init = $.fn.cycle.transitions[opts.fx]; - if ($.isFunction(init)) - init($cont, $slides, opts); - else if (opts.fx != 'custom' && !opts.multiFx) { - log('unknown transition: ' + opts.fx,'; slideshow terminating'); - return false; - } - } - - // fire artificial events - var e0 = $slides[first]; - if (!opts.skipInitializationCallbacks) { - if (opts.before.length) - opts.before[0].apply(e0, [e0, e0, opts, true]); - if (opts.after.length) - opts.after[0].apply(e0, [e0, e0, opts, true]); - } - if (opts.next) - $(opts.next).bind(opts.prevNextEvent,function(){return advance(opts,1);}); - if (opts.prev) - $(opts.prev).bind(opts.prevNextEvent,function(){return advance(opts,0);}); - if (opts.pager || opts.pagerAnchorBuilder) - buildPager(els,opts); - - exposeAddSlide(opts, els); - - return opts; -} - -// save off original opts so we can restore after clearing state -function saveOriginalOpts(opts) { - opts.original = { before: [], after: [] }; - opts.original.cssBefore = $.extend({}, opts.cssBefore); - opts.original.cssAfter = $.extend({}, opts.cssAfter); - opts.original.animIn = $.extend({}, opts.animIn); - opts.original.animOut = $.extend({}, opts.animOut); - $.each(opts.before, function() { opts.original.before.push(this); }); - $.each(opts.after, function() { opts.original.after.push(this); }); -} - -function supportMultiTransitions(opts) { - var i, tx, txs = $.fn.cycle.transitions; - // look for multiple effects - if (opts.fx.indexOf(',') > 0) { - opts.multiFx = true; - opts.fxs = opts.fx.replace(/\s*/g,'').split(','); - // discard any bogus effect names - for (i=0; i < opts.fxs.length; i++) { - var fx = opts.fxs[i]; - tx = txs[fx]; - if (!tx || !txs.hasOwnProperty(fx) || !$.isFunction(tx)) { - log('discarding unknown transition: ',fx); - opts.fxs.splice(i,1); - i--; - } - } - // if we have an empty list then we threw everything away! - if (!opts.fxs.length) { - log('No valid transitions named; slideshow terminating.'); - return false; - } - } - else if (opts.fx == 'all') { // auto-gen the list of transitions - opts.multiFx = true; - opts.fxs = []; - for (var p in txs) { - if (txs.hasOwnProperty(p)) { - tx = txs[p]; - if (txs.hasOwnProperty(p) && $.isFunction(tx)) - opts.fxs.push(p); - } - } - } - if (opts.multiFx && opts.randomizeEffects) { - // munge the fxs array to make effect selection random - var r1 = Math.floor(Math.random() * 20) + 30; - for (i = 0; i < r1; i++) { - var r2 = Math.floor(Math.random() * opts.fxs.length); - opts.fxs.push(opts.fxs.splice(r2,1)[0]); - } - debug('randomized fx sequence: ',opts.fxs); - } - return true; -} - -// provide a mechanism for adding slides after the slideshow has started -function exposeAddSlide(opts, els) { - opts.addSlide = function(newSlide, prepend) { - var $s = $(newSlide), s = $s[0]; - if (!opts.autostopCount) - opts.countdown++; - els[prepend?'unshift':'push'](s); - if (opts.els) - opts.els[prepend?'unshift':'push'](s); // shuffle needs this - opts.slideCount = els.length; - - // add the slide to the random map and resort - if (opts.random) { - opts.randomMap.push(opts.slideCount-1); - opts.randomMap.sort(function(a,b) {return Math.random() - 0.5;}); - } - - $s.css('position','absolute'); - $s[prepend?'prependTo':'appendTo'](opts.$cont); - - if (prepend) { - opts.currSlide++; - opts.nextSlide++; - } - - if (!$.support.opacity && opts.cleartype && !opts.cleartypeNoBg) - clearTypeFix($s); - - if (opts.fit && opts.width) - $s.width(opts.width); - if (opts.fit && opts.height && opts.height != 'auto') - $s.height(opts.height); - s.cycleH = (opts.fit && opts.height) ? opts.height : $s.height(); - s.cycleW = (opts.fit && opts.width) ? opts.width : $s.width(); - - $s.css(opts.cssBefore); - - if (opts.pager || opts.pagerAnchorBuilder) - $.fn.cycle.createPagerAnchor(els.length-1, s, $(opts.pager), els, opts); - - if ($.isFunction(opts.onAddSlide)) - opts.onAddSlide($s); - else - $s.hide(); // default behavior - }; -} - -// reset internal state; we do this on every pass in order to support multiple effects -$.fn.cycle.resetState = function(opts, fx) { - fx = fx || opts.fx; - opts.before = []; opts.after = []; - opts.cssBefore = $.extend({}, opts.original.cssBefore); - opts.cssAfter = $.extend({}, opts.original.cssAfter); - opts.animIn = $.extend({}, opts.original.animIn); - opts.animOut = $.extend({}, opts.original.animOut); - opts.fxFn = null; - $.each(opts.original.before, function() { opts.before.push(this); }); - $.each(opts.original.after, function() { opts.after.push(this); }); - - // re-init - var init = $.fn.cycle.transitions[fx]; - if ($.isFunction(init)) - init(opts.$cont, $(opts.elements), opts); -}; - -// this is the main engine fn, it handles the timeouts, callbacks and slide index mgmt -function go(els, opts, manual, fwd) { - var p = opts.$cont[0], curr = els[opts.currSlide], next = els[opts.nextSlide]; - - // opts.busy is true if we're in the middle of an animation - if (manual && opts.busy && opts.manualTrump) { - // let manual transitions requests trump active ones - debug('manualTrump in go(), stopping active transition'); - $(els).stop(true,true); - opts.busy = 0; - clearTimeout(p.cycleTimeout); - } - - // don't begin another timeout-based transition if there is one active - if (opts.busy) { - debug('transition active, ignoring new tx request'); - return; - } - - - // stop cycling if we have an outstanding stop request - if (p.cycleStop != opts.stopCount || p.cycleTimeout === 0 && !manual) - return; - - // check to see if we should stop cycling based on autostop options - if (!manual && !p.cyclePause && !opts.bounce && - ((opts.autostop && (--opts.countdown <= 0)) || - (opts.nowrap && !opts.random && opts.nextSlide < opts.currSlide))) { - if (opts.end) - opts.end(opts); - return; - } - - // if slideshow is paused, only transition on a manual trigger - var changed = false; - if ((manual || !p.cyclePause) && (opts.nextSlide != opts.currSlide)) { - changed = true; - var fx = opts.fx; - // keep trying to get the slide size if we don't have it yet - curr.cycleH = curr.cycleH || $(curr).height(); - curr.cycleW = curr.cycleW || $(curr).width(); - next.cycleH = next.cycleH || $(next).height(); - next.cycleW = next.cycleW || $(next).width(); - - // support multiple transition types - if (opts.multiFx) { - if (fwd && (opts.lastFx === undefined || ++opts.lastFx >= opts.fxs.length)) - opts.lastFx = 0; - else if (!fwd && (opts.lastFx === undefined || --opts.lastFx < 0)) - opts.lastFx = opts.fxs.length - 1; - fx = opts.fxs[opts.lastFx]; - } - - // one-time fx overrides apply to: $('div').cycle(3,'zoom'); - if (opts.oneTimeFx) { - fx = opts.oneTimeFx; - opts.oneTimeFx = null; - } - - $.fn.cycle.resetState(opts, fx); - - // run the before callbacks - if (opts.before.length) - $.each(opts.before, function(i,o) { - if (p.cycleStop != opts.stopCount) return; - o.apply(next, [curr, next, opts, fwd]); - }); - - // stage the after callacks - var after = function() { - opts.busy = 0; - $.each(opts.after, function(i,o) { - if (p.cycleStop != opts.stopCount) return; - o.apply(next, [curr, next, opts, fwd]); - }); - if (!p.cycleStop) { - // queue next transition - queueNext(); - } - }; - - debug('tx firing('+fx+'); currSlide: ' + opts.currSlide + '; nextSlide: ' + opts.nextSlide); - - // get ready to perform the transition - opts.busy = 1; - if (opts.fxFn) // fx function provided? - opts.fxFn(curr, next, opts, after, fwd, manual && opts.fastOnEvent); - else if ($.isFunction($.fn.cycle[opts.fx])) // fx plugin ? - $.fn.cycle[opts.fx](curr, next, opts, after, fwd, manual && opts.fastOnEvent); - else - $.fn.cycle.custom(curr, next, opts, after, fwd, manual && opts.fastOnEvent); - } - else { - queueNext(); - } - - if (changed || opts.nextSlide == opts.currSlide) { - // calculate the next slide - var roll; - opts.lastSlide = opts.currSlide; - if (opts.random) { - opts.currSlide = opts.nextSlide; - if (++opts.randomIndex == els.length) { - opts.randomIndex = 0; - opts.randomMap.sort(function(a,b) {return Math.random() - 0.5;}); - } - opts.nextSlide = opts.randomMap[opts.randomIndex]; - if (opts.nextSlide == opts.currSlide) - opts.nextSlide = (opts.currSlide == opts.slideCount - 1) ? 0 : opts.currSlide + 1; - } - else if (opts.backwards) { - roll = (opts.nextSlide - 1) < 0; - if (roll && opts.bounce) { - opts.backwards = !opts.backwards; - opts.nextSlide = 1; - opts.currSlide = 0; - } - else { - opts.nextSlide = roll ? (els.length-1) : opts.nextSlide-1; - opts.currSlide = roll ? 0 : opts.nextSlide+1; - } - } - else { // sequence - roll = (opts.nextSlide + 1) == els.length; - if (roll && opts.bounce) { - opts.backwards = !opts.backwards; - opts.nextSlide = els.length-2; - opts.currSlide = els.length-1; - } - else { - opts.nextSlide = roll ? 0 : opts.nextSlide+1; - opts.currSlide = roll ? els.length-1 : opts.nextSlide-1; - } - } - } - if (changed && opts.pager) - opts.updateActivePagerLink(opts.pager, opts.currSlide, opts.activePagerClass); - - function queueNext() { - // stage the next transition - var ms = 0, timeout = opts.timeout; - if (opts.timeout && !opts.continuous) { - ms = getTimeout(els[opts.currSlide], els[opts.nextSlide], opts, fwd); - if (opts.fx == 'shuffle') - ms -= opts.speedOut; - } - else if (opts.continuous && p.cyclePause) // continuous shows work off an after callback, not this timer logic - ms = 10; - if (ms > 0) - p.cycleTimeout = setTimeout(function(){ go(els, opts, 0, !opts.backwards); }, ms); - } -} - -// invoked after transition -$.fn.cycle.updateActivePagerLink = function(pager, currSlide, clsName) { - $(pager).each(function() { - $(this).children().removeClass(clsName).eq(currSlide).addClass(clsName); - }); -}; - -// calculate timeout value for current transition -function getTimeout(curr, next, opts, fwd) { - if (opts.timeoutFn) { - // call user provided calc fn - var t = opts.timeoutFn.call(curr,curr,next,opts,fwd); - while (opts.fx != 'none' && (t - opts.speed) < 250) // sanitize timeout - t += opts.speed; - debug('calculated timeout: ' + t + '; speed: ' + opts.speed); - if (t !== false) - return t; - } - return opts.timeout; -} - -// expose next/prev function, caller must pass in state -$.fn.cycle.next = function(opts) { advance(opts,1); }; -$.fn.cycle.prev = function(opts) { advance(opts,0);}; - -// advance slide forward or back -function advance(opts, moveForward) { - var val = moveForward ? 1 : -1; - var els = opts.elements; - var p = opts.$cont[0], timeout = p.cycleTimeout; - if (timeout) { - clearTimeout(timeout); - p.cycleTimeout = 0; - } - if (opts.random && val < 0) { - // move back to the previously display slide - opts.randomIndex--; - if (--opts.randomIndex == -2) - opts.randomIndex = els.length-2; - else if (opts.randomIndex == -1) - opts.randomIndex = els.length-1; - opts.nextSlide = opts.randomMap[opts.randomIndex]; - } - else if (opts.random) { - opts.nextSlide = opts.randomMap[opts.randomIndex]; - } - else { - opts.nextSlide = opts.currSlide + val; - if (opts.nextSlide < 0) { - if (opts.nowrap) return false; - opts.nextSlide = els.length - 1; - } - else if (opts.nextSlide >= els.length) { - if (opts.nowrap) return false; - opts.nextSlide = 0; - } - } - - var cb = opts.onPrevNextEvent || opts.prevNextClick; // prevNextClick is deprecated - if ($.isFunction(cb)) - cb(val > 0, opts.nextSlide, els[opts.nextSlide]); - go(els, opts, 1, moveForward); - return false; -} - -function buildPager(els, opts) { - var $p = $(opts.pager); - $.each(els, function(i,o) { - $.fn.cycle.createPagerAnchor(i,o,$p,els,opts); - }); - opts.updateActivePagerLink(opts.pager, opts.startingSlide, opts.activePagerClass); -} - -$.fn.cycle.createPagerAnchor = function(i, el, $p, els, opts) { - var a; - if ($.isFunction(opts.pagerAnchorBuilder)) { - a = opts.pagerAnchorBuilder(i,el); - debug('pagerAnchorBuilder('+i+', el) returned: ' + a); - } - else - a = '    '+(i+1)+''; - - if (!a) - return; - var $a = $(a); - // don't reparent if anchor is in the dom - if ($a.parents('body').length === 0) { - var arr = []; - if ($p.length > 1) { - $p.each(function() { - var $clone = $a.clone(true); - $(this).append($clone); - arr.push($clone[0]); - }); - $a = $(arr); - } - else { - $a.appendTo($p); - } - } - - opts.pagerAnchors = opts.pagerAnchors || []; - opts.pagerAnchors.push($a); - - var pagerFn = function(e) { - e.preventDefault(); - opts.nextSlide = i; - var p = opts.$cont[0], timeout = p.cycleTimeout; - if (timeout) { - clearTimeout(timeout); - p.cycleTimeout = 0; - } - var cb = opts.onPagerEvent || opts.pagerClick; // pagerClick is deprecated - if ($.isFunction(cb)) - cb(opts.nextSlide, els[opts.nextSlide]); - go(els,opts,1,opts.currSlide < i); // trigger the trans -// return false; // <== allow bubble - }; - - if ( /mouseenter|mouseover/i.test(opts.pagerEvent) ) { - $a.hover(pagerFn, function(){/* no-op */} ); - } - else { - $a.bind(opts.pagerEvent, pagerFn); - } - - if ( ! /^click/.test(opts.pagerEvent) && !opts.allowPagerClickBubble) - $a.bind('click.cycle', function(){return false;}); // suppress click - - var cont = opts.$cont[0]; - var pauseFlag = false; // https://github.com/malsup/cycle/issues/44 - if (opts.pauseOnPagerHover) { - $a.hover( - function() { - pauseFlag = true; - cont.cyclePause++; - triggerPause(cont,true,true); - }, function() { - if (pauseFlag) - cont.cyclePause--; - triggerPause(cont,true,true); - } - ); - } -}; - -// helper fn to calculate the number of slides between the current and the next -$.fn.cycle.hopsFromLast = function(opts, fwd) { - var hops, l = opts.lastSlide, c = opts.currSlide; - if (fwd) - hops = c > l ? c - l : opts.slideCount - l; - else - hops = c < l ? l - c : l + opts.slideCount - c; - return hops; -}; - -// fix clearType problems in ie6 by setting an explicit bg color -// (otherwise text slides look horrible during a fade transition) -function clearTypeFix($slides) { - debug('applying clearType background-color hack'); - function hex(s) { - s = parseInt(s,10).toString(16); - return s.length < 2 ? '0'+s : s; - } - function getBg(e) { - for ( ; e && e.nodeName.toLowerCase() != 'html'; e = e.parentNode) { - var v = $.css(e,'background-color'); - if (v && v.indexOf('rgb') >= 0 ) { - var rgb = v.match(/\d+/g); - return '#'+ hex(rgb[0]) + hex(rgb[1]) + hex(rgb[2]); - } - if (v && v != 'transparent') - return v; - } - return '#ffffff'; - } - $slides.each(function() { $(this).css('background-color', getBg(this)); }); -} - -// reset common props before the next transition -$.fn.cycle.commonReset = function(curr,next,opts,w,h,rev) { - $(opts.elements).not(curr).hide(); - if (typeof opts.cssBefore.opacity == 'undefined') - opts.cssBefore.opacity = 1; - opts.cssBefore.display = 'block'; - if (opts.slideResize && w !== false && next.cycleW > 0) - opts.cssBefore.width = next.cycleW; - if (opts.slideResize && h !== false && next.cycleH > 0) - opts.cssBefore.height = next.cycleH; - opts.cssAfter = opts.cssAfter || {}; - opts.cssAfter.display = 'none'; - $(curr).css('zIndex',opts.slideCount + (rev === true ? 1 : 0)); - $(next).css('zIndex',opts.slideCount + (rev === true ? 0 : 1)); -}; - -// the actual fn for effecting a transition -$.fn.cycle.custom = function(curr, next, opts, cb, fwd, speedOverride) { - var $l = $(curr), $n = $(next); - var speedIn = opts.speedIn, speedOut = opts.speedOut, easeIn = opts.easeIn, easeOut = opts.easeOut; - $n.css(opts.cssBefore); - if (speedOverride) { - if (typeof speedOverride == 'number') - speedIn = speedOut = speedOverride; - else - speedIn = speedOut = 1; - easeIn = easeOut = null; - } - var fn = function() { - $n.animate(opts.animIn, speedIn, easeIn, function() { - cb(); - }); - }; - $l.animate(opts.animOut, speedOut, easeOut, function() { - $l.css(opts.cssAfter); - if (!opts.sync) - fn(); - }); - if (opts.sync) fn(); -}; - -// transition definitions - only fade is defined here, transition pack defines the rest -$.fn.cycle.transitions = { - fade: function($cont, $slides, opts) { - $slides.not(':eq('+opts.currSlide+')').css('opacity',0); - opts.before.push(function(curr,next,opts) { - $.fn.cycle.commonReset(curr,next,opts); - opts.cssBefore.opacity = 0; - }); - opts.animIn = { opacity: 1 }; - opts.animOut = { opacity: 0 }; - opts.cssBefore = { top: 0, left: 0 }; - } -}; - -$.fn.cycle.ver = function() { return ver; }; - -// override these globally if you like (they are all optional) -$.fn.cycle.defaults = { - activePagerClass: 'activeSlide', // class name used for the active pager link - after: null, // transition callback (scope set to element that was shown): function(currSlideElement, nextSlideElement, options, forwardFlag) - allowPagerClickBubble: false, // allows or prevents click event on pager anchors from bubbling - animIn: null, // properties that define how the slide animates in - animOut: null, // properties that define how the slide animates out - aspect: false, // preserve aspect ratio during fit resizing, cropping if necessary (must be used with fit option) - autostop: 0, // true to end slideshow after X transitions (where X == slide count) - autostopCount: 0, // number of transitions (optionally used with autostop to define X) - backwards: false, // true to start slideshow at last slide and move backwards through the stack - before: null, // transition callback (scope set to element to be shown): function(currSlideElement, nextSlideElement, options, forwardFlag) - center: null, // set to true to have cycle add top/left margin to each slide (use with width and height options) - cleartype: !$.support.opacity, // true if clearType corrections should be applied (for IE) - cleartypeNoBg: false, // set to true to disable extra cleartype fixing (leave false to force background color setting on slides) - containerResize: 1, // resize container to fit largest slide - containerResizeHeight: 0, // resize containers height to fit the largest slide but leave the width dynamic - continuous: 0, // true to start next transition immediately after current one completes - cssAfter: null, // properties that defined the state of the slide after transitioning out - cssBefore: null, // properties that define the initial state of the slide before transitioning in - delay: 0, // additional delay (in ms) for first transition (hint: can be negative) - easeIn: null, // easing for "in" transition - easeOut: null, // easing for "out" transition - easing: null, // easing method for both in and out transitions - end: null, // callback invoked when the slideshow terminates (use with autostop or nowrap options): function(options) - fastOnEvent: 0, // force fast transitions when triggered manually (via pager or prev/next); value == time in ms - fit: 0, // force slides to fit container - fx: 'fade', // name of transition effect (or comma separated names, ex: 'fade,scrollUp,shuffle') - fxFn: null, // function used to control the transition: function(currSlideElement, nextSlideElement, options, afterCalback, forwardFlag) - height: 'auto', // container height (if the 'fit' option is true, the slides will be set to this height as well) - manualTrump: true, // causes manual transition to stop an active transition instead of being ignored - metaAttr: 'cycle', // data- attribute that holds the option data for the slideshow - next: null, // element, jQuery object, or jQuery selector string for the element to use as event trigger for next slide - nowrap: 0, // true to prevent slideshow from wrapping - onPagerEvent: null, // callback fn for pager events: function(zeroBasedSlideIndex, slideElement) - onPrevNextEvent: null, // callback fn for prev/next events: function(isNext, zeroBasedSlideIndex, slideElement) - pager: null, // element, jQuery object, or jQuery selector string for the element to use as pager container - pagerAnchorBuilder: null, // callback fn for building anchor links: function(index, DOMelement) - pagerEvent: 'click.cycle', // name of event which drives the pager navigation - pause: 0, // true to enable "pause on hover" - pauseOnPagerHover: 0, // true to pause when hovering over pager link - prev: null, // element, jQuery object, or jQuery selector string for the element to use as event trigger for previous slide - prevNextEvent: 'click.cycle',// event which drives the manual transition to the previous or next slide - random: 0, // true for random, false for sequence (not applicable to shuffle fx) - randomizeEffects: 1, // valid when multiple effects are used; true to make the effect sequence random - requeueOnImageNotLoaded: true, // requeue the slideshow if any image slides are not yet loaded - requeueTimeout: 250, // ms delay for requeue - rev: 0, // causes animations to transition in reverse (for effects that support it such as scrollHorz/scrollVert/shuffle) - shuffle: null, // coords for shuffle animation, ex: { top:15, left: 200 } - skipInitializationCallbacks: false, // set to true to disable the first before/after callback that occurs prior to any transition - slideExpr: null, // expression for selecting slides (if something other than all children is required) - slideResize: 1, // force slide width/height to fixed size before every transition - speed: 1000, // speed of the transition (any valid fx speed value) - speedIn: null, // speed of the 'in' transition - speedOut: null, // speed of the 'out' transition - startingSlide: undefined,// zero-based index of the first slide to be displayed - sync: 1, // true if in/out transitions should occur simultaneously - timeout: 4000, // milliseconds between slide transitions (0 to disable auto advance) - timeoutFn: null, // callback for determining per-slide timeout value: function(currSlideElement, nextSlideElement, options, forwardFlag) - updateActivePagerLink: null,// callback fn invoked to update the active pager link (adds/removes activePagerClass style) - width: null // container width (if the 'fit' option is true, the slides will be set to this width as well) -}; - -})(jQuery); - - -/*! - * jQuery Cycle Plugin Transition Definitions - * This script is a plugin for the jQuery Cycle Plugin - * Examples and documentation at: http://malsup.com/jquery/cycle/ - * Copyright (c) 2007-2010 M. Alsup - * Version: 2.73 - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - */ -(function($) { -"use strict"; - -// -// These functions define slide initialization and properties for the named -// transitions. To save file size feel free to remove any of these that you -// don't need. -// -$.fn.cycle.transitions.none = function($cont, $slides, opts) { - opts.fxFn = function(curr,next,opts,after){ - $(next).show(); - $(curr).hide(); - after(); - }; -}; - -// not a cross-fade, fadeout only fades out the top slide -$.fn.cycle.transitions.fadeout = function($cont, $slides, opts) { - $slides.not(':eq('+opts.currSlide+')').css({ display: 'block', 'opacity': 1 }); - opts.before.push(function(curr,next,opts,w,h,rev) { - $(curr).css('zIndex',opts.slideCount + (rev !== true ? 1 : 0)); - $(next).css('zIndex',opts.slideCount + (rev !== true ? 0 : 1)); - }); - opts.animIn.opacity = 1; - opts.animOut.opacity = 0; - opts.cssBefore.opacity = 1; - opts.cssBefore.display = 'block'; - opts.cssAfter.zIndex = 0; -}; - -// scrollUp/Down/Left/Right -$.fn.cycle.transitions.scrollUp = function($cont, $slides, opts) { - $cont.css('overflow','hidden'); - opts.before.push($.fn.cycle.commonReset); - var h = $cont.height(); - opts.cssBefore.top = h; - opts.cssBefore.left = 0; - opts.cssFirst.top = 0; - opts.animIn.top = 0; - opts.animOut.top = -h; -}; -$.fn.cycle.transitions.scrollDown = function($cont, $slides, opts) { - $cont.css('overflow','hidden'); - opts.before.push($.fn.cycle.commonReset); - var h = $cont.height(); - opts.cssFirst.top = 0; - opts.cssBefore.top = -h; - opts.cssBefore.left = 0; - opts.animIn.top = 0; - opts.animOut.top = h; -}; -$.fn.cycle.transitions.scrollLeft = function($cont, $slides, opts) { - $cont.css('overflow','hidden'); - opts.before.push($.fn.cycle.commonReset); - var w = $cont.width(); - opts.cssFirst.left = 0; - opts.cssBefore.left = w; - opts.cssBefore.top = 0; - opts.animIn.left = 0; - opts.animOut.left = 0-w; -}; -$.fn.cycle.transitions.scrollRight = function($cont, $slides, opts) { - $cont.css('overflow','hidden'); - opts.before.push($.fn.cycle.commonReset); - var w = $cont.width(); - opts.cssFirst.left = 0; - opts.cssBefore.left = -w; - opts.cssBefore.top = 0; - opts.animIn.left = 0; - opts.animOut.left = w; -}; -$.fn.cycle.transitions.scrollHorz = function($cont, $slides, opts) { - $cont.css('overflow','hidden').width(); - opts.before.push(function(curr, next, opts, fwd) { - if (opts.rev) - fwd = !fwd; - $.fn.cycle.commonReset(curr,next,opts); - opts.cssBefore.left = fwd ? (next.cycleW-1) : (1-next.cycleW); - opts.animOut.left = fwd ? -curr.cycleW : curr.cycleW; - }); - opts.cssFirst.left = 0; - opts.cssBefore.top = 0; - opts.animIn.left = 0; - opts.animOut.top = 0; -}; -$.fn.cycle.transitions.scrollVert = function($cont, $slides, opts) { - $cont.css('overflow','hidden'); - opts.before.push(function(curr, next, opts, fwd) { - if (opts.rev) - fwd = !fwd; - $.fn.cycle.commonReset(curr,next,opts); - opts.cssBefore.top = fwd ? (1-next.cycleH) : (next.cycleH-1); - opts.animOut.top = fwd ? curr.cycleH : -curr.cycleH; - }); - opts.cssFirst.top = 0; - opts.cssBefore.left = 0; - opts.animIn.top = 0; - opts.animOut.left = 0; -}; - -// slideX/slideY -$.fn.cycle.transitions.slideX = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $(opts.elements).not(curr).hide(); - $.fn.cycle.commonReset(curr,next,opts,false,true); - opts.animIn.width = next.cycleW; - }); - opts.cssBefore.left = 0; - opts.cssBefore.top = 0; - opts.cssBefore.width = 0; - opts.animIn.width = 'show'; - opts.animOut.width = 0; -}; -$.fn.cycle.transitions.slideY = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $(opts.elements).not(curr).hide(); - $.fn.cycle.commonReset(curr,next,opts,true,false); - opts.animIn.height = next.cycleH; - }); - opts.cssBefore.left = 0; - opts.cssBefore.top = 0; - opts.cssBefore.height = 0; - opts.animIn.height = 'show'; - opts.animOut.height = 0; -}; - -// shuffle -$.fn.cycle.transitions.shuffle = function($cont, $slides, opts) { - var i, w = $cont.css('overflow', 'visible').width(); - $slides.css({left: 0, top: 0}); - opts.before.push(function(curr,next,opts) { - $.fn.cycle.commonReset(curr,next,opts,true,true,true); - }); - // only adjust speed once! - if (!opts.speedAdjusted) { - opts.speed = opts.speed / 2; // shuffle has 2 transitions - opts.speedAdjusted = true; - } - opts.random = 0; - opts.shuffle = opts.shuffle || {left:-w, top:15}; - opts.els = []; - for (i=0; i < $slides.length; i++) - opts.els.push($slides[i]); - - for (i=0; i < opts.currSlide; i++) - opts.els.push(opts.els.shift()); - - // custom transition fn (hat tip to Benjamin Sterling for this bit of sweetness!) - opts.fxFn = function(curr, next, opts, cb, fwd) { - if (opts.rev) - fwd = !fwd; - var $el = fwd ? $(curr) : $(next); - $(next).css(opts.cssBefore); - var count = opts.slideCount; - $el.animate(opts.shuffle, opts.speedIn, opts.easeIn, function() { - var hops = $.fn.cycle.hopsFromLast(opts, fwd); - for (var k=0; k < hops; k++) { - if (fwd) - opts.els.push(opts.els.shift()); - else - opts.els.unshift(opts.els.pop()); - } - if (fwd) { - for (var i=0, len=opts.els.length; i < len; i++) - $(opts.els[i]).css('z-index', len-i+count); - } - else { - var z = $(curr).css('z-index'); - $el.css('z-index', parseInt(z,10)+1+count); - } - $el.animate({left:0, top:0}, opts.speedOut, opts.easeOut, function() { - $(fwd ? this : curr).hide(); - if (cb) cb(); - }); - }); - }; - $.extend(opts.cssBefore, { display: 'block', opacity: 1, top: 0, left: 0 }); -}; - -// turnUp/Down/Left/Right -$.fn.cycle.transitions.turnUp = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,true,false); - opts.cssBefore.top = next.cycleH; - opts.animIn.height = next.cycleH; - opts.animOut.width = next.cycleW; - }); - opts.cssFirst.top = 0; - opts.cssBefore.left = 0; - opts.cssBefore.height = 0; - opts.animIn.top = 0; - opts.animOut.height = 0; -}; -$.fn.cycle.transitions.turnDown = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,true,false); - opts.animIn.height = next.cycleH; - opts.animOut.top = curr.cycleH; - }); - opts.cssFirst.top = 0; - opts.cssBefore.left = 0; - opts.cssBefore.top = 0; - opts.cssBefore.height = 0; - opts.animOut.height = 0; -}; -$.fn.cycle.transitions.turnLeft = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,false,true); - opts.cssBefore.left = next.cycleW; - opts.animIn.width = next.cycleW; - }); - opts.cssBefore.top = 0; - opts.cssBefore.width = 0; - opts.animIn.left = 0; - opts.animOut.width = 0; -}; -$.fn.cycle.transitions.turnRight = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,false,true); - opts.animIn.width = next.cycleW; - opts.animOut.left = curr.cycleW; - }); - $.extend(opts.cssBefore, { top: 0, left: 0, width: 0 }); - opts.animIn.left = 0; - opts.animOut.width = 0; -}; - -// zoom -$.fn.cycle.transitions.zoom = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,false,false,true); - opts.cssBefore.top = next.cycleH/2; - opts.cssBefore.left = next.cycleW/2; - $.extend(opts.animIn, { top: 0, left: 0, width: next.cycleW, height: next.cycleH }); - $.extend(opts.animOut, { width: 0, height: 0, top: curr.cycleH/2, left: curr.cycleW/2 }); - }); - opts.cssFirst.top = 0; - opts.cssFirst.left = 0; - opts.cssBefore.width = 0; - opts.cssBefore.height = 0; -}; - -// fadeZoom -$.fn.cycle.transitions.fadeZoom = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,false,false); - opts.cssBefore.left = next.cycleW/2; - opts.cssBefore.top = next.cycleH/2; - $.extend(opts.animIn, { top: 0, left: 0, width: next.cycleW, height: next.cycleH }); - }); - opts.cssBefore.width = 0; - opts.cssBefore.height = 0; - opts.animOut.opacity = 0; -}; - -// blindX -$.fn.cycle.transitions.blindX = function($cont, $slides, opts) { - var w = $cont.css('overflow','hidden').width(); - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts); - opts.animIn.width = next.cycleW; - opts.animOut.left = curr.cycleW; - }); - opts.cssBefore.left = w; - opts.cssBefore.top = 0; - opts.animIn.left = 0; - opts.animOut.left = w; -}; -// blindY -$.fn.cycle.transitions.blindY = function($cont, $slides, opts) { - var h = $cont.css('overflow','hidden').height(); - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts); - opts.animIn.height = next.cycleH; - opts.animOut.top = curr.cycleH; - }); - opts.cssBefore.top = h; - opts.cssBefore.left = 0; - opts.animIn.top = 0; - opts.animOut.top = h; -}; -// blindZ -$.fn.cycle.transitions.blindZ = function($cont, $slides, opts) { - var h = $cont.css('overflow','hidden').height(); - var w = $cont.width(); - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts); - opts.animIn.height = next.cycleH; - opts.animOut.top = curr.cycleH; - }); - opts.cssBefore.top = h; - opts.cssBefore.left = w; - opts.animIn.top = 0; - opts.animIn.left = 0; - opts.animOut.top = h; - opts.animOut.left = w; -}; - -// growX - grow horizontally from centered 0 width -$.fn.cycle.transitions.growX = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,false,true); - opts.cssBefore.left = this.cycleW/2; - opts.animIn.left = 0; - opts.animIn.width = this.cycleW; - opts.animOut.left = 0; - }); - opts.cssBefore.top = 0; - opts.cssBefore.width = 0; -}; -// growY - grow vertically from centered 0 height -$.fn.cycle.transitions.growY = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,true,false); - opts.cssBefore.top = this.cycleH/2; - opts.animIn.top = 0; - opts.animIn.height = this.cycleH; - opts.animOut.top = 0; - }); - opts.cssBefore.height = 0; - opts.cssBefore.left = 0; -}; - -// curtainX - squeeze in both edges horizontally -$.fn.cycle.transitions.curtainX = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,false,true,true); - opts.cssBefore.left = next.cycleW/2; - opts.animIn.left = 0; - opts.animIn.width = this.cycleW; - opts.animOut.left = curr.cycleW/2; - opts.animOut.width = 0; - }); - opts.cssBefore.top = 0; - opts.cssBefore.width = 0; -}; -// curtainY - squeeze in both edges vertically -$.fn.cycle.transitions.curtainY = function($cont, $slides, opts) { - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,true,false,true); - opts.cssBefore.top = next.cycleH/2; - opts.animIn.top = 0; - opts.animIn.height = next.cycleH; - opts.animOut.top = curr.cycleH/2; - opts.animOut.height = 0; - }); - opts.cssBefore.height = 0; - opts.cssBefore.left = 0; -}; - -// cover - curr slide covered by next slide -$.fn.cycle.transitions.cover = function($cont, $slides, opts) { - var d = opts.direction || 'left'; - var w = $cont.css('overflow','hidden').width(); - var h = $cont.height(); - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts); - opts.cssAfter.display = ''; - if (d == 'right') - opts.cssBefore.left = -w; - else if (d == 'up') - opts.cssBefore.top = h; - else if (d == 'down') - opts.cssBefore.top = -h; - else - opts.cssBefore.left = w; - }); - opts.animIn.left = 0; - opts.animIn.top = 0; - opts.cssBefore.top = 0; - opts.cssBefore.left = 0; -}; - -// uncover - curr slide moves off next slide -$.fn.cycle.transitions.uncover = function($cont, $slides, opts) { - var d = opts.direction || 'left'; - var w = $cont.css('overflow','hidden').width(); - var h = $cont.height(); - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,true,true,true); - if (d == 'right') - opts.animOut.left = w; - else if (d == 'up') - opts.animOut.top = -h; - else if (d == 'down') - opts.animOut.top = h; - else - opts.animOut.left = -w; - }); - opts.animIn.left = 0; - opts.animIn.top = 0; - opts.cssBefore.top = 0; - opts.cssBefore.left = 0; -}; - -// toss - move top slide and fade away -$.fn.cycle.transitions.toss = function($cont, $slides, opts) { - var w = $cont.css('overflow','visible').width(); - var h = $cont.height(); - opts.before.push(function(curr, next, opts) { - $.fn.cycle.commonReset(curr,next,opts,true,true,true); - // provide default toss settings if animOut not provided - if (!opts.animOut.left && !opts.animOut.top) - $.extend(opts.animOut, { left: w*2, top: -h/2, opacity: 0 }); - else - opts.animOut.opacity = 0; - }); - opts.cssBefore.left = 0; - opts.cssBefore.top = 0; - opts.animIn.left = 0; -}; - -// wipe - clip animation -$.fn.cycle.transitions.wipe = function($cont, $slides, opts) { - var w = $cont.css('overflow','hidden').width(); - var h = $cont.height(); - opts.cssBefore = opts.cssBefore || {}; - var clip; - if (opts.clip) { - if (/l2r/.test(opts.clip)) - clip = 'rect(0px 0px '+h+'px 0px)'; - else if (/r2l/.test(opts.clip)) - clip = 'rect(0px '+w+'px '+h+'px '+w+'px)'; - else if (/t2b/.test(opts.clip)) - clip = 'rect(0px '+w+'px 0px 0px)'; - else if (/b2t/.test(opts.clip)) - clip = 'rect('+h+'px '+w+'px '+h+'px 0px)'; - else if (/zoom/.test(opts.clip)) { - var top = parseInt(h/2,10); - var left = parseInt(w/2,10); - clip = 'rect('+top+'px '+left+'px '+top+'px '+left+'px)'; - } - } - - opts.cssBefore.clip = opts.cssBefore.clip || clip || 'rect(0px 0px 0px 0px)'; - - var d = opts.cssBefore.clip.match(/(\d+)/g); - var t = parseInt(d[0],10), r = parseInt(d[1],10), b = parseInt(d[2],10), l = parseInt(d[3],10); - - opts.before.push(function(curr, next, opts) { - if (curr == next) return; - var $curr = $(curr), $next = $(next); - $.fn.cycle.commonReset(curr,next,opts,true,true,false); - opts.cssAfter.display = 'block'; - - var step = 1, count = parseInt((opts.speedIn / 13),10) - 1; - (function f() { - var tt = t ? t - parseInt(step * (t/count),10) : 0; - var ll = l ? l - parseInt(step * (l/count),10) : 0; - var bb = b < h ? b + parseInt(step * ((h-b)/count || 1),10) : h; - var rr = r < w ? r + parseInt(step * ((w-r)/count || 1),10) : w; - $next.css({ clip: 'rect('+tt+'px '+rr+'px '+bb+'px '+ll+'px)' }); - (step++ <= count) ? setTimeout(f, 13) : $curr.css('display', 'none'); - })(); - }); - $.extend(opts.cssBefore, { display: 'block', opacity: 1, top: 0, left: 0 }); - opts.animIn = { left: 0 }; - opts.animOut = { left: 0 }; -}; - -})(jQuery); diff --git a/edumed/static/catalogue/js/lesson-list.js b/edumed/static/catalogue/js/lesson-list.js deleted file mode 100644 index 62bbb65..0000000 --- a/edumed/static/catalogue/js/lesson-list.js +++ /dev/null @@ -1,60 +0,0 @@ -(function($){ -$(function() { - - -function scrollTo(thing) { - $('html, body').scrollTop($(thing).offset().top - $('#level-chooser').outerHeight()); -} - -function updateView() { - var scrolltop = $(window).scrollTop(); - - $('#level-chooser-place').each(function(i, el){ - if (scrolltop > $(el).offset().top) { - $("#level-chooser").addClass("fixed"); - } - else { - $("#level-chooser").removeClass("fixed"); - } - }); - - $('.level-toc').each(function(i, el) { - var $sect = $($(el).parent()); - var menu_top = $('#level-chooser').outerHeight(); - var menu_scrolltop = scrolltop + menu_top; - - if (menu_scrolltop + 2 >= $sect.offset().top && - menu_scrolltop < $sect.offset().top + $sect.outerHeight()) { - $(el).addClass("fixed").css("top", Math.min( - menu_top, - - scrolltop + $sect.offset().top + $sect.outerHeight() - $(el).outerHeight() - )); - $("#level-chooser a[href='#" + $sect.attr('id') + "']").addClass('active'); - } - else { - $(el).removeClass("fixed"); - $("#level-chooser a[href='#" + $sect.attr('id') + "']").removeClass('active'); - } - }); -} - - - -$("#level-chooser a, .level-toc a").click(function(ev) { - ev.preventDefault(); - scrollTo($(this).attr('href')); -}); - - - - - -updateView(); -$(document).scroll(updateView); -if (window.location.hash) { - scrollTo(window.location.hash); -} - - -}); -})(jQuery); diff --git a/edumed/static/catalogue/js/lesson.js b/edumed/static/catalogue/js/lesson.js deleted file mode 100755 index 080eb45..0000000 --- a/edumed/static/catalogue/js/lesson.js +++ /dev/null @@ -1,12 +0,0 @@ -(function($){ -$(function() { - - -$('a.image').colorbox({ - maxWidth: '100%', - maxHeight: '100%', -}); - - -}); -})($); diff --git a/edumed/static/css/base.css b/edumed/static/css/base.css index 292a122..f5a492b 100644 --- a/edumed/static/css/base.css +++ b/edumed/static/css/base.css @@ -74,48 +74,6 @@ header.main { text-align: center; margin: auto; margin-bottom: .8em; } - header.main nav .menu-lekcje:before { - background: url(../img/menu/lekcje.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-kompetencje:before { - background: url(../img/menu/katalog.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-wspolpraca:before { - background: url(../img/menu/wspolpraca.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-szkolenia:before { - background: url(../img/menu/szkolenia.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-wesprzyj:before { - background: url(../img/menu/wesprzyj.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-o-nas:before { - background: url(../img/menu/o-nas.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-kontakt:before { - background: url(../img/menu/kontakt.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-lekcje:hover:before { - background: url(../img/menu/lekcje_active.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-kompetencje:hover:before { - background: url(../img/menu/katalog_active.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-wspolpraca:hover:before { - background: url(../img/menu/wspolpraca_active.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-szkolenia:hover:before { - background: url(../img/menu/szkolenia_active.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-wesprzyj:hover:before { - background: url(../img/menu/wesprzyj_active.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-o-nas:hover:before { - background: url(../img/menu/o-nas_active.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-kontakt:hover:before { - background: url(../img/menu/kontakt_active.png) no-repeat 0 0; - background-size: 100%; } header.main nav .menu-oc-program:before { background: url(../img/menu/olimpiada/program.png) no-repeat 0 0; background-size: 100%; } diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss index d40f461..6c45d50 100644 --- a/edumed/static/css/base.scss +++ b/edumed/static/css/base.scss @@ -102,20 +102,6 @@ header.main { margin: auto; margin-bottom: .8em; } - .menu-lekcje:before { background: url(../img/menu/lekcje.png) no-repeat 0 0; background-size: 100%;} - .menu-kompetencje:before { background: url(../img/menu/katalog.png) no-repeat 0 0; background-size: 100%;} - .menu-wspolpraca:before { background: url(../img/menu/wspolpraca.png) no-repeat 0 0; background-size: 100%;} - .menu-szkolenia:before { background: url(../img/menu/szkolenia.png) no-repeat 0 0; background-size: 100%;} - .menu-wesprzyj:before { background: url(../img/menu/wesprzyj.png) no-repeat 0 0; background-size: 100%;} - .menu-o-nas:before { background: url(../img/menu/o-nas.png) no-repeat 0 0; background-size: 100%;} - .menu-kontakt:before { background: url(../img/menu/kontakt.png) no-repeat 0 0; background-size: 100%;} - .menu-lekcje:hover:before { background: url(../img/menu/lekcje_active.png) no-repeat 0 0; background-size: 100%;} - .menu-kompetencje:hover:before { background: url(../img/menu/katalog_active.png) no-repeat 0 0; background-size: 100%;} - .menu-wspolpraca:hover:before { background: url(../img/menu/wspolpraca_active.png) no-repeat 0 0; background-size: 100%;} - .menu-szkolenia:hover:before { background: url(../img/menu/szkolenia_active.png) no-repeat 0 0; background-size: 100%;} - .menu-wesprzyj:hover:before { background: url(../img/menu/wesprzyj_active.png) no-repeat 0 0; background-size: 100%;} - .menu-o-nas:hover:before { background: url(../img/menu/o-nas_active.png) no-repeat 0 0; background-size: 100%;} - .menu-kontakt:hover:before { background: url(../img/menu/kontakt_active.png) no-repeat 0 0; background-size: 100%;} .menu-oc-program:before { background: url(../img/menu/olimpiada/program.png) no-repeat 0 0; background-size: 100%;} .menu-oc-harmonogram:before { background: url(../img/menu/olimpiada/harmonogram.png) no-repeat 0 0; background-size: 100%;} diff --git a/edumed/static/css/forum.css b/edumed/static/css/forum.css deleted file mode 100644 index 1c0b056..0000000 --- a/edumed/static/css/forum.css +++ /dev/null @@ -1,89 +0,0 @@ -ul.breadcrumb { - margin: 0; - padding: 0; - list-style: none; } - ul.breadcrumb li { - display: inline; } - -.forum-body { - position: relative; - /* --- Unread --- */ - /* --- Moderation --- */ - /* --- Mini pagination --- */ } - .forum-body .search-result em { - background-color: yellow; } - .forum-body .pagination ul { - margin: 0; - padding: 0; - list-style: none; } - .forum-body .pagination ul li { - display: inline-block; } - .forum-body .pagination ul li a { - display: block; - padding: .5em; } - .forum-body .pagination ul .disabled a { - color: black; } - .forum-body .table { - width: 100%; - margin: 1em 0; } - .forum-body .forum-description { - margin: 5px; } - .forum-body .forum-row, .forum-body .topic-row { - width: 100%; } - .forum-body .forum-name, .forum-body .topic-name { - width: 40%; - text-align: left; } - .forum-body .forum-topic-count, .forum-body .forum-post-count, .forum-body .topic-post-count, .forum-body .topic-view-count { - width: 10%; - text-align: center; } - .forum-body .forum-last-post, .forum-body .topic-last-post { - width: 32%; - text-align: center; } - .forum-body .first-unread-post-link, .forum-body .first-unread-post-link:hover { - text-decoration: none; } - .forum-body .post:nth-child(4n+4) { - background-color: #eaeaea; } - .forum-body .post-header { - padding: 3px 0 3px 20px; } - .forum-body .post-header th { - text-align: left; } - .forum-body .post-info { - width: 200px; - padding: 10px; } - .forum-body .post-info .post-author { - padding: 5px 0; } - .forum-body .post-content { - vertical-align: top; - padding: 10px; } - .forum-body .post-signature { - color: #CCC; - margin-top: 15px; - border-top: 1px dotted #cccccc; - display: block; } - .forum-body .post-related { - margin-top: 20px; } - .forum-body .forum-headline { - margin-top: 10px; } - .forum-body .attachments-form { - padding-bottom: 15px; } - .forum-body .attachment-link { - border-bottom: 1px dotted; } - .forum-body .state-indicator { - display: block; - float: left; - height: 10px; - width: 10px; - margin: 3px 5px; } - .forum-body .topic-unread a, .forum-body .forum-unread a { - font-weight: bold; } - .forum-body .on-moderation { - background: #ffcccc; } - .forum-body .mini-pagination { - padding: 3px 0 3px 10px; } - .forum-body .post-form input, .forum-body .post-form textarea { - font-family: Dosis; - background: white; - color: #363a3e; - font-size: 1.6em; } - .forum-body .post-form #id_name { - width: 698px; } diff --git a/edumed/static/css/forum.scss b/edumed/static/css/forum.scss deleted file mode 100755 index e1a3d58..0000000 --- a/edumed/static/css/forum.scss +++ /dev/null @@ -1,180 +0,0 @@ -@import "mixins"; - - -ul.breadcrumb { - margin: 0; - padding: 0; - list-style: none; - li { - display: inline; - } -} - - - -.forum-body { - - position: relative; - - .search-result { - em { - background-color: yellow; - } - } - - .pagination { - ul { - margin: 0; - padding: 0; - list-style: none; - - li { - display: inline-block; - a { - display: block; - padding: .5em; - } - } - - .disabled { - a { - color: black; - } - } - } - } - - .table { - width: 100%; - margin: 1em 0; - } - - .forum-description { - margin: 5px; - } - - .forum-row, .topic-row { - width: 100%; - } - - .forum-name, .topic-name { - width: 40%; - text-align: left; - } - - .forum-topic-count, .forum-post-count, .topic-post-count, .topic-view-count { - width: 10%; - text-align: center; - } - - .forum-last-post, .topic-last-post { - width: 32%; - text-align: center; - } - - .first-unread-post-link, .first-unread-post-link:hover { - text-decoration: none; - } - - - - .post:nth-child(4n+4) { - background-color: lighten(#D0D0D0 , 10%); - } - - .post-header { - padding: 3px 0 3px 20px; - th { - text-align: left; - } - } - - .post-info { - width: 200px; - padding: 10px; - - .avatar { - - } - - .post-author { - padding: 5px 0; - } - - .post-extra-info { - } - - .post-controls { - } - } - - .post-content { - vertical-align: top; - padding: 10px; - } - - .post-signature { - color: #CCC; - margin-top: 15px; - border-top: 1px dotted #CCC; - display: block; - } - - .post-related { - margin-top: 20px; - } - - - - - .forum-headline { - margin-top: 10px; - } - - .attachments-form { - padding-bottom: 15px; - } - - .attachment-link { - border-bottom: 1px dotted; - } - - /* --- Unread --- */ - - .state-indicator { - display: block; - float: left; - height: 10px; - width: 10px; - margin: 3px 5px; - } - - .topic-unread, .forum-unread { - a { - font-weight: bold; - } - .state-indicator { - } - } - - /* --- Moderation --- */ - .on-moderation { - background: #ffcccc; - } - - /* --- Mini pagination --- */ - .mini-pagination { - padding: 3px 0 3px 10px; - } - - - .post-form { - input, textarea { - @include base-font; - font-size: 1.6em; - } - #id_name { - width: 698px; - } - } -} diff --git a/edumed/static/css/mil.css b/edumed/static/css/mil.css deleted file mode 100644 index 3d9bbbe..0000000 --- a/edumed/static/css/mil.css +++ /dev/null @@ -1,47 +0,0 @@ -header.header-mil { - background-color: #f47b3b; } - header.header-mil #organizer { - color: white; - float: none; - position: absolute; - top: 10px; - right: 12px; } - header.header-mil nav ul { - margin-top: 0; } - header.header-mil nav ul li { - vertical-align: text-bottom; } - header.header-mil nav a, header.header-mil nav a:hover { - color: white; } - header.header-mil nav a:before { - content: " "; - display: block; - margin-bottom: .8em; - width: 5.5em; - height: 4.25em; - text-align: center; - margin: auto; - margin-bottom: .8em; } - header.header-mil nav .menu-consultations:before { - background: url(../img/menu/mil/consultations.png) no-repeat 0 0; - background-size: 100%; } - header.header-mil nav .menu-takepart:before { - background: url(../img/menu/mil/takepart.png) no-repeat 0 0; - background-size: 100%; } - header.header-mil nav .menu-knowledgebase:before { - background: url(../img/menu/mil/knowledgebase.png) no-repeat 0 0; - background-size: 100%; } - header.header-mil nav .menu-kompetencje:before, header.header-mil nav .menu-kontakt:before { - width: 3.625em; - height: 2.8125em; } - header.header-mil nav .menu-kompetencje:before, header.header-mil nav .menu-kompetencje:hover:before { - background: url(../img/menu/mil/catalog.png) no-repeat 0 0; - background-size: 100%; } - header.header-mil nav .menu-kontakt:before, header.header-mil nav .menu-kontakt:hover:before { - background: url(../img/menu/mil/contact.png) no-repeat 0 0; - background-size: 100%; } - header.header-mil nav .lang-switcher-en:before { - background: url(../img/menu/mil/lang_en.png) no-repeat 0 0; - background-size: 100%; } - header.header-mil nav .lang-switcher-pl:before { - background: url(../img/menu/mil/lang_pl.png) no-repeat 0 0; - background-size: 100%; } diff --git a/edumed/static/css/mil.scss b/edumed/static/css/mil.scss deleted file mode 100644 index be3f0aa..0000000 --- a/edumed/static/css/mil.scss +++ /dev/null @@ -1,57 +0,0 @@ -@import "vars"; - -header.header-mil { - - background-color: #f47b3b; - - #organizer { - color: white; - float: none; - position: absolute; - top: 10px; - right:12px; - } - - nav { - ul { - margin-top: 0; - li { - vertical-align: text-bottom; - } - } - - a,a:hover { - color: white; - } - - a:before { - content: " "; - display: block; - margin-bottom: .8em; - width: 88*$px; - height: 68*$px; - text-align:center; - margin: auto; - margin-bottom: .8em; - } - - .menu-consultations:before { background: url(../img/menu/mil/consultations.png) no-repeat 0 0; background-size: 100%;} - .menu-takepart:before { background: url(../img/menu/mil/takepart.png) no-repeat 0 0; background-size: 100%;} - .menu-knowledgebase:before { background: url(../img/menu/mil/knowledgebase.png) no-repeat 0 0; background-size: 100%;} - - .menu-kompetencje:before, .menu-kontakt:before { - width: 58*$px; - height: 45*$px; - } - - .menu-kompetencje:before, .menu-kompetencje:hover:before { - background: url(../img/menu/mil/catalog.png) no-repeat 0 0; background-size: 100%; - } - .menu-kontakt:before, .menu-kontakt:hover:before { - background: url(../img/menu/mil/contact.png) no-repeat 0 0; background-size: 100%; - } - - .lang-switcher-en:before { background: url(../img/menu/mil/lang_en.png) no-repeat 0 0; background-size: 100%;} - .lang-switcher-pl:before { background: url(../img/menu/mil/lang_pl.png) no-repeat 0 0; background-size: 100%;} - } -} \ No newline at end of file diff --git a/edumed/static/css/promobox.css b/edumed/static/css/promobox.css deleted file mode 100644 index e69de29..0000000 diff --git a/edumed/static/css/promobox.scss b/edumed/static/css/promobox.scss deleted file mode 100755 index f90b03f..0000000 --- a/edumed/static/css/promobox.scss +++ /dev/null @@ -1,9 +0,0 @@ -/*TODO: delete cause is not used*/ - -#main-promobox { - h1 { - color: white; - margin: 0; - background: red; - } -} \ No newline at end of file diff --git a/edumed/static/img/logo-mil.png b/edumed/static/img/logo-mil.png deleted file mode 100644 index 1f1d78022b916931040bddd7890ce123c959092e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11893 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 diff --git a/edumed/static/img/logo.png b/edumed/static/img/logo.png deleted file mode 100644 index eab7eede26dedf2d0b0f2bf36c71b90d854ba1af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3020 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 O0000; diff --git a/edumed/static/img/logo_fnp_white.png b/edumed/static/img/logo_fnp_white.png deleted file mode 100644 index f189ca79028cf854c80781920470ed5aeca6a72f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1674 zcmV;526g#~P)0zeZs$DBv zQIn>nX-ShN70Xtc%O+VKCVG@CMX{Bni}F+}nHd(P1zjYt5C&FtO`fjM?ea$N2 z#wUzX13j7$O6=3VI1y!KGB+@LsRDG1D@tz_{t0fJJ(eITsJj^4`dqmPFf!{U8 z8!qWfN%JJti1F%4+9#<^ig_#uV?JBSJlCY4JtS#`q{B4*c<>o;TNT@mp!&Naiv1j} ztyMuQpd475f;STA3A6{kiqP)_J^+e=RS|m2Fo$BQ{>=clR5{Vr@0ih&m*^qs(YKz*PcFf+nyix=cjY^>VA z_1IJu=cJg#sf>NV>QJIsfOk(%;G-CCH?R(P4W9*3`~eIFmH?X~^gN&e&?~fQ5aIof zclKdye< zL+Kr8?SKhDw@_~Y3;|vOngrT-?D>oVt_rk;|PwrhQ4zpl}Q>P zDPPiVNy{be3EweT(mF|nq5ad6NBE&P@O z&4Dh!cI>jX3G|{s>x5mt&Vhdr`_hxJ4_<=Z&Aq^jq2DjSvOw#AV}l%E4$wa`znAfj zXa$^ucgPT66l9-yN#Y>(i2)jg`rp7`Kx5!*?9=zeKJzs|3oP_Tp&d9&+8CRO{b9@} zapLbfEXe0@P*Vuh!VC017W^=k+x^YBOY#+p43fAnJD zS{y9pVY|O5@Grx5xm~C)!%^t~yb$ex$-sJG7PiUDvAkyDU9%k+7~VY=FJ7G#^V<~4 zt-vjCdI)_J*0_ry9j$O8AY}UJ&Ct**bdhAnm8EQ z0Bi*wOwngr;BN!&kMRcK+oAf{?Oca<(^4GHXB62g^d>m)0UvDbalYj#EU3q0?Hd92 z0Iy<~uqeX25c}Ih@$FGxd@v3O?@45O^4Ti%2e6|<_Eg3I({Z9HdfT%ZUnlm# zDT7fFUQwXU3ibBb)=$R)P{xt1LVphnr!~%pM72?&o*$u=<6O&R;AUVh{;LMq-0Ywt zlbB0|tM|XiC+epca`?787Uq%K|2+{{gG2Wu<^qGUCU?Wp=jI5%8TNLj;(2$W;z0cr zN1DBWVZ z4!fEYu}MnzZ-e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00P}fL_t(o!|hl>cG@ry{prgA zoEy*+#GIgTf|wH&wpzG&p*3Nx1w;#Np(ntc060O_6O<$P2JL3#H&0JCiVaC$US<>H zjHEB=&z~6spLScj>pOwbY5*Vu@B|gUP7>ZoZ*t@d>3jp-&IGd91kj8?>9cb?B0`|ae>13?YDg!X^s1TyZz-W~b zcgHkG4f?8piL*6Wk;@so#&2Fgg@O#+SLCvy)2>0&8vOy28q66D{6KLkaSU;h-W@$( zX9c6joYrc!`-n~PNS_5j)%-PDHA&pr^Q|{yw3-3<#nzg1RtZW9e>fE=Kt^=EBOgSB zxg=uUtr)E~Og+A~C6`MloU!NMMys9ou8XC7lSZo&z{y*4-4*Z?dkzIf#ZvKveupdp zunUZF05fmR&VWPLy`?KXQZO!vkL3k=xyKg*G$L@*h&7`DC!RbNoL>xtjpT01l%oVt z8m*Reds$%3PAX9cT+9DsQfttM4q)O1-c>T)e_^pFJS90R8YCyC7D!s8a}}#T_Yv2a z@Mtz#@t}(e6yJwwc_`?rK7ef?ole;z6$6o7kTqvNF4W1k58yomTu^q)8i4E~>6HYE zqZ8BleV?G?+WIJRIRWrMNn#l(XQ2~Z(i{&o=i`NnFTUe2S{>La5B*-uX!VyRl%EaL ze0MYwxx5QhgRb}~X#>4fqF@tlj8=Y2;}XI^e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00PoUL_t(o!|hnnapEu#eYr^i z&Zq%WL97Z6Du}7zpacA;KgWOigR20p0!#%!1#&7l8qf?K-2JRPI~v(2HYAx$_9w-(g|nm`PC}9_1^WdlyA~1SphhDYp(hNerC_1pg6NsJf+_uO8{&G zV;sQDTeCOd&~_vXuydlPdVoo15rnEH)YCE0jR8! zCEZ>YShJT(Gy&J~|CrPo^q~WodVzP9O!p})_Jn67XL*a{#MA;whjcDu)#pCq8WSGP zR!JUoQGw$7Ff9)S-FZmj*k35nuOVx`9fUTMz9+n6fOE=jS<5wVBk7d{ilZab`Q4D9 z!92Gq}koW&o^^qR~zwOrcAF;eYbG{>kZU6uP07*qoM6N<$g1*mt Axc~qF diff --git a/edumed/static/img/menu/kontakt.png b/edumed/static/img/menu/kontakt.png deleted file mode 100644 index 291865d30d23edb26cb4b78127f4bb39b345e96b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 481 zcmV<70UrK|P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00Bu!L_t(o!|m9=al$YZ$MJ7; z4B%|Q2#kP7U;zp`x-fx9AXM&LcmYOmHV7kl1V%{nxYPM;M}MA_6#7-@WLckk78U|Z zN=mZkZKGVm|3$ej13&do0a0WLrTR95?;gxdjE`TPWK zGS@Z)48ZYp{_MN<3m6350QJ%%bB!#y#=_Rt{TE|gZZ5c5Zd?I_Oc;ZG72xSp0OLA| z7CHv&1=c{vV!gpJXbo%-I0UVQ4F>z5HL+1(7qm7u8oY*1fpywA0#XSSYj;#jbcJUs z`Kt7^9kto0fae~&wLGS674$|EYpv1u$+fk0?a+5^-q)J%7fSQDh)IprMw=X1O|;2{ z)k2$`SPissz<#9IvF6agKIXMH%Gv5V*~Py5u1#_Hw2wz)NQDn;15+RK%RewBCI2Kp XolWX!e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00BNpL_t(o!|m74ZG$ir$MJ8h z3_!&K=>}ngGD0?KZ``e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00N9jL_t(o!|j;SjoLsEhQA;R z@O1zc#8&}OK}-Y7;kSKCr~q9BxqI@PA#MOu!MTI;RS>5GcaXfyN_);4)&`$+5+hl{ z>-q6`X8xJkg`3>uoqXw{oTbSGm;)2wD^LS}fC?y7tg9AWD7e6Z%T=uFs~Vi8$sE|q zOHWAwJgQh1f_o6$SoFZv%Ofh${Z zroLB$80>oCxpfa*(Un8vj)V)OWX&Y3rXd_pwO9-HtP3^S4SQ7&8{9?dP>%p%_4q^lg>4^*t{EKP8bZVJ@Rlo9XO zLz1p)jEuF4btQ(>J~*HCYmzPkR`&EJ9`zm%FO@E&3xPw+<46cJ9opbg2i;0MnFDKJ zD%aYq_X+V}9+o^^Iv(xi`VblM$>h@++-DvRniG~!b?A%hyG2?`M_Qd22TR~t>anRN zcfb#sA;J?o=A-=o_S_c9*TV-7oly2=b^~dfJ^m|+L#4!Cyiu4oE1{lS4JB~QAA6b1 za>t>}%HzDFb4rxJ`rO_EG3!lxR=q!LI+2SvJnu(Ba iDv?;;P7rU>LH+^O6e;JIgvL1l0000e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00MtWL_t(o!|j;SZQC#qhQ9a@ zB#J-z>v;e1D7e|pKG|KL&Q%&mz!HdnZ$J%v040!XW6KWQTyUxdmuX|`s}io#cnNG} z(o>cLzqGNr;2s4Roxx?mi^B~jT&1xB_CVq_*FYhc5;Dsc0;xi@hH%!OPVE^6SEm(S;;cvu@-R%sl|y}yhb*%(}(sDUdwa4x@> zqY!SJ@LYQUF7KPi?Ut?nh%IIdkYXnBKB^6;#G{#qTX@17U36uO_mwubuF{wm(anIm88YJidQ8!k zjgqm}#+E{)4#9=AUsH4m@ZeW(;?dyp@KWm|x;gOL@j4L!&Bi8t-=l9Sp3HzXFq3QT z+J`LhXdae0UA4SA$n{_Bo-bx!j_{CrST!rGknAuNH}r_Kk{#*cL^)UhFOrX4HkkrX zQbWv7oS2U?{`TAvDU@&@s~d%p>N~(S&UAi8SOHUQ?41lemA0&<=1@M)VFc$=Vm?Ml z6u|mi-7A~R-dp}$aAm-cnpgLMmxRQV46+OToh0Jg0w1BLW)Jr)HF9?Qi+Hm@`v)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00G8HL_t(o!|hn@af2`n)$4Tt zMqq?=gLDI!pkxC!C>vx1(h2AWbOU#TutBoH>mR$PxW>?YkdVu}%UyzO`9*$~ghd{> zaga<&mLyw}JO0Ja+Dek?HHj`Pk^iD0xtN;ldVo}AKQXMQAexXg-omww+Amo(zVael zdvguRWGb@8Z7s>IeYOqEJFr9)oZr>=6@a~GcZ+l+mpwi@Z>)%j0N9gUiHK2a z<);>f11Z?3WL661h&*g;_Q=#Z(9%dxAzUg)rI)_Wg~nee#t8$2TM=1ChU`VeX*##R zLr6rV3Cs!M3&88K5f1eRwcAcz7)JQgRnW<*4)q?VNW$N`)U#J(^Qh8$6*wmcQj7U{ z8p(YFAP3Mzq%nlx7yuoBTtqfwh&;*6FqUu;l7x4thLA*3XCorTIjY>v9lE)1^KU`RH-;<_;AA_}!ptem-rAyPx**{u=mMz9P-?C3JSL s`Ln!831pAv$U-sgRn;sn10NWPA6#3@mw&e=0{{R307*qoM6N<$f)NM-rT_o{ diff --git a/edumed/static/img/menu/mil/consultations.png b/edumed/static/img/menu/mil/consultations.png deleted file mode 100644 index e050b981640880c791b805c4815ae07418e6d43f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 624 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqBQFoL-c|0#UknV4e?46sLn>~)y>l>2*iq*A$9$&) z!Jk-OGS5iv4)_qWFivz&^d~l3?QeGk&a>K@uLx(YW!zikvA%Vg!k2&!{t0q(T4j8C zX5W4J?#*}hYA+*iyFbtEHw$}YZ;VLzv|P8bfr(3Ffnb0GBdZCB)!+tXiCo|SvY4b8 zz5Slgdv}|CAH&^_?=@UL!Ax(M<~OXK^nNR|4Re)dXu>r91K%gT-zd-Uw(;A6t1lUw zn~u+ET`kzK-g`#c{f5L~hWjmb5h=@jXC3;?(cNil;Ldt(Hj@Pt-4m}2lDy~zaL89oM|6d z>@nep-Go95TAG^$=;`{Djg|I(>_j6Y;7?iTfAKlm6_zc=RdzQi^E#JN8tGhUrs z`%nBs_1S}m1q~SEmXys1xZ+eKy>7d9+IYWuV)jd3*QG7s{rj)w*WQx0AB)%2rnG{b5 zA7jq=dEDBr6BN!UAjA5L~c#`DCC7XMsm# zF#`j)FbFd;%$g$s6l5>)^mS#w$H>deF8tzb(hZ=HWQl7;iF1B#Zfaf$gL6@8Vo7R> zLV0FMhJw4NZ$Nk>pEyv_A5Ry@kch)?r(fhfWWeKczJt+k22G>PK_L&Ek8HN8rk zt}|WcKhL1Yu_H|$=|Dk!*C^+)5kZw3FRb=Mj#eY&q`l1)qL=0z@qLn>~)ow+ej*ioQuzk=0~ zy$st{~?rA{t)hSfqlg3J6qW!6)&K@o5L?8-6U1f> z5Q0lxkN&P)b&c->*9#{8=5O2&1T2`uQthv}v9Q19oWK+vXU~}Cc;9#d>mRl<*_2A7 z&05|`Y1V0GhMRXzUpaGW+O=>0Hg4zNQ+L;5?t@)(jqWe>;?7~7-{5Y?YhPV0T=8r_x(0>bvu8zqpY_izA#m>;!?-6s)*lNe8{J!~)v)sL%RlTz zasT(--#_1YZa!0dx26rdn?rqT_2q=F$;RhcelYG?=Ph&N0Rq8W5G}*mnKuOW?Mw!#Pbh&ZQk8xv178|`&WF!^XupK5=6( zbD8e8)i>B~f8kTxF8=DkGW6Q%;py;L>x=I;vI;#{P#Vbt%R%_$RSc$W=U2Iwr^Z zzi@KYf$tKGa=)+F2Rj7pjxf^kYI?o6hxzwDXQPt-h;MD_n={2Wm|NHIj^I^-(1qN>T5&
  7. 8ygKFfw!1YQ7JvJpDudU5-rl%;Z#TdGA`| zl?VNXA-Rh?Q~qkmj8s%Fb_+bS50lKfaPI4X^^--^*$W>xs>LY;u@98nnPEV80EYtB#Jmr{1}rw=3dH*W+W~kJ z>H+HyfJFgXM9@u!_yBrd%f-LjSLf&9EyTBj|ukL)Y8Kol%NfE54x`)*dfS zLi%^dH8!MEjmV#6PrhmzwLx0LRIQ@&krgab?(nZ`Tus9ciD0C|SFNBPx}KX?z&N^O z;|_;H)1W`F2+Hgaqb2A8WvIm?=vaD7f#_^sDe8s{I0PZ;eXk`A=F&M|b@Kq-K5pGh zj1r`he!UxFpmu9kW0Y$BWVAQ5Ca|3ZqIduf<&MdZMPPV7<;iwnz_V{uEhuMJTk#u&S`$yn-$dmB!g!OjH4=42PMSUFfL9z zhL>jUDpQoz^S4xlzAQi7GB#vATmtEEoqdtaN5#&LfTxZh?OYW$W`U8{dJvtUDo^Mj zx)tSOO|E^?ilJP1PjPHIp+dLjHuKOvdpR@AdBO9JEe$yH@RAp{OZY%QJ8;b7T6;jx z>y#?1wc*({hRin%@jC~4+4)RWTIh@}4Or9m$!JOlNygpvF5EU^F>6GoB8LcrXP2}u zCU>M;g0Yyv^mFyU<_*5#hrbLc!etXe)~8NsBKaDdl?kCYUHU0Xp4s;Ft-5C31JqP6 zOu&f+UCEuJ<*3rG&{r3)$azYgs=tki8s*Dg$IZa^O+$r+0!CWCNQA!yC&S^@+(Q}s zHvAmy>Y9l0hX;-S7;kHL;gb4`rz0+_VtVy&uALd+1k8ty?`^C|85ax$BPxWhpRbXA z@&0NtzcmN>jew*j>{q(2oj*YqKCWWqUYgNSd;ob{Ny>3>r)B0<=McZt5_Zz+<>u!O zUcWeiOYGp!DEcvyaq%Hbekf+46p|E7TzR%tZ+53^8Vv6Gqnz-6XP037)o-U3d6}R5r+Uv>UDADlndkD{& zoCi*?FE|MJ=p4M1<0Rno#%Tkm;6aBeTiFxS-}ODueUL1d_O1Qy*-bhx|H~>ea0n=~s^~5&jld`__8F><+9hfw%`qvKF}2vpzopr0N=%XssI20 diff --git a/edumed/static/img/menu/mil/takepart.png b/edumed/static/img/menu/mil/takepart.png deleted file mode 100644 index 28a6839b83238757997fd148b85e75489c793638..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 523 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqBQFmN-$E7huM7-~Gdx`!Ln>~)z2oS2$U&m*q4;Cn zl!vppS6o~h$KbJE@nUku6P7pz8^&nfB8GCkm@C{b7+)7QMGnuII&8S9_jKecya-b?rBx@|h`_n5bz z=8AasYhMW0nN0@V$_Wu!^*I|`bQ8UI%&5DTbp6o7$O-#$t6B228;%^Poj#xW`r-^G zp3VQ5Uxr&h;yvGZnOF7B|fF^uVw_X^qtZ@yf5XMao1qo^G`K?h_N8SQ43O|<=A mv3##G*5HBo1Q<|nPl!jK@#{1Q^xpuCHU>{uKbLh*2~7YS*vbt6 diff --git a/edumed/static/img/menu/o-nas.png b/edumed/static/img/menu/o-nas.png deleted file mode 100644 index 00dab37ce6254074bb7609a038f760e15c4e0ffa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 681 zcmV;a0#^NrP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00I$7L_t(o!|hkWal$YVTrw2k z5}*T9K}ZLt0R`))Ut9sC0-TqA!chY;72s5WJBUkg3Hh97E*c!iSU{NJUI^*XYPGss zfP38IM~r;@h&4I@@B-i&z=Taz0Nw$lLaO>-0JcVl06rX`Zd3pkLaOqrfUVIJ00#hp z!)O6u?l4{hmA$yJo9(c>Zz6z<EzpVWL z5Ycctgyn|;hmF|hq+@N;l6O(SjTFi*#%R8D@-7Y->@oRVcXq%R4Ih9*&+EAL#&-Ij-P+CB%Zo-|NrcvDpZkaB2E4fyNz`Y?QR5!>I4!;bKKi^n_nQ$U P00000NkvXXu0mjfHNPWg diff --git a/edumed/static/img/menu/o-nas_active.png b/edumed/static/img/menu/o-nas_active.png deleted file mode 100644 index 1fc61e9ca04916e352071857e1c7f631f2b85b3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 679 zcmV;Y0$BZtP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00Iw5L_t(o!|hkgjlwVxeXJ-T zk{f^y;tH1SAXEV90B*hkH{S>qkgb4F0oe*n2b%^grG&jqq*;p)Ld;KMP8fUe^Yin} z19-u5=q% zB}WYvW#rWAhXBr)F4xqa>)Q63={S1`VDbhVcHIY;X&N7x95!7&g%2;W1u$h_9f`@n z(QPWUiM#ICzY^r2@(4nk*eY3)TdR9qiO^=wZlJif+x1!k4M~q9htZf=odWn|b3Xu5 z<|9JKYs}j^xLymeQ`)q){R(Z86L~ZC=uX90Xp?ybe8NVq=(SIn6e`wYp-n+KTjw?s zvY!z-xYoAwQVlN{*jQ+jR&uaP?g`j{z!|G#Mxc1@jfFNj%PW{YU68E2m9>by^wcSD zIRHsot<24oflZ0Q+{sH>PUO2vRGaV5)a0149ne+B4f@sOIPd1D+U-tms>;t%2ey+09_l-vLS N002ovPDHLkV1lxnAJ_l@ diff --git a/edumed/static/img/menu/szkolenia.png b/edumed/static/img/menu/szkolenia.png deleted file mode 100644 index 97f83622f9a8b674f8bf7fc2f159de425d77948a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 743 zcmV?P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00K`*L_t(o!{u1ZaoaEueafT& zqywdb&=rKNz)S;(gd0u{E3j1oofB>djSAF(mww!)8zfEMHyO>D)hGlS>{ zfEqwcfiy-6&J4hTUT>t*Lo5s5(le(GZe}(w0eta%_cwsORJxx5JI!4Khz7V~$}?w8 zE|qTC#x))0HOT?oJ8N11yJ;OAPB35ZqXivVryvWolX7Rx20(WNtPlJ^?gi2_(z7_% z%~n_V-v+=hHZ%bEN!LHnob_a3y7EbOQt5|eK{w;C9UE!@RL893ta%{dlLS@4&^*j7 z+eoFir>>MNTCt&ek;37uDOu_5rPAAT*Gi=y$!7szO>ULk!nfQP1J>_mbR`2kWrQ)r z2Pv%$p04Xlv$N*F!LdrTj=&Ro(j!A=HTLol^jveGv2oZADJQKJ|Ya{~#usD7?A&rxs={e|@BgjAZ%dO#o(H!@WnwM*w^J4>82p Z=LO)^)nSvglcWFu002ovPDHLkV1nsDMy~(> diff --git a/edumed/static/img/menu/szkolenia_active.png b/edumed/static/img/menu/szkolenia_active.png deleted file mode 100644 index 271eb8a6c72467c807bacccbffb18b8b1e469038..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 739 zcmV<90v!E`P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00K)%L_t(o!{u1bQR^@e{>)H- z88r|pz^VYdg5*{3k_sR<-5@vJ3>Cc4K{|+E1#3ER0~%Zcm-Wn|!TC`n&oJoXv0|-0 zt-js;HW?BOXEXsQ0Q^ywb}?;VA@A#Y9;9%8;~}e`6~d;5V84ozeLjU~{iv zyd?+BLZ}hJxIY7QEwW4_lw0zSVn^304 zYD%y%noyb2sxeMFqf61db(d_Iy3LP1el_4C@V7|;OFljv`0in3&2(vPM23Fp?L=i; z9+Qnz0`?oyUR1);%hTHbLuGQnqUEm-6p@}if3ZZ(Vg&e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00LP_L_t(o!|hkik=ig6{+6Kt zbr7}#cM!V+(tt3!>9kM**$M(D-GrkCvK_!y5O;vnflJ8cIrE}mO9Bs@gWn8;J(iw7 zfA4!g0w$a6FMAq#=&Z>A{0#VblS+Si6yRClxrp!~9?9@LVQmHA7rS2pSUg%1DS*FA zrO!+*p9yg0tT{#ccn45PrJEFx&YA^)ZvdM42p=r~D&YGH)${i*1kal-GsxtuX7+{<=3uldp09`YX3##?k{0RU*STtUx(#;IOGk~J! zw~Yjw1GoUV5G%oo!>+R)uqXDcmP&sGfVot<1#s>G5(8EMII`pto@S2#&Qj^3$Hl_) zx1>FtpPII8p@$}^3#kpOI!$u>A;K<9f5l^d}dN;Sn`yNx!2LBH40&07H0zu;M&mM(ob+r2dqv4Oc^@L z5H6K&oi)z@L_muxPs2%oM?EnRt8JhZ{*g_D#{U6aL{4jC%o`ctsNNr>uHl68q3obBX`J jW)b1W2x}&rY%;Rncp%y1kAHEr00000NkvXXu0mjf%J)6r diff --git a/edumed/static/img/menu/wesprzyj_active.png b/edumed/static/img/menu/wesprzyj_active.png deleted file mode 100644 index 0402b9f12298492b01d06450367d812d212d9b1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 755 zcmVe zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00LV{L_t(o!|j*Nk=j5Ig}DjU zZmc^hxqKGDsV}laq>m3^Z>+2Ofb>N+0lop%cz};ifIM<-4y=8VZH#rR9`ASsUivcJ zwr$UkO4a?+7g=JgTSV@k%YXIci!8su&?mKcswHua`68Q3Xq!Y`80+?dJxkdGuo(k~ zdnJsqZtsh%RHbq)$$Uw>YaP`QP!9pd7um!YSrP%dR3Il(>(BX1fFCLvZ^pW61Uv)N zj^8R0Yz~}&ldux3IO;m>0DDl+N@LwufU&Wz296y-V!$TAP9;~;((Dd68tbMVE+#F1 zFS4icQwn+9S|w0AY+kyTkn7rcmc=t#&82+lwWTC`9ow2i?54m{ZtIqWG)vpS2cKlU z2D@p49fIMVx?VNTC9HW{f06bMY`aS6_y%^DijiYePg|M>2sMXFa_B?+R71@Y=R(;? zL4(qbVbf?jFr!3A;1&%Zl@uzKJafg|+u+lhgs>}%(+dsY+|XXjFVUI~SlJ7(WauD6 zxUsJGMfMCN0WHp28tw&n&=Z5OS_ewuZ`nj>{4c=M$Z2hed1J1c3D;;mbO_DWG&gOX zI9{YPT{90iU2)Mn>24tGwZ}=LZGBH1gLS&5GQ{fesx#fSfM+6+_LNm#n8g0+sd>(S lV55j|Gr*dMJ?vp(zW_L7*`f=o8hHQ!002ovPDHLkV1gSCM`Qp1 diff --git a/edumed/static/img/menu/wspolpraca.png b/edumed/static/img/menu/wspolpraca.png deleted file mode 100644 index af1aa432e7c1bc7be61dcf0f1e8a0b60bbfe336d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 635 zcmV->0)+jEP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00HAkL_t(o!|j&Mal$YVMjuo_ z2apa-1%VDo0}9qnr$7ae3PMi48R7;)Du7fFcM#G6CFHWoXcRjLc{T#p zz#w4l4KP>Q90NgnzymN1n0^3KrOmz;xX81qz`7r8ffs2fz_obaopYnKDNn#Az_aIw zJ@6{eo@3jcle*sSc%I!k6X!~s)el>`cEaTdjO(BUb|+94G_4D%BF|>B6INsE>5j8i z?~cLYDUZo_OJMO6bOr3a(qtZzVYcEQ&mv1R7jcz?NPv^`RdEZ70rccaXZ} zpI*%Y#m}oijif*swN(6+Qdpf|{4^{tS5h0CQ(i8BSu5pbg}47)0Us3=6&3Zn`UEGh V`r5BE(ZT=#002ovPDHLkV1nmd2aNy# diff --git a/edumed/static/img/menu/wspolpraca_active.png b/edumed/static/img/menu/wspolpraca_active.png deleted file mode 100644 index e849d300b2151228c686285f33fb17715c01bc52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 634 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 trans "Page not found" %} - -

    - {% trans "The page you were looking for doesn't exist." %} -

    - -{% endblock %} diff --git a/edumed/templates/base_forum.html b/edumed/templates/base_forum.html deleted file mode 100755 index 587a1e8..0000000 --- a/edumed/templates/base_forum.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block body %} -
    - {% block breadcrumb %}{% endblock %} - {% trans 'Forum search' %} - {% block content %}{% endblock %} -
    -{% endblock %} diff --git a/edumed/templates/base_mil.html b/edumed/templates/base_mil.html deleted file mode 100644 index 7a88f45..0000000 --- a/edumed/templates/base_mil.html +++ /dev/null @@ -1,38 +0,0 @@ -{% extends "base_super.html" %} -{% load subdomainurls %} -{% load fnp_lang %} -{% load sponsor_tags %} -{% load static %} - -{% load i18n %} - -{% block header_class %}header-mil{% endblock %} - -{% block logo %} -Edukacja medialna -{% endblock %} - -{% block top_navigation %} -
  8. {% trans 'About Catalogue' %}
    9. -
  9. {% trans 'Competencies' %}
    10. - {% comment %}
  10. {% trans 'Take Part' %}
    11. {% endcomment %} - {% if request.LANGUAGE_CODE == 'pl' %} -
  11. Baza wiedzy
    12. - {% endif %} -
  12. {% trans 'Contact' %}
    13. -
  13. {% lang_switcher %}
    14. -{% endblock %} - -{% block sponsors %} - {% sponsor_page "footer_mil" %} -{% endblock %} - -{% block organizer %} - Projekt prowadzi:
    - - Fundacja Nowoczesna Polska -
    - - Narodowy Instytut Audiowizualny - -{% endblock %} \ No newline at end of file diff --git a/edumed/templates/contact/konkurs/mail_body.txt b/edumed/templates/contact/konkurs/mail_body.txt deleted file mode 100644 index 6e4ba7c..0000000 --- a/edumed/templates/contact/konkurs/mail_body.txt +++ /dev/null @@ -1,15 +0,0 @@ -Dziękujemy za rejestrację udziału w konkursie MediaLog. - -Przypominamy, że prace można nadsyłać do 6 maja 2013 na adres -edukacjamedialna@nowoczesnapolska.org.pl. W mailu należy podać dane -kontaktowe Autora/ów pracy, Opiekuna (osoby, która zarejestrowała udział -danej instytucji w konkursie i prowadziła zajęcia z edukacji medialnej) -oraz nazwę instytucji (szkoły, biblioteki, domu kultury itp.). -W przypadku prac opublikowanych już wcześniej wystarczy w mailu podać -link do odpowiedniej strony. - -W razie jakichkolwiek wątpliwości prosimy o kontakt: -http://edukacjamedialna.edu.pl/info/kontakt/ - --- -Wiadomość wysłana automatycznie. Prosimy na nią nie odpowiadać. diff --git a/edumed/templates/contact/konkurs/mail_subject.txt b/edumed/templates/contact/konkurs/mail_subject.txt deleted file mode 100644 index 386c1e6..0000000 --- a/edumed/templates/contact/konkurs/mail_subject.txt +++ /dev/null @@ -1 +0,0 @@ -Zgłoszenie na konkurs MediaLog zostało zarejestrowane. diff --git a/edumed/templates/contact/konkurs/thanks.html b/edumed/templates/contact/konkurs/thanks.html deleted file mode 100644 index 6c4a518..0000000 --- a/edumed/templates/contact/konkurs/thanks.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "contact/thanks.html" %} - -{% block contact_form_description %} -

    Dziękujemy za rejestrację udziału w konkursie MediaLog.

    - -

    Przypominamy, że prace można nadsyłać do 6 maja 2013 na adres -edukacjamedialna@nowoczesnapolska.org.pl. W mailu należy podać dane -kontaktowe Autora/ów pracy, Opiekuna (osoby, która zarejestrowała udział -danej instytucji w konkursie i prowadziła zajęcia z edukacji medialnej) -oraz nazwę instytucji (szkoły, biblioteki, domu kultury itp.). -W przypadku prac opublikowanych już wcześniej wystarczy w mailu podać -link do odpowiedniej strony.

    -{% endblock %} diff --git a/edumed/templates/contact/sugestie/mail_body.txt b/edumed/templates/contact/sugestie/mail_body.txt deleted file mode 100644 index ad38005..0000000 --- a/edumed/templates/contact/sugestie/mail_body.txt +++ /dev/null @@ -1,10 +0,0 @@ -Dziękujemy, - -Zgłoszenie na stronie {{ site_name }} -zostało przekazane koordynatorce projektu. - -W razie jakichkolwiek dodatkowych wątpliwości prosimy o kontakt: -http://edukacjamedialna.edu.pl/info/kontakt/ - --- -Wiadomość wysłana automatycznie. Prosimy na nią nie odpowiadać. diff --git a/edumed/templates/contact/sugestie/mail_subject.txt b/edumed/templates/contact/sugestie/mail_subject.txt deleted file mode 100644 index 19fcbfa..0000000 --- a/edumed/templates/contact/sugestie/mail_subject.txt +++ /dev/null @@ -1 +0,0 @@ -Zgłoszenie na stronie {{ site_name }} zostało zarejestrowane. diff --git a/edumed/templates/contact/sugestie/thanks.html b/edumed/templates/contact/sugestie/thanks.html deleted file mode 100644 index 5c89bba..0000000 --- a/edumed/templates/contact/sugestie/thanks.html +++ /dev/null @@ -1,5 +0,0 @@ -{% extends "contact/thanks.html" %} - -{% block contact_form_description %} -

    Dziękujemy, zgłoszenie zostało zarejestrowane.

    -{% endblock %} diff --git a/edumed/templates/contact/tem/mail_body.txt b/edumed/templates/contact/tem/mail_body.txt deleted file mode 100755 index bb22ccb..0000000 --- a/edumed/templates/contact/tem/mail_body.txt +++ /dev/null @@ -1,8 +0,0 @@ -Dziękujemy za przesłanie zgłoszenia. - -O wynikach rekrutacji poinformujemy uczestników do 30 kwietnia. - -Z pozdrowieniami - -Zespół Edukacji Medialnej -fundacja Nowoczesna Polska diff --git a/edumed/templates/contact/tem/mail_subject.txt b/edumed/templates/contact/tem/mail_subject.txt deleted file mode 100755 index edd517f..0000000 --- a/edumed/templates/contact/tem/mail_subject.txt +++ /dev/null @@ -1 +0,0 @@ -TEM - szkolenie dla trenerów edukacji medialnej diff --git a/edumed/templates/contact/tem/thanks.html b/edumed/templates/contact/tem/thanks.html deleted file mode 100755 index 0f0c893..0000000 --- a/edumed/templates/contact/tem/thanks.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "contact/thanks.html" %} - -{% block contact_form_description %} -

    Dziękujemy za przesłanie zgłoszenia.

    - -

    O wynikach rekrutacji poinformujemy uczestników do 30 kwietnia.

    -{% endblock %} diff --git a/edumed/templates/contact/wspolpraca/mail_body.txt b/edumed/templates/contact/wspolpraca/mail_body.txt deleted file mode 100644 index 1e68866..0000000 --- a/edumed/templates/contact/wspolpraca/mail_body.txt +++ /dev/null @@ -1,9 +0,0 @@ -Dziękujemy, - -Zgłoszenie na stronie {{ site_name }} zostało zarejestrowane. - -W razie jakichkolwiek dodatkowych wątpliwości prosimy o kontakt: -http://edukacjamedialna.edu.pl/info/kontakt/ - --- -Wiadomość wysłana automatycznie. Prosimy na nią nie odpowiadać. diff --git a/edumed/templates/contact/wspolpraca/mail_subject.txt b/edumed/templates/contact/wspolpraca/mail_subject.txt deleted file mode 100644 index 19fcbfa..0000000 --- a/edumed/templates/contact/wspolpraca/mail_subject.txt +++ /dev/null @@ -1 +0,0 @@ -Zgłoszenie na stronie {{ site_name }} zostało zarejestrowane. diff --git a/edumed/templates/contact/wspolpraca/thanks.html b/edumed/templates/contact/wspolpraca/thanks.html deleted file mode 100644 index 5c89bba..0000000 --- a/edumed/templates/contact/wspolpraca/thanks.html +++ /dev/null @@ -1,5 +0,0 @@ -{% extends "contact/thanks.html" %} - -{% block contact_form_description %} -

    Dziękujemy, zgłoszenie zostało zarejestrowane.

    -{% endblock %} diff --git a/edumed/templates/contact/wtem/form.html b/edumed/templates/contact/wtem/form.html deleted file mode 100755 index e340633..0000000 --- a/edumed/templates/contact/wtem/form.html +++ /dev/null @@ -1,71 +0,0 @@ -{% extends "base.html" %} -{% load chunks %} - -{% block title %}{{ form.form_title }}{% endblock %} - -{% block body %} - - - - - - -

    {% block contact_form_title %}{{ form.form_title }}{% endblock %}

    - -
    - {% block contact_form_description %} - {% chunk "contact_form__"|add:form.form_tag %} - {% endblock %} -
    - -
    - {% csrf_token %} -

    Dane Opiekuna/Opiekunki i instytucji zgłaszającej Uczestnika:

    - - {{ form.as_table }} -
    - - {% for formset in formsets %} - -

    Dane Uczestników i Uczestniczek:

    -

    Można zgłosić 3 do 5 osób.

    - - {{ formset.management_form }} - -
      - {% for err in formset.non_form_errors %} -
    • {{ err }}
      • - {% endfor %} -
    - - {% for form in formset.forms %} -

    Uczestnik lub Uczestniczka nr {{ forloop.counter }}:

    - - - {{ form.as_table }} -
    - {% endfor %} - -{% comment %} - - - -{% endcomment %} - - - {% endfor %} - -

    - -

    -
    - - -{% endblock %} diff --git a/edumed/templates/contact/wtem/mail_body.txt b/edumed/templates/contact/wtem/mail_body.txt deleted file mode 100755 index 0a63f92..0000000 --- a/edumed/templates/contact/wtem/mail_body.txt +++ /dev/null @@ -1,19 +0,0 @@ -Dziękujemy za rejestrację w Olimpiadzie Cyfrowej. -Do udziału zostały zgłoszone następujące osoby: -{% for student in contact.body.student %}* {{ student.first_name }} {{ student.last_name }}{% endfor %} - -Każdy zgłoszony uczeń powinien otrzymać wiadomość z potwierdzeniem -rejestracji. Prosimy upewnić się, czy potwierdzenie dotarło do każdego -ze zgłoszonych uczniów. W ten sposób zweryfikujemy, czy podane adresy -są prawidłowe. - -Pierwszy etap Olimpiady (test on-line) odbędzie się -15 listopada 2016 r. o godz. 10:00 i potrwa 90 minut. - -Wszystkie ogłoszenia związane z Turniejem będą publikowane na stronie https://olimpiadacyfrowa.pl. -W razie pytań lub wątpliwości można kontaktować się z nami, pisząc na adres: olimpiada@nowoczesnapolska.org.pl. - -Z pozdrowieniami, - -Zespół Olimpiady Cyfrowej -Fundacja Nowoczesna Polska \ No newline at end of file diff --git a/edumed/templates/contact/wtem/mail_subject.txt b/edumed/templates/contact/wtem/mail_subject.txt deleted file mode 100755 index b40c079..0000000 --- a/edumed/templates/contact/wtem/mail_subject.txt +++ /dev/null @@ -1 +0,0 @@ -Potwierdzenie zgłoszenia uczniów do Olimpiady Cyfrowej \ No newline at end of file diff --git a/edumed/templates/contact/wtem/student_mail_body.html b/edumed/templates/contact/wtem/student_mail_body.html deleted file mode 100644 index eb3df3e..0000000 --- a/edumed/templates/contact/wtem/student_mail_body.html +++ /dev/null @@ -1,17 +0,0 @@ -Witaj, - -Przewodniczący Komisji Szkolnej właśnie zgłosił Cię do Olimpiady Cyfrowej. -Cieszymy się, że chcesz wziąć w niej udział. - -Pierwszy etap Olimpiady (test on-line) odbędzie się 15 listopada 2016 r. -o godz. 10:00 i potrwa 90 minut. - -Szczegółowe informacje na temat pierwszego etapu Olimpiady oraz wszystkie -ogłoszenia z nią związane będą publikowane na stronie https://olimpiadacyfrowa.pl. -W razie pytań lub wątpliwości możesz kontaktować się z nami, pisząc na adres -olimpiada@nowoczesnapolska.org.pl. - -Z pozdrowieniami, - -Zespół Olimpiady Cyfrowej -Fundacja Nowoczesna Polska diff --git a/edumed/templates/contact/wtem/student_mail_subject.html b/edumed/templates/contact/wtem/student_mail_subject.html deleted file mode 100644 index 4910d3f..0000000 --- a/edumed/templates/contact/wtem/student_mail_subject.html +++ /dev/null @@ -1 +0,0 @@ -Potwierdzenie zgłoszenia do Olimpiady Cyfrowej \ No newline at end of file diff --git a/edumed/templates/contact/wtem/thanks.html b/edumed/templates/contact/wtem/thanks.html deleted file mode 100755 index 0185bcc..0000000 --- a/edumed/templates/contact/wtem/thanks.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "contact/thanks.html" %} - -{% block contact_form_description %} -

    Dziękujemy za rejestrację w Wielkim Turnieju Edukacji Medialnej.

    - -

    Na adres adres e-mail Opiekuna została wysłana wiadomość potwierdzająca -rejestrację.

    - -

    Każdy zgłoszony uczeń powinien otrzymać wiadomość z potwierdzeniem rejestracji. -Prosimy upewnić się, czy potwierdzenie dotarło do każdego ze zgłoszonych uczniów. -W ten sposób zweryfikujemy, czy podane adresy są prawidłowe.

    - -

    Zespół Edukacji Medialnej
    -fundacja Nowoczesna Polska

    -{% endblock %} diff --git a/edumed/templates/flatpages/mil.html b/edumed/templates/flatpages/mil.html deleted file mode 100644 index 5ac86a6..0000000 --- a/edumed/templates/flatpages/mil.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "base_mil.html" %} -{% load textile_pl from fnp_markup %} - -{% block title %}{{ flatpage.title }}{% endblock %} - -{% block body %} -
    -{{ flatpage.content|textile_pl }} -
    -{% endblock %} diff --git a/edumed/templates/home.html b/edumed/templates/home.html deleted file mode 100755 index 4307ee8..0000000 --- a/edumed/templates/home.html +++ /dev/null @@ -1,70 +0,0 @@ -{% extends "base.html" %} -{% load catalogue_tags %} -{% load course_boxes_toc from curriculum_tags %} -{% load chunk from chunks %} -{% load static %} - -{% block full_title %}Edukacja medialna{% endblock %} - -{% block body %} - -{% catalogue_carousel %} - -
    -

    Co nowego?

    - - {% chunk "promobox" %} -
    - -
    -

    Lekcje:

    - {% catalogue_levels_main %} -
    - -
    -

    Nasze lekcje to:

    - -

    Zobacz, jak przeprowadzili je inni.

    - - -
    - -
    -

    Według podstawy programowej:

    -{% course_boxes_toc %} -
    - - -
    - -
    -

    Aktualności na stronie Fundacji

    -{% latest_blog_posts "http://nowoczesnapolska.org.pl/feed" 5 %} -
    - -
    -

    Narzędzia

    - -
    - -
    -
    - - -{% endblock %} - diff --git a/edumed/templates/home_mil.html b/edumed/templates/home_mil.html deleted file mode 100644 index 5811963..0000000 --- a/edumed/templates/home_mil.html +++ /dev/null @@ -1,5 +0,0 @@ -{% extends "base_mil.html" %} - -{% block body %} -mil -{% endblock %} diff --git a/edumed/templates/olimpiada_teaser.html b/edumed/templates/olimpiada_teaser.html deleted file mode 100644 index f5266d8..0000000 --- a/edumed/templates/olimpiada_teaser.html +++ /dev/null @@ -1,45 +0,0 @@ -{% extends "base_super.html" %} -{% load textile_pl from fnp_markup %} -{% load sponsor_tags %} -{% load compressed %} -{% load static %} - -{% block full_title %}Olimpiada cyfrowa{% endblock %} - -{% block og_site_name %}Olimpiada cyfrowa{% endblock %} - -{% block ogurl %}https://olimpiadacyfrowa.pl{% endblock %} - -{% block og_image %}http://olimpiadacyfrowa.pl/media/chunks/attachment/olimpiada_cyfrowa_logo.png{% endblock %} - -{% block logo %}Olimpiada cyfrowa{% endblock %} - -{% block searchbox %}{% endblock %} - -{% block top_navigation %} -
  14. Regulamin
    15. -
  15. Program
    16. -
  16. Literatura
    17. -
  17. Harmonogram
    18. -
  18. Rada i komitet
    19. -
  19. Kontakt
    20. -{% endblock %} - -{% block body %} -
    - {{ flatpage.content|textile_pl }} -
    -{% endblock %} - -{% block copyrights %} -
    Ikonki w menu: - Designed by Freepik and distributed by Flaticon -{% endblock %} - -{% block sponsors %} - {% sponsor_page "footer_olimpiada" %} -{% endblock %} - -{% block extra_script %} - {% compressed_js 'base' %} -{% endblock %} \ No newline at end of file diff --git a/edumed/templates/pybb/_need_to_login_message.html b/edumed/templates/pybb/_need_to_login_message.html deleted file mode 100755 index bcc8550..0000000 --- a/edumed/templates/pybb/_need_to_login_message.html +++ /dev/null @@ -1,2 +0,0 @@ -{% load i18n %} -{% trans "Login" %} / {% trans "register" %} {% trans "to create to post a reply" %}. diff --git a/edumed/templates/pybb/avatar.html b/edumed/templates/pybb/avatar.html deleted file mode 100755 index 0358753..0000000 --- a/edumed/templates/pybb/avatar.html +++ /dev/null @@ -1,8 +0,0 @@ -{% load pybb_tags %} -{% load libravatar_tags %} -
    - {% pybb_get_profile user=user as user_profile %} - - {{ user }} libravatar - -
    diff --git a/edumed/templates/pybb/breadcrumb.html b/edumed/templates/pybb/breadcrumb.html deleted file mode 100755 index a537281..0000000 --- a/edumed/templates/pybb/breadcrumb.html +++ /dev/null @@ -1,20 +0,0 @@ -{% load i18n pybb_tags %} -
      - {% include "pybb/breadcrumb_top_extra_crumb.html" %} -
    • Forum /
      • - {% if object %} - {% if object.get_parents %} - {% for obj in object.get_parents %} -
    • {% pybb_link obj %} /
      • - {% endfor %} - {% endif %} - {% if extra_crumb %} -
    • {% pybb_link object %} /
      • - {% else %} -
    • {{ object }}
      • - {% endif %} - {% endif %} - {% if extra_crumb %} -
    • {% trans extra_crumb %}
      • - {% endif %} -
    diff --git a/edumed/templates/pybb/breadcrumb_top_extra_crumb.html b/edumed/templates/pybb/breadcrumb_top_extra_crumb.html deleted file mode 100755 index dd09f97..0000000 --- a/edumed/templates/pybb/breadcrumb_top_extra_crumb.html +++ /dev/null @@ -1 +0,0 @@ -
  20. Strona główna /
    21. diff --git a/edumed/urls.py b/edumed/urls.py index 1764f61..47055d9 100644 --- a/edumed/urls.py +++ b/edumed/urls.py @@ -1,33 +1,15 @@ # -*- coding: utf-8 -*- -from django.conf.urls import patterns, include, url +from django.conf.urls import include, url from django.conf import settings from django.contrib.flatpages.views import flatpage -# from django.shortcuts import redirect -# from .views import HomeView, AvatarlessProfileEditView, flatpage_with_template - -urlpatterns = patterns( - '', - # url(r'^$', HomeView.as_view(), name="home"), - # url(r'^lekcje/', include('catalogue.urls')), - # url(r'^info/turniej/(?P.*)$', lambda request, url: redirect('olimpiada', url)), - # url(r'^info/(?P.*)$', flatpage, name="info"), - # url(r'^olimpiada/$', lambda request: flatpage(request, 'turniej/'), name='olimpiada'), - # url(r'^olimpiada/(?P.*)$', lambda request, url: flatpage(request, 'turniej/' + url), name='olimpiada'), +urlpatterns = [ url(r'^szukaj/', include('haystack.urls')), - # url(r'^olimpiada-teaser/(?P.*)$', - # lambda request, url: flatpage_with_template(request, 'turniej/' + url, 'olimpiada_teaser.html'), - # name='olimpiada_teaser'), - url(r'^zglos/', include('contact.urls')), - # url(r'^forum/profile/edit/$', AvatarlessProfileEditView.as_view(), name='edit_profile'), - # url(r'^forum/', include('forum.urls')), - # url(r'^forum/', include('pybb.urls', namespace='pybb')), - # url(r'^kompetencje/', include('curriculum.urls')), url(r'^zadania/', include('wtem.urls')), url(r'^drugi-etap/', include('stage2.urls')), -) +] # Admin stuff, if necessary. @@ -36,38 +18,28 @@ if 'django.contrib.admin' in settings.INSTALLED_APPS: admin.autodiscover() if 'django_cas' in settings.INSTALLED_APPS: - urlpatterns += patterns( - '', - (r'^admin/logout/$', 'django_cas.views.logout'), - ) - urlpatterns += patterns( - '', + urlpatterns += [ + url(r'^admin/logout/$', 'django_cas.views.logout'), + ] + urlpatterns += [ url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^admin/', include(admin.site.urls)), - ) + ] # Auth stuff, if necessary if 'django_cas' in settings.INSTALLED_APPS: - urlpatterns += patterns( - '', + urlpatterns += [ url(r'^accounts/login/$', 'django_cas.views.login', name='login'), url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'), - ) + ] else: from django.contrib.auth.views import login, logout - urlpatterns += ( + urlpatterns += [ url(r'^accounts/login/$', login, name='login'), url(r'^accounts/logout/$', logout, name='logout'), - ) + ] urlpatterns += ( url(r'^(?P[^/]*/|)$', lambda request, url: flatpage(request, 'turniej/' + url)), ) - -if settings.DEBUG: - urlpatterns += ( - # url(r'^media/(?P.*)$', 'django.views.static.serve', { - # 'document_root': settings.MEDIA_ROOT, - # }), - ) diff --git a/edumed/views.py b/edumed/views.py index 6bbee53..866bce1 100644 --- a/edumed/views.py +++ b/edumed/views.py @@ -1,30 +1,12 @@ # -*- coding: utf-8 -*- -from django.contrib.flatpages.views import flatpage -from django.views.defaults import page_not_found +from django.conf import settings +from django.contrib.flatpages.models import FlatPage +from django.contrib.flatpages.views import render_flatpage +from django.contrib.sites.models import get_current_site +from django.http.response import Http404, HttpResponsePermanentRedirect +from django.shortcuts import get_object_or_404 from django.views.generic import TemplateView -from .forms import AvatarlessEditProfileForm - - -class HomeView(TemplateView): - template_name = "home.html" - - -def mil_home_view(request): - return flatpage(request, url='/' if request.LANGUAGE_CODE == 'pl' else '/en/') - - -def mil_404_view(request): - return page_not_found(request, '404_mil.html') - - -def mil_contact_view(request): - return flatpage(request, url='/kontakt_mil/' if request.LANGUAGE_CODE == 'pl' else '/contact_mil/') - - -def mil_knowledge_base_view(request, url): - return flatpage(request, url='bazawiedzy/' + url) - def flatpage_with_template(request, url, template_name): """ @@ -37,12 +19,6 @@ def flatpage_with_template(request, url, template_name): flatpage `flatpages.flatpages` object """ - from django.conf import settings - from django.contrib.flatpages.models import FlatPage - from django.contrib.flatpages.views import render_flatpage - from django.contrib.sites.models import get_current_site - from django.http.response import Http404, HttpResponsePermanentRedirect - from django.shortcuts import get_object_or_404 if not url.startswith('/'): url = '/' + url site_id = get_current_site(request).id diff --git a/forum/__init__.py b/forum/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/forum/forms.py b/forum/forms.py deleted file mode 100644 index 37c9b35..0000000 --- a/forum/forms.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- -from django import forms -from django.forms.models import ModelChoiceIterator -from django.utils.translation import ugettext as _ -import pybb.forms - -from catalogue.models import Lesson - - -class GroupedModelChoiceIterator(ModelChoiceIterator): - def __init__(self, field): - super(GroupedModelChoiceIterator, self).__init__(field) - self.queryset = self.field.grouping_model.objects - self.items_queryset = self.field.queryset - - def choice(self, obj): - items_query = self.items_queryset.filter(**{self.field.grouping_fk_field: obj}) - items = [super(GroupedModelChoiceIterator, self).choice(item) for item in items_query.all()] - return unicode(obj), items - - -class GroupedModelChoiceField(forms.ModelChoiceField): - - def __init__(self, queryset, grouping_fk_field, **kwargs): - self.grouping_fk_field = grouping_fk_field - self.grouping_model = queryset.model._meta.get_field(grouping_fk_field).rel.to - super(GroupedModelChoiceField, self).__init__(queryset, **kwargs) - - def _get_choices(self): - toret = super(GroupedModelChoiceField, self)._get_choices() - if isinstance(toret, ModelChoiceIterator): - toret = GroupedModelChoiceIterator(self) - return toret - - choices = property(_get_choices, forms.ModelChoiceField.choices.fset) - - -class PostForm(pybb.forms.PostForm): - lesson = GroupedModelChoiceField( - label=_('Related lesson'), queryset=Lesson.objects.all(), - grouping_fk_field='section', required=False) diff --git a/forum/locale/pl/LC_MESSAGES/django.mo b/forum/locale/pl/LC_MESSAGES/django.mo deleted file mode 100644 index 219ea2adca4e809f65b60563be2d7ac8c594cd1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 536 zcmYL^(QeZ)6ovyDT;yUBTyt@5m^KX$C*z{H$ynC9BO+-+nofc%Olv|$W>>bm4YXSx zfk)s?cn+S0lY;1xKKa=G|Ks1kAMgC|uNU z{a?L*QWiU;04iV3jG&@bkQd}{}lIi)p zj~r#$Y1bZU(`+>uHBWQC{az=PV(W)UVJ_}=|i|6%(47R#H z)+cEQR|~ytRl{KLv2}jgt&Ql&M4KziK&>`g8y^qhZyWEcI1bOB*xTE* sQT(EB_xocS1r+Y?Hs`&D9-t>cPk1o&y;9$_zrKGHNPx# diff --git a/forum/locale/pl/LC_MESSAGES/django.po b/forum/locale/pl/LC_MESSAGES/django.po deleted file mode 100644 index bc13e50..0000000 --- a/forum/locale/pl/LC_MESSAGES/django.po +++ /dev/null @@ -1,60 +0,0 @@ -# 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: 2013-08-29 10:00+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" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" - -#: forms.py:9 templates/forum/related_lesson_info.html:2 -msgid "Related lesson" -msgstr "Powiązana lekcja" - -#: templates/pybb/topic.html:27 templates/pybb/topic.html.py:47 -msgid "Posts" -msgstr "" - -#: templates/pybb/topic.html:55 -msgid "Unstick topic" -msgstr "" - -#: templates/pybb/topic.html:57 -msgid "Stick topic" -msgstr "" - -#: templates/pybb/topic.html:61 -msgid "Open topic" -msgstr "" - -#: templates/pybb/topic.html:63 -msgid "Close topic" -msgstr "" - -#: templates/pybb/topic.html:66 -msgid "Admin" -msgstr "" - -#: templates/pybb/topic.html:75 -msgid "Unsubscribe" -msgstr "" - -#: templates/pybb/topic.html:77 -msgid "Subscribe" -msgstr "" - -#: templates/pybb/topic.html:96 -msgid "Subscribers" -msgstr "" diff --git a/forum/middleware.py b/forum/middleware.py deleted file mode 100644 index 1b6e26b..0000000 --- a/forum/middleware.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -from urllib import urlencode - -from django.contrib.auth import REDIRECT_FIELD_NAME -from django.http import HttpResponseRedirect -from django.core.urlresolvers import reverse -from django_cas.views import login as cas_login - - -class ForumMiddleware(object): - @staticmethod - def process_request(request): - if request.path.startswith(reverse('pybb:index')) \ - and (not hasattr(request, 'user') or not request.user.is_authenticated()): - params = urlencode({REDIRECT_FIELD_NAME: request.get_full_path()}) - return HttpResponseRedirect(reverse(cas_login) + '?' + params) diff --git a/forum/migrations/0001_initial.py b/forum/migrations/0001_initial.py deleted file mode 100644 index 3a80106..0000000 --- a/forum/migrations/0001_initial.py +++ /dev/null @@ -1,164 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding model 'Topic' - db.create_table(u'forum_topic', ( - ('pybb_topic', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['pybb.Topic'], unique=True, primary_key=True)), - ('lesson', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Lesson'], null=True, blank=True)), - )) - db.send_create_signal(u'forum', ['Topic']) - - - def backwards(self, orm): - # Deleting model 'Topic' - db.delete_table(u'forum_topic') - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'catalogue.lesson': { - 'Meta': {'ordering': "['section', 'level', 'order']", 'object_name': 'Lesson'}, - 'curriculum_courses': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['curriculum.CurriculumCourse']", 'symmetrical': 'False', 'blank': 'True'}), - 'dc': ('jsonfield.fields.JSONField', [], {'default': "'{}'"}), - 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['curriculum.Level']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'package': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Section']", 'null': 'True', 'blank': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}), - 'student_package': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'student_pdf': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) - }, - u'catalogue.section': { - 'Meta': {'ordering': "['order']", 'object_name': 'Section'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}), - 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) - }, - u'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - u'curriculum.curriculumcourse': { - 'Meta': {'ordering': "['slug']", 'object_name': 'CurriculumCourse'}, - 'accusative': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'curriculum.level': { - 'Meta': {'ordering': "['order']", 'object_name': 'Level'}, - 'group': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'forum.topic': { - 'Meta': {'object_name': 'Topic'}, - 'lesson': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Lesson']", 'null': 'True', 'blank': 'True'}), - 'pybb_topic': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['pybb.Topic']", 'unique': 'True', 'primary_key': 'True'}) - }, - u'pybb.category': { - 'Meta': {'ordering': "['position']", 'object_name': 'Category'}, - 'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}), - 'position': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}) - }, - u'pybb.forum': { - 'Meta': {'ordering': "['position']", 'object_name': 'Forum'}, - 'category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'forums'", 'to': u"orm['pybb.Category']"}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'headline': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'moderators': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}), - 'position': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}), - 'post_count': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}), - 'readed_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'readed_forums'", 'symmetrical': 'False', 'through': u"orm['pybb.ForumReadTracker']", 'to': u"orm['auth.User']"}), - 'topic_count': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}), - 'updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}) - }, - u'pybb.forumreadtracker': { - 'Meta': {'unique_together': "(('user', 'forum'),)", 'object_name': 'ForumReadTracker'}, - 'forum': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['pybb.Forum']", 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'time_stamp': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) - }, - u'pybb.topic': { - 'Meta': {'ordering': "['-created']", 'object_name': 'Topic'}, - 'closed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'forum': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'topics'", 'to': u"orm['pybb.Forum']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'on_moderation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'poll_question': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'poll_type': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'post_count': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}), - 'readed_by': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'readed_topics'", 'symmetrical': 'False', 'through': u"orm['pybb.TopicReadTracker']", 'to': u"orm['auth.User']"}), - 'sticky': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'subscriptions'", 'blank': 'True', 'to': u"orm['auth.User']"}), - 'updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}), - 'views': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}) - }, - u'pybb.topicreadtracker': { - 'Meta': {'unique_together': "(('user', 'topic'),)", 'object_name': 'TopicReadTracker'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'time_stamp': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'topic': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['pybb.Topic']", 'null': 'True', 'blank': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) - } - } - - complete_apps = ['forum'] \ No newline at end of file diff --git a/forum/migrations/__init__.py b/forum/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/forum/models.py b/forum/models.py deleted file mode 100644 index 5ec506b..0000000 --- a/forum/models.py +++ /dev/null @@ -1,11 +0,0 @@ -# -*- coding: utf-8 -*- -from django.db import models - -import pybb.models - -from catalogue.models import Lesson - - -class Topic(models.Model): - pybb_topic = models.OneToOneField(pybb.models.Topic, primary_key=True, related_name='edumed_topic') - lesson = models.ForeignKey(Lesson, null=True, blank=True, related_name='forum_topics') diff --git a/forum/search_indexes.py b/forum/search_indexes.py deleted file mode 100644 index 0a3f413..0000000 --- a/forum/search_indexes.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -from haystack import indexes -from pybb.models import Post - - -class PostIndex(indexes.SearchIndex, indexes.Indexable): - text = indexes.CharField(document=True, use_template=True) - - def get_model(self): - return Post diff --git a/forum/templates/forum/related_lesson_info.html b/forum/templates/forum/related_lesson_info.html deleted file mode 100644 index 1f807f6..0000000 --- a/forum/templates/forum/related_lesson_info.html +++ /dev/null @@ -1,4 +0,0 @@ -{% load i18n %} -{% if lesson %} -
    {% trans 'Related lesson' %}: {{lesson.title}}
    -{% endif %} \ No newline at end of file diff --git a/forum/templates/forum/search_results.html b/forum/templates/forum/search_results.html deleted file mode 100644 index b656a40..0000000 --- a/forum/templates/forum/search_results.html +++ /dev/null @@ -1,41 +0,0 @@ -{% extends 'pybb/base.html' %} -{% load i18n %} - - -{% block content %} - -

    {% trans 'Search' %}

    -
    - {{form.q}} - -   - - - - -
    - - {% if query %} -
    - {% for result in page.object_list %} -

    - Temat: {{ result.object.topic.name }}
    - {% autoescape off %} - {% for snippet in result.highlighted.text %} - {{snippet}}{% if not forloop.last %} ... {% endif %} - {% endfor %} - {% endautoescape %} -

    - {% empty %} -

    Brak wyników.

    - {% endfor %} - - {% if page.has_previous or page.has_next %} -
    - {% if page.has_previous %}{% endif %}« Poprzednie{% if page.has_previous %}{% endif %} - | - {% if page.has_next %}{% endif %}Następne »{% if page.has_next %}{% endif %} -
    - {% endif %} - {% endif %} -{% endblock %} \ No newline at end of file diff --git a/forum/templates/pybb/category.html b/forum/templates/pybb/category.html deleted file mode 100644 index 53c3c50..0000000 --- a/forum/templates/pybb/category.html +++ /dev/null @@ -1,47 +0,0 @@ -{% load url from future %} -{% load i18n pybb_tags %} - -{% if category.forums_accessed|pybb_forum_unread:user|length > 0 %} -
    - - - - - - - - - - - {% for forum in category.forums_accessed|pybb_forum_unread:user %} - - - - - - - {% endfor %} - -
    - {% trans "Forum" %} - - {% trans "Topics" %} - - {% trans "Posts" %} - - {% trans "Last posts" %} -
    -
    - {{ forum.name }} {% if forum.hidden %}[{% trans "Hidden" %}]{% endif %} -
    - {{ forum.description|safe }} -
    -     		- {{ forum.topic_count }} - - {{ forum.post_count }} - - {% include "pybb/forum_last_update_info.html" %} -
    -
    -{% endif %} \ No newline at end of file diff --git a/forum/templates/pybb/forum_last_update_info.html b/forum/templates/pybb/forum_last_update_info.html deleted file mode 100644 index c3256a9..0000000 --- a/forum/templates/pybb/forum_last_update_info.html +++ /dev/null @@ -1,5 +0,0 @@ -{% load humanize %} -{% if forum.updated %} - {{ forum.last_post.user }} - {{ forum.updated|naturaltime }} -{% endif %} \ No newline at end of file diff --git a/forum/templates/pybb/post_form.html b/forum/templates/pybb/post_form.html deleted file mode 100644 index 5db31a4..0000000 --- a/forum/templates/pybb/post_form.html +++ /dev/null @@ -1,36 +0,0 @@ -{% load url from future %} -{% load i18n pybb_tags %} -
    - {% csrf_token %} -
    - {% include "pybb/form_errors.html" %} - {% if form.name %} {% include "pybb/form_field.html" with field=form.name %} {% endif %} - - {% if lesson_editable %} - {% include "pybb/form_field.html" with field=form.lesson %} - {% endif %} - - {% if form.login %} {% include "pybb/form_field.html" with field=form.login %} {% endif %} - {% if form.body %} {% include "pybb/form_field.html" with field=form.body %} {% endif %} -
    - {% for smile, url in form.available_smiles.items %} - - {% endfor %} -
    - - {% if form.poll_type and request.user.is_superuser %} - {% include "pybb/poll_edit_form.html" %} - {% endif %} - {% include "pybb/attachments_formset.html" %} -

    {% include "pybb/_button_submit.html" %}

    -
    -
    diff --git a/forum/templates/pybb/topic.html b/forum/templates/pybb/topic.html deleted file mode 100644 index f11f2cb..0000000 --- a/forum/templates/pybb/topic.html +++ /dev/null @@ -1,102 +0,0 @@ -{% extends 'pybb/base.html' %} - -{% load url from future %} - -{% load pybb_tags i18n %} - -{% block title %}{{ topic }}{% endblock %} - -{% block extra_script %} - {{ block.super }} - {% include "pybb/_markitup.html" %} - -{% endblock %} - -{% block breadcrumb %} - {% with object=topic %} - {% include "pybb/breadcrumb.html" %} - {% endwith %} -{% endblock %} - -{% block content %} -
    -

    {{ topic.name }}

    - - {% include 'forum/related_lesson_info.html' with lesson=topic.edumed_topic.lesson %} - - {% with _('Posts') as label %} - {% include "pybb/pagination.html" %} - {% endwith %} - - {% if topic.poll_type %} - {% include 'pybb/poll.html' %} - {% endif %} - -
    - {% if first_post %}{% ifnotequal first_post post_list.0 %} - {% with first_post as post %} -
  21. {% include "pybb/post_template.html" %}
    22. - {% endwith %} - {% endifnotequal %}{% endif %} - {% for post in post_list %} - {% cycle 'odd' 'even' as rowcolors silent %} - {% include "pybb/post_template.html" %} - {% endfor %} -
    -
     
    - {% with _('Posts') as label %} - {% include "pybb/pagination.html" %} - {% endwith %} - - {% if user.is_authenticated %} -
    - {% if user.is_moderator %} - {% if topic.sticky %} - {% trans "Unstick topic" %} / - {% else %} - {% trans "Stick topic" %} / - {% endif %} - - {% if topic.closed %} - {% trans "Open topic" %} / - {% else %} - {% trans "Close topic" %} / - {% endif %} - {% if perms.pybb.change_topic and user.is_staff %} - {% trans 'Admin' %} / - {% endif %} - {% comment %} - {% trans 'Merge topics' %} / - {% endcomment %} - {% endif %} - - {% if user.is_subscribed %} - {% trans "Unsubscribe" %} - {% else %} - {% trans "Subscribe" %} - {% endif %} -
    - {% endif %} - - {% if user.is_authenticated or PYBB_ENABLE_ANONYMOUS_POST %} - {% pybb_get_profile user=user as user_profile %} - - {% if not user_profile.is_banned %} - {% if not topic.closed %} - {% include "pybb/post_form.html" %} - {% endif %} - {% endif %} - {% else %} - {% include 'pybb/_need_to_login_message.html' %} - {% endif %} - - {% if user.is_staff %} -
    - {% trans "Subscribers" %}: - {% for subscriber in topic.subscribers.all %} - {{ subscriber.username }}, - {% endfor %} -
    - {% endif %} -
    -{% endblock %} diff --git a/forum/templates/pybb/topic_last_message_info.html b/forum/templates/pybb/topic_last_message_info.html deleted file mode 100644 index ff49ffa..0000000 --- a/forum/templates/pybb/topic_last_message_info.html +++ /dev/null @@ -1,6 +0,0 @@ -{% load humanize %} -{% if topic.updated %} - {{ topic.last_post.user }} - {{ topic.updated|naturaltime }} - -{% endif %} \ No newline at end of file diff --git a/forum/templates/search/indexes/pybb/post_text.txt b/forum/templates/search/indexes/pybb/post_text.txt deleted file mode 100644 index c51be26..0000000 --- a/forum/templates/search/indexes/pybb/post_text.txt +++ /dev/null @@ -1 +0,0 @@ -{{object.body_text}} \ No newline at end of file diff --git a/forum/urls.py b/forum/urls.py deleted file mode 100644 index c669808..0000000 --- a/forum/urls.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -from django.conf.urls import patterns, url -from haystack.query import SearchQuerySet -from haystack.views import SearchView, search_view_factory -from haystack.forms import SearchForm -from pybb.models import Post - -from .views import AddPostView, EditPostView - - -urlpatterns = patterns( - '', - url(r'^forum/(?P\d+)/topic/add/$', AddPostView.as_view()), - url(r'^post/(?P\d+)/edit/$', EditPostView.as_view()), -) - -PostsSearchQuerySet = SearchQuerySet().models(Post).highlight() - -urlpatterns += patterns( - 'haystack.views', - url(r'^szukaj/$', search_view_factory( - view_class=SearchView, - template='forum/search_results.html', - searchqueryset=PostsSearchQuerySet, - form_class=SearchForm - ), name='forum_search')) diff --git a/forum/views.py b/forum/views.py deleted file mode 100644 index 6750d99..0000000 --- a/forum/views.py +++ /dev/null @@ -1,58 +0,0 @@ -# -*- coding: utf-8 -*- -from django.core.exceptions import ObjectDoesNotExist -import pybb.views -import pybb.forms - -from .forms import PostForm -from .models import Topic - - -class PostEditMixin(pybb.views.PostEditMixin): - - def get_form_class(self): - toret = super(PostEditMixin, self).get_form_class() - if issubclass(toret, pybb.forms.PostForm): - toret = PostForm - return toret - - def form_valid(self, form): - toret = super(PostEditMixin, self).form_valid(form) - - pybb_post = self.object - pybb_topic = pybb_post.topic - topic, topic_created = Topic.objects.get_or_create(pybb_topic=pybb_topic) - - if pybb_post == pybb_topic.head: - topic.lesson = form.cleaned_data['lesson'] - topic.save() - - return toret - - -class AddPostView(PostEditMixin, pybb.views.AddPostView): - def get_context_data(self, **kwargs): - ctx = super(AddPostView, self).get_context_data(**kwargs) - ctx['lesson_editable'] = self._creates_new_topic() - return ctx - - def _creates_new_topic(self): - return self.forum is not None - - -class EditPostView(PostEditMixin, pybb.views.EditPostView): - def get_context_data(self, **kwargs): - ctx = super(EditPostView, self).get_context_data(**kwargs) - ctx['lesson_editable'] = self._edits_topics_head() - return ctx - - def _edits_topics_head(self): - return self.object == self.object.topic.head - - def get_form_kwargs(self): - kwargs = super(EditPostView, self).get_form_kwargs() - try: - lesson = self.object.topic.edumed_topic.lesson - except ObjectDoesNotExist: - lesson = None - kwargs['initial']['lesson'] = lesson - return kwargs diff --git a/lib/librarian b/lib/librarian deleted file mode 160000 index 05a4485..0000000 --- a/lib/librarian +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 05a4485b020b9252f5ffc02d19c163705cbf26e2 diff --git a/publishers/__init__.py b/publishers/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/publishers/admin.py b/publishers/admin.py deleted file mode 100644 index 95bd7ab..0000000 --- a/publishers/admin.py +++ /dev/null @@ -1,5 +0,0 @@ -# -*- coding: utf-8 -*- -from django.contrib import admin -from .models import Publisher - -admin.site.register(Publisher) diff --git a/publishers/migrations/0001_initial.py b/publishers/migrations/0001_initial.py deleted file mode 100644 index 1a77507..0000000 --- a/publishers/migrations/0001_initial.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding model 'Publisher' - db.create_table(u'publishers_publisher', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('name', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('logo', self.gf('django.db.models.fields.files.ImageField')(max_length=100)), - )) - db.send_create_signal(u'publishers', ['Publisher']) - - - def backwards(self, orm): - # Deleting model 'Publisher' - db.delete_table(u'publishers_publisher') - - - models = { - u'publishers.publisher': { - 'Meta': {'object_name': 'Publisher'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'logo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - } - } - - complete_apps = ['publishers'] \ No newline at end of file diff --git a/publishers/migrations/__init__.py b/publishers/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/publishers/models.py b/publishers/models.py deleted file mode 100644 index 14ed63a..0000000 --- a/publishers/models.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -from django.db import models - - -class Publisher(models.Model): - name = models.CharField(max_length=255) - logo = models.ImageField(upload_to='publishers/logo') - - def __unicode__(self): - return self.name diff --git a/requirements.txt b/requirements.txt index d1fde75..ae876a5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,7 +31,6 @@ django-sponsors>=1.1,<1.2 django-haystack>=2.0,<2.1 pysolr>=3,<4 -pybbm>=0.14,<0.15 django-libravatar sorl-thumbnail>=12,<13 -- 2.20.1 From f09fd4c98021b75d6d6c288537946703eb706d04 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Fri, 17 Nov 2017 16:29:28 +0100 Subject: [PATCH 14/16] notify all teachers --- wtem/management/commands/notify_teachers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wtem/management/commands/notify_teachers.py b/wtem/management/commands/notify_teachers.py index 354ab43..127e204 100644 --- a/wtem/management/commands/notify_teachers.py +++ b/wtem/management/commands/notify_teachers.py @@ -25,7 +25,7 @@ class Command(BaseCommand): unconfirmed = [] for similar_contact in Contact.objects.filter(contact=contact.contact): unconfirmed += list(Confirmation.objects.filter( - contact=similar_contact, confirmed=False, contact__created_at__lt=threshold)) + contact=similar_contact, confirmed=False)) # contact__created_at__lt=threshold)) if not unconfirmed: continue message = render_to_string(message_template, {'unconfirmed': unconfirmed}) -- 2.20.1 From 3f6a89f199635580ebc7b6bea30cd8bdc6fc068b Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Fri, 17 Nov 2017 16:47:18 +0100 Subject: [PATCH 15/16] search in confirmation and contact admins --- contact/admin.py | 1 + wtem/admin.py | 1 + 2 files changed, 2 insertions(+) diff --git a/contact/admin.py b/contact/admin.py index 22d3593..437ad97 100644 --- a/contact/admin.py +++ b/contact/admin.py @@ -28,6 +28,7 @@ class ContactAdmin(admin.ModelAdmin): fields = ['form_tag', 'created_at', 'contact', 'ip'] readonly_fields = ['form_tag', 'created_at', 'contact', 'ip'] list_filter = ['form_tag'] + search_fields = ['contact', 'body'] @staticmethod def admin_list(obj, nr): diff --git a/wtem/admin.py b/wtem/admin.py index efaf253..acab816 100644 --- a/wtem/admin.py +++ b/wtem/admin.py @@ -244,6 +244,7 @@ class ConfirmationAdmin(admin.ModelAdmin): readonly_fields = ('contact', 'readable_contact', 'readable_age', 'school_phone', 'key', 'confirmed') list_filter = ('confirmed',) list_select_related = ('contact',) + search_fields = ('last_name', 'email', 'contact__contact') def resend_mail(self, request, queryset): for confirmation in queryset: -- 2.20.1 From 76c8e6fdcc6485d6899bfabaea8c13bec7502760 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Mon, 20 Nov 2017 11:58:20 +0100 Subject: [PATCH 16/16] restore jquery.cycle - needed for sponsors --- edumed/settings/static.py | 1 + edumed/static/jquery/jquery.cycle.all.js | 1538 ++++++++++++++++++++++ 2 files changed, 1539 insertions(+) create mode 100644 edumed/static/jquery/jquery.cycle.all.js diff --git a/edumed/settings/static.py b/edumed/settings/static.py index f4020ee..19a69ca 100644 --- a/edumed/settings/static.py +++ b/edumed/settings/static.py @@ -36,6 +36,7 @@ PIPELINE_JS = { 'source_filenames': ( 'jquery/colorbox/jquery.colorbox-min.js', 'jquery/colorbox/jquery.colorbox-pl.js', + 'jquery/jquery.cycle.all.js', 'catalogue/js/edumed.js', 'sponsors/js/sponsors.js', 'js/formset.js', diff --git a/edumed/static/jquery/jquery.cycle.all.js b/edumed/static/jquery/jquery.cycle.all.js new file mode 100644 index 0000000..dfd1950 --- /dev/null +++ b/edumed/static/jquery/jquery.cycle.all.js @@ -0,0 +1,1538 @@ +/*! + * jQuery Cycle Plugin (with Transition Definitions) + * Examples and documentation at: http://jquery.malsup.com/cycle/ + * Copyright (c) 2007-2012 M. Alsup + * Version: 2.9999.81 (15-JAN-2013) + * Dual licensed under the MIT and GPL licenses. + * http://jquery.malsup.com/license.html + * Requires: jQuery v1.7.1 or later + */ +;(function($, undefined) { +"use strict"; + +var ver = '2.9999.81'; + +function debug(s) { + if ($.fn.cycle.debug) + log(s); +} +function log() { + if (window.console && console.log) + console.log('[cycle] ' + Array.prototype.join.call(arguments,' ')); +} +$.expr[':'].paused = function(el) { + return el.cyclePause; +}; + + +// the options arg can be... +// a number - indicates an immediate transition should occur to the given slide index +// a string - 'pause', 'resume', 'toggle', 'next', 'prev', 'stop', 'destroy' or the name of a transition effect (ie, 'fade', 'zoom', etc) +// an object - properties to control the slideshow +// +// the arg2 arg can be... +// the name of an fx (only used in conjunction with a numeric value for 'options') +// the value true (only used in first arg == 'resume') and indicates +// that the resume should occur immediately (not wait for next timeout) + +$.fn.cycle = function(options, arg2) { + var o = { s: this.selector, c: this.context }; + + // in 1.3+ we can fix mistakes with the ready state + if (this.length === 0 && options != 'stop') { + if (!$.isReady && o.s) { + log('DOM not ready, queuing slideshow'); + $(function() { + $(o.s,o.c).cycle(options,arg2); + }); + return this; + } + // is your DOM ready? http://docs.jquery.com/Tutorials:Introducing_$(document).ready() + log('terminating; zero elements found by selector' + ($.isReady ? '' : ' (DOM not ready)')); + return this; + } + + // iterate the matched nodeset + return this.each(function() { + var opts = handleArguments(this, options, arg2); + if (opts === false) + return; + + opts.updateActivePagerLink = opts.updateActivePagerLink || $.fn.cycle.updateActivePagerLink; + + // stop existing slideshow for this container (if there is one) + if (this.cycleTimeout) + clearTimeout(this.cycleTimeout); + this.cycleTimeout = this.cyclePause = 0; + this.cycleStop = 0; // issue #108 + + var $cont = $(this); + var $slides = opts.slideExpr ? $(opts.slideExpr, this) : $cont.children(); + var els = $slides.get(); + + if (els.length < 2) { + log('terminating; too few slides: ' + els.length); + return; + } + + var opts2 = buildOptions($cont, $slides, els, opts, o); + if (opts2 === false) + return; + + var startTime = opts2.continuous ? 10 : getTimeout(els[opts2.currSlide], els[opts2.nextSlide], opts2, !opts2.backwards); + + // if it's an auto slideshow, kick it off + if (startTime) { + startTime += (opts2.delay || 0); + if (startTime < 10) + startTime = 10; + debug('first timeout: ' + startTime); + this.cycleTimeout = setTimeout(function(){go(els,opts2,0,!opts.backwards);}, startTime); + } + }); +}; + +function triggerPause(cont, byHover, onPager) { + var opts = $(cont).data('cycle.opts'); + if (!opts) + return; + var paused = !!cont.cyclePause; + if (paused && opts.paused) + opts.paused(cont, opts, byHover, onPager); + else if (!paused && opts.resumed) + opts.resumed(cont, opts, byHover, onPager); +} + +// process the args that were passed to the plugin fn +function handleArguments(cont, options, arg2) { + if (cont.cycleStop === undefined) + cont.cycleStop = 0; + if (options === undefined || options === null) + options = {}; + if (options.constructor == String) { + switch(options) { + case 'destroy': + case 'stop': + var opts = $(cont).data('cycle.opts'); + if (!opts) + return false; + cont.cycleStop++; // callbacks look for change + if (cont.cycleTimeout) + clearTimeout(cont.cycleTimeout); + cont.cycleTimeout = 0; + if (opts.elements) + $(opts.elements).stop(); + $(cont).removeData('cycle.opts'); + if (options == 'destroy') + destroy(cont, opts); + return false; + case 'toggle': + cont.cyclePause = (cont.cyclePause === 1) ? 0 : 1; + checkInstantResume(cont.cyclePause, arg2, cont); + triggerPause(cont); + return false; + case 'pause': + cont.cyclePause = 1; + triggerPause(cont); + return false; + case 'resume': + cont.cyclePause = 0; + checkInstantResume(false, arg2, cont); + triggerPause(cont); + return false; + case 'prev': + case 'next': + opts = $(cont).data('cycle.opts'); + if (!opts) { + log('options not found, "prev/next" ignored'); + return false; + } + $.fn.cycle[options](opts); + return false; + default: + options = { fx: options }; + } + return options; + } + else if (options.constructor == Number) { + // go to the requested slide + var num = options; + options = $(cont).data('cycle.opts'); + if (!options) { + log('options not found, can not advance slide'); + return false; + } + if (num < 0 || num >= options.elements.length) { + log('invalid slide index: ' + num); + return false; + } + options.nextSlide = num; + if (cont.cycleTimeout) { + clearTimeout(cont.cycleTimeout); + cont.cycleTimeout = 0; + } + if (typeof arg2 == 'string') + options.oneTimeFx = arg2; + go(options.elements, options, 1, num >= options.currSlide); + return false; + } + return options; + + function checkInstantResume(isPaused, arg2, cont) { + if (!isPaused && arg2 === true) { // resume now! + var options = $(cont).data('cycle.opts'); + if (!options) { + log('options not found, can not resume'); + return false; + } + if (cont.cycleTimeout) { + clearTimeout(cont.cycleTimeout); + cont.cycleTimeout = 0; + } + go(options.elements, options, 1, !options.backwards); + } + } +} + +function removeFilter(el, opts) { + if (!$.support.opacity && opts.cleartype && el.style.filter) { + try { el.style.removeAttribute('filter'); } + catch(smother) {} // handle old opera versions + } +} + +// unbind event handlers +function destroy(cont, opts) { + if (opts.next) + $(opts.next).unbind(opts.prevNextEvent); + if (opts.prev) + $(opts.prev).unbind(opts.prevNextEvent); + + if (opts.pager || opts.pagerAnchorBuilder) + $.each(opts.pagerAnchors || [], function() { + this.unbind().remove(); + }); + opts.pagerAnchors = null; + $(cont).unbind('mouseenter.cycle mouseleave.cycle'); + if (opts.destroy) // callback + opts.destroy(opts); +} + +// one-time initialization +function buildOptions($cont, $slides, els, options, o) { + var startingSlideSpecified; + // support metadata plugin (v1.0 and v2.0) + var opts = $.extend({}, $.fn.cycle.defaults, options || {}, $.metadata ? $cont.metadata() : $.meta ? $cont.data() : {}); + var meta = $.isFunction($cont.data) ? $cont.data(opts.metaAttr) : null; + if (meta) + opts = $.extend(opts, meta); + if (opts.autostop) + opts.countdown = opts.autostopCount || els.length; + + var cont = $cont[0]; + $cont.data('cycle.opts', opts); + opts.$cont = $cont; + opts.stopCount = cont.cycleStop; + opts.elements = els; + opts.before = opts.before ? [opts.before] : []; + opts.after = opts.after ? [opts.after] : []; + + // push some after callbacks + if (!$.support.opacity && opts.cleartype) + opts.after.push(function() { removeFilter(this, opts); }); + if (opts.continuous) + opts.after.push(function() { go(els,opts,0,!opts.backwards); }); + + saveOriginalOpts(opts); + + // clearType corrections + if (!$.support.opacity && opts.cleartype && !opts.cleartypeNoBg) + clearTypeFix($slides); + + // container requires non-static position so that slides can be position within + if ($cont.css('position') == 'static') + $cont.css('position', 'relative'); + if (opts.width) + $cont.width(opts.width); + if (opts.height && opts.height != 'auto') + $cont.height(opts.height); + + if (opts.startingSlide !== undefined) { + opts.startingSlide = parseInt(opts.startingSlide,10); + if (opts.startingSlide >= els.length || opts.startSlide < 0) + opts.startingSlide = 0; // catch bogus input + else + startingSlideSpecified = true; + } + else if (opts.backwards) + opts.startingSlide = els.length - 1; + else + opts.startingSlide = 0; + + // if random, mix up the slide array + if (opts.random) { + opts.randomMap = []; + for (var i = 0; i < els.length; i++) + opts.randomMap.push(i); + opts.randomMap.sort(function(a,b) {return Math.random() - 0.5;}); + if (startingSlideSpecified) { + // try to find the specified starting slide and if found set start slide index in the map accordingly + for ( var cnt = 0; cnt < els.length; cnt++ ) { + if ( opts.startingSlide == opts.randomMap[cnt] ) { + opts.randomIndex = cnt; + } + } + } + else { + opts.randomIndex = 1; + opts.startingSlide = opts.randomMap[1]; + } + } + else if (opts.startingSlide >= els.length) + opts.startingSlide = 0; // catch bogus input + opts.currSlide = opts.startingSlide || 0; + var first = opts.startingSlide; + + // set position and zIndex on all the slides + $slides.css({position: 'absolute', top:0, left:0}).hide().each(function(i) { + var z; + if (opts.backwards) + z = first ? i <= first ? els.length + (i-first) : first-i : els.length-i; + else + z = first ? i >= first ? els.length - (i-first) : first-i : els.length-i; + $(this).css('z-index', z); + }); + + // make sure first slide is visible + $(els[first]).css('opacity',1).show(); // opacity bit needed to handle restart use case + removeFilter(els[first], opts); + + // stretch slides + if (opts.fit) { + if (!opts.aspect) { + if (opts.width) + $slides.width(opts.width); + if (opts.height && opts.height != 'auto') + $slides.height(opts.height); + } else { + $slides.each(function(){ + var $slide = $(this); + var ratio = (opts.aspect === true) ? $slide.width()/$slide.height() : opts.aspect; + if( opts.width && $slide.width() != opts.width ) { + $slide.width( opts.width ); + $slide.height( opts.width / ratio ); + } + + if( opts.height && $slide.height() < opts.height ) { + $slide.height( opts.height ); + $slide.width( opts.height * ratio ); + } + }); + } + } + + if (opts.center && ((!opts.fit) || opts.aspect)) { + $slides.each(function(){ + var $slide = $(this); + $slide.css({ + "margin-left": opts.width ? + ((opts.width - $slide.width()) / 2) + "px" : + 0, + "margin-top": opts.height ? + ((opts.height - $slide.height()) / 2) + "px" : + 0 + }); + }); + } + + if (opts.center && !opts.fit && !opts.slideResize) { + $slides.each(function(){ + var $slide = $(this); + $slide.css({ + "margin-left": opts.width ? ((opts.width - $slide.width()) / 2) + "px" : 0, + "margin-top": opts.height ? ((opts.height - $slide.height()) / 2) + "px" : 0 + }); + }); + } + + // stretch container + var reshape = (opts.containerResize || opts.containerResizeHeight) && !$cont.innerHeight(); + if (reshape) { // do this only if container has no size http://tinyurl.com/da2oa9 + var maxw = 0, maxh = 0; + for(var j=0; j < els.length; j++) { + var $e = $(els[j]), e = $e[0], w = $e.outerWidth(), h = $e.outerHeight(); + if (!w) w = e.offsetWidth || e.width || $e.attr('width'); + if (!h) h = e.offsetHeight || e.height || $e.attr('height'); + maxw = w > maxw ? w : maxw; + maxh = h > maxh ? h : maxh; + } + if (opts.containerResize && maxw > 0 && maxh > 0) + $cont.css({width:maxw+'px',height:maxh+'px'}); + if (opts.containerResizeHeight && maxh > 0) + $cont.css({height:maxh+'px'}); + } + + var pauseFlag = false; // https://github.com/malsup/cycle/issues/44 + if (opts.pause) + $cont.bind('mouseenter.cycle', function(){ + pauseFlag = true; + this.cyclePause++; + triggerPause(cont, true); + }).bind('mouseleave.cycle', function(){ + if (pauseFlag) + this.cyclePause--; + triggerPause(cont, true); + }); + + if (supportMultiTransitions(opts) === false) + return false; + + // apparently a lot of people use image slideshows without height/width attributes on the images. + // Cycle 2.50+ requires the sizing info for every slide; this block tries to deal with that. + var requeue = false; + options.requeueAttempts = options.requeueAttempts || 0; + $slides.each(function() { + // try to get height/width of each slide + var $el = $(this); + this.cycleH = (opts.fit && opts.height) ? opts.height : ($el.height() || this.offsetHeight || this.height || $el.attr('height') || 0); + this.cycleW = (opts.fit && opts.width) ? opts.width : ($el.width() || this.offsetWidth || this.width || $el.attr('width') || 0); + + if ( $el.is('img') ) { + var loading = (this.cycleH === 0 && this.cycleW === 0 && !this.complete); + // don't requeue for images that are still loading but have a valid size + if (loading) { + if (o.s && opts.requeueOnImageNotLoaded && ++options.requeueAttempts < 100) { // track retry count so we don't loop forever + log(options.requeueAttempts,' - img slide not loaded, requeuing slideshow: ', this.src, this.cycleW, this.cycleH); + setTimeout(function() {$(o.s,o.c).cycle(options);}, opts.requeueTimeout); + requeue = true; + return false; // break each loop + } + else { + log('could not determine size of image: '+this.src, this.cycleW, this.cycleH); + } + } + } + return true; + }); + + if (requeue) + return false; + + opts.cssBefore = opts.cssBefore || {}; + opts.cssAfter = opts.cssAfter || {}; + opts.cssFirst = opts.cssFirst || {}; + opts.animIn = opts.animIn || {}; + opts.animOut = opts.animOut || {}; + + $slides.not(':eq('+first+')').css(opts.cssBefore); + $($slides[first]).css(opts.cssFirst); + + if (opts.timeout) { + opts.timeout = parseInt(opts.timeout,10); + // ensure that timeout and speed settings are sane + if (opts.speed.constructor == String) + opts.speed = $.fx.speeds[opts.speed] || parseInt(opts.speed,10); + if (!opts.sync) + opts.speed = opts.speed / 2; + + var buffer = opts.fx == 'none' ? 0 : opts.fx == 'shuffle' ? 500 : 250; + while((opts.timeout - opts.speed) < buffer) // sanitize timeout + opts.timeout += opts.speed; + } + if (opts.easing) + opts.easeIn = opts.easeOut = opts.easing; + if (!opts.speedIn) + opts.speedIn = opts.speed; + if (!opts.speedOut) + opts.speedOut = opts.speed; + + opts.slideCount = els.length; + opts.currSlide = opts.lastSlide = first; + if (opts.random) { + if (++opts.randomIndex == els.length) + opts.randomIndex = 0; + opts.nextSlide = opts.randomMap[opts.randomIndex]; + } + else if (opts.backwards) + opts.nextSlide = opts.startingSlide === 0 ? (els.length-1) : opts.startingSlide-1; + else + opts.nextSlide = opts.startingSlide >= (els.length-1) ? 0 : opts.startingSlide+1; + + // run transition init fn + if (!opts.multiFx) { + var init = $.fn.cycle.transitions[opts.fx]; + if ($.isFunction(init)) + init($cont, $slides, opts); + else if (opts.fx != 'custom' && !opts.multiFx) { + log('unknown transition: ' + opts.fx,'; slideshow terminating'); + return false; + } + } + + // fire artificial events + var e0 = $slides[first]; + if (!opts.skipInitializationCallbacks) { + if (opts.before.length) + opts.before[0].apply(e0, [e0, e0, opts, true]); + if (opts.after.length) + opts.after[0].apply(e0, [e0, e0, opts, true]); + } + if (opts.next) + $(opts.next).bind(opts.prevNextEvent,function(){return advance(opts,1);}); + if (opts.prev) + $(opts.prev).bind(opts.prevNextEvent,function(){return advance(opts,0);}); + if (opts.pager || opts.pagerAnchorBuilder) + buildPager(els,opts); + + exposeAddSlide(opts, els); + + return opts; +} + +// save off original opts so we can restore after clearing state +function saveOriginalOpts(opts) { + opts.original = { before: [], after: [] }; + opts.original.cssBefore = $.extend({}, opts.cssBefore); + opts.original.cssAfter = $.extend({}, opts.cssAfter); + opts.original.animIn = $.extend({}, opts.animIn); + opts.original.animOut = $.extend({}, opts.animOut); + $.each(opts.before, function() { opts.original.before.push(this); }); + $.each(opts.after, function() { opts.original.after.push(this); }); +} + +function supportMultiTransitions(opts) { + var i, tx, txs = $.fn.cycle.transitions; + // look for multiple effects + if (opts.fx.indexOf(',') > 0) { + opts.multiFx = true; + opts.fxs = opts.fx.replace(/\s*/g,'').split(','); + // discard any bogus effect names + for (i=0; i < opts.fxs.length; i++) { + var fx = opts.fxs[i]; + tx = txs[fx]; + if (!tx || !txs.hasOwnProperty(fx) || !$.isFunction(tx)) { + log('discarding unknown transition: ',fx); + opts.fxs.splice(i,1); + i--; + } + } + // if we have an empty list then we threw everything away! + if (!opts.fxs.length) { + log('No valid transitions named; slideshow terminating.'); + return false; + } + } + else if (opts.fx == 'all') { // auto-gen the list of transitions + opts.multiFx = true; + opts.fxs = []; + for (var p in txs) { + if (txs.hasOwnProperty(p)) { + tx = txs[p]; + if (txs.hasOwnProperty(p) && $.isFunction(tx)) + opts.fxs.push(p); + } + } + } + if (opts.multiFx && opts.randomizeEffects) { + // munge the fxs array to make effect selection random + var r1 = Math.floor(Math.random() * 20) + 30; + for (i = 0; i < r1; i++) { + var r2 = Math.floor(Math.random() * opts.fxs.length); + opts.fxs.push(opts.fxs.splice(r2,1)[0]); + } + debug('randomized fx sequence: ',opts.fxs); + } + return true; +} + +// provide a mechanism for adding slides after the slideshow has started +function exposeAddSlide(opts, els) { + opts.addSlide = function(newSlide, prepend) { + var $s = $(newSlide), s = $s[0]; + if (!opts.autostopCount) + opts.countdown++; + els[prepend?'unshift':'push'](s); + if (opts.els) + opts.els[prepend?'unshift':'push'](s); // shuffle needs this + opts.slideCount = els.length; + + // add the slide to the random map and resort + if (opts.random) { + opts.randomMap.push(opts.slideCount-1); + opts.randomMap.sort(function(a,b) {return Math.random() - 0.5;}); + } + + $s.css('position','absolute'); + $s[prepend?'prependTo':'appendTo'](opts.$cont); + + if (prepend) { + opts.currSlide++; + opts.nextSlide++; + } + + if (!$.support.opacity && opts.cleartype && !opts.cleartypeNoBg) + clearTypeFix($s); + + if (opts.fit && opts.width) + $s.width(opts.width); + if (opts.fit && opts.height && opts.height != 'auto') + $s.height(opts.height); + s.cycleH = (opts.fit && opts.height) ? opts.height : $s.height(); + s.cycleW = (opts.fit && opts.width) ? opts.width : $s.width(); + + $s.css(opts.cssBefore); + + if (opts.pager || opts.pagerAnchorBuilder) + $.fn.cycle.createPagerAnchor(els.length-1, s, $(opts.pager), els, opts); + + if ($.isFunction(opts.onAddSlide)) + opts.onAddSlide($s); + else + $s.hide(); // default behavior + }; +} + +// reset internal state; we do this on every pass in order to support multiple effects +$.fn.cycle.resetState = function(opts, fx) { + fx = fx || opts.fx; + opts.before = []; opts.after = []; + opts.cssBefore = $.extend({}, opts.original.cssBefore); + opts.cssAfter = $.extend({}, opts.original.cssAfter); + opts.animIn = $.extend({}, opts.original.animIn); + opts.animOut = $.extend({}, opts.original.animOut); + opts.fxFn = null; + $.each(opts.original.before, function() { opts.before.push(this); }); + $.each(opts.original.after, function() { opts.after.push(this); }); + + // re-init + var init = $.fn.cycle.transitions[fx]; + if ($.isFunction(init)) + init(opts.$cont, $(opts.elements), opts); +}; + +// this is the main engine fn, it handles the timeouts, callbacks and slide index mgmt +function go(els, opts, manual, fwd) { + var p = opts.$cont[0], curr = els[opts.currSlide], next = els[opts.nextSlide]; + + // opts.busy is true if we're in the middle of an animation + if (manual && opts.busy && opts.manualTrump) { + // let manual transitions requests trump active ones + debug('manualTrump in go(), stopping active transition'); + $(els).stop(true,true); + opts.busy = 0; + clearTimeout(p.cycleTimeout); + } + + // don't begin another timeout-based transition if there is one active + if (opts.busy) { + debug('transition active, ignoring new tx request'); + return; + } + + + // stop cycling if we have an outstanding stop request + if (p.cycleStop != opts.stopCount || p.cycleTimeout === 0 && !manual) + return; + + // check to see if we should stop cycling based on autostop options + if (!manual && !p.cyclePause && !opts.bounce && + ((opts.autostop && (--opts.countdown <= 0)) || + (opts.nowrap && !opts.random && opts.nextSlide < opts.currSlide))) { + if (opts.end) + opts.end(opts); + return; + } + + // if slideshow is paused, only transition on a manual trigger + var changed = false; + if ((manual || !p.cyclePause) && (opts.nextSlide != opts.currSlide)) { + changed = true; + var fx = opts.fx; + // keep trying to get the slide size if we don't have it yet + curr.cycleH = curr.cycleH || $(curr).height(); + curr.cycleW = curr.cycleW || $(curr).width(); + next.cycleH = next.cycleH || $(next).height(); + next.cycleW = next.cycleW || $(next).width(); + + // support multiple transition types + if (opts.multiFx) { + if (fwd && (opts.lastFx === undefined || ++opts.lastFx >= opts.fxs.length)) + opts.lastFx = 0; + else if (!fwd && (opts.lastFx === undefined || --opts.lastFx < 0)) + opts.lastFx = opts.fxs.length - 1; + fx = opts.fxs[opts.lastFx]; + } + + // one-time fx overrides apply to: $('div').cycle(3,'zoom'); + if (opts.oneTimeFx) { + fx = opts.oneTimeFx; + opts.oneTimeFx = null; + } + + $.fn.cycle.resetState(opts, fx); + + // run the before callbacks + if (opts.before.length) + $.each(opts.before, function(i,o) { + if (p.cycleStop != opts.stopCount) return; + o.apply(next, [curr, next, opts, fwd]); + }); + + // stage the after callacks + var after = function() { + opts.busy = 0; + $.each(opts.after, function(i,o) { + if (p.cycleStop != opts.stopCount) return; + o.apply(next, [curr, next, opts, fwd]); + }); + if (!p.cycleStop) { + // queue next transition + queueNext(); + } + }; + + debug('tx firing('+fx+'); currSlide: ' + opts.currSlide + '; nextSlide: ' + opts.nextSlide); + + // get ready to perform the transition + opts.busy = 1; + if (opts.fxFn) // fx function provided? + opts.fxFn(curr, next, opts, after, fwd, manual && opts.fastOnEvent); + else if ($.isFunction($.fn.cycle[opts.fx])) // fx plugin ? + $.fn.cycle[opts.fx](curr, next, opts, after, fwd, manual && opts.fastOnEvent); + else + $.fn.cycle.custom(curr, next, opts, after, fwd, manual && opts.fastOnEvent); + } + else { + queueNext(); + } + + if (changed || opts.nextSlide == opts.currSlide) { + // calculate the next slide + var roll; + opts.lastSlide = opts.currSlide; + if (opts.random) { + opts.currSlide = opts.nextSlide; + if (++opts.randomIndex == els.length) { + opts.randomIndex = 0; + opts.randomMap.sort(function(a,b) {return Math.random() - 0.5;}); + } + opts.nextSlide = opts.randomMap[opts.randomIndex]; + if (opts.nextSlide == opts.currSlide) + opts.nextSlide = (opts.currSlide == opts.slideCount - 1) ? 0 : opts.currSlide + 1; + } + else if (opts.backwards) { + roll = (opts.nextSlide - 1) < 0; + if (roll && opts.bounce) { + opts.backwards = !opts.backwards; + opts.nextSlide = 1; + opts.currSlide = 0; + } + else { + opts.nextSlide = roll ? (els.length-1) : opts.nextSlide-1; + opts.currSlide = roll ? 0 : opts.nextSlide+1; + } + } + else { // sequence + roll = (opts.nextSlide + 1) == els.length; + if (roll && opts.bounce) { + opts.backwards = !opts.backwards; + opts.nextSlide = els.length-2; + opts.currSlide = els.length-1; + } + else { + opts.nextSlide = roll ? 0 : opts.nextSlide+1; + opts.currSlide = roll ? els.length-1 : opts.nextSlide-1; + } + } + } + if (changed && opts.pager) + opts.updateActivePagerLink(opts.pager, opts.currSlide, opts.activePagerClass); + + function queueNext() { + // stage the next transition + var ms = 0, timeout = opts.timeout; + if (opts.timeout && !opts.continuous) { + ms = getTimeout(els[opts.currSlide], els[opts.nextSlide], opts, fwd); + if (opts.fx == 'shuffle') + ms -= opts.speedOut; + } + else if (opts.continuous && p.cyclePause) // continuous shows work off an after callback, not this timer logic + ms = 10; + if (ms > 0) + p.cycleTimeout = setTimeout(function(){ go(els, opts, 0, !opts.backwards); }, ms); + } +} + +// invoked after transition +$.fn.cycle.updateActivePagerLink = function(pager, currSlide, clsName) { + $(pager).each(function() { + $(this).children().removeClass(clsName).eq(currSlide).addClass(clsName); + }); +}; + +// calculate timeout value for current transition +function getTimeout(curr, next, opts, fwd) { + if (opts.timeoutFn) { + // call user provided calc fn + var t = opts.timeoutFn.call(curr,curr,next,opts,fwd); + while (opts.fx != 'none' && (t - opts.speed) < 250) // sanitize timeout + t += opts.speed; + debug('calculated timeout: ' + t + '; speed: ' + opts.speed); + if (t !== false) + return t; + } + return opts.timeout; +} + +// expose next/prev function, caller must pass in state +$.fn.cycle.next = function(opts) { advance(opts,1); }; +$.fn.cycle.prev = function(opts) { advance(opts,0);}; + +// advance slide forward or back +function advance(opts, moveForward) { + var val = moveForward ? 1 : -1; + var els = opts.elements; + var p = opts.$cont[0], timeout = p.cycleTimeout; + if (timeout) { + clearTimeout(timeout); + p.cycleTimeout = 0; + } + if (opts.random && val < 0) { + // move back to the previously display slide + opts.randomIndex--; + if (--opts.randomIndex == -2) + opts.randomIndex = els.length-2; + else if (opts.randomIndex == -1) + opts.randomIndex = els.length-1; + opts.nextSlide = opts.randomMap[opts.randomIndex]; + } + else if (opts.random) { + opts.nextSlide = opts.randomMap[opts.randomIndex]; + } + else { + opts.nextSlide = opts.currSlide + val; + if (opts.nextSlide < 0) { + if (opts.nowrap) return false; + opts.nextSlide = els.length - 1; + } + else if (opts.nextSlide >= els.length) { + if (opts.nowrap) return false; + opts.nextSlide = 0; + } + } + + var cb = opts.onPrevNextEvent || opts.prevNextClick; // prevNextClick is deprecated + if ($.isFunction(cb)) + cb(val > 0, opts.nextSlide, els[opts.nextSlide]); + go(els, opts, 1, moveForward); + return false; +} + +function buildPager(els, opts) { + var $p = $(opts.pager); + $.each(els, function(i,o) { + $.fn.cycle.createPagerAnchor(i,o,$p,els,opts); + }); + opts.updateActivePagerLink(opts.pager, opts.startingSlide, opts.activePagerClass); +} + +$.fn.cycle.createPagerAnchor = function(i, el, $p, els, opts) { + var a; + if ($.isFunction(opts.pagerAnchorBuilder)) { + a = opts.pagerAnchorBuilder(i,el); + debug('pagerAnchorBuilder('+i+', el) returned: ' + a); + } + else + a = ''+(i+1)+''; + + if (!a) + return; + var $a = $(a); + // don't reparent if anchor is in the dom + if ($a.parents('body').length === 0) { + var arr = []; + if ($p.length > 1) { + $p.each(function() { + var $clone = $a.clone(true); + $(this).append($clone); + arr.push($clone[0]); + }); + $a = $(arr); + } + else { + $a.appendTo($p); + } + } + + opts.pagerAnchors = opts.pagerAnchors || []; + opts.pagerAnchors.push($a); + + var pagerFn = function(e) { + e.preventDefault(); + opts.nextSlide = i; + var p = opts.$cont[0], timeout = p.cycleTimeout; + if (timeout) { + clearTimeout(timeout); + p.cycleTimeout = 0; + } + var cb = opts.onPagerEvent || opts.pagerClick; // pagerClick is deprecated + if ($.isFunction(cb)) + cb(opts.nextSlide, els[opts.nextSlide]); + go(els,opts,1,opts.currSlide < i); // trigger the trans +// return false; // <== allow bubble + }; + + if ( /mouseenter|mouseover/i.test(opts.pagerEvent) ) { + $a.hover(pagerFn, function(){/* no-op */} ); + } + else { + $a.bind(opts.pagerEvent, pagerFn); + } + + if ( ! /^click/.test(opts.pagerEvent) && !opts.allowPagerClickBubble) + $a.bind('click.cycle', function(){return false;}); // suppress click + + var cont = opts.$cont[0]; + var pauseFlag = false; // https://github.com/malsup/cycle/issues/44 + if (opts.pauseOnPagerHover) { + $a.hover( + function() { + pauseFlag = true; + cont.cyclePause++; + triggerPause(cont,true,true); + }, function() { + if (pauseFlag) + cont.cyclePause--; + triggerPause(cont,true,true); + } + ); + } +}; + +// helper fn to calculate the number of slides between the current and the next +$.fn.cycle.hopsFromLast = function(opts, fwd) { + var hops, l = opts.lastSlide, c = opts.currSlide; + if (fwd) + hops = c > l ? c - l : opts.slideCount - l; + else + hops = c < l ? l - c : l + opts.slideCount - c; + return hops; +}; + +// fix clearType problems in ie6 by setting an explicit bg color +// (otherwise text slides look horrible during a fade transition) +function clearTypeFix($slides) { + debug('applying clearType background-color hack'); + function hex(s) { + s = parseInt(s,10).toString(16); + return s.length < 2 ? '0'+s : s; + } + function getBg(e) { + for ( ; e && e.nodeName.toLowerCase() != 'html'; e = e.parentNode) { + var v = $.css(e,'background-color'); + if (v && v.indexOf('rgb') >= 0 ) { + var rgb = v.match(/\d+/g); + return '#'+ hex(rgb[0]) + hex(rgb[1]) + hex(rgb[2]); + } + if (v && v != 'transparent') + return v; + } + return '#ffffff'; + } + $slides.each(function() { $(this).css('background-color', getBg(this)); }); +} + +// reset common props before the next transition +$.fn.cycle.commonReset = function(curr,next,opts,w,h,rev) { + $(opts.elements).not(curr).hide(); + if (typeof opts.cssBefore.opacity == 'undefined') + opts.cssBefore.opacity = 1; + opts.cssBefore.display = 'block'; + if (opts.slideResize && w !== false && next.cycleW > 0) + opts.cssBefore.width = next.cycleW; + if (opts.slideResize && h !== false && next.cycleH > 0) + opts.cssBefore.height = next.cycleH; + opts.cssAfter = opts.cssAfter || {}; + opts.cssAfter.display = 'none'; + $(curr).css('zIndex',opts.slideCount + (rev === true ? 1 : 0)); + $(next).css('zIndex',opts.slideCount + (rev === true ? 0 : 1)); +}; + +// the actual fn for effecting a transition +$.fn.cycle.custom = function(curr, next, opts, cb, fwd, speedOverride) { + var $l = $(curr), $n = $(next); + var speedIn = opts.speedIn, speedOut = opts.speedOut, easeIn = opts.easeIn, easeOut = opts.easeOut; + $n.css(opts.cssBefore); + if (speedOverride) { + if (typeof speedOverride == 'number') + speedIn = speedOut = speedOverride; + else + speedIn = speedOut = 1; + easeIn = easeOut = null; + } + var fn = function() { + $n.animate(opts.animIn, speedIn, easeIn, function() { + cb(); + }); + }; + $l.animate(opts.animOut, speedOut, easeOut, function() { + $l.css(opts.cssAfter); + if (!opts.sync) + fn(); + }); + if (opts.sync) fn(); +}; + +// transition definitions - only fade is defined here, transition pack defines the rest +$.fn.cycle.transitions = { + fade: function($cont, $slides, opts) { + $slides.not(':eq('+opts.currSlide+')').css('opacity',0); + opts.before.push(function(curr,next,opts) { + $.fn.cycle.commonReset(curr,next,opts); + opts.cssBefore.opacity = 0; + }); + opts.animIn = { opacity: 1 }; + opts.animOut = { opacity: 0 }; + opts.cssBefore = { top: 0, left: 0 }; + } +}; + +$.fn.cycle.ver = function() { return ver; }; + +// override these globally if you like (they are all optional) +$.fn.cycle.defaults = { + activePagerClass: 'activeSlide', // class name used for the active pager link + after: null, // transition callback (scope set to element that was shown): function(currSlideElement, nextSlideElement, options, forwardFlag) + allowPagerClickBubble: false, // allows or prevents click event on pager anchors from bubbling + animIn: null, // properties that define how the slide animates in + animOut: null, // properties that define how the slide animates out + aspect: false, // preserve aspect ratio during fit resizing, cropping if necessary (must be used with fit option) + autostop: 0, // true to end slideshow after X transitions (where X == slide count) + autostopCount: 0, // number of transitions (optionally used with autostop to define X) + backwards: false, // true to start slideshow at last slide and move backwards through the stack + before: null, // transition callback (scope set to element to be shown): function(currSlideElement, nextSlideElement, options, forwardFlag) + center: null, // set to true to have cycle add top/left margin to each slide (use with width and height options) + cleartype: !$.support.opacity, // true if clearType corrections should be applied (for IE) + cleartypeNoBg: false, // set to true to disable extra cleartype fixing (leave false to force background color setting on slides) + containerResize: 1, // resize container to fit largest slide + containerResizeHeight: 0, // resize containers height to fit the largest slide but leave the width dynamic + continuous: 0, // true to start next transition immediately after current one completes + cssAfter: null, // properties that defined the state of the slide after transitioning out + cssBefore: null, // properties that define the initial state of the slide before transitioning in + delay: 0, // additional delay (in ms) for first transition (hint: can be negative) + easeIn: null, // easing for "in" transition + easeOut: null, // easing for "out" transition + easing: null, // easing method for both in and out transitions + end: null, // callback invoked when the slideshow terminates (use with autostop or nowrap options): function(options) + fastOnEvent: 0, // force fast transitions when triggered manually (via pager or prev/next); value == time in ms + fit: 0, // force slides to fit container + fx: 'fade', // name of transition effect (or comma separated names, ex: 'fade,scrollUp,shuffle') + fxFn: null, // function used to control the transition: function(currSlideElement, nextSlideElement, options, afterCalback, forwardFlag) + height: 'auto', // container height (if the 'fit' option is true, the slides will be set to this height as well) + manualTrump: true, // causes manual transition to stop an active transition instead of being ignored + metaAttr: 'cycle', // data- attribute that holds the option data for the slideshow + next: null, // element, jQuery object, or jQuery selector string for the element to use as event trigger for next slide + nowrap: 0, // true to prevent slideshow from wrapping + onPagerEvent: null, // callback fn for pager events: function(zeroBasedSlideIndex, slideElement) + onPrevNextEvent: null, // callback fn for prev/next events: function(isNext, zeroBasedSlideIndex, slideElement) + pager: null, // element, jQuery object, or jQuery selector string for the element to use as pager container + pagerAnchorBuilder: null, // callback fn for building anchor links: function(index, DOMelement) + pagerEvent: 'click.cycle', // name of event which drives the pager navigation + pause: 0, // true to enable "pause on hover" + pauseOnPagerHover: 0, // true to pause when hovering over pager link + prev: null, // element, jQuery object, or jQuery selector string for the element to use as event trigger for previous slide + prevNextEvent: 'click.cycle',// event which drives the manual transition to the previous or next slide + random: 0, // true for random, false for sequence (not applicable to shuffle fx) + randomizeEffects: 1, // valid when multiple effects are used; true to make the effect sequence random + requeueOnImageNotLoaded: true, // requeue the slideshow if any image slides are not yet loaded + requeueTimeout: 250, // ms delay for requeue + rev: 0, // causes animations to transition in reverse (for effects that support it such as scrollHorz/scrollVert/shuffle) + shuffle: null, // coords for shuffle animation, ex: { top:15, left: 200 } + skipInitializationCallbacks: false, // set to true to disable the first before/after callback that occurs prior to any transition + slideExpr: null, // expression for selecting slides (if something other than all children is required) + slideResize: 1, // force slide width/height to fixed size before every transition + speed: 1000, // speed of the transition (any valid fx speed value) + speedIn: null, // speed of the 'in' transition + speedOut: null, // speed of the 'out' transition + startingSlide: undefined,// zero-based index of the first slide to be displayed + sync: 1, // true if in/out transitions should occur simultaneously + timeout: 4000, // milliseconds between slide transitions (0 to disable auto advance) + timeoutFn: null, // callback for determining per-slide timeout value: function(currSlideElement, nextSlideElement, options, forwardFlag) + updateActivePagerLink: null,// callback fn invoked to update the active pager link (adds/removes activePagerClass style) + width: null // container width (if the 'fit' option is true, the slides will be set to this width as well) +}; + +})(jQuery); + + +/*! + * jQuery Cycle Plugin Transition Definitions + * This script is a plugin for the jQuery Cycle Plugin + * Examples and documentation at: http://malsup.com/jquery/cycle/ + * Copyright (c) 2007-2010 M. Alsup + * Version: 2.73 + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + */ +(function($) { +"use strict"; + +// +// These functions define slide initialization and properties for the named +// transitions. To save file size feel free to remove any of these that you +// don't need. +// +$.fn.cycle.transitions.none = function($cont, $slides, opts) { + opts.fxFn = function(curr,next,opts,after){ + $(next).show(); + $(curr).hide(); + after(); + }; +}; + +// not a cross-fade, fadeout only fades out the top slide +$.fn.cycle.transitions.fadeout = function($cont, $slides, opts) { + $slides.not(':eq('+opts.currSlide+')').css({ display: 'block', 'opacity': 1 }); + opts.before.push(function(curr,next,opts,w,h,rev) { + $(curr).css('zIndex',opts.slideCount + (rev !== true ? 1 : 0)); + $(next).css('zIndex',opts.slideCount + (rev !== true ? 0 : 1)); + }); + opts.animIn.opacity = 1; + opts.animOut.opacity = 0; + opts.cssBefore.opacity = 1; + opts.cssBefore.display = 'block'; + opts.cssAfter.zIndex = 0; +}; + +// scrollUp/Down/Left/Right +$.fn.cycle.transitions.scrollUp = function($cont, $slides, opts) { + $cont.css('overflow','hidden'); + opts.before.push($.fn.cycle.commonReset); + var h = $cont.height(); + opts.cssBefore.top = h; + opts.cssBefore.left = 0; + opts.cssFirst.top = 0; + opts.animIn.top = 0; + opts.animOut.top = -h; +}; +$.fn.cycle.transitions.scrollDown = function($cont, $slides, opts) { + $cont.css('overflow','hidden'); + opts.before.push($.fn.cycle.commonReset); + var h = $cont.height(); + opts.cssFirst.top = 0; + opts.cssBefore.top = -h; + opts.cssBefore.left = 0; + opts.animIn.top = 0; + opts.animOut.top = h; +}; +$.fn.cycle.transitions.scrollLeft = function($cont, $slides, opts) { + $cont.css('overflow','hidden'); + opts.before.push($.fn.cycle.commonReset); + var w = $cont.width(); + opts.cssFirst.left = 0; + opts.cssBefore.left = w; + opts.cssBefore.top = 0; + opts.animIn.left = 0; + opts.animOut.left = 0-w; +}; +$.fn.cycle.transitions.scrollRight = function($cont, $slides, opts) { + $cont.css('overflow','hidden'); + opts.before.push($.fn.cycle.commonReset); + var w = $cont.width(); + opts.cssFirst.left = 0; + opts.cssBefore.left = -w; + opts.cssBefore.top = 0; + opts.animIn.left = 0; + opts.animOut.left = w; +}; +$.fn.cycle.transitions.scrollHorz = function($cont, $slides, opts) { + $cont.css('overflow','hidden').width(); + opts.before.push(function(curr, next, opts, fwd) { + if (opts.rev) + fwd = !fwd; + $.fn.cycle.commonReset(curr,next,opts); + opts.cssBefore.left = fwd ? (next.cycleW-1) : (1-next.cycleW); + opts.animOut.left = fwd ? -curr.cycleW : curr.cycleW; + }); + opts.cssFirst.left = 0; + opts.cssBefore.top = 0; + opts.animIn.left = 0; + opts.animOut.top = 0; +}; +$.fn.cycle.transitions.scrollVert = function($cont, $slides, opts) { + $cont.css('overflow','hidden'); + opts.before.push(function(curr, next, opts, fwd) { + if (opts.rev) + fwd = !fwd; + $.fn.cycle.commonReset(curr,next,opts); + opts.cssBefore.top = fwd ? (1-next.cycleH) : (next.cycleH-1); + opts.animOut.top = fwd ? curr.cycleH : -curr.cycleH; + }); + opts.cssFirst.top = 0; + opts.cssBefore.left = 0; + opts.animIn.top = 0; + opts.animOut.left = 0; +}; + +// slideX/slideY +$.fn.cycle.transitions.slideX = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $(opts.elements).not(curr).hide(); + $.fn.cycle.commonReset(curr,next,opts,false,true); + opts.animIn.width = next.cycleW; + }); + opts.cssBefore.left = 0; + opts.cssBefore.top = 0; + opts.cssBefore.width = 0; + opts.animIn.width = 'show'; + opts.animOut.width = 0; +}; +$.fn.cycle.transitions.slideY = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $(opts.elements).not(curr).hide(); + $.fn.cycle.commonReset(curr,next,opts,true,false); + opts.animIn.height = next.cycleH; + }); + opts.cssBefore.left = 0; + opts.cssBefore.top = 0; + opts.cssBefore.height = 0; + opts.animIn.height = 'show'; + opts.animOut.height = 0; +}; + +// shuffle +$.fn.cycle.transitions.shuffle = function($cont, $slides, opts) { + var i, w = $cont.css('overflow', 'visible').width(); + $slides.css({left: 0, top: 0}); + opts.before.push(function(curr,next,opts) { + $.fn.cycle.commonReset(curr,next,opts,true,true,true); + }); + // only adjust speed once! + if (!opts.speedAdjusted) { + opts.speed = opts.speed / 2; // shuffle has 2 transitions + opts.speedAdjusted = true; + } + opts.random = 0; + opts.shuffle = opts.shuffle || {left:-w, top:15}; + opts.els = []; + for (i=0; i < $slides.length; i++) + opts.els.push($slides[i]); + + for (i=0; i < opts.currSlide; i++) + opts.els.push(opts.els.shift()); + + // custom transition fn (hat tip to Benjamin Sterling for this bit of sweetness!) + opts.fxFn = function(curr, next, opts, cb, fwd) { + if (opts.rev) + fwd = !fwd; + var $el = fwd ? $(curr) : $(next); + $(next).css(opts.cssBefore); + var count = opts.slideCount; + $el.animate(opts.shuffle, opts.speedIn, opts.easeIn, function() { + var hops = $.fn.cycle.hopsFromLast(opts, fwd); + for (var k=0; k < hops; k++) { + if (fwd) + opts.els.push(opts.els.shift()); + else + opts.els.unshift(opts.els.pop()); + } + if (fwd) { + for (var i=0, len=opts.els.length; i < len; i++) + $(opts.els[i]).css('z-index', len-i+count); + } + else { + var z = $(curr).css('z-index'); + $el.css('z-index', parseInt(z,10)+1+count); + } + $el.animate({left:0, top:0}, opts.speedOut, opts.easeOut, function() { + $(fwd ? this : curr).hide(); + if (cb) cb(); + }); + }); + }; + $.extend(opts.cssBefore, { display: 'block', opacity: 1, top: 0, left: 0 }); +}; + +// turnUp/Down/Left/Right +$.fn.cycle.transitions.turnUp = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,true,false); + opts.cssBefore.top = next.cycleH; + opts.animIn.height = next.cycleH; + opts.animOut.width = next.cycleW; + }); + opts.cssFirst.top = 0; + opts.cssBefore.left = 0; + opts.cssBefore.height = 0; + opts.animIn.top = 0; + opts.animOut.height = 0; +}; +$.fn.cycle.transitions.turnDown = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,true,false); + opts.animIn.height = next.cycleH; + opts.animOut.top = curr.cycleH; + }); + opts.cssFirst.top = 0; + opts.cssBefore.left = 0; + opts.cssBefore.top = 0; + opts.cssBefore.height = 0; + opts.animOut.height = 0; +}; +$.fn.cycle.transitions.turnLeft = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,false,true); + opts.cssBefore.left = next.cycleW; + opts.animIn.width = next.cycleW; + }); + opts.cssBefore.top = 0; + opts.cssBefore.width = 0; + opts.animIn.left = 0; + opts.animOut.width = 0; +}; +$.fn.cycle.transitions.turnRight = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,false,true); + opts.animIn.width = next.cycleW; + opts.animOut.left = curr.cycleW; + }); + $.extend(opts.cssBefore, { top: 0, left: 0, width: 0 }); + opts.animIn.left = 0; + opts.animOut.width = 0; +}; + +// zoom +$.fn.cycle.transitions.zoom = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,false,false,true); + opts.cssBefore.top = next.cycleH/2; + opts.cssBefore.left = next.cycleW/2; + $.extend(opts.animIn, { top: 0, left: 0, width: next.cycleW, height: next.cycleH }); + $.extend(opts.animOut, { width: 0, height: 0, top: curr.cycleH/2, left: curr.cycleW/2 }); + }); + opts.cssFirst.top = 0; + opts.cssFirst.left = 0; + opts.cssBefore.width = 0; + opts.cssBefore.height = 0; +}; + +// fadeZoom +$.fn.cycle.transitions.fadeZoom = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,false,false); + opts.cssBefore.left = next.cycleW/2; + opts.cssBefore.top = next.cycleH/2; + $.extend(opts.animIn, { top: 0, left: 0, width: next.cycleW, height: next.cycleH }); + }); + opts.cssBefore.width = 0; + opts.cssBefore.height = 0; + opts.animOut.opacity = 0; +}; + +// blindX +$.fn.cycle.transitions.blindX = function($cont, $slides, opts) { + var w = $cont.css('overflow','hidden').width(); + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts); + opts.animIn.width = next.cycleW; + opts.animOut.left = curr.cycleW; + }); + opts.cssBefore.left = w; + opts.cssBefore.top = 0; + opts.animIn.left = 0; + opts.animOut.left = w; +}; +// blindY +$.fn.cycle.transitions.blindY = function($cont, $slides, opts) { + var h = $cont.css('overflow','hidden').height(); + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts); + opts.animIn.height = next.cycleH; + opts.animOut.top = curr.cycleH; + }); + opts.cssBefore.top = h; + opts.cssBefore.left = 0; + opts.animIn.top = 0; + opts.animOut.top = h; +}; +// blindZ +$.fn.cycle.transitions.blindZ = function($cont, $slides, opts) { + var h = $cont.css('overflow','hidden').height(); + var w = $cont.width(); + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts); + opts.animIn.height = next.cycleH; + opts.animOut.top = curr.cycleH; + }); + opts.cssBefore.top = h; + opts.cssBefore.left = w; + opts.animIn.top = 0; + opts.animIn.left = 0; + opts.animOut.top = h; + opts.animOut.left = w; +}; + +// growX - grow horizontally from centered 0 width +$.fn.cycle.transitions.growX = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,false,true); + opts.cssBefore.left = this.cycleW/2; + opts.animIn.left = 0; + opts.animIn.width = this.cycleW; + opts.animOut.left = 0; + }); + opts.cssBefore.top = 0; + opts.cssBefore.width = 0; +}; +// growY - grow vertically from centered 0 height +$.fn.cycle.transitions.growY = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,true,false); + opts.cssBefore.top = this.cycleH/2; + opts.animIn.top = 0; + opts.animIn.height = this.cycleH; + opts.animOut.top = 0; + }); + opts.cssBefore.height = 0; + opts.cssBefore.left = 0; +}; + +// curtainX - squeeze in both edges horizontally +$.fn.cycle.transitions.curtainX = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,false,true,true); + opts.cssBefore.left = next.cycleW/2; + opts.animIn.left = 0; + opts.animIn.width = this.cycleW; + opts.animOut.left = curr.cycleW/2; + opts.animOut.width = 0; + }); + opts.cssBefore.top = 0; + opts.cssBefore.width = 0; +}; +// curtainY - squeeze in both edges vertically +$.fn.cycle.transitions.curtainY = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,true,false,true); + opts.cssBefore.top = next.cycleH/2; + opts.animIn.top = 0; + opts.animIn.height = next.cycleH; + opts.animOut.top = curr.cycleH/2; + opts.animOut.height = 0; + }); + opts.cssBefore.height = 0; + opts.cssBefore.left = 0; +}; + +// cover - curr slide covered by next slide +$.fn.cycle.transitions.cover = function($cont, $slides, opts) { + var d = opts.direction || 'left'; + var w = $cont.css('overflow','hidden').width(); + var h = $cont.height(); + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts); + opts.cssAfter.display = ''; + if (d == 'right') + opts.cssBefore.left = -w; + else if (d == 'up') + opts.cssBefore.top = h; + else if (d == 'down') + opts.cssBefore.top = -h; + else + opts.cssBefore.left = w; + }); + opts.animIn.left = 0; + opts.animIn.top = 0; + opts.cssBefore.top = 0; + opts.cssBefore.left = 0; +}; + +// uncover - curr slide moves off next slide +$.fn.cycle.transitions.uncover = function($cont, $slides, opts) { + var d = opts.direction || 'left'; + var w = $cont.css('overflow','hidden').width(); + var h = $cont.height(); + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,true,true,true); + if (d == 'right') + opts.animOut.left = w; + else if (d == 'up') + opts.animOut.top = -h; + else if (d == 'down') + opts.animOut.top = h; + else + opts.animOut.left = -w; + }); + opts.animIn.left = 0; + opts.animIn.top = 0; + opts.cssBefore.top = 0; + opts.cssBefore.left = 0; +}; + +// toss - move top slide and fade away +$.fn.cycle.transitions.toss = function($cont, $slides, opts) { + var w = $cont.css('overflow','visible').width(); + var h = $cont.height(); + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,true,true,true); + // provide default toss settings if animOut not provided + if (!opts.animOut.left && !opts.animOut.top) + $.extend(opts.animOut, { left: w*2, top: -h/2, opacity: 0 }); + else + opts.animOut.opacity = 0; + }); + opts.cssBefore.left = 0; + opts.cssBefore.top = 0; + opts.animIn.left = 0; +}; + +// wipe - clip animation +$.fn.cycle.transitions.wipe = function($cont, $slides, opts) { + var w = $cont.css('overflow','hidden').width(); + var h = $cont.height(); + opts.cssBefore = opts.cssBefore || {}; + var clip; + if (opts.clip) { + if (/l2r/.test(opts.clip)) + clip = 'rect(0px 0px '+h+'px 0px)'; + else if (/r2l/.test(opts.clip)) + clip = 'rect(0px '+w+'px '+h+'px '+w+'px)'; + else if (/t2b/.test(opts.clip)) + clip = 'rect(0px '+w+'px 0px 0px)'; + else if (/b2t/.test(opts.clip)) + clip = 'rect('+h+'px '+w+'px '+h+'px 0px)'; + else if (/zoom/.test(opts.clip)) { + var top = parseInt(h/2,10); + var left = parseInt(w/2,10); + clip = 'rect('+top+'px '+left+'px '+top+'px '+left+'px)'; + } + } + + opts.cssBefore.clip = opts.cssBefore.clip || clip || 'rect(0px 0px 0px 0px)'; + + var d = opts.cssBefore.clip.match(/(\d+)/g); + var t = parseInt(d[0],10), r = parseInt(d[1],10), b = parseInt(d[2],10), l = parseInt(d[3],10); + + opts.before.push(function(curr, next, opts) { + if (curr == next) return; + var $curr = $(curr), $next = $(next); + $.fn.cycle.commonReset(curr,next,opts,true,true,false); + opts.cssAfter.display = 'block'; + + var step = 1, count = parseInt((opts.speedIn / 13),10) - 1; + (function f() { + var tt = t ? t - parseInt(step * (t/count),10) : 0; + var ll = l ? l - parseInt(step * (l/count),10) : 0; + var bb = b < h ? b + parseInt(step * ((h-b)/count || 1),10) : h; + var rr = r < w ? r + parseInt(step * ((w-r)/count || 1),10) : w; + $next.css({ clip: 'rect('+tt+'px '+rr+'px '+bb+'px '+ll+'px)' }); + (step++ <= count) ? setTimeout(f, 13) : $curr.css('display', 'none'); + })(); + }); + $.extend(opts.cssBefore, { display: 'block', opacity: 1, top: 0, left: 0 }); + opts.animIn = { left: 0 }; + opts.animOut = { left: 0 }; +}; + +})(jQuery); -- 2.20.1