diff --git a/wells/index.html b/wells/index.html index 56e7e68..86d856f 100644 --- a/wells/index.html +++ b/wells/index.html @@ -174,6 +174,8 @@ $("#about").click(function(){ +<<<<<<< HEAD +======= +>>>>>>> f589ef5ab8aff787a3421ad0701fb57769be1f4c diff --git a/wells/static/css/style.css b/wells/static/css/style.css index 696c37d..bdaa076 100644 --- a/wells/static/css/style.css +++ b/wells/static/css/style.css @@ -32,8 +32,8 @@ body { right: 0px; bottom: 0px; left: 0px; - opacity: 0.2; - filter: blur(10px); + opacity: 0.6; + filter: blur(20px); } /*Main areas*/ .map_area { diff --git a/wells/static/js/group1.json b/wells/static/js/group1.json index bacde84..a005990 100644 --- a/wells/static/js/group1.json +++ b/wells/static/js/group1.json @@ -16,7 +16,7 @@ "url": "https://www.youtube.com/embed/AnsVY_gjJns" }, { - "name": "Aşık Nesimi", + "name": "Kul Nesimi", "group": 1, "id": "asikN", "time": 1, @@ -32,7 +32,7 @@ "url": "https://www.youtube.com/embed/opunkzOcGS4" }, { - "name": "Aşık Mahzuni Şerif", + "name": "Aşık Mazhuni Şerif", "group": 1, "id": "asikM", "time": 1, @@ -82,7 +82,7 @@ "url": "https://www.youtube.com/embed/1fJw71ZJUy4" }, { - "name": "Dedeoğlu", + "name": "Dedemoğlu", "group": 1, "id": "dedeoglu", "time": 1, @@ -98,23 +98,22 @@ "url": "https://www.youtube.com/embed/2r9MrqMilRo" }, { - "name": "Yunus Emre", + "name": "Anatolyan Anonymous Folk Balads", "group": 1, - "id": "yunus", + "id": "balads", "time": 1, "bio": "bio1" }, { - "name": "Kul Nesimi", - "group": 1, - "id": "kulN", + "name": "Yunus Emre", + "group": 2, + "id": "yunus", "time": 1, - "bio": "bio1", - "url": "https://www.youtube.com/embed/AnsVY_gjJns" + "bio": "bio1" }, { "name": "Kaygusuz Abdal", - "group": 1, + "group": 2, "id": "kaygusuz", "time": 1, "bio": "bio1" @@ -213,6 +212,13 @@ "time": 1, "bio": "bio1" }, + { + "name": "Metin Altıok", + "group": 3, + "id": "metin", + "time": 1, + "bio": "bio1" + }, { "name": "Ruhi Su", "group": 4, @@ -343,14 +349,6 @@ "bio": "bio1", "url": "https://www.youtube.com/embed/F-k_Fr67bPQ" }, - { - "name": "Moğollar", - "group": 4, - "id": "mogollar", - "time": 1, - "bio": "bio1", - "url": "https://www.youtube.com/embed/WzFy8rduQQ8" - }, { "name": "Fikret Kızılok", "group": 4, @@ -416,193 +414,249 @@ "value": 1 }, { - "source": 4, + "source": 29, + "target": 0, + "value": 1 + }, + { + "source": 2, "target": 11, "value": 1 }, { "source": 2, - "target": 11, + "target": 13, "value": 1 }, { - "source": 14, + "source": 2, + "target": 40, + "value": 1 + }, + { + "source": 3, + "target": 6, + "value": 1 + }, + { + "source": 3, + "target": 41, + "value": 1 + }, + { + "source": 4, "target": 11, "value": 1 }, { - "source": 15, - "target": 16, + "source": 5, + "target": 29, "value": 1 }, { - "source": 15, + "source": 6, + "target": 29, + "value": 1 + }, + { + "source": 6, + "target": 45, + "value": 1 + }, + { + "source": 7, + "target": 42, + "value": 1 + }, + { + "source": 9, "target": 17, "value": 1 }, { - "source": 28, - "target": 0, + "source": 9, + "target": 11, "value": 1 }, { - "source": 40, - "target": 3, + "source": 10, + "target": 29, "value": 1 }, { - "source": 40, + "source": 11, + "target": 14, + "value": 1 + }, + { + "source": 11, "target": 2, "value": 1 }, { - "source": 28, - "target": 5, + "source": 11, + "target": 4, "value": 1 }, { - "source": 28, + "source": 11, "target": 6, "value": 1 }, { - "source": 45, - "target": 6, + "source": 11, + "target": 32, "value": 1 }, { - "source": 41, - "target": 7, + "source": 14, + "target": 17, "value": 1 }, { - "source": 28, - "target": 10, + "source": 15, + "target": 17, "value": 1 }, { - "source": 50, - "target": 12, + "source": 31, + "target": 4, "value": 1 }, { "source": 32, - "target": 12, + "target": 22, "value": 1 }, { - "source": 17, - "target": 13, + "source": 32, + "target": 19, "value": 1 }, { - "source": 17, - "target": 14, + "source": 32, + "target": 29, "value": 1 }, { - "source": 17, - "target": 11, + "source": 33, + "target": 28, "value": 1 }, { - "source": 45, - "target": 19, + "source": 33, + "target": 18, "value": 1 }, { - "source": 31, - "target": 22, + "source": 33, + "target": 27, "value": 1 }, { - "source": 48, - "target": 23, + "source": 34, + "target": 32, "value": 1 }, { - "source": 16, - "target": 24, + "source": 34, + "target": 4, "value": 1 }, { "source": 34, - "target": 25, + "target": 7, "value": 1 }, { - "source": 47, - "target": 27, + "source": 35, + "target": 25, "value": 1 }, { - "source": 31, - "target": 22, + "source": 35, + "target": 20, "value": 1 }, { - "source": 30, - "target": 4, + "source": 35, + "target": 28, "value": 1 }, { - "source": 32, + "source": 36, "target": 18, "value": 1 }, { - "source": 34, - "target": 20, + "source": 37, + "target": 29, "value": 1 }, { - "source": 34, - "target": 25, + "source": 38, + "target": 12, "value": 1 }, { - "source": 35, - "target": 18, + "source": 38, + "target": 27, "value": 1 }, { - "source": 33, - "target": 31, + "source": 38, + "target": 18, "value": 1 }, { - "source": 33, - "target": 11, + "source": 38, + "target": 19, "value": 1 }, { - "source": 36, - "target": 28, + "source": 39, + "target": 12, "value": 1 }, { - "source": 40, + "source": 41, "target": 18, "value": 1 }, { - "source": 40, - "target": 28, + "source": 41, + "target": 29, "value": 1 }, { - "source": 40, - "target": 51, + "source": 41, + "target": 3, "value": 1 }, { - "source": 18, - "target": 51, + "source": 41, + "target": 13, + "value": 1 + }, + { + "source": 42, + "target": 7, + "value": 1 + }, + { + "source": 43, + "target": 12, + "value": 1 + } + , + { + "source": 44, + "target": 12, "value": 1 }, { "source": 45, - "target": 6, + "target": 18, "value": 1 }, { @@ -612,42 +666,42 @@ }, { "source": 45, - "target": 18, + "target": 6, "value": 1 }, { - "source": 41, - "target": 7, + "source": 46, + "target": 12, "value": 1 }, { - "source": 48, - "target": 23, + "source": 47, + "target": 27, "value": 1 }, { - "source": 49, - "target": 26, + "source": 48, + "target": 23, "value": 1 }, { - "source": 29, - "target": 11, + "source": 49, + "target": 12, "value": 1 }, { - "source": 39, - "target": 13, + "source": 49, + "target": 26, "value": 1 }, { - "source": 39, - "target": 17, + "source": 49, + "target": 27, "value": 1 }, { - "source": 47, - "target": 34, + "source": 50, + "target": 13, "value": 1 } ]