# HG changeset patch
# User Raphael Velt <raph.velt@gmail.com>
# Date 1324052552 -3600
# Node ID c8db83b70def3ae6249b80ad482f1f7d12d1ecc5
# Parent  eb7c2cff1816ee3a3c508b43d2bdf09e45e0a8a4
Added "sweet-tweet" & Knowtex iframes in client

diff -r eb7c2cff1816 -r c8db83b70def web/client_new.php
--- a/web/client_new.php	Fri Dec 16 15:57:23 2011 +0100
+++ b/web/client_new.php	Fri Dec 16 17:22:32 2011 +0100
@@ -39,12 +39,11 @@
     
     $(document).ready(function() {
         
-        setTimeout(function() {
+/*        setTimeout(function() {
             $.scrollTo(70, 1000);
-        }, 2000);
+        }, 2000); */
         
         $("#accordeon h3").click(function() {
-            console.log("click");
             $("li.acctexte").slideToggle();
             return false;
         })
@@ -104,6 +103,20 @@
                 'type'              : 'iframe'
             });
             
+    $("#onglets a").click(function() {
+        $("div.ifwrap").hide();
+        $("#onglets li").removeClass("selected");
+        $(this).parent().addClass("selected");
+        var hr = $(this).attr("href");
+        if (hr[0] == '#') {
+            $(hr).show();
+        } else {
+            $("#iframeWrap").show();
+            $("#graphFrame").attr("src", hr);
+        }
+        return false;
+    });
+            
 
         });
 
@@ -231,13 +244,19 @@
                     </div>
                 </div>
             </div>
-            <ul id="onglets">
-                <li class="selected">Vidéo</li>
-                <li>Tweet Wall</li>
-                <li>Graphe des contributeurs</li>
-            </ul>
             <div id="coldroite">
-                <div id="vlWrap">
+                <ul id="onglets">
+                    <li class="selected">
+                        <a href="#vlWrap"><?php echo($translate->_('Video')); ?></a>
+                    </li>
+                    <li>
+                        <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>
+                    </li>
+                </ul>
+                <div class="ifwrap" id="vlWrap">
                     <div id="videoLivePlayer">
                     <?php if ($config['islive']):?>
                         <object id="player" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" name="player" width="480" height="320">
@@ -266,6 +285,9 @@
                     <?php endif; ?>
                     </div>
                 </div>
+                <div class="ifwrap hidden" id="iframeWrap">
+                    <iframe id="graphFrame"></iframe>
+                </div>
                 <div id="out_fleche">
                 <!--    <div id="in_fleche"></div> -->
                 </div>
diff -r eb7c2cff1816 -r c8db83b70def web/enmi2011/config.php
--- a/web/enmi2011/config.php	Fri Dec 16 15:57:23 2011 +0100
+++ b/web/enmi2011/config.php	Fri Dec 16 17:22:32 2011 +0100
@@ -73,8 +73,8 @@
     // New Tweet live parameters
     'use_tweetcast' => true,
     'js_config' => "
-    var connect_type = 'standalone',
-    source_address = 'http://velt.info/polemic/tweetdata.js',
+    var connect_type = 'gevent',
+    source_address = 'http://polemictweet.com:8888/',
     tracking_keywords = [ \"#enmi\" ],
     suggested_keywords = [
         \"confiance\",
diff -r eb7c2cff1816 -r c8db83b70def web/res/css/tweetcast.css
--- a/web/res/css/tweetcast.css	Fri Dec 16 15:57:23 2011 +0100
+++ b/web/res/css/tweetcast.css	Fri Dec 16 17:22:32 2011 +0100
@@ -390,20 +390,32 @@
     border: 1px #999; border-style: solid solid solid none; margin-top: 1px;
 }
 
+#onglets a {
+    text-decoration: none; color: #666666;
+}
+
+#onglets a:hover {
+    color: #0099ff;
+}
+
 #onglets li.selected {
     background-position: 0 -22px; padding-bottom: 8px; border-bottom: none; margin-top: 0;
 }
 
+#onglets li.selected a {
+    color: #333333; 
+}
+
 #coldroite {
     float: left; width: 492px;
 }
 
-#vlWrap {
-    float: left; border: 5px solid #ffffff; background: #999999; padding: 1px;
+div.ifwrap {
+    float: left; border: 5px solid #ffffff; background: #999999; padding: 1px; width: 480px; height: 320px;
 }
 
-#videoLivePlayer {
-    width: 480px; height: 320px; background: #000000;
+#videoLivePlayer, .ifwrap iframe {
+    width: 480px; height: 320px; background: #000000; border: none; padding: 0; margin: 0;
 }
 
 #out_fleche {
diff -r eb7c2cff1816 -r c8db83b70def web/sweet-tweet/script.js
--- a/web/sweet-tweet/script.js	Fri Dec 16 15:57:23 2011 +0100
+++ b/web/sweet-tweet/script.js	Fri Dec 16 17:22:32 2011 +0100
@@ -1,10 +1,9 @@
-var THRESHOLD = 12,
+var THRESHOLD = 13,
     DROPCOUNT = 12;
 
 var swTw = {
     "keyword" : "#enmi",
     "columns_words" : [
-        "politique",
         "confiance",
         "croyance",
         "crédit",
@@ -15,7 +14,8 @@
         "démocratie", 
         "expertise",
         "catastrophe",
-        "transparence"
+        "transparence",
+        "politique",
     ],
     "tweets" : [],
     "tweetsIndex" : [],
@@ -162,9 +162,9 @@
 
 function retrieveTweets() {
     var options =  {
-        "keyword" : swTw.columns_words.join(" OR "),
-        "lang" : "fr",
-//        "keyword" : "#enmi",
+//        "keyword" : swTw.columns_words.join(" OR "),
+//        "lang" : "fr",
+        "keyword" : "#enmi",
         "pages" : 1,
         "rpp" : 100,
         "cbEnd" : function() {
diff -r eb7c2cff1816 -r c8db83b70def web/sweet-tweet/small.html
--- a/web/sweet-tweet/small.html	Fri Dec 16 15:57:23 2011 +0100
+++ b/web/sweet-tweet/small.html	Fri Dec 16 17:22:32 2011 +0100
@@ -4,31 +4,14 @@
         <meta charset="utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
         <title>Sweet Tweet</title>
-        <style type="text/css">
-            body {
-                margin: 0; background: #000000;
-            }
-            #aroundtw {
-                margin: 0 auto; width: 400px; height: 640px; overflow: hidden;
-            }
-            #tweetwall {
-                -moz-transform: scale(.5);
-                -moz-transform-origin: top left;
-                -webkit-transform: scale(.5);
-                -webkit-transform-origin: top left;
-                -ms-transform: scale(.5);
-                -ms-transform-origin: top left;
-                width: 800px;
-                height: 1280px;
-                border: none;
-                padding: 0; margin: 0;
-            }
-        </style>
+        <link rel="stylesheet" type="text/css" href="style-small.css" />
+        <script type="text/javascript" src="lib/jquery-1.7.1.min.js"></script>
+        <script type="text/javascript" src="lib/underscore-min.js"></script>
+        <script type="text/javascript" src="script.js"></script>
     </head>
-    <body>
-        <div id="aroundtw">
-            <iframe id="tweetwall" src="index.html"></iframe>
+    <body class="jour">
+        <div id="container">
+            <div id="columncont"></div>
         </div>
-        
     </body>
 </html>
\ No newline at end of file
diff -r eb7c2cff1816 -r c8db83b70def web/sweet-tweet/style-small.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/sweet-tweet/style-small.css	Fri Dec 16 17:22:32 2011 +0100
@@ -0,0 +1,64 @@
+body {
+    margin: 0; font-family: Helvetica, Arial, sans-serif;
+}
+
+body.jour {
+    background: #ffffff;
+}
+
+body.nuit {
+    background: #000000;
+}
+
+img {
+    border: none;
+}
+
+
+#container {
+    width: 446px;
+    margin: 0 auto;
+    position: relative;
+    overflow: hidden;
+}
+
+.column {
+    float: left; width: 446px; height: 32px; margin: 2px 0; position: relative;
+}
+
+.column-tube {
+    float: left; width: 221px; height: 32px;
+}
+
+.tube {
+    width: 500px; height: 16px; margin-left: -279px; overflow: hidden;
+}
+
+.column-title {
+    float: left; margin-left: 4px; width: 221px; height: 32px;
+}
+
+.polemicvol {
+    float: right; height: 32px;
+}
+
+.column-title h3 {
+    position: absolute; margin: 6px; padding: 0; font-size: 18px; line-height: 18px;
+    height: 18px; text-transform: uppercase; font-weight: normal;
+}
+
+.jour .column-tube, .jour .column-title {
+    background: #cccccc; color: #333333;
+}
+ 
+.nuit .column-tube, .nuit .column-title {
+    background: #eeeeee; color: #000000;
+}
+   
+div.avatar {
+   float: right; width: 16px; height: 16px; overflow: hidden;
+}
+
+.avatar img {
+    width: 100%; height: 100%;
+}
diff -r eb7c2cff1816 -r c8db83b70def web/sweet-tweet/style.css
--- a/web/sweet-tweet/style.css	Fri Dec 16 15:57:23 2011 +0100
+++ b/web/sweet-tweet/style.css	Fri Dec 16 17:22:32 2011 +0100
@@ -19,7 +19,7 @@
 }
 
 #container {
-    width: 800px;
+    width: 960px;
     height: 1280px;
     margin: 0 auto;
     position: relative;
@@ -27,7 +27,7 @@
 }
 
 #tweetcont {
-    float: left; width: 760px; height: 96px; background: #dddddd;
+    float: left; width: 920px; height: 96px; background: #dddddd;
     padding: 20px;
 }
 
@@ -36,7 +36,7 @@
 }
 
 #tweetcont p {
-    margin: -2px 5px 10px 106px; padding: 0; font-size: 20px;
+    margin: -4px 5px 10px 106px; padding: 0; font-size: 26px;
 }
 
 p.tweet_text {
@@ -48,23 +48,23 @@
 }
 
 #columncont {
-    float: left; width: 800px; margin-top: 20px;
+    float: left; width: 960px; margin-top: 12px;
 }
 
 .column {
-    float: left; width: 780px; height: 70px; margin: 8px 10px; position: relative;
+    float: left; width: 900px; height: 70px; margin: 8px 30px; position: relative;
 }
 
 .column-tube {
-    float: left; width: 420px; height: 70px;
+    float: left; width: 442px; height: 70px;
 }
 
 .tube {
-    width: 1000px; height: 35px; margin-left: -580px; overflow: hidden;
+    width: 1000px; height: 35px; margin-left: -558px; overflow: hidden;
 }
 
 .column-title {
-    float: left; margin-left: 10px; width: 350px; height: 70px;
+    float: left; margin-left: 16px; width: 442px; height: 70px;
 }
 
 .polemicvol {
@@ -93,7 +93,7 @@
 }
 
 div#logos {
-    width: 800px; height: 87px; background: #dddddd; position: absolute; left: 0; bottom: 0;
+    width: 960px; height: 87px; background: #dddddd; position: absolute; left: 0; bottom: 0;
 }
 
 #logos img {
diff -r eb7c2cff1816 -r c8db83b70def web/traduction.php
--- a/web/traduction.php	Fri Dec 16 15:57:23 2011 +0100
+++ b/web/traduction.php	Fri Dec 16 17:22:32 2011 +0100
@@ -154,7 +154,10 @@
                 "addToTweet" => "Tweeter",
                 "keywords" => "Mots-clés",
                 "suggested" => "Suggérés",
-                "contextual" => "Contextuels"
+                "contextual" => "Contextuels",
+                "Video" => "Vidéo",
+                "SemanticBoard" => "Semantic Board",
+                "SocialGraph" => "Graphe des contributeurs"
 				);
                               
 $english = array(
@@ -296,7 +299,10 @@
                 "addToTweet" => "Tweet it",
                 "keywords" => "Keywords",
                 "suggested" => "Suggested",
-                "contextual" => "Contextual"
+                "contextual" => "Contextual",
+                "Video" => "Video",
+                "SemanticBoard" => "Semantic Board",
+                "SocialGraph" => "Contributors Graph"
 				);
                 
 $japan = array(
@@ -430,6 +436,9 @@
                 "addToTweet" => "Tweet it",
                 "keywords" => "Keywords",
                 "suggested" => "Suggested",
-                "contextual" => "Contextual"
+                "contextual" => "Contextual",
+                "Video" => "Video",
+                "SemanticBoard" => "Semantic Board",
+                "SocialGraph" => "Contributors Graph"
 );
 ?>
\ No newline at end of file