alicestrt
/
vvvw
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

fixed conflict

master
alicestrt 4 years ago
parent
125e980026 26901027c0
commit
ffa65066c9
4 changed files with 65 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      static/css/style.css
  2. 1
      static/js/d3/-home-angeliki-Documents-2005_Hybrid_Publishing-vvvw-static-js-.txt
  3. 66
      static/js/d3_map.js
  4. 31
      templates/hello.html

17
static/css/style.css
View File

@ -13,8 +13,8 @@
} }
/* /*
.bg { .bg {
background-image: url("/static/images/book.jpeg"); /* background-image: url("/static/images/book.jpeg");*/
background-image: linear-gradient(#CDCEC9, #9494A0, #652A2E); /* background-image: linear-gradient(#CDCEC9, #9494A0, #652A2E); */
height: 100%; height: 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: cover; background-size: cover;
@ -48,6 +48,17 @@
} }
/* Audio in background */
.audio-button {
background: white;
}
.audio-button:hover {
background: grey;
cursor: pointer;
}
/* Node styling */ /* Node styling */
#ahmed text { #ahmed text {
@ -186,7 +197,7 @@ stroke-dasharray:6px;
/* text area */ /* text area */
.thesis { .thesis {
overflow-y: scroll; overflow-y: scroll;
max-height:600px; max-height:480px;
scroll-behavior: smooth; scroll-behavior: smooth;
font-size: 1em; font-size: 1em;
border: 1px black solid; border: 1px black solid;

1
static/js/d3/-home-angeliki-Documents-2005_Hybrid_Publishing-vvvw-static-js-.txt
View File

@ -1 +0,0 @@
/home/angeliki/Documents/2005_Hybrid_Publishing/vvvw/static/js/test.json

66
static/js/d3_map.js
View File

@ -49,16 +49,17 @@ d3.json("/static/js/group1.json", function(error, json) {
.attr("width", 16) .attr("width", 16)
.attr("height", 16); .attr("height", 16);
node.on({
"mouseover": function(d) {
d3.select(this).style("cursor", "pointer");
}});
node.append("text") node.append("text")
// .attr("xlink:href", "#")
.attr("dx", 12) .attr("dx", 12)
.attr("dy", ".35em") .attr("dy", ".35em")
.text(function(d) { return d.name }); .text(function(d) { return d.name });
node.on({
"mouseover": function(d) {
d3.select(this).style("cursor", "pointer");
}});
force.on("tick", function() { force.on("tick", function() {
link.attr("x1", function(d) { return d.source.x; }) link.attr("x1", function(d) { return d.source.x; })
.attr("y1", function(d) { return d.source.y; }) .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 // scripts for mouse events
$("#dadaloglu").click(function(){
$("#showdadaloglu").fadeIn() function popup(name,time) {
$("#"+name).click(function(){
$("#show"+name).fadeIn()
console.log("around") console.log("around")
var dada = document.getElementById("textdadaloglu"); var dada = document.getElementById("text"+name);
dada.className += " active"; dada.className += " active";
dada.scrollIntoView(); dada.scrollIntoView();
var audio1 = document.getElementById("audio-1"); var audio1 = document.getElementById("audioBG");
audio1.currentTime = 12; audio1.currentTime = time;
// audio1.play(); audio1.play();
}); });
};
popup('dadaloglu',12);
popup('asikA',45);
$("#asikA").click(function(){$("#showasikA").fadeIn()
console.log("around") // $("#dadaloglu").click(function(){
var muh = document.getElementById("textasikA"); // $("#showdadaloglu").fadeIn()
muh.className += " active"; // console.log("around")
muh.scrollIntoView(); // var dada = document.getElementById("textdadaloglu");
var audio2 = document.getElementById("audio-1"); // dada.className += " active";
audio2.currentTime = 50; // 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(); // audio2.play();
}); // });
//pop-up //stop events when clicking somewhere else
$(document).click(function (e) { $(document).click(function (e) {
if (!$(e.target).parents().andSelf().is('#dadaloglu')) { if (!$(e.target).parents().andSelf().is('#dadaloglu')) {
$("#showdadaloglu").fadeOut(); $("#showdadaloglu").fadeOut();
@ -134,10 +152,12 @@ d3.json("/static/js/group1.json", function(error, json) {
}; };
if (!$(e.target).parents().andSelf().is('#asikA')) { if (!$(e.target).parents().andSelf().is('#asikA')) {
$("#showasikA").fadeOut(); $("#showasikA").fadeOut();
$("audioasikA").trigger('pause'); $("#audioasikA").trigger('pause');
var textmuh = document.getElementById("textasikA"); var textmuh = document.getElementById("textasikA");
textmuh.classList.remove("active"); textmuh.classList.remove("active");
}; };
}); });
}); });

31
templates/hello.html
View File

@ -28,10 +28,7 @@
<source src="../static/audio/HNI_Soundinstall_3tracks_together1.mp3" type="audio/mpeg"> <source src="../static/audio/HNI_Soundinstall_3tracks_together1.mp3" type="audio/mpeg">
Your browser does not support the audio tag. Your browser does not support the audio tag.
</audio></div> </audio></div>
<div id="showasikA"><div class='text_audio'>Audio for Aşık Ali İzzet</div><audio id="audioasikA" controls> <div id="showasikA"><div class='text_audio'>Bio Aşık Ali İzzet</div><iframe width="560" height="315" src="https://www.youtube.com/embed/AnsVY_gjJns" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div>
<source src="../static/audio/FreshMythsDifferentTimes_performance_podcast1.mp3" type="audio/mpeg">
Your browser does not support the audio tag.
</audio></div>
<!-- <img src="../static/images/test_small.jpeg" alt="poem"> --> <!-- <img src="../static/images/test_small.jpeg" alt="poem"> -->
</div> </div>
</div> </div>
@ -43,11 +40,13 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="play-stop"> <div class="play-stop">
<div id="tracktime">0:0 / 22:39</div>
<a id="mBtn" onclick="PSFunction()">(Play)</a> <a id="mBtn" onclick="PSFunction()">(Play)</a>
<button class="audio-button" onclick="document.getElementById('audioBG').volume -= 0.1">-</button>
<button class="audio-button" onclick="document.getElementById('audioBG').volume += 0.1">+</button>
</div> </div>
<div class="main_audio"> <div class="main_audio">
<audio id='audio1'> <audio id='audioBG' ontimeupdate="document.getElementById('tracktime').innerHTML = Math.floor(this.currentTime/60) + ':' + (Math.floor(this.currentTime) - Math.floor(this.currentTime/60)*60) + ' / ' + Math.floor(this.duration/60)+ ':' + (Math.floor(this.duration) - Math.floor(this.duration/60)*60);">
<source src="../static/audio/FreshMythsDifferentTimes_performance_podcast1.mp3" type="audio/mpeg"> <source src="../static/audio/FreshMythsDifferentTimes_performance_podcast1.mp3" type="audio/mpeg">
Your browser does not support the audio tag. Your browser does not support the audio tag.
</audio> </audio>
@ -58,25 +57,7 @@
</div> </div>
<!-- scripts for mouse events --> <!-- scripts for mouse events -->
<script> <script>
// function popup(d) { var audio = document.getElementById("audioBG");
// $(d).click(function(){
// $("#show1").fadeIn()
// console.log("around")
// })};
// function scrolldiv() {
// var elem = document.getElementById("ele");
// elem.scrollIntoView();
// }
// function play() {
// var audio = document.getElementById("audio-1");
// audio.currentTime = 12;
// audio.play();
// }
var audio = document.getElementById("audio1");
var btn = document.getElementById("mBtn"); var btn = document.getElementById("mBtn");
function PSFunction() { function PSFunction() {

Write Preview
Loading…
Cancel
Save