# HG changeset patch
# User Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com>
# Date 1316508052 -7200
# Node ID c9d8fce0b6da715cd48a91de3dbc90cc2e5ca1f3
# Parent  602997bb4cc4b4b9d41747876183b0b5222e2918# Parent  483cc4e351939c1cd0237c22da87b2c48a5e5d81
Merge with 040e58ebfd76a227242ebf59d15ec415b3e92c68

diff -r 602997bb4cc4 -r c9d8fce0b6da script/lib/iri_tweet/export_twitter_alchemy.py
--- a/script/lib/iri_tweet/export_twitter_alchemy.py	Fri Sep 16 00:10:24 2011 +0200
+++ b/script/lib/iri_tweet/export_twitter_alchemy.py	Tue Sep 20 10:40:52 2011 +0200
@@ -304,7 +304,7 @@
                             etree.SubElement(polemics_element, u'polemic').text = pol
                         meta_element.append(polemics_element)
 
-                    etree.SubElement(meta_element, u"source", attrib={"url":u"http://dev.twitter.com", "mimetype":u"application/json"}).text = etree.CDATA(unicode(tw.original_json))
+                    etree.SubElement(meta_element, u"source", attrib={"url":u"http://dev.twitter.com", "mimetype":u"application/json"}).text = etree.CDATA(unicode(tw.tweet_source.original_json))
                 
                 output_data = etree.tostring(root, encoding="utf-8", method="xml", pretty_print=True, xml_declaration=True)  
                 
diff -r 602997bb4cc4 -r c9d8fce0b6da web/JaneMcGonigal-gameDesign/config.php
--- a/web/JaneMcGonigal-gameDesign/config.php	Fri Sep 16 00:10:24 2011 +0200
+++ b/web/JaneMcGonigal-gameDesign/config.php	Tue Sep 20 10:40:52 2011 +0200
@@ -37,7 +37,8 @@
 	'archive_description' => "par <a href=\"http://www.rslnmag.fr/\" target=\"_blank\">RSLN mag</a> a Microsoft France<br/>le vendredi 26 septembre 2011 | 09:30 - 10:30",
 		 
 	// After the event 
-	'metadata'	    => "http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/1c764b02-abc9-11e0-b488-00145ea49a02",
+	'metadata'	    => "http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/12753e96-e2b1-11e0-973a-00145ea49a02",
+	'duration'   => '4127000',
     'player'        => "res/metadataplayer/src/js/LdtPlayer.js",
     'div_height'    => 740,
 	'player_width'  => 650,
diff -r 602997bb4cc4 -r c9d8fce0b6da web/common.php
--- a/web/common.php	Fri Sep 16 00:10:24 2011 +0200
+++ b/web/common.php	Tue Sep 20 10:40:52 2011 +0200
@@ -14,7 +14,7 @@
 * Base configuration
 */
 $C_default_rep = 'JaneMcGonigal-gameDesign';
-$C_feedback_form_url = 'https://docs.google.com/spreadsheet/viewform?formkey=dDZILVdXVHRzd0xhWGVZXzkweHN2RGc6MQ';
+$C_feedback_form_url = 'http://www.rslnmag.fr/blog/theme/les-rencontres-rsln/2011/7/4/jane-mcgonigal_invitee-des-rencontres-rsln_vendredi-16-septembre/';
 
 $configuration = array(
     'siteUrl'        => 'http://twitter.com/oauth',
diff -r 602997bb4cc4 -r c9d8fce0b6da web/rwd-meetup-patrimoine/config.php
--- a/web/rwd-meetup-patrimoine/config.php	Fri Sep 16 00:10:24 2011 +0200
+++ b/web/rwd-meetup-patrimoine/config.php	Tue Sep 20 10:40:52 2011 +0200
@@ -24,9 +24,9 @@
     'partenaires'=> "",
 		 
 	// After the event 
-#	'metadata'	 => "http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/13b0aa52-336b-11e0-b233-00145ea49a02",
+	'metadata'	 => "http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/ae035b2e-dad0-11e0-84af-00145ea49a02",
     'player'     => "res/metadataplayer/src/js/LdtPlayer.js",  
-	'duration'   => '4299820',
+	'duration'   => '7778370',
 	'client_visual' => 'images/bgd_player.png', // optional - relative path
    	'head_logo' => 'images/sw-horz-w3c_head.png', // optional - relative path
 	'slide_background' => 'images/slide_background.png',