Avant-Première Hanna Arendt : Tweet Wall

# HG changeset patch # User Raphael Velt # Date 1366101729 -7200 # Node ID ed575da0ee15f11a3a4e4c6a101c58edb1edf0e4 # Parent 4c377df665697365c4847d24fabe8f07abae1c43# Parent e846b15e7a15484c83ebec3c766e1a2b8690132c Merge with 61e3683f9e2340a8c999a4e1f4aa2e4129d45b5b diff -r e846b15e7a15 -r ed575da0ee15 web/common.php --- a/web/common.php Mon Apr 15 12:54:29 2013 +0200 +++ b/web/common.php Tue Apr 16 10:42:09 2013 +0200 @@ -17,7 +17,7 @@ $ldt_platform = 'http://ldt.iri.centrepompidou.fr/'; $project_url_base = 'ldtplatform/ldt/cljson/id/'; -$C_default_rep = 'enmi12-barcamp'; +$C_default_rep = 'edito-1213-06-modeles-economiques'; $C_feedback_form_url = 'https://spreadsheets.google.com/spreadsheet/viewform?hl=en_US&formkey=dDZILVdXVHRzd0xhWGVZXzkweHN2RGc6MQ#gid=0'; $archives_list = array( diff -r e846b15e7a15 -r ed575da0ee15 web/hanna-arendt/arendt-background.jpg Binary file web/hanna-arendt/arendt-background.jpg has changed diff -r e846b15e7a15 -r ed575da0ee15 web/hanna-arendt/index.php --- a/web/hanna-arendt/index.php Mon Apr 15 12:54:29 2013 +0200 +++ b/web/hanna-arendt/index.php Tue Apr 16 10:42:09 2013 +0200 @@ -8,87 +8,80 @@ * Do we already have a valid Access Token or need to go get one? */ -if (!isset($_SESSION['TWITTER_ACCESS_TOKEN']) ) { - +if (!isset($_SESSION['TWITTER_ACCESS_TOKEN'])) { + $_SESSION['TWITTER_REDIRECT_URL'] = URL_ROOT . basename(__DIR__) . '/' . basename(__FILE__); // Permanent redirection header("HTTP/1.1 301 Moved Permanently"); - header("Location: client.php?CONNECT=true&rep=".basename(__DIR__)); + header("Location: client.php?CONNECT=true&rep=" . basename(__DIR__)); exit(); - + } - ?> - - - Avant-Première Hanna Arendt : Tweet Wall - - - - + + + Avant-Première Hanna Arendt : Tweet Wall + + + + + - - - - - - + + + + + + + + + + + + + +

+ + - - - - - - - -

- - - -

- -

- +

+ +

- + \ No newline at end of file diff -r e846b15e7a15 -r ed575da0ee15 web/hanna-arendt/paris.php --- a/web/hanna-arendt/paris.php Mon Apr 15 12:54:29 2013 +0200 +++ b/web/hanna-arendt/paris.php Tue Apr 16 10:42:09 2013 +0200 @@ -30,6 +30,7 @@ + @@ -46,47 +47,40 @@ - -

- -

+ +

- -

- +

+ +

- + \ No newline at end of file diff -r e846b15e7a15 -r ed575da0ee15 web/hanna-arendt/script.js --- a/web/hanna-arendt/script.js Mon Apr 15 12:54:29 2013 +0200 +++ b/web/hanna-arendt/script.js Tue Apr 16 10:42:09 2013 +0200 @@ -479,7 +479,7 @@ if (tweet.annotations.length) { html += '

'; for (var i in tweet.annotations) { - html += '

'; + html += '

'; } html += '

'; } @@ -877,17 +877,17 @@ var startY = twCx.tlHeight - startTl * twCx.scaleY, endY = twCx.tlHeight - ( endTl + 1 ) * twCx.scaleY, path = "M0 " + twCx.tlHeight + "C" + .7*twCx.deltaX + " " + twCx.tlHeight + " " + .3*twCx.deltaX + " " + startY + " " + twCx.deltaX + " " + startY + "L" + twCx.tlWidth + " " + startY + "L" + twCx.tlWidth + " " + endY + "L" + twCx.deltaX + " " + endY + "C" + .3*twCx.deltaX + " " + endY + " " + .7*twCx.deltaX + " 0 0 0"; - twCx.tlPaper.path( path ).attr({ "stroke" : "none", "fill" : "#000080", "opacity" : .2 }); + twCx.tlPaper.path( path ).attr({ "stroke" : "none", "fill" : "#8080c0", "opacity" : .2 }); } // dessin de la date de début twCx.tlPaper.text(twCx.deltaX / 2, twCx.tlHeight - 7, new Date(twCx.tlOnDisplay[0].start).toTimeString().substr(0,5)) - .attr({ "text-anchor" : "middle", "font-size": "9px" }); + .attr({ "text-anchor" : "middle", "font-size": "9px", "fill": "#cccccc" }); // dessin de la date de fin twCx.tlPaper.text(twCx.deltaX / 2, 7, new Date(twCx.tlOnDisplay[twCx.tlOnDisplay.length - 1].end).toTimeString().substr(0,5)) - .attr({ "text-anchor" : "middle", "font-size": "9px" }); + .attr({ "text-anchor" : "middle", "font-size": "9px", "fill": "#cccccc" }); for (var i = 0; i < twCx.tlOnDisplay.length; i++) { var n = 0, @@ -904,8 +904,8 @@ // Si on est à une demi-heure, on trace un axe secondaire + heure if (i < twCx.tlOnDisplay.length - 1 && !(twCx.tlOnDisplay[i].end % 1800000)) { - twCx.tlPaper.path("M0 "+posY+"L" + twCx.tlWidth +" "+posY).attr({"stroke":"#ccc"}); - twCx.tlPaper.text(twCx.deltaX / 2, posY, new Date(twCx.tlOnDisplay[i].end).toTimeString().substr(0,5)).attr({ "text-anchor" : "middle", "font-size": "9px" }); + twCx.tlPaper.path("M0 "+posY+"L" + twCx.tlWidth +" "+posY).attr({"stroke":"#555"}); + twCx.tlPaper.text(twCx.deltaX / 2, posY, new Date(twCx.tlOnDisplay[i].end).toTimeString().substr(0,5)).attr({ "text-anchor" : "middle", "font-size": "9px", "fill": "#cccccc" }); } } @@ -1044,7 +1044,7 @@ var html = ''; for (var j in annotations) { if (j != "default") { - html += '' + annotations[j].display_name + ' ' + html += '' + annotations[j].display_name + ' ' } } $("#rech_list_annot").html(html); diff -r e846b15e7a15 -r ed575da0ee15 web/hanna-arendt/style.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/hanna-arendt/style.css Tue Apr 16 10:42:09 2013 +0200 @@ -0,0 +1,42 @@ +body { + background: #222222; +} + + +#main { + position: absolute; background: url(arendt-background.jpg); + left: 50%; top: 50%; width: 1400px; height: 875px; + margin-top: -437px; margin-left: -700px; +} + +#visionplayer_1101 { + position: absolute; margin: 5px; width: 836px; height: 440px; left: 34px; top: 227px; +} + +#vizcontainer { + position: absolute; left: 915px; top: 158px; width: 452px; height: 507px; overflow: hidden; +} + +#tweetlist { + background: #222222; color: #cccccc; +} + +li.tweet { + background: none; +} + +.full p.tweet_text { + color: #ffffff; +} + +#inp_q, #recherche_annot { + background: #555555; color: #cccccc; +} + +li.tweet, li.placeholder { + border-color: #666666; +} + +li.full { + border-right: 10px solid #ff0 !important; +} \ No newline at end of file diff -r e846b15e7a15 -r ed575da0ee15 web/player_embed.php --- a/web/player_embed.php Mon Apr 15 12:54:29 2013 +0200 +++ b/web/player_embed.php Tue Apr 16 10:42:09 2013 +0200 @@ -69,6 +69,11 @@ height: 300, provider: "rtmp" }, + { type: "Slider" }, + { + type: "Controller", + disable_annotate_btn: true + }, 1): ?> { type: "Polemic" @@ -78,11 +83,6 @@ }, - { type: "Slider" }, - { - type: "Controller", - disable_annotate_btn: true - }, { type: "MultiSegments" }, diff -r e846b15e7a15 -r ed575da0ee15 web/polemicaltimeline.php --- a/web/polemicaltimeline.php Mon Apr 15 12:54:29 2013 +0200 +++ b/web/polemicaltimeline.php Tue Apr 16 10:42:09 2013 +0200 @@ -145,6 +145,11 @@ provider: "rtmp", autostart: true }, + { type: "Slider" }, + { + type: "Controller", + disable_annotate_btn: true + }, 1): ?> { type: "Polemic" @@ -154,11 +159,6 @@ }, - { type: "Slider" }, - { - type: "Controller", - disable_annotate_btn: true - }, 1): ?> { type: "Segments",