From daf2a6d9fd782c2a6ee1c8da58651e718108c02f Mon Sep 17 00:00:00 2001 From: nglk Date: Mon, 1 Mar 2021 14:30:21 +0100 Subject: [PATCH 1/3] nothing to commit --- index.html | 2 ++ static/css/style.css | 7 ++++--- static/js/d3_map.js | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index a686cf0..42c1b08 100644 --- a/index.html +++ b/index.html @@ -153,6 +153,8 @@ $(document).ready(function() { { start: function(event, ui) { $(this).css('z-index', a++); } });}); + + diff --git a/static/css/style.css b/static/css/style.css index 8247d86..66656ea 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -397,18 +397,18 @@ h2 { .topleft { float: right; cursor: pointer; - font-size: 100%; + font-size: 140%; color: black; } .thesisX { position: absolute; z-index:5; - left: 46%; + left: 48%; top: 14%; float: right; cursor: pointer; - font-size: 100%; + font-size: 140%; color: black; } @@ -416,6 +416,7 @@ h2 { display: none; } + /* about and colophon */ #menu { margin-top: 15px; diff --git a/static/js/d3_map.js b/static/js/d3_map.js index 0f8e103..1a2adaf 100644 --- a/static/js/d3_map.js +++ b/static/js/d3_map.js @@ -69,10 +69,10 @@ d3.json("/static/js/group1.json", function(error, json) { console.log('vid') if (i.url) { divVideo.transition().duration(100); - divVideo.html("
  × 
"); + divVideo.html("
  × 
"); }; divBio.transition().duration(100); - divBio.html("
  × 
" + i.bio + "
"); + divBio.html("
  × 
" + i.bio + "
"); popup(i.id, i.time); }) .on("dblclick", connectedNodes) @@ -80,6 +80,7 @@ d3.json("/static/js/group1.json", function(error, json) { + force.on("tick", function() { link.attr("x1", function(d) { return d.source.x; @@ -101,6 +102,7 @@ d3.json("/static/js/group1.json", function(error, json) { }); + // highlight NodeLists//Toggle stores whether the highlighting is on var toggle = 0; //Create an array logging what is connected to what From 5b052df39f83eb03b9ef83b8c6edd2a58f2de6cd Mon Sep 17 00:00:00 2001 From: nglk Date: Mon, 1 Mar 2021 14:33:43 +0100 Subject: [PATCH 2/3] fixed style issue with popups --- index.html | 77 ++++++++++++++++++--------------------------- static/js/d3_map.js | 6 ++-- 2 files changed, 34 insertions(+), 49 deletions(-) diff --git a/index.html b/index.html index 2eda9dc..42c1b08 100644 --- a/index.html +++ b/index.html @@ -91,54 +91,39 @@ Through the map, we give shape to a common context in Turkish culture. The map a

-
×

Colophon

-

Wells of Knowledge: Poetry, Music and Rresistance in Turkey
- © 2020 at.wdka.nl/wellsofknowledge

-

Developed by Hybrid Publishing,
- Willem de Kooning Academy

-

Text and images © Merve Kılıçer
- All rights reserved

-

ISBN: 9789492479112

-

Author: Merve Kılıçer

-

- Graphic Design & Web Development: Angeliki Diakrousi - (https://w­i­t­m.net/) and Alice Strete (https://alicestrete.me/)

-

Editor: Liz Allan

-

Coordination: Kimmy Spreeuwenberg

-

Printer: De Raddraaier, Amsterdam
- Paper: Old Mill/Bianco 100g
- Print Run: 300

-

- Thanks for the generous support of Nihan Somay, Jake Caleb, - Ulufer Çelik and Carmen José

-

Hybrid Publishing
- This publication was developed by Hybrid Publishing, founded by - the Willem de Kooning Academy as a means of profiling and - disseminating outstanding research conducted by its students and - teaching staff, whether independently or in collaboration with - external partners. Researching and experimenting across a broad - range of processes native to digital and analog media, WdKA - Hybrid Publishing fosters novel approaches to design, authoring, - reading and dissemination made possible through ongoing - developments from the legacies of Gutenberg’s press to present­day - technologies. (hybridpublishing.wdka.nl)

-

HP Research Awards
- The HP Research Awards series showcases the work of recipients - or nominees of the Willem de Kooning Research Award. - Established by the Willem de Kooning Foundation, the awards are - granted to outstanding students whose graduation projects and - research have helped provide new insights to broader audiences. For - a digital version of this and other publications, go to - at.wdka.nl/hpresearchawards

- - -
+
×

colophon

+Wells of Knowledge: Poetry, music and resistance in Turkey © 2020
+at.wdka.nl/wellsofknowledge
+Developed by Hybrid Publishing,
+Willem de Kooning Academy
+Text and images © Merve Kılıçer
+All rights reserved
+ISBN: XXXX
+Author: Merve Kılıçer
+Graphic Design & Web Development: Angeliki Diakrousi and Alice Strete
+Editor: Liz Allan
+Coordination: Kimmy Spreeuwenberg
+[@Merve - ADD THANK YOU MESSAGE HERE]
+Hybrid Publishing
+This publication was developed by Hybrid Publishing, founded by the Willem de Kooning +Academy as a means of profiling and disseminating outstanding research conducted by its +students and teaching staff, whether independently or in collaboration with external +partners. Researching and experimenting across a broad range of processes native to digital +and analog media, WdKA Hybrid Publishing fosters novel approaches to design, authoring, +reading and dissemination made possible through ongoing developments from the legacies +of Gutenberg’s press to present-day technologies. (hybridpublishing.wdka.nl)
+HP Research Awards
+The HP Research Awards series showcases the work of recipients or nominees of the Willem +de Kooning Research Award. Established by the Willem de Kooning Foundation, the awards +are granted to outstanding students whose graduation projects and research have helped +provide new insights to broader audiences. For a digital version of this and other +publications, go to at.wdka.nl/hpresearchawards
-
×

How to use

- The map shows connections between various representatives in Turkish culture, be it poets, authors or musicians, traditional or contemporary.

Each name is presented in relation to a song, a poem, an image, or a fragment of text or audio.

-

When clickling once on one of the names, various kinds of media appear in connection to that name. The colors represent different categories (Folklore literature, Islamic Mysticism, etc).

-

When double clicking, a name is isolated and displayed alongside its closest connections.

All the elements of the map can be rearranged and moved.

+
×

How to use

+ The map shows connections between various representatives in Turkish culture, be it poets, authors or musicians, traditional or contemporary. Each name is presented in relation to a song, a poem, an image, or a fragment of text or audio.
+ When double clicking, a name is isolated and displayed alongside its closest connections.
+ When clickling once on one of the names, various kinds of media appear in connection to that name. The colors represent different categories (Folklore literature, Islamic Mysticism, etc).
All the elements of the map can be rearranged and moved.

diff --git a/static/js/d3_map.js b/static/js/d3_map.js index 1a2adaf..0d9ca61 100644 --- a/static/js/d3_map.js +++ b/static/js/d3_map.js @@ -69,10 +69,10 @@ d3.json("/static/js/group1.json", function(error, json) { console.log('vid') if (i.url) { divVideo.transition().duration(100); - divVideo.html("
  × 
"); + divVideo.html("
  × 
"); }; divBio.transition().duration(100); - divBio.html("
  × 
" + i.bio + "
"); + divBio.html("
  × 
" + i.bio + "
"); popup(i.id, i.time); }) .on("dblclick", connectedNodes) @@ -80,7 +80,6 @@ d3.json("/static/js/group1.json", function(error, json) { - force.on("tick", function() { link.attr("x1", function(d) { return d.source.x; @@ -103,6 +102,7 @@ d3.json("/static/js/group1.json", function(error, json) { + // highlight NodeLists//Toggle stores whether the highlighting is on var toggle = 0; //Create an array logging what is connected to what From 8bd0a4a2d4f6641e2a28da638fca5ee1b361114e Mon Sep 17 00:00:00 2001 From: nglk Date: Mon, 1 Mar 2021 14:56:42 +0100 Subject: [PATCH 3/3] fixed x again and styled some stuff --- index.html | 1 - static/css/style.css | 9 +++++---- static/js/d3_map.js | 2 +- thesis.html | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index 42c1b08..b6a2e38 100644 --- a/index.html +++ b/index.html @@ -132,7 +132,6 @@ publications, go to at.wdka.nl/hpresearchawards
- ××
diff --git a/static/css/style.css b/static/css/style.css index ba2543c..d4992d4 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -54,6 +54,7 @@ body { margin-right: 10px; margin-left: 20px; position: relative; + border-top: 1px dashed #d81159;; } .media_area { margin-top: 10px; @@ -400,18 +401,18 @@ h2 { .topleft { float: right; cursor: pointer; - font-size: 140%; + font-size: 16px; color: black; } .thesisX { position: absolute; z-index:5; - left: 48%; - top: 14%; + left: 96%; + top: 8%; float: right; cursor: pointer; - font-size: 140%; + font-size: 16px; color: black; } diff --git a/static/js/d3_map.js b/static/js/d3_map.js index 0d9ca61..6cd326c 100644 --- a/static/js/d3_map.js +++ b/static/js/d3_map.js @@ -148,7 +148,7 @@ d3.json("/static/js/group1.json", function(error, json) { $("#bio" + name).fadeIn() var dada = document.getElementById("text" + name); dada.className += " active"; - dada.scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'start' }); + dada.scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'nearest' }); }; }); diff --git a/thesis.html b/thesis.html index b668a52..7493083 100644 --- a/thesis.html +++ b/thesis.html @@ -1,3 +1,4 @@ +×

Wells of Knowledge:

Streams of poetry, music and resistance in Turkey

Merve Kılıçer