# HG changeset patch
# User Raphael Velt <raph.velt@gmail.com>
# Date 1329225463 -3600
# Node ID f7fd2458fc5ca4749bef4dcaecb2b9ce59605d78
# Parent  b90c2bd832dd434562ccf032c63c1efe09e8266f
Added museo 14.02.12 and several corrections

diff -r b90c2bd832dd -r f7fd2458fc5c web/2011-2012-museo-contribution/config.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/2011-2012-museo-contribution/config.php	Tue Feb 14 14:17:43 2012 +0100
@@ -0,0 +1,54 @@
+<?php
+$config = array(
+   	'hashtag'    => '#museoweb',
+   	'date'   	 => '14.02.2012',
+   	'heure'   	 => '17h00-20h00',
+   	'place'   	 => 'Centre Pompidou (Paris)',
+   	'duration'   => '',
+
+   	'title' 	 => "Muséologie, muséographie et nouvelles formes d’adresse au public",
+						
+   	'abstract'   => "«&nbsp;<b>Comment la dynamique de contribution peut-elle converger avec l’indexation et la numérisation mise en place par les Musées ?</b>&nbsp;» <br/> 14 / 12 / 2012 de 17h00 à 20h00 @ Centre Pompidou (Paris)",
+
+   	'description'=> "<p><b>Comment la dynamique de contribution peut-elle converger avec l’indexation et la numérisation mise en place par les Musées ?</b> (le 14/12/2012)</p>
+<p>Quelle autorité ? Quel rapport au temps et notamment pour la recherche ? Les communautés intermédiaires ? Quelles stratégies et pour quel public ? Comment mettre en place les outils de la convergence ? Question de l’autorité en interne ou externe : les médiateurs, les conservateurs ? La question objectivité/subjectivité.</p>
+<ul>
+    <li>Maxime Crépel – Sciences Po</li>
+    <li>Patrick Peccatte, Flickr Commons – SoftExperience</li>
+    <li>Romain Wenz, data.bnf.fr et la notion d’autorité et d’identifiant dans l’écosystème du Web – BNF</li>
+</ul>
+<p>Coups de projecteur :</p>
+<ul>
+    <li>Pascal Krajewski – Fonds Trutat, Bibliothèque de Toulouse</li>
+    <li>Jean-Frédéric Berthelot – Wikimédia</li>
+    <li>François Queré et Renaud Sagot – Plateforme collaborative de la Cité de l’immigration</li>
+</ul>",
+
+   	'link' 		 => 'http://www.iri.centrepompidou.fr/evenement/museologie-museographie-et-nouvelles-formes-dadresse-au-public/?lang=fr_fr',
+   	'islive'     => true,
+   	'keywords'   => 'muséographie, muséologie, contribution, indexation, numérisation, communautés, recherche, médiation',
+   	'rep' 		 => basename('__DIR__'),
+   	'partenaires'=> "<a href='http://www.culture.gouv.fr/'
+class='footerLink' target='_blank'> Ministère de la Culture et communication </a>
+|  <a href='http://www.iri.centrepompidou.fr/' class='footerLink' target='_blank'>
+IRI  </a>",
+
+    'client_visual' => "images/big_visuel_museo_2011_fr.png", // 501 × 376 pixels
+    
+ 	'head_logo' => 'images/head_logo.gif', // 171 × 63 pixels
+ 	
+  	'slide_background' => "images/slide4_museo_fr.png", // 606 × 282 pixels
+    
+  	'archive_img' => "images/museo-2011.jpg", // 270 × 150 pixels
+
+ 	'archive_title' => "Muséologie 2011 - Comment la dynamique de contribution peut-elle converger avec l’indexation et la numérisation mise en place par les Musées ?",
+ 	'archive_description' => "par <a href=\"http://www.iri.centrepompidou.fr/\" target=\"_blank\">IRI</a> au Centre Pompidou<br/> le mardi 14 février 2012 | 17:00 - 20:00",
+
+    // After the event
+	'metadata'		=> "http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/321ae0b0-ff2c-11e0-95c2-00145ea49a02",
+	'duration'  	=> 10876600,
+	'player'        => "res/metadataplayer/src/js/LdtPlayer.js",
+	'div_height'    => 740,
+	'player_width'  => 650,
+	'player_height' => 500,
+);
\ No newline at end of file
diff -r b90c2bd832dd -r f7fd2458fc5c web/2011-2012-museo-contribution/images/big_visuel_museo_2011_fr.png
Binary file web/2011-2012-museo-contribution/images/big_visuel_museo_2011_fr.png has changed
diff -r b90c2bd832dd -r f7fd2458fc5c web/2011-2012-museo-contribution/images/head_logo.gif
Binary file web/2011-2012-museo-contribution/images/head_logo.gif has changed
diff -r b90c2bd832dd -r f7fd2458fc5c web/2011-2012-museo-contribution/images/museo-2011.jpg
Binary file web/2011-2012-museo-contribution/images/museo-2011.jpg has changed
diff -r b90c2bd832dd -r f7fd2458fc5c web/2011-2012-museo-contribution/images/polemic_fly_home.png
Binary file web/2011-2012-museo-contribution/images/polemic_fly_home.png has changed
diff -r b90c2bd832dd -r f7fd2458fc5c web/2011-2012-museo-contribution/images/slide4_museo_fr.png
Binary file web/2011-2012-museo-contribution/images/slide4_museo_fr.png has changed
diff -r b90c2bd832dd -r f7fd2458fc5c web/2011-2012-museo-contribution/images/tweetExplainBgd.gif
Binary file web/2011-2012-museo-contribution/images/tweetExplainBgd.gif has changed
diff -r b90c2bd832dd -r f7fd2458fc5c web/2011-2012-museo-contribution/index.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/2011-2012-museo-contribution/index.php	Tue Feb 14 14:17:43 2012 +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 b90c2bd832dd -r f7fd2458fc5c web/client_new.php
--- a/web/client_new.php	Mon Feb 13 12:47:01 2012 +0100
+++ b/web/client_new.php	Tue Feb 14 14:17:43 2012 +0100
@@ -58,9 +58,32 @@
                 document.location.href="<?php echo(URL_ROOT.$rep); ?>/client.php?CONNECT=true";
             });
             
+            function updateCounter() {
+                var _v = $("#status").val();
+                if (_v.length > 140) {
+                    _v = _v.substr(0,140);
+                    $("#status").val(_v);
+                }
+                $('#tweetCounter').html(140-_v.length);
+                if(140-_v.length < 0) {
+                    $('#tweetCounter').addClass("tweetCounterNegative");
+                }
+                else {
+                    $('#tweetCounter').removeClass("tweetCounterNegative");
+                }
+                $(".tweetButton").each(function(_i, _e) {
+                    if (_v.search($(_e).find('span.twbSyntax').text().replace(/(\W)/g, '\\$1')) > -1) {
+                        $(_e).addClass('selected');
+                    } else {
+                        $(_e).removeClass('selected');
+                    }
+                });
+            }
+            
             // BUTTONS
             $(".tweetButton").click(function() {
-                add_grammar($(this).text());
+                add_grammar($(this).find('span.twbSyntax').text());
+                updateCounter();
             })
             
             // SEND TWEETS
@@ -83,17 +106,9 @@
                 });
                 
             });
+            
 
-            $("#status").bind("change keyup paste blur focus",function() {
-                newval = 140-$("#status").val().length;
-                $('#tweetCounter').val(newval);
-                if(newval < 0) {
-                    $('#tweetCounter').addClass("tweetCounterNegative");
-                }
-                else {
-                    $('#tweetCounter').removeClass("tweetCounterNegative");
-                }
-            });
+            $("#status").bind("change keyup paste blur focus",updateCounter);
             
             
             $("#Program").fancybox({
@@ -123,9 +138,6 @@
         });
 
         //<!-- LIMIT TEXTAREA:
-        function imposemax(obj) {
-            obj.value = obj.value.substr(0,140);
-        };
         // End -->
 
     </script>
@@ -288,12 +300,15 @@
                 </div>
                 <div id="twwWrap">
                     <div id="tweetWriter">
+                            <?php if (isset($_SESSION['TWITTER_ACCESS_TOKEN'])): ?>
+                            <div id="tweetCounter"><?php echo(140-strlen($config['hashtag']));?></div>
+                            <?php endif;?>
                         <h3 class="tweetWriterTitle"><?php print $translate->_("ClientTitle1 :"); ?></h3>
                         <form  action="tweet.php" method="post" id="statusform" >
                             <?php if (!isset($_SESSION['TWITTER_ACCESS_TOKEN'])){
                                 echo("<div class='loginbutton'><a href='".URL_ROOT."$rep/client.php?CONNECT=true' class='loginlink'>".$translate->_("Vous n'êtes pas connecté.")."</a></div>");
                             } else {
-                                echo("<textarea name='status' id='status' rows='3' cols='50' onkeypress='imposemax(this);'>$config[hashtag]</textarea>");
+                                echo("<textarea name='status' id='status' rows='3' cols='50'>$config[hashtag]</textarea>");
                             }
                             ?>
                             <div id="messageSuccess" style="background-color:lightgreen; display: none;">
@@ -305,13 +320,26 @@
                             <a href="#"  id="sendTweet" >
                                 <span><?php print $translate->_("Envoyer"); ?></span>
                             </a>
-                            <?php if (isset($_SESSION['TWITTER_ACCESS_TOKEN'])): ?>
-                            <input id="tweetCounter" value="<?php echo(140-strlen($config['hashtag']));?>" disabled="disabled" size="3"/>
-                            <?php endif;?>
-                            <a id="positive" title="<?php echo $translate->_('Agree'); ?>" class="tweetButton">++</a>
-                            <a id="negative" title="<?php echo $translate->_('Disagree'); ?>" class="tweetButton">--</a>
-                            <a id="reference" title="<?php echo $translate->_('Reference'); ?>" class="tweetButton">==</a>
-                            <a id="question" title="<?php echo $translate->_('Question'); ?>" class="tweetButton"> ??</a>
+                            <a id="positive" title="++ | <?php echo $translate->_('Agree'); ?>" class="tweetButton twbGreen">
+                                <span class="twbSyntax">++</span>
+                                <span class="twbSeparator">|</span>
+                                <span class="twbLabel"><?php echo $translate->_('Agree'); ?></span>
+                            </a>
+                            <a id="negative" title="-- | <?php echo $translate->_('Disagree'); ?>" class="tweetButton twbRed">
+                                <span class="twbSyntax">--</span>
+                                <span class="twbSeparator">|</span>
+                                <span class="twbLabel"><?php echo $translate->_('Disagree'); ?></span>
+                            </a>
+                            <a id="reference" title="== | <?php echo $translate->_('Reference'); ?>" class="tweetButton twbYellow">
+                                <span class="twbSyntax">==</span>
+                                <span class="twbSeparator">|</span>
+                                <span class="twbLabel"><?php echo $translate->_('Reference'); ?></span>
+                            </a>
+                            <a id="question" title="?? | <?php echo $translate->_('Question'); ?>" class="tweetButton twbBlue">
+                                <span class="twbSyntax">??</span>
+                                <span class="twbSeparator">|</span>
+                                <span class="twbLabel"><?php echo $translate->_('Question'); ?></span>
+                            </a>
                             
                             <div style="clear: both;"></div>
                         </form>
diff -r b90c2bd832dd -r f7fd2458fc5c web/common.php
--- a/web/common.php	Mon Feb 13 12:47:01 2012 +0100
+++ b/web/common.php	Tue Feb 14 14:17:43 2012 +0100
@@ -13,7 +13,7 @@
 /**
 * Base configuration
 */
-$C_default_rep = 'bpi-des-livres-aux-machines';
+$C_default_rep = '2011-2012-museo-contribution';
 $C_feedback_form_url = 'https://spreadsheets.google.com/spreadsheet/viewform?hl=en_US&formkey=dDZILVdXVHRzd0xhWGVZXzkweHN2RGc6MQ#gid=0';
 
 $archives_list = array(
diff -r b90c2bd832dd -r f7fd2458fc5c web/res/css/archives-iframe.css
--- a/web/res/css/archives-iframe.css	Mon Feb 13 12:47:01 2012 +0100
+++ b/web/res/css/archives-iframe.css	Tue Feb 14 14:17:43 2012 +0100
@@ -15,6 +15,9 @@
     max-width: 266px;
     text-align: center;
 }
+.archivesTitleActionsContainer {
+    margin-bottom: 10px;
+}
 .archivesTitleContainer {
     width: 270px;
     padding: 0;
@@ -76,7 +79,7 @@
 .scrollable .items {
     /* this cannot be too large */
     position: absolute;
-    top: 22px;
+    top: 27px;
     width: 20000em;
 }
 .item {
diff -r b90c2bd832dd -r f7fd2458fc5c web/res/css/twcx-img/tweetbuttons.png
Binary file web/res/css/twcx-img/tweetbuttons.png has changed
diff -r b90c2bd832dd -r f7fd2458fc5c web/res/css/tweetcast.css
--- a/web/res/css/tweetcast.css	Mon Feb 13 12:47:01 2012 +0100
+++ b/web/res/css/tweetcast.css	Tue Feb 14 14:17:43 2012 +0100
@@ -175,7 +175,7 @@
 a#sendTweet {
     background: transparent url('../../images/bg_button_a_w.png') no-repeat top right;
     color: #444; display: block; font-size: 12px; height: 24px; line-height: 14px;
-    float:right; margin-left: 50px; padding: 0 18px 0 0; text-decoration: none;
+    float:right; margin: 2px 0 0 5px; padding: 0 18px 0 0; text-decoration: none;
 }
 a#sendTweet span {
     background: transparent url('../../images/bg_button_span_w.png') no-repeat; display: block; height: 14px;
@@ -187,26 +187,59 @@
 a#sendTweet:hover span, a#sendTweet:active span {
     background-position: 0 -24px;
 }
-a.tweetButton { 
-    float:right; margin: 2px 10px 0 0; width:32px; height:20px; text-decoration: none; font: normal 12px;
-    color: #444; text-align:center; cursor: pointer; cursor: hand;
+.tweetButton { 
+    float:left; margin: 2px 8px 0 0; width:75px; height:24px; text-decoration: none;
+    background: url('twcx-img/tweetbuttons.png');
+    color: #333; text-align:center; cursor: pointer; cursor: hand; 
+}
+.twbSyntax {
+    font-weight: normal; font-size: 14px;
+}
+.twbSeparator {
+    color: #999; font-size: 12px;
 }
-
-#question {
-    background: transparent url('../../images/bt_blue.png') no-repeat;
+.twbLabel {
+    font-weight: bold; font-size: 10px;
+}
+.tweetButton.twbGreen {
+    background-position: 0 0;
+}
+.tweetButton.twbGreen.selected {
+    background-position: 0 -48px;
+}
+.tweetButton.twbGreen:hover {
+    background-position: 0 -24px;
+}
+.tweetButton.twbRed {
+    background-position: -75px 0;
 }
-#reference{
-    background: transparent url('../../images/bt_yellow.png') no-repeat;
+.tweetButton.twbRed.selected {
+    background-position: -75px -48px;
+}
+.tweetButton.twbRed:hover {
+    background-position: -75px -24px;
 }
-#positive{
-    background: transparent url('../../images/bt_green.png') no-repeat;
+.tweetButton.twbYellow {
+    background-position: -150px 0;
+}
+.tweetButton.twbYellow.selected {
+    background-position: -150px -48px;
 }
-#negative{
-    background: transparent url('../../images/bt_red.png') no-repeat;
+.tweetButton.twbYellow:hover {
+    background-position: -150px -24px;
+}
+.tweetButton.twbBlue {
+    background-position: -225px 0;
 }
-
+.tweetButton.twbBlue.selected {
+    background-position: -225px -48px;
+}
+.tweetButton.twbBlue:hover {
+    background-position: -225px -24px;
+}
 #tweetCounter{
-    float: left; background: transparent; border: none;font-weight:bold; margin-top: 2px; padding: 0;
+    float: right; background: transparent; border: none; font-size: 13px;
+    font-weight:bold; margin: 4px 0 0; padding: 0; color: #666;
 }
 .tweetCounterNegative{
     color:red;
diff -r b90c2bd832dd -r f7fd2458fc5c web/res/js-tweetcast/live-polemic.js
--- a/web/res/js-tweetcast/live-polemic.js	Mon Feb 13 12:47:01 2012 +0100
+++ b/web/res/js-tweetcast/live-polemic.js	Tue Feb 14 14:17:43 2012 +0100
@@ -7,7 +7,7 @@
             }
         },
         "positive" : {
-            "display_name" : "++",
+            "display_name" : "++ | accord",
             "keywords" : [ /\+\+/ ],
             "colors" : {
                 "h" : .3,
@@ -15,7 +15,7 @@
             }
         },
         "negative" : {
-            "display_name" : "--",
+            "display_name" : "-- | désaccord",
             "keywords" : [ /\-\-/ ],
             "colors" : {
                 "h" : 0,
@@ -23,7 +23,7 @@
             }
         },
         "reference" : {
-            "display_name" : "==",
+            "display_name" : "== | référence",
             "keywords" : [ /\=\=/ ],
             "colors" : {
                 "h" : .16,
@@ -31,7 +31,7 @@
             }
         },
         "question" : {
-            "display_name" : "??",
+            "display_name" : "?? | question",
             "keywords" : [ /\?\?/ ],
             "colors" : {
                 "h" : .6,
@@ -90,9 +90,9 @@
         urlRegExp : /https?:\/\/[0-9a-zA-Z\.%\/-_]+/g,
         wordRegExp : /[^ \.&;,'"!\?\d\(\)\+\[\]\\\…\-«»:\/]{3,}/g,
         stopWords : [
-            'aussi', 'and', 'avec', 'aux', 'car', 'cette', 'comme', 'dans', 'donc', 'des', 'elle', 'est',
-            'être', 'eux', 'fait', 'ici', 'ils', 'les', 'leur', 'leurs', 'mais', 'mes', 'même', 'mon', 'notre',
-            'non', 'nos', 'nous', 'ont', 'par', 'pas', 'peu', 'pour', 'que', 'qui', 'ses' ,'son', 'sont', 'sur',
+            'aussi', 'and', 'avec', 'aux', 'bien', 'car', 'cette', 'comme', 'dans', 'donc', 'des', 'elle', 'encore', 'est',
+            'être', 'eux', 'faire', 'fait', 'ici', 'ils', 'les', 'leur', 'leurs', 'mais', 'mes', 'même', 'mon', 'notre',
+            'non', 'nos', 'nous', 'ont', 'par', 'pas', 'peu', 'peut', 'plus', 'pour', 'que', 'qui', 'ses' ,'son', 'sont', 'sur',
             'tes', 'très', 'the', 'ton', 'tous', 'tout', 'une', 'votre', 'vos', 'vous'
             ],
     }
@@ -277,7 +277,7 @@
     var tab = tweet.text.replace(twCx.urlRegExp,'').match(twCx.wordRegExp);
     for (var i in tab) {
         var word = tab[i].toLowerCase();
-        if (twCx.stopWords.indexOf(word) == -1 && tracking_keywords.indexOf(word) == -1) {
+        if (twCx.stopWords.indexOf(word) == -1 && tracking_keywords.indexOf(word) == -1 && word[0] != '@') {
             if (twCx.globalWords[word]) {
                 twCx.globalWords[word].freq++;
             } else {