# HG changeset patch
# User Raphael Velt <raph.velt@gmail.com>
# Date 1320419552 -3600
# Node ID 19ed2a92d3c12e8e17d261a105f5683d72e67913
# Parent  9cabcd2709be09529830700067fc65ddd6ddab60# Parent  ef3ff87f98fde316a1d7e7fa01b07ee76ec398cb
Merge

diff -r 9cabcd2709be -r 19ed2a92d3c1 web/2011-2012-museo-ouverture/config.php
--- a/web/2011-2012-museo-ouverture/config.php	Fri Nov 04 16:11:51 2011 +0100
+++ b/web/2011-2012-museo-ouverture/config.php	Fri Nov 04 16:12:32 2011 +0100
@@ -71,11 +71,11 @@
     "jp" => "images/museo-2011.jpg",
     ), // 270 × 150 pixels
 
- 	'archive_title' => array("fr" => "Muséologie 2011 - Séance d'ouverture", "en" => "Muséologie 2011 - Openning session", "jp" => "カタストロフィとメディア"),
+ 	'archive_title' => array("fr" => "Muséologie 2011 - Séance d'ouverture", "en" => "Muséologie 2011 - Openning session", "jp" => "ミュゼオロジー2011開幕討議"),
  	'archive_description' => array(
  		"fr" => "par <a href=\"http://www.iri.centrepompidou.fr/\" target=\"_blank\">IRI</a> au Centre Pompidou<br/> le mardi 18 octobre 2011 | 17:00 - 20:00",
-        "en" => "by <a href=\"http://www.iri.centrepompidou.fr/\" target=\"_blank\">IRI</a> in Villa Gillet<br/> thu, Oct. 18, 2011 | 17:00 - 20:00",
-        "jp" => "主催: <a href=\"http:/www.iri.centrepompidou.fr/\" target=\"_blank\">IRI</a> 会場: Villa Gillet<br/> thu, Oct. 18, 2011 | 17:00 - 20:00",
+        "en" => "by <a href=\"http://www.iri.centrepompidou.fr/\" target=\"_blank\">IRI</a> at the Centre Pompidou<br/> Tue, Oct. 18, 2011 | 17:00 - 20:00",
+        "jp" => "主催: <a href=\"http:/www.iri.centrepompidou.fr/\" target=\"_blank\">IRI</a> 会場: ポンピドゥー・センター<br/> 2011年10月18日（火） | 17:00 - 20:00",
     ),
 
     // After the event
diff -r 9cabcd2709be -r 19ed2a92d3c1 web/common.php
--- a/web/common.php	Fri Nov 04 16:11:51 2011 +0100
+++ b/web/common.php	Fri Nov 04 16:12:32 2011 +0100
@@ -13,7 +13,7 @@
 /**
 * Base configuration
 */
-$C_default_rep = 'iii-catastrophe';
+$C_default_rep = 'edito-inaugurale';
 $C_feedback_form_url = 'https://spreadsheets.google.com/spreadsheet/viewform?hl=en_US&formkey=dDZILVdXVHRzd0xhWGVZXzkweHN2RGc6MQ#gid=0';
 
 $archives_list = array(
diff -r 9cabcd2709be -r 19ed2a92d3c1 web/config.php
--- a/web/config.php	Fri Nov 04 16:11:51 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Please edit all for your application registration / other details
- * 
- */
-
-//define('URL_ROOT', 'http://127.0.0.1/IRI/REPO_TWEET_LIVE/web/');
-define('URL_ROOT', 'http://www.polemictweet.com/');
-
-
-$C_default_registry = 'local';
\ No newline at end of file
diff -r 9cabcd2709be -r 19ed2a92d3c1 web/edito-inaugurale/config.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/edito-inaugurale/config.php	Fri Nov 04 16:12:32 2011 +0100
@@ -0,0 +1,36 @@
+<?php
+$config = array(
+   	'hashtag'    => '#edito11',
+   	'date'   => '03.11.2011',
+   	'heure'   => '17h30-19h30',
+   	'place'   => 'Salle Triangle - Centre Pompidou',
+
+   	'title' => "Séance d'ouverture - les nouvelles écritures",
+   	'abstract'   => "<b>Nouvelle forme d'éditorialisation</b>,<br/><b>Séance d'ouverture - les nouvelles écritures,</b><br/>le 03/11/2011 de 17h30 à 19h30<br/>@ Salle Triangle (Centre Pompidou) - entrée libre et gratuite",
+   	'description'=> "<i>Les nouvelles écritures et participation</i><br/>Pour beaucoup, le web est devenu la première – et parfois unique – source d’information, de connaissance et d’apprentissage. Mais comment ce savoir se construit-il ? Comment se structure-t-il ?
+A l’heure où des risques de marchandisation extrême du Web et de fragmentation de la neutralité de l’Internet se font jours,  nous interrogerons les enjeux de cette constitution du savoir sur le web.",
+   	'link' => 'http://seminaire.sens-public.org',
+   	'islive'     => true,
+   	'keywords'   => 'editorialisation, iri',
+   	'rep' => basename(__DIR__),
+   	'partenaires'=> "<a href='http://www.sens-public.org' class='footerLink' target='_blank'>Sens Public</a> | <a href='http://www.iri.centrepompidou.fr/' class='footerLink' target='_blank'>IRI</a>",
+
+    'client_visual' => 'images/big_visuel_edito.jpg',// 501 × 376 pixels
+    
+ 	'head_logo' => 'images/head_logo.gif', // 171 × 63 pixels
+ 	
+  	'slide_background' => 'images/slide4-editorialisation.jpg', // 606 × 282 pixels
+    
+  	'archive_img' => 'images/archive-editorialisation.jpg', // 270 × 150 pixels
+
+ 	'archive_title' => "Séance d'ouverture - les nouvelles écriture",
+ 	'archive_description' => 'par <a href="http://www.sens-public.org" target="_blank">Sens Public</a> et l\'<a href="http://www.iri.centrepompidou.fr" target="_blank">IRI</a><br/>au Centre Pompidou le jeudi 3 novembre 2011 17:30 - 19:30',
+
+    // After the event
+	'metadata'    => "http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/67280b1c-ff30-11e0-a82d-00145ea49a02",
+	'duration'   => 23705500,
+	'player'        => "res/metadataplayer/src/js/LdtPlayer.js",
+	'div_height'    => 740,
+	'player_width'  => 650,
+	'player_height' => 600,
+);
\ No newline at end of file
diff -r 9cabcd2709be -r 19ed2a92d3c1 web/edito-inaugurale/images/archive-editorialisation.jpg
Binary file web/edito-inaugurale/images/archive-editorialisation.jpg has changed
diff -r 9cabcd2709be -r 19ed2a92d3c1 web/edito-inaugurale/images/big_visuel_edito.jpg
Binary file web/edito-inaugurale/images/big_visuel_edito.jpg has changed
diff -r 9cabcd2709be -r 19ed2a92d3c1 web/edito-inaugurale/images/head_logo.gif
Binary file web/edito-inaugurale/images/head_logo.gif has changed
diff -r 9cabcd2709be -r 19ed2a92d3c1 web/edito-inaugurale/images/slide4-editorialisation.jpg
Binary file web/edito-inaugurale/images/slide4-editorialisation.jpg has changed
diff -r 9cabcd2709be -r 19ed2a92d3c1 web/edito-inaugurale/index.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/edito-inaugurale/index.php	Fri Nov 04 16:12:32 2011 +0100
@@ -0,0 +1,6 @@
+<?php
+// Permanent redirection
+header("HTTP/1.1 301 Moved Permanently");
+header("Location: polemicaltimeline.php");
+exit();
+?>
\ No newline at end of file
diff -r 9cabcd2709be -r 19ed2a92d3c1 web/iii-catastrophe/config.php
--- a/web/iii-catastrophe/config.php	Fri Nov 04 16:11:51 2011 +0100
+++ b/web/iii-catastrophe/config.php	Fri Nov 04 16:12:32 2011 +0100
@@ -68,10 +68,14 @@
     ),
 
     // After the event
-	'metadata'    => "http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/67280b1c-ff30-11e0-a82d-00145ea49a02",
+	'metadata'    => array(
+		"fr"=>"http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/24509a44-00a1-11e1-a400-00145ea49a02",
+		"en"=>"http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/90fa8b48-00a9-11e1-9a3f-00145ea49a02",
+		"jp"=>"http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/ea7277cc-00a3-11e1-88f6-00145ea49a02",
+	),
 	'duration'   => 23705500,
 	'player'        => "res/metadataplayer/src/js/LdtPlayer.js",
-	'div_height'    => 740,
+	'div_height'    => 790,
 	'player_width'  => 650,
 	'player_height' => 600,
 );
\ No newline at end of file
diff -r 9cabcd2709be -r 19ed2a92d3c1 web/iii-catastrophe/images/tweetExplainBgd.gif
Binary file web/iii-catastrophe/images/tweetExplainBgd.gif has changed
diff -r 9cabcd2709be -r 19ed2a92d3c1 web/res/css/custom.css
--- a/web/res/css/custom.css	Fri Nov 04 16:11:51 2011 +0100
+++ b/web/res/css/custom.css	Fri Nov 04 16:12:32 2011 +0100
@@ -123,7 +123,7 @@
 .aboutBox{background-image:url(../../images/archivesBoxBody.gif);width:900px;position:absolute; margin-top:70px;}
 .archivesBox{background-image:url(../../images/archivesBoxBody.gif);width:900px;height:297px;position:absolute; margin-top:450px;}
 .archivesBoxArchive{width:900px;}
-.archivesBoxContainer{padding:10px 10px 0 0;width:880px;display:block;height:280px; }
+.archivesBoxContainer{padding:10px 10px 0 0;width:880px;display:block;height:480px;}
 .archivesBoxClear { /* generic container (i.e. div) for floating buttons */
     overflow: hidden;
     width: 100%;
diff -r 9cabcd2709be -r 19ed2a92d3c1 web/traduction.php
--- a/web/traduction.php	Fri Nov 04 16:11:51 2011 +0100
+++ b/web/traduction.php	Fri Nov 04 16:12:32 2011 +0100
@@ -140,8 +140,7 @@
 										</tr></table>
 										Suite a cette phase d’annotation, vous trouverez à droite de ce texte <b>la version alpha</b> de l'interface de navigation et de représentation de la polémique durant la conférence.
 										<br/><br/>
-										Ce dispositif, outre qu’il approfondit la dimension critique de la discussion avec la salle et les auditeurs présents ou distants, permet ainsi également de pérenniser et de valoriser les commentaires produits en les rendant accessibles en temps différé lors de tout visionnage ultérieur de la vidéo 
-										<br/><br/>Merci a RSLN pour cette expérimentation !",
+										Ce dispositif, outre qu’il approfondit la dimension critique de la discussion avec la salle et les auditeurs présents ou distants, permet ainsi également de pérenniser et de valoriser les commentaires produits en les rendant accessibles en temps différé lors de tout visionnage ultérieur de la vidéo.",
 				"changer de contenu"  => "Changer de contenu"   										
 				);
                               
@@ -256,7 +255,7 @@
 					<tr><td><a id='positive' title='agree' class='tweetButton'>
 					++ 		</a> </td><td>corresponds to a tweet of assent</td>
 					</tr><tr><td><a id='negative' title='disagree' class='tweetButton'>
-					--  	</a> </td><td>to a tweet of disagreement,</td>
+					--  	</a> </td><td>to a tweet of disagreement</td>
 					</tr><tr><td><a id='reference' title='reference' class='tweetButton'>
 					== 		</a> </td><td>to a tweet of reference</td>
 					</tr><tr><td><a id='question' title='question' class='tweetButton'>
@@ -270,9 +269,7 @@
 					This device, in addition to deepening the critical dimension of the
 					discussion with the present or distant audience, allows also to
 					perpetuate and promote the published comments by making them
-					accessible at any time deferred later viewing of the video
-					<br/><br/>
-					Thank you to RSLN for this experiment !",
+					accessible at any time deferred later viewing of the video.",
 				"changer de contenu"  => "Change content"
 				);
                 
@@ -286,6 +283,7 @@
   				'Anglais'			=> 'English',
   				'Programme'			=> 'イベント詳細',
   				'Archives'			=> 'アーカイブ',
+  				'Partager'			=> '共有',
 
                 // mot de liaisons (archives)
   				'Par'			    => 'By',
@@ -369,42 +367,30 @@
 				
 				// Embed #############
 				
-				"EmbedTitle"	  =>"このプレイヤーを埋め込む",
-				"EmbedText"		  =>"To embed this player in your blog or cms copy this embed code in html :",
+				"EmbedTitle"	  =>"動画を埋め込む",
+				"EmbedText"		  =>"この動画をあなたのブログなどに埋め込むには、以下のコードをコピーして、htmlに貼り付けてください :",
 
 				// Polemicla Timeline  #############
 			// Polemicla Timeline  #############
 			"ExplicationPT" 	  => "
-				Institute for Research and Innovation (IRI) proposed to you an
-				experiment and a demonstration of a controversial annotation device
-				based on twitter. Classifying your tweets allowed us to create a
-				timeline representing the polemical positions of the audience during
-				the conference.
+				ポレミックツイートは、ポンピドゥーセンターIRI（リサーチ＆イノベーション研究所）が提供する、ツイッター・ベースの議論およびアノテーションツールの試作版です。イベント中に観客がおこなったツイートを分類して、議論上の立場を可視化しながら、タイムライン上に表示させることができます。
 				<br/><br/>
-				This controversy tracking syntax enabled you to take position on the
-				speaker or other participants points of view in the debate:
+				以下の「ポレミック符号」をツイートに加えることで、登壇者の発表や、他の観客のつぶやきへのあなたの意見を表明することができます。
 
 				<table>
 				<tr><td><a id='positive' title='agree' class='tweetButton'>
-				++ 		</a> </td><td>corresponds to a tweet of assent</td>
+				++ 		</a> </td><td>賛成する</td>
 				</tr><tr><td><a id='negative' title='disagree' class='tweetButton'>
-				--  	</a> </td><td>to a tweet of disagreement,</td>
+				--  	</a> </td><td>反論する</td>
 				</tr><tr><td><a id='reference' title='reference' class='tweetButton'>
-				== 		</a> </td><td>to a tweet of reference</td>
+				== 		</a> </td><td>参照を挙げる</td>
 				</tr><tr><td><a id='question' title='question' class='tweetButton'>
-				??  	</a> </td><td>to a question</td>
+				??  	</a> </td><td>疑問／質問をする</td>
 				</tr></table>
 
-				Following this annotation phase, you will find right to the present
-				text the alpha version of the browser and controversy representation
-				interface.
+				そのようにして集積されたアノテーションは、専用のナビゲーション・インターフェイスとして表現され、そのイベントに関する論争の状態を可視化します。この文の右側→にある動画プレイヤーが、まさにその<b>アルファ版</b>というわけです。
 				<br/><br/>
-				This device, in addition to deepening the critical dimension of the
-				discussion with the present or distant audience, allows also to
-				perpetuate and promote the published comments by making them
-				accessible at any time deferred later viewing of the video
-				<br/><br/>
-				Thank you to RSLN for this experiment !",
+				このデバイスを通じて、イベントの現場にいる観客が遠隔の視聴者と議論をおこない、批評を深められるだけでなく、コメントは後からビデオを視聴するときにも参照できるので、意見を永続化させ、更に促進させていくことも可能になっています。",
 				"changer de contenu"  => "ビデオを変更"				
 );
 ?>
\ No newline at end of file