diff --git a/static/css/style.css b/static/css/style.css index 02d3dd9..b63e4ba 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -63,7 +63,7 @@ cursor: pointer; .group2 { fill: #92817a ; - font-size: 25px; + font-size: 20px; font-family: 'Vesper Libre', serif; } @@ -71,14 +71,14 @@ cursor: pointer; .group1 { fill: #bedbbb; - font-size: 25px; + font-size: 20px; font-family: 'Vesper Libre', serif; } .group4 { fill: #8db956; font-family: 'Vesper Libre', serif; - font-size: 25px; + font-size: 20px; } @@ -86,7 +86,7 @@ cursor: pointer; .group3 { fill: #707070; font-family: 'Vesper Libre', serif; - font-size: 25px; + font-size: 20px; } @@ -124,10 +124,11 @@ font-size: 1em; border: 1px black solid; padding: 2em; margin-right: 10px; -margin-top: 10px; +margin-top: 20px; line-height: 1.6em; font-family: 'Vesper Libre', serif; -scrollbar-color: #cdcec9 #aeb10a; +scrollbar-color: #cdcec9 #bedbbb; +position: relative; } .scrollable { @@ -208,7 +209,7 @@ draggable { /* pop up */ -#showdadaloglu,#showasikA { +#showdadaloglu,#showasikA,#showasikV,#showmuharrem,#shownazim,#showneyzen,#showruhisu,#showasu { display: none; left: 20%; width: 50% !important; @@ -232,5 +233,7 @@ draggable { } .active { - background-color: RGBA(174, 177, 10, 0.6); + background-color: RGBA(190,219,187, 0.6); + display: inline; + /* box-shadow: 5px 0 0px 0px #bedbbb, -5px 0 0px 0px #bedbbb; */ } diff --git a/static/js/d3_map.js b/static/js/d3_map.js index f7f2111..6ed7520 100644 --- a/static/js/d3_map.js +++ b/static/js/d3_map.js @@ -44,7 +44,8 @@ d3.json("/static/js/group1.json", function(error, json) { node.append("image") - .attr("xlink:href", "/static/images/squig2.png") + // .attr("xlink:href", "/static/images/squig2.png") + .attr("xlink:href", "/static/images/circleB.png") .attr("x", -8) .attr("y", -8) .attr("width", 16) @@ -115,41 +116,42 @@ function popup(name,time) { audio1.play(); }; -function -// popup('dadaloglu',12); -// popup('asikA',45); -// +//stop events when clicking somewhere else + $(document).click(function (e) { + if (!$(e.target).parents().andSelf().is('#dadaloglu')) { + $("#showdadaloglu").fadeOut(); + $("#audiodadaloglu").trigger('pause'); + var textdada = document.getElementById("textdadaloglu"); + textdada.classList.remove("active"); + }; + if (!$(e.target).parents().andSelf().is('#asikA')) { + $("#showasikA").fadeOut(); + $("#audioasikA").trigger('pause'); + var textmuh = document.getElementById("textasikA"); + textmuh.classList.remove("active"); + }; + if (!$(e.target).parents().andSelf().is('#asikV')) { + $("#showasikV").fadeOut(); + $("#audioasikV").trigger('pause'); + var textmuh = document.getElementById("textasikV"); + textmuh.classList.remove("active"); + }; + + }); +}); -//stop events when clicking somewhere else +// function stop(name) { // $(document).click(function (e) { -// if (!$(e.target).parents().andSelf().is('#dadaloglu')) { -// $("#showdadaloglu").fadeOut(); -// $("#audiodadaloglu").trigger('pause'); -// var textdada = document.getElementById("textdadaloglu"); +// if (!$(e.target).parents().andSelf().is('#'+ name)) { +// $("#show"+name).fadeOut(); +// $("#audio"+name).trigger('pause'); +// var textdada = document.getElementById("text"+name); // textdada.classList.remove("active"); // }; -// if (!$(e.target).parents().andSelf().is('#asikA')) { -// $("#showasikA").fadeOut(); -// $("#audioasikA").trigger('pause'); -// var textmuh = document.getElementById("textasikA"); -// textmuh.classList.remove("active"); -// }; -// // }); - -function stop(name) { - $(document).click(function (e) { - if (!$(e.target).parents().andSelf().is('#'+ name)) { - $("#show"+name).fadeOut(); - $("#audio"+name).trigger('pause'); - var textdada = document.getElementById("text"+name); - textdada.classList.remove("active"); - }; - }); -}; +// }; // // -// }); diff --git a/static/js/group1.json b/static/js/group1.json index 7c03047..9e6f8bb 100644 --- a/static/js/group1.json +++ b/static/js/group1.json @@ -113,7 +113,7 @@ "name": "Nazım Hikmet", "group": 3, "id": "nazim", - "time": 1 + "time": 10 }, { "name": "Ahmed Arif", diff --git a/templates/hello.html b/templates/hello.html index 8276c17..93a40c1 100644 --- a/templates/hello.html +++ b/templates/hello.html @@ -18,8 +18,6 @@
- -
{% include 'thesis.html' %}
@@ -34,7 +32,24 @@ Your browser does not support the audio tag.
+
Bio Aşık Ali İzzet
+ +
Bio
+ + +
+ +
+ +
+ +
+ +
+ +
+
diff --git a/templates/thesis.html b/templates/thesis.html index 2fd6b4e..f2f4698 100644 --- a/templates/thesis.html +++ b/templates/thesis.html @@ -68,7 +68,7 @@ ers or minstrels who traveled with their instruments from land to land, chanting and those of their predecessor. They were storytellers who narrated with poetry, music, dance and plays. Such practices are common in many cultures around the world and although the societies and beliefs went through significant changes over time, this method of carrying knowledge re- -mained part of everyday life. +mained part of everyday life.

Kalktı Göç Eyledi Avşar Elleri,
@@ -83,7 +83,7 @@ The paths overrunning the mighty mountains are ours.
Dadaloğlu’s (18th cc) epical folk poem was chanted by Ruhi Su in 1960’s

-Islam started spreading through similar traditions of folkloric chanting and poetry migrating from +

Islam started spreading through similar traditions of folkloric chanting and poetry migrating from regions today known as Iran (Horasan) and Afghanistan. In time, many nomadic tribes of Central Asia started abandoning their polytheistic beliefs, like the shamanic belief Tengrism 2 , and started joining Islam. In this process Islam became greatly influenced by previous belief systems and @@ -111,7 +111,7 @@ norities and critical thinking methods. To emancipate myself and my practice, it investigate the past through folkloric production that has reached our present day. Following Ashik traditions 3 and practices has been helping me to travel in time and listen to the stories of people from different centuries. This tradition which has been taught and transferred through mentoring, -allows this volatile knowledge 4 to flow and continue reaching different audiences. +allows this volatile knowledge 4 to flow and continue reaching different audiences.

Bize de Banaz'da Pir Sultan derler Bizi de kem kişi bellemesinler Paşa hademine tembih eylesin @@ -169,7 +169,7 @@ roots to be played on the radio. Even though in the 1930’s he was titled as th state, his Alevi roots, were still not recognized. In the 1940’s he was teaching to play cura at several Village Institutes 7 (1942-1947) where he encountered Ruhi Su and many other musicians and intel- lectuals from Istanbul. -

+

The cultural production of those years can serve as a recording of the political climate around the country. Starting from the 1950’s the western educated musicians, like Ruhi Su, Tülay German, Sümeyra Çakır or Fikret Kızılok, in order to stay connected to their roots, started combining folk-