diff --git a/wells/index.html b/wells/index.html index 969a0f2..56e7e68 100644 --- a/wells/index.html +++ b/wells/index.html @@ -56,7 +56,9 @@
-
+ + +
@@ -81,19 +83,18 @@
- - -

Folklore literature

Islamic Mysticism

-

Contemporary poets

-

Contemporary musicians

+

Contemporary poets

+

Contemporary musicians

+
+ @@ -116,9 +117,9 @@ diff --git a/wells/static/css/style.css b/wells/static/css/style.css index 74cc4d5..696c37d 100644 --- a/wells/static/css/style.css +++ b/wells/static/css/style.css @@ -38,8 +38,8 @@ body { /*Main areas*/ .map_area { text-align: center; - margin-top: 20px; - margin-bottom: 20px; + /* margin-top: 20px; */ + /* margin-bottom: 20px; */ margin-right: 10px; margin-left: 20px; position: relative; @@ -177,6 +177,22 @@ a { background-color: #73d2de; } +#box1:hover { + cursor: pointer; +} + +#box2:hover { + cursor: pointer; +} + +#box3:hover { + cursor: pointer; +} + +#box4:hover { + cursor: pointer; +} + .map_legend p { padding-left: 5px; font-family: 'Vesper Libre', serif; @@ -363,6 +379,14 @@ h2 { color: black; } +#thesisX { + position: absolute; + z-index:5; + left: 480px; + top: 14%; + display: none; +} + /* about and colophon */ #about, #colophon { diff --git a/wells/static/js/d3_map.js b/wells/static/js/d3_map.js index 5fc307e..a7348f4 100644 --- a/wells/static/js/d3_map.js +++ b/wells/static/js/d3_map.js @@ -47,13 +47,16 @@ d3.json("/static/js/group1.json", function(error, json) { .attr("dy", ".35em") .text(function(d) { return d.name }); -// let drag = d3.behavior.drag(); +// // let drag = d3.behavior.drag(); // var drag = d3.behavior.drag() // .on("drag", function() { // var x = d3.event.x; // var y = d3.event.y; // d3.select(this).attr("transform", "translate(" + x + "," + y + ")"); // }); +// +// + var divVideo = d3.select("body").append("div").style("opacity", 1); var divBio = d3.select("body").append("div").style("opacity", 1); @@ -65,11 +68,26 @@ var divBio = d3.select("body").append("div").style("opacity", 1); d3.select(this).style("cursor", "pointer"); }}) .on("click", function(i){ + // $(document).ready(function() { + // var a = 3; + // var dragOpts = { + // cursor: "move", + // cursor: "grab", + // distance: "0", + // }; + // $('.draggable').draggable( + // { + // start: function(event, ui) { $(this).css("z-index", a++); } + // }); + // }); // popup video divVideo.transition().duration(100); - divVideo.html("
  × 
"); + divVideo.html("
  × 
"); divBio.transition().duration(100); divBio.html("
  × 
"+i.bio+"
"); + // draggable + + // div.on(".drag", null); // span.html("×"); // rest pop up @@ -78,6 +96,8 @@ var divBio = d3.select("body").append("div").style("opacity", 1); .on("dblclick",connectedNodes); + + force.on("tick", function() { link.attr("x1", function(d) { return d.source.x; }) .attr("y1", function(d) { return d.source.y; }) @@ -167,23 +187,49 @@ function connectedNodes() { // scripts for mouse events // var stopVideo = function (name) { -function stopVideo(name) { - var iframe = document.querySelector( 'iframe'); - var video = document.getElementById( "#video"+name ); - if ( iframe !== null ) { - var iframeSrc = iframe.src; - iframe.src = iframeSrc; - } - if ( video !== null ) { - video.pause(); - } +// function stopVideo(name) { +// var iframe = document.querySelector( 'iframe'); +// var video = document.getElementById( "#video"+name ); +// if ( iframe !== null ) { +// var iframeSrc = iframe.src; +// iframe.src = iframeSrc; +// } +// if ( video !== null ) { +// video.pause(); +// } +// }; + +// $(function (){ +// $('.topleft').click(function(){ +// $('iframe').attr('src', $('iframe').attr('src')); +// }); +// }); + + +// function pauseAllVideos(name) +// { +// $("#video"+name).each(function(){ +// this.contentWindow.postMessage('{"event":"command","func":"stopVideo","args":""}', '*') +// }); +// } + +function pauseAllVideos(name) { + $("video"+name).each(function(){ + $(this).stopVideo(); + }); }; +// $(function (){ +// $('.topleft').click(function(){ +// $('iframe').attr('src', $('iframe').attr('src')); +// }); +// }); function popup(name,time) { $("#show"+name).fadeIn() console.log("around") $("#thesis").fadeIn() + $("#thesisX").fadeIn() $("#bio"+name).fadeIn() var dada = document.getElementById("text"+name); dada.className += " active"; @@ -196,22 +242,22 @@ function popup(name,time) { //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 textasikA = document.getElementById("textasikA"); - // textasikA.classList.remove("active"); - stopVideo("#asikA"); - }; - - }); + // $(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 textasikA = document.getElementById("textasikA"); + // // textasikA.classList.remove("active"); + // stopVideo("#asikA"); + // }; + // + // }); // $(document).click(function (e) { // if (!$(e.target).parents().andSelf().is('#dadaloglu')) {