diff --git a/static/css/style.css b/static/css/style.css index bb1305f..ae91f84 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -13,8 +13,8 @@ } /* .bg { - background-image: url("/static/images/book.jpeg"); - background-image: linear-gradient(#CDCEC9, #9494A0, #652A2E); +/* background-image: url("/static/images/book.jpeg");*/ + /* background-image: linear-gradient(#CDCEC9, #9494A0, #652A2E); */ height: 100%; background-repeat: no-repeat; background-size: cover; @@ -48,6 +48,17 @@ } +/* Audio in background */ +.audio-button { + background: white; +} + +.audio-button:hover { +background: grey; +cursor: pointer; +} + + /* Node styling */ #ahmed text { @@ -186,7 +197,7 @@ stroke-dasharray:6px; /* text area */ .thesis { overflow-y: scroll; -max-height:600px; +max-height:480px; scroll-behavior: smooth; font-size: 1em; border: 1px black solid; diff --git a/static/js/d3/-home-angeliki-Documents-2005_Hybrid_Publishing-vvvw-static-js-.txt b/static/js/d3/-home-angeliki-Documents-2005_Hybrid_Publishing-vvvw-static-js-.txt deleted file mode 100644 index 88592f1..0000000 --- a/static/js/d3/-home-angeliki-Documents-2005_Hybrid_Publishing-vvvw-static-js-.txt +++ /dev/null @@ -1 +0,0 @@ -/home/angeliki/Documents/2005_Hybrid_Publishing/vvvw/static/js/test.json \ No newline at end of file diff --git a/static/js/d3_map.js b/static/js/d3_map.js index 8536155..24aa52c 100644 --- a/static/js/d3_map.js +++ b/static/js/d3_map.js @@ -49,16 +49,17 @@ d3.json("/static/js/group1.json", function(error, json) { .attr("width", 16) .attr("height", 16); - node.on({ - "mouseover": function(d) { - d3.select(this).style("cursor", "pointer"); - }}); - node.append("text") + // .attr("xlink:href", "#") .attr("dx", 12) .attr("dy", ".35em") .text(function(d) { return d.name }); + node.on({ + "mouseover": function(d) { + d3.select(this).style("cursor", "pointer"); + }}); + force.on("tick", function() { link.attr("x1", function(d) { return d.source.x; }) .attr("y1", function(d) { return d.source.y; }) @@ -101,30 +102,47 @@ d3.json("/static/js/group1.json", function(error, json) { //} // scripts for mouse events - $("#dadaloglu").click(function(){ - $("#showdadaloglu").fadeIn() + +function popup(name,time) { + $("#"+name).click(function(){ + $("#show"+name).fadeIn() console.log("around") - var dada = document.getElementById("textdadaloglu"); + var dada = document.getElementById("text"+name); dada.className += " active"; dada.scrollIntoView(); - var audio1 = document.getElementById("audio-1"); - audio1.currentTime = 12; - // audio1.play(); + var audio1 = document.getElementById("audioBG"); + audio1.currentTime = time; + audio1.play(); }); - - - - $("#asikA").click(function(){$("#showasikA").fadeIn() - console.log("around") - var muh = document.getElementById("textasikA"); - muh.className += " active"; - muh.scrollIntoView(); - var audio2 = document.getElementById("audio-1"); - audio2.currentTime = 50; +}; + +popup('dadaloglu',12); +popup('asikA',45); + + // $("#dadaloglu").click(function(){ + // $("#showdadaloglu").fadeIn() + // console.log("around") + // var dada = document.getElementById("textdadaloglu"); + // dada.className += " active"; + // dada.scrollIntoView(); + // var audio1 = document.getElementById("audioBG"); + // audio1.currentTime = 12; + // audio1.play(); + // }); + // + // + // + // $("#asikA").click(function(){$("#showasikA").fadeIn() + // console.log("around") + // var muh = document.getElementById("textasikA"); + // muh.className += " active"; + // muh.scrollIntoView(); + // var audio2 = document.getElementById("audioBG"); + // audio2.currentTime = 120; // audio2.play(); - }); + // }); -//pop-up +//stop events when clicking somewhere else $(document).click(function (e) { if (!$(e.target).parents().andSelf().is('#dadaloglu')) { $("#showdadaloglu").fadeOut(); @@ -134,10 +152,12 @@ d3.json("/static/js/group1.json", function(error, json) { }; if (!$(e.target).parents().andSelf().is('#asikA')) { $("#showasikA").fadeOut(); - $("audioasikA").trigger('pause'); + $("#audioasikA").trigger('pause'); var textmuh = document.getElementById("textasikA"); textmuh.classList.remove("active"); }; + }); + }); diff --git a/templates/hello.html b/templates/hello.html index f40851f..2cbfc0e 100644 --- a/templates/hello.html +++ b/templates/hello.html @@ -28,10 +28,7 @@ Your browser does not support the audio tag. -
Audio for Aşık Ali İzzet
+
Bio Aşık Ali İzzet
@@ -43,12 +40,14 @@
+
0:0 / 22:39
(Play) - + +
-
@@ -58,25 +57,7 @@