+ schedule;

+ models;
+ assets graphics;
= gulpfile;
This commit is contained in:
tmshv committed 2014-03-15 20:47:11 +04:00
1 parent a71eb79001
commit a377776d72
5 files changed
+586

No files matched your search

+4
View File
@@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="none" style="stroke: rgba(218,68,68,1); stroke-width: 2" >
<line x1="0" y1="0" x2="100" y2="100" vector-effect="non-scaling-stroke" />
<line x1="0" y1="100" x2="100" y2="0" vector-effect="non-scaling-stroke" />
</svg>

After

Width:  |  Height:  |  Size: 312 B

+2
View File
@@ -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(){
+402
View File
@@ -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"
]
}
}
]
+101
View File
@@ -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"
}
]
+77
View File
@@ -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