From a377776d72ae8db13c08565aff69db57980d2173 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Sat, 15 Mar 2014 20:47:11 +0400 Subject: [PATCH] + schedule; + models; + assets graphics; = gulpfile; --- assets/graphics/lesson-canceled.svg | 4 + gulpfile.js | 2 + models/schedule-2014-early.json | 402 ++++++++++++++++++++++++++++ models/team.json | 101 +++++++ pages/schedule/schedule.jade | 77 ++++++ 5 files changed, 586 insertions(+) create mode 100644 assets/graphics/lesson-canceled.svg create mode 100644 models/schedule-2014-early.json create mode 100644 models/team.json create mode 100644 pages/schedule/schedule.jade diff --git a/assets/graphics/lesson-canceled.svg b/assets/graphics/lesson-canceled.svg new file mode 100644 index 00000000..50574bce --- /dev/null +++ b/assets/graphics/lesson-canceled.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 517227c8..4370fba7 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -17,6 +17,8 @@ gulp.task("sass", function () { gulp.task("copy", function(){ gulp.src("./assets/fonts/*") .pipe(gulp.dest(pub+"fonts")); + gulp.src("./assets/style/*.css") + .pipe(gulp.dest(pub+"s")); }); gulp.task("imagemin", function(){ diff --git a/models/schedule-2014-early.json b/models/schedule-2014-early.json new file mode 100644 index 00000000..f44e6018 --- /dev/null +++ b/models/schedule-2014-early.json @@ -0,0 +1,402 @@ +[ + { + "name": "1", + "monday": { + "lesson": "composition", + "teacher": "as-mantseva", + "time": [ + "15:00 15:45", + "15:55 16:40" + ] + }, + "tuesday": { + "lesson": "painting", + "teacher": "od-gogoleva", + "time": [ + "15:00 15:45", + "15:55 16:40" + ] + }, + "saturday": { + "lesson": "sculpting", + "teacher": "in-vturina", + "time": [ + "10:00 10:45", + "10:55 11:40" + ] + } + }, + { + "name": "2", + "tuesday": { + "lesson": "painting", + "teacher": "od-gogoleva", + "time": [ + "17:00 17:45", + "17:55 18:40" + ] + }, + "friday": { + "lesson": "sculpting", + "teacher": "in-vturina", + "time": [ + "17:00 17:45", + "17:55 18:40" + ] + }, + "saturday": { + "lesson": "composition", + "teacher": "as-mantseva", + "time": [ + "12:00 12:45", + "12:55 13:40" + ] + } + }, + { + "name": "3", + "thursday": { + "lesson": "painting", + "teacher": "od-gogoleva", + "time": [ + "15:00 15:45", + "15:55 16:40" + ] + }, + "friday": { + "lesson": "sculpting", + "teacher": "in-vturina", + "time": [ + "15:00 15:45", + "15:55 16:40" + ] + }, + "saturday": { + "lesson": "composition", + "teacher": "as-mantseva", + "time": [ + "10:00 10:45", + "10:55 11:40" + ] + } + }, + { + "name": "4", + "monday": { + "lesson": "composition", + "teacher": "vv-voronova", + "time": [ + "15:00 15:45", + "15:55 16:40" + ] + }, + "wednesday": { + "lesson": "painting", + "teacher": "od-gogoleva", + "time": [ + "15:00 15:45", + "15:55 16:40" + ] + }, + "thursday": { + "lesson": "composition", + "teacher": "nv-andreeva", + "time": [ + "15:00 15:45", + "15:55 16:40" + ] + } + }, + { + "name": "5", + "monday": { + "lesson": "composition", + "teacher": "vv-voronova", + "time": [ + "17:00 17:45", + "17:55 18:40" + ] + }, + "wednesday": { + "lesson": "painting", + "teacher": "od-gogoleva", + "time": [ + "17:00 17:45", + "17:55 18:40" + ] + }, + "thursday": { + "lesson": "composition", + "teacher": "nv-andreeva", + "time": [ + "17:00 17:45", + "17:55 18:40" + ] + } + }, + { + "name": "6", + "wednesday": { + "lesson": "composition", + "teacher": "nv-andreeva", + "time": [ + "15:00 15:45", + "15:55 16:40" + ] + }, + "thursday": { + "lesson": "painting", + "teacher": "od-gogoleva", + "time": [ + "17:00 17:45", + "17:55 18:40" + ] + }, + "friday": { + "lesson": "composition", + "teacher": "vv-voronova", + "time": [ + "15:00 15:45", + "15:55 16:40" + ] + } + }, + { + "name": "7", + "wednesday": { + "lesson": "history", + "teacher": "my-valkova", + "time": [ + "17:00 17:45" + ] + }, + "thursday": { + "lesson": "painting", + "teacher": "va-sarzhin", + "time": [ + "15:00 15:45", + "15:55 16:40" + ] + }, + "friday": { + "lesson": "drawing", + "teacher": "sa-latipova", + "time": [ + "15:00 15:45", + "15:55 16:40" + ] + }, + "saturday": { + "lesson": "cg", + "teacher": "rk-timashev", + "time": [ + "10:00 10:45", + "10:55 11:40" + ] + } + }, + { + "name": "8", + "wednesday": { + "lesson": "history", + "teacher": "my-valkova", + "time": [ + "17:00 17:45" + ] + }, + "thursday": { + "lesson": "painting", + "teacher": "va-sarzhin", + "time": [ + "17:00 17:45", + "17:55 18:40" + ] + }, + "friday": { + "lesson": "drawing", + "teacher": "sa-latipova", + "time": [ + "17:00 17:45", + "17:55 18:40" + ] + }, + "saturday": { + "lesson": "cg", + "teacher": "rk-timashev", + "time": [ + "12:00 12:45", + "12:55 13:40" + ] + } + }, + { + "name": "9", + "monday": { + "lesson": "drawing", + "teacher": "sa-latipova", + "time": [ + "15:00 15:45", + "15:55 16:40" + ] + }, + "tuesday": { + "lesson": "painting", + "teacher": "va-sarzhin", + "time": [ + "15:00 15:45", + "15:55 16:40" + ] + }, + "wednesday": { + "lesson": "history", + "teacher": "my-valkova", + "time": [ + "18:00 18:45" + ] + }, + "friday": { + "lesson": "composition", + "teacher": "nv-andreeva", + "time": [ + "15:00 15:45", + "15:55 16:40" + ] + } + }, + { + "name": "10", + "monday": { + "lesson": "drawing", + "teacher": "sa-latipova", + "time": [ + "17:00 17:45", + "17:55 18:40" + ] + }, + "tuesday": { + "lesson": "painting", + "teacher": "va-sarzhin", + "time": [ + "17:00 17:45", + "17:55 18:40" + ] + }, + "wednesday": { + "lesson": "history", + "teacher": "my-valkova", + "time": [ + "18:00 18:45" + ] + }, + "friday": { + "lesson": "composition", + "teacher": "nv-andreeva", + "time": [ + "17:00 17:45", + "17:55 18:40" + ] + } + }, + { + "name": "11", + "monday": { + "lesson": "painting", + "teacher": "va-sarzhin", + "time": [ + "15:00 15:45", + "15:55 16:40" + ] + }, + "wednesday": { + "lesson": "drawing", + "teacher": "mg-timasheva", + "time": [ + "15:00 15:45", + "15:55 16:40" + ] + }, + "thursday": { + "lesson": "history", + "teacher": "my-valkova", + "time": [ + "17:00 17:45" + ] + }, + "friday": { + "lesson": "composition", + "teacher": "od-gogoleva", + "time": [ + "15:00 15:45", + "15:55 16:40" + ] + } + }, + { + "name": "12", + "monday": { + "lesson": "painting", + "teacher": "va-sarzhin", + "time": [ + "17:00 17:45", + "17:55 18:40" + ] + }, + "wednesday": { + "lesson": "drawing", + "teacher": "mg-timasheva", + "time": [ + "17:00 17:45", + "17:55 18:40" + ] + }, + "thursday": { + "lesson": "history", + "teacher": "my-valkova", + "time": [ + "17:00 17:45" + ] + }, + "friday": { + "lesson": "composition", + "teacher": "od-gogoleva", + "time": [ + "17:00 17:45", + "17:55 18:40" + ] + } + }, + { + "name": "13", + "tuesday": { + "lesson": "drawing", + "teacher": "mg-timasheva", + "time": [ + "17:00 17:45", + "17:55 18:40" + ] + }, + "wednesday": { + "lesson": "painting", + "teacher": "va-sarzhin", + "time": [ + "17:00 17:45", + "17:55 18:40" + ] + }, + "thursday": { + "lesson": "history", + "teacher": "my-valkova", + "time": [ + "18:00 18:45" + ] + }, + "friday": { + "lesson": "composition", + "teacher": "vv-voronova", + "time": [ + "17:00 17:45", + "17:55 18:40" + ] + } + } +] \ No newline at end of file diff --git a/models/team.json b/models/team.json new file mode 100644 index 00000000..5036ac5f --- /dev/null +++ b/models/team.json @@ -0,0 +1,101 @@ +[ + { + "id": "mg-timasheva", + "name": "Марина Геннадьевна Тимашева", + "position": "Директор", + "edu": "Ленинградский инженерно-строительный институт", + "diplom": "НВ №222567", + "status": "", + "picture": "http://static.shburg.org/art/team/teacher5.jpg" + }, + { + "id": "va-sarzhin", + "name": "Валерий Александрович Саржин", + "position": "Преподаватель живописи", + "edu": "Академия художеств имени И. Е. Репина", + "diplom": "B-I №259798", + "status": "Первая квалификационная категория по живописи и станковой композиции", + "picture": "http://static.shburg.org/art/team/teacher10.jpg" + }, + { + "id": "od-gogoleva", + "name": "Ольга Дмитриевна Гоголева", + "position": "Преподаватель живописи", + "edu": "Ленинградский инженерно-строительный институт", + "diplom": "B-I №222572", + "status": "Высшая квалификационная категория по живописи и станковой композиции", + "picture": "http://static.shburg.org/art/team/teacher11.jpg" + }, + { + "id": "nv-andreeva", + "name": "Наталья Викторовна Андреева", + "position": "Преподаватель композиции", + "edu": "Санкт-Петербургский государственный университет технологии и дизайна", + "diplom": "ИВС 0514253", + "status": "Вторая квалификационная категория по прикладной композиции", + "picture": "http://static.shburg.org/art/team/teacher2.jpg" + }, + { + "id": "vv-voronova", + "name": "Вера Викторовна Воронова", + "position": "Преподаватель композииции", + "edu": "Российский государственный университет имени А. И. Герцена", + "diplom": "ВСГ 0530340", + "status": "Вторая квалификационная категория по прикладной композиции", + "picture": "http://static.shburg.org/art/team/teacher1.jpg" + }, + { + "id": "in-vturina", + "name": "Ирина Николаевна Втюрина", + "position": "Преподаватель скульптуры", + "edu": "Кировский государственный педагогический институт имени В. И. Ленина", + "diplom": "ШВ №164501", + "status": "Первая квалификационная категория по скульптуре", + "picture": "http://static.shburg.org/art/team/teacher8.jpg" + }, + { + "id": "my-valkova", + "name": "Мария Юрьевна Валькова", + "position": "Преподаватель истории искусства", + "edu": "Педагогический институт имени А. И. Герцена", + "diplom": "ПП №224197", + "status": "Высшая квалификационная категория по истории искусства", + "picture": "http://static.shburg.org/art/team/teacher.jpg" + }, + { + "id": "rk-timashev", + "name": "Руслан Камилевич Тимашев", + "position": "Преподаватель компьютерной графики", + "edu": "Санкт-Петербургский государственный архитектурно-строительный университет", + "diplom": "ВСГ 5344910", + "status": "", + "picture": "http://static.shburg.org/art/team/teacher4.jpg" + }, + { + "id": "as-timasheva", + "name": "Анна Сергеевна Манцева", + "position": "Преподаватель рисунка", + "edu": "Московский архитектурный институт", + "diplom": "РН 70241", + "status": "", + "picture": "http://static.shburg.org/art/team/teacher3.jpg" + }, + { + "id": "sa-latipova", + "name": "Серафима Александровна Латыпова", + "position": "Преподаватель рисунка", + "edu": "Незаконченный Ленинградский государственный педагогический университет имени А. С. Пушкина", + "diplom": "", + "status": "", + "picture": "http://static.shburg.org/art/team/teacher9.jpg" + }, + { + "id": "ey-tarasova", + "name": "Евгения Юрьевна Тарасова", + "position": "Преподаватель гравюры", + "edu": "Санкт-Петербургский государственный архитектурно-строительный университет", + "diplom": "ВСВ 1321444", + "status": "", + "picture": "http://static.shburg.org/art/team/teacher.jpg" + } +] \ No newline at end of file diff --git a/pages/schedule/schedule.jade b/pages/schedule/schedule.jade new file mode 100644 index 00000000..60f0e8be --- /dev/null +++ b/pages/schedule/schedule.jade @@ -0,0 +1,77 @@ +extends ../layout + +block custom_head + link(rel='stylesheet', href='/s/animate.min.css') + link(rel='stylesheet', href='/s/sschedule.css') + script(src='http://code.jquery.com/jquery-2.1.0.min.js') + script(src='/c/schedule.js') + +block content + include ../menu + .schedule + ul + li + a(href='') 2012, осень + li + a(href='') 2013, весна + li + a(href='') 2013, осень + li.current 2014, весна + table + thead + - var days = ["Понедельник", "Вторник", "Среда", "Четверг", "Пятница", "Суббота"]; + th.group Гр. + for day in days + //- th.current.first + //- th.weekend + th + p.day day + p.date + tbody + for group in groups + for + tr + td.group + p 1 + td + p.lesson + a(href='') Рисунок + p.teacher + a(href='') С. А. Латыпова + p.time 15:00—15:45 + p.time 15:55—16:40 + td.canceled + p.lesson + a(href='') Живопись + p.teacher + a(href='') В. Ю. Саржин + p.time 15:00—15:45 + p.time 15:55—16:40 + td + p.lesson + a(href='') Макетирование + p.teacher + a(href='') А. С. Тимашева + p.time 15:00—15:45 + p.time 15:55—16:40 + td.current + p.lesson + a(href='') Композиция + p.teacher + a(href='') А. А Андеева + p.time 15:00—15:45 + p.time 15:55—16:40 + td + p.lesson + a(href='') История искусства + p.teacher + a(href='') М. Ю. Валькова + p.time 15:00—15:45 + p.time 15:55—16:40 + td + p.lesson + a(href='') Комп. графика + p.teacher + a(href='') Р. К. Тимашев + p.time 15:00—15:45 + p.time 15:55—16:40