From d66e1b8924f4642942aaca7f49230eae638a09ff Mon Sep 17 00:00:00 2001 From: nglk Date: Wed, 3 Mar 2021 18:36:19 +0100 Subject: [PATCH 1/3] changed the closepopups to show/hide --- index-fixed.html | 152 ------------------------------------------- index.html | 1 + static/css/style.css | 4 ++ static/js/d3_map.js | 1 + 4 files changed, 6 insertions(+), 152 deletions(-) delete mode 100644 index-fixed.html diff --git a/index-fixed.html b/index-fixed.html deleted file mode 100644 index b15d4df..0000000 --- a/index-fixed.html +++ /dev/null @@ -1,152 +0,0 @@ - - - - - -VVVW - - - - - - - - - - - - -
-
-
-
-
- -
-
-
-

Map legend

- -
-

Folklore literature

-

Islamic Mysticism

-

Contemporary poets

-

Contemporary musicians

-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- -
Bio
- - -
- -
Bio Aşık Ali İzzet
- -
Bio
- - -
- -
- -
- -
- -
- -
- - -
-
-
-
-
-
- -
-
-
-
0:0 / 22:39
- (Play) - - -
-
- -
-
-
- -
- - - - -
- - diff --git a/index.html b/index.html index e71568c..eedaccc 100644 --- a/index.html +++ b/index.html @@ -273,6 +273,7 @@ includeHTML(); $("#showbio").hide() $("#nothesis").hide() $("#showvideo").hide() + $("#closeall").hide() } diff --git a/static/css/style.css b/static/css/style.css index 1030add..041a733 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -235,6 +235,10 @@ a :hover { } +#closeall { +display: none; +} + /* text area */ /* with position:fixed and svg {position:relative} the text can overlay the map */ .thesis { diff --git a/static/js/d3_map.js b/static/js/d3_map.js index 6db16c9..d175356 100644 --- a/static/js/d3_map.js +++ b/static/js/d3_map.js @@ -142,6 +142,7 @@ d3.json("/static/js/group1.json", function(error, json) { console.log("around") $("#nothesis").fadeIn() $("#thesis").fadeIn() + $("#closeall").fadeIn() $("#bio" + name).fadeIn() var dada = document.getElementById("text" + name); dada.className += " active"; From 5d6da6340dbc27766cfd583f684cac33308aab74 Mon Sep 17 00:00:00 2001 From: nglk Date: Wed, 3 Mar 2021 19:12:59 +0100 Subject: [PATCH 2/3] timestamps fixed with endings and the opning is also ok --- index.html | 50 ++++++++++++++++++++++++++++++-------------- static/css/style.css | 8 +++---- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/index.html b/index.html index eedaccc..e059529 100644 --- a/index.html +++ b/index.html @@ -23,8 +23,16 @@
@@ -35,10 +43,10 @@

-

Folklore literature

-

Islamic Mysticism

-

Contemporary poets

-

Contemporary musicians

+

Folklore literature

+

Islamic Mysticism

+

Contemporary poets

+

Contemporary musicians

@@ -152,18 +160,12 @@ Through the map, we give shape to a common context in Turkish culture. The map a - - colophon - - - - how to use - - +