From 85c04a9a33ef0c83409bd7ec775842453869fbac Mon Sep 17 00:00:00 2001
From: nglk <diakaggel@gmail.com>
Date: Mon, 26 Oct 2020 18:08:10 +0100
Subject: [PATCH] added youtube popup and audio time

---
 static/css/style.css                                  |  4 ++--
 ...cuments-2005_Hybrid_Publishing-vvvw-static-js-.txt |  1 -
 static/js/d3_map.js                                   | 11 ++++++-----
 templates/hello.html                                  | 10 ++++------
 4 files changed, 12 insertions(+), 14 deletions(-)
 delete mode 100644 static/js/d3/-home-angeliki-Documents-2005_Hybrid_Publishing-vvvw-static-js-.txt

diff --git a/static/css/style.css b/static/css/style.css
index 69b3665..b602b2d 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -14,7 +14,7 @@
 
 .bg {
 /*  background-image: url("/static/images/book.jpeg");*/
-  background-image: linear-gradient(#CDCEC9, #9494A0, #652A2E);
+  /* background-image: linear-gradient(#CDCEC9, #9494A0, #652A2E); */
   height: 100%;
   background-repeat: no-repeat;
   background-size: cover;
@@ -186,7 +186,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..cc84805 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; })
diff --git a/templates/hello.html b/templates/hello.html
index f40851f..39bb20a 100644
--- a/templates/hello.html
+++ b/templates/hello.html
@@ -28,10 +28,7 @@
               <source src="../static/audio/HNI_Soundinstall_3tracks_together1.mp3" type="audio/mpeg">
               Your browser does not support the audio tag.
             </audio></div>
-          <div id="showasikA"><div class='text_audio'>Audio for Aşık Ali İzzet</div><audio id="audioasikA" controls>
-              <source src="../static/audio/FreshMythsDifferentTimes_performance_podcast1.mp3" type="audio/mpeg">
-              Your browser does not support the audio tag.
-            </audio></div>
+          <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>
           <!-- <img src="../static/images/test_small.jpeg" alt="poem"> -->
         </div>
       </div>
@@ -43,12 +40,13 @@
 <div class="row">
   <div class="col-md-12">
     <div class="play-stop">
+      <div id="tracktime">0 / 0</div>
       <a id="mBtn" onclick="PSFunction()">(Play)</a>
 
  </div>
  <div class="main_audio">
-   <audio id='audio1'>
-       <source src="../static/audio/FreshMythsDifferentTimes_performance_podcast1.mp3" type="audio/mpeg">
+   <audio id='audio1' ontimeupdate="document.getElementById('tracktime').innerHTML = Math.floor(this.currentTime/60) + ':' + (currentTime - Math.floor(this.currentTime/60)*60) + ' / ' + Math.floor(this.duration);">
+   <source src="../static/audio/FreshMythsDifferentTimes_performance_podcast1.mp3" type="audio/mpeg">
        Your browser does not support the audio tag.
      </audio>
 </div>