# HG changeset patch
# User Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com>
# Date 1322694841 -3600
# Node ID 71c55bfff14779c0fab8797e48743f90b6589992
# Parent  e1a94c866d35e34d5d32b80c3a63ea109457344d
edito session 2

diff -r e1a94c866d35 -r 71c55bfff147 .pydevproject
--- a/.pydevproject	Tue Nov 29 16:20:55 2011 +0100
+++ b/.pydevproject	Thu Dec 01 00:14:01 2011 +0100
@@ -2,7 +2,7 @@
 <?eclipse-pydev version="1.0"?>
 
 <pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python_live</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python_tl</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
 <path>/tweet_live/script/lib</path>
diff -r e1a94c866d35 -r 71c55bfff147 sbin/sync/sync_live
--- a/sbin/sync/sync_live	Tue Nov 29 16:20:55 2011 +0100
+++ b/sbin/sync/sync_live	Thu Dec 01 00:14:01 2011 +0100
@@ -22,4 +22,4 @@
     rm -fr ~/tmp/tweet_live_V$1;
 fi
 
-ssh iri@web.iri.centrepompidou.fr sudo apache2ctl restart
+ssh iri@www.iri.centrepompidou.fr sudo apache2ctl restart
diff -r e1a94c866d35 -r 71c55bfff147 web/common.php
--- a/web/common.php	Tue Nov 29 16:20:55 2011 +0100
+++ b/web/common.php	Thu Dec 01 00:14:01 2011 +0100
@@ -13,7 +13,7 @@
 /**
 * Base configuration
 */
-$C_default_rep = '2011-2012-museo-desir';
+$C_default_rep = 'edito-webdoc';
 $C_feedback_form_url = 'https://spreadsheets.google.com/spreadsheet/viewform?hl=en_US&formkey=dDZILVdXVHRzd0xhWGVZXzkweHN2RGc6MQ#gid=0';
 
 $archives_list = array(
diff -r e1a94c866d35 -r 71c55bfff147 web/edito-inaugurale/config.php
--- a/web/edito-inaugurale/config.php	Tue Nov 29 16:20:55 2011 +0100
+++ b/web/edito-inaugurale/config.php	Thu Dec 01 00:14:01 2011 +0100
@@ -12,7 +12,7 @@
    	'link' => 'http://seminaire.sens-public.org',
    	'islive'     => true,
    	'keywords'   => 'editorialisation, iri',
-   	'rep' => basename('__DIR__'),
+   	'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
diff -r e1a94c866d35 -r 71c55bfff147 web/edito-webdoc/config.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/edito-webdoc/config.php	Thu Dec 01 00:14:01 2011 +0100
@@ -0,0 +1,36 @@
+<?php
+$config = array(
+   	'hashtag'    => '#edito11',
+   	'date'   => '01.12.2011',
+   	'heure'   => '17h30-19h30',
+   	'place'   => 'Salle Triangle - Centre Pompidou',
+
+   	'title' => "Entre pédagogie, information et entertainment : le Web-doc et au-delà",
+	'abstract'   => "<b>Entre pédagogie, information et entertainment : le Web-doc et au-delà,</b><br/>le 01/12/2011 de 17h30 à 19h30<br/>@ Salle Triangle (Centre Pompidou) - entrée libre et gratuite",
+//   	'abstract'   => "<b>Nouvelle forme d'éditorialisation</b>,<br/><b>Entre pédagogie, information et entertainment : le Web-doc et au-delà,</b><br/>le 01/12/2011 de 17h30 à 19h30<br/>@ Salle Triangle (Centre Pompidou) - entrée libre et gratuite",
+   	'description'=> "<i>Entre pédagogie, information et entertainment : le Web-doc et au-delà</i><br/>Les intervenants, Alexander Knetig (Arte Web), Julien Guintard (auteur de Thanatorama), Jean Marc Merriaux (Universciences / France TV / Paris 3 Sorbonne) et Etienne Armand Amato (Institut de Création et d'Animation Numériques / Université Paris 8 Vincennes-Saint-Denis / Observatoire des Mondes Numériques en Sciences Humaines) discuteront autour du thème «&nbsp;Entre pédagogie, information et entertainment : le Web-doc et au-delà&nbsp;».",
+   	'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' => "le Web-doc et au-delà",
+ 	'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 1 décembre 2011 17:30 - 19:30',
+
+    // After the event
+	'metadata'    => "http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/0911926e-093a-11e1-996f-00145ea49a02",
+	'duration'   => 8357400,
+	'player'        => "res/metadataplayer/src/js/LdtPlayer.js",
+	'div_height'    => 700,
+	'player_width'  => 650,
+	'player_height' => 488,
+);
\ No newline at end of file
diff -r e1a94c866d35 -r 71c55bfff147 web/edito-webdoc/images/archive-editorialisation.jpg
Binary file web/edito-webdoc/images/archive-editorialisation.jpg has changed
diff -r e1a94c866d35 -r 71c55bfff147 web/edito-webdoc/images/big_visuel_edito.jpg
Binary file web/edito-webdoc/images/big_visuel_edito.jpg has changed
diff -r e1a94c866d35 -r 71c55bfff147 web/edito-webdoc/images/head_logo.gif
Binary file web/edito-webdoc/images/head_logo.gif has changed
diff -r e1a94c866d35 -r 71c55bfff147 web/edito-webdoc/images/slide4-editorialisation.jpg
Binary file web/edito-webdoc/images/slide4-editorialisation.jpg has changed
diff -r e1a94c866d35 -r 71c55bfff147 web/edito-webdoc/images/tweetExplainBgd.gif
Binary file web/edito-webdoc/images/tweetExplainBgd.gif has changed
diff -r e1a94c866d35 -r 71c55bfff147 web/edito-webdoc/index.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/edito-webdoc/index.php	Thu Dec 01 00:14:01 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