# HG changeset patch
# User Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com>
# Date 1325949289 -3600
# Node ID 266c861f293ffd14ba9e20d7b0110c047bb52fbe
# Parent  297156c2efbe3b93222859e219f3e6eae5df0fce# Parent  8231b4f3acca770f8919a7d681ad1f9fc50f8268
Merge with 155318ee8b869126abc2d93fa666615b8663e941

diff -r 297156c2efbe -r 266c861f293f script/utils/create_twitter_export_conf.py
diff -r 297156c2efbe -r 266c861f293f script/utils/export_twitter_alchemy.py
diff -r 297156c2efbe -r 266c861f293f script/utils/get_stats.py
diff -r 297156c2efbe -r 266c861f293f web/client_new.php
--- a/web/client_new.php	Sat Jan 07 16:13:42 2012 +0100
+++ b/web/client_new.php	Sat Jan 07 16:14:49 2012 +0100
@@ -163,7 +163,7 @@
                         <a href="../sweet-tweet/small.html"><?php echo($translate->_('SemanticBoard')); ?></a>
                     </li>
                     <li>
-                        <a href="http://labs.knowtex.com/enmi2011"><?php echo($translate->_('SocialGraph')); ?></a>
+                        <a href="http://labs.knowtex.com/enmi2011/?mapOnly#carto"><?php echo($translate->_('SocialGraph')); ?></a>
                     </li>
                 </ul>
                 <div class="ifwrap" id="vlWrap">
diff -r 297156c2efbe -r 266c861f293f web/res/js-tweetcast/live-polemic.js
--- a/web/res/js-tweetcast/live-polemic.js	Sat Jan 07 16:13:42 2012 +0100
+++ b/web/res/js-tweetcast/live-polemic.js	Sat Jan 07 16:14:49 2012 +0100
@@ -261,7 +261,7 @@
 function ktxHighlightTweet(tweet) {
     var _gF = $("#graphFrame");
     if ( _gF.is(":visible") && _gF.attr("src").indexOf("labs.knowtex.com") != -1 ) {
-        _gF.attr("src",'http://labs.knowtex.com/enmi2011/#carto::user=' + tweet.user.screen_name + '&time=' + ~~(tweet.date_value/1000));
+        _gF.attr("src",'http://labs.knowtex.com/enmi2011/?mapOnly#carto::user=' + tweet.user.screen_name + '&time=' + ~~(tweet.date_value/1000));
     }
 }
 
@@ -293,7 +293,7 @@
     }
     html += '<div class="twmain">';
     var a_user = '<a href="http://twitter.com/' + tweet.user.screen_name + '"  onclick="filtrerTexte(\'@' + tweet.user.screen_name + '\'); return false;" target="_blank">';
-    html += '<div class="around_img">' + a_user + '<img class="profile_image" src="' + tweet.user.profile_image_url + '" /></a>';
+    html += '<div class="around_img"><img class="profile_image" src="' + tweet.user.profile_image_url + '" />';
     if (className == 'full') {
         html += '<p class="created_at">' + new Date(tweet.date_value).toTimeString().substr(0,8) + '</a></p>';
     }