Mercurial Mercurial > tweet_live / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
semantic board corrections
authorRaphael Velt <raph.velt@gmail.com>
Mon, 09 Jan 2012 13:06:23 +0100
changeset 470 1e091ac28dd9
parent 469 99d105834315
child 471 65f3ce59d8b7
semantic board corrections
web/client_new.php file | annotate | diff | comparison | revisions
web/client_old.php file | annotate | diff | comparison | revisions
web/enmi2011/config.php file | annotate | diff | comparison | revisions
web/res/css/semanticboard.css file | annotate | diff | comparison | revisions 
--- a/web/client_new.php	Mon Jan 09 12:51:19 2012 +0100
+++ b/web/client_new.php	Mon Jan 09 13:06:23 2012 +0100
@@ -160,11 +160,13 @@
                         <a href="#vlWrap"><?php echo($translate->_('Video')); ?></a>
                     </li>
                     <li>
-                        <a href="../sweet-tweet/small.html"><?php echo($translate->_('SemanticBoard')); ?></a>
+                        <a href="semanticboard.php?small=1&theme=jour"><?php echo($translate->_('SemanticBoard')); ?></a>
                     </li>
+<?php if (isset($config['knowtex_url'])) { ?>
                     <li>
-                        <a href="http://labs.knowtex.com/enmi2011/?mapOnly#carto"><?php echo($translate->_('SocialGraph')); ?></a>
+                        <a href="<?php echo $config['knowtex_url'] ?>"><?php echo($translate->_('SocialGraph')); ?></a>
                     </li>
+<?php } ?>
                 </ul>
                 <div class="ifwrap" id="vlWrap">
                     <div id="videoLivePlayer">
--- a/web/client_old.php	Mon Jan 09 12:51:19 2012 +0100
+++ b/web/client_old.php	Mon Jan 09 13:06:23 2012 +0100
@@ -279,11 +279,13 @@
             <a href="#vlWrap"><?php echo($translate->_('Video')); ?></a>
         </li>
         <li>
-            <a href="../sweet-tweet/small.html"><?php echo($translate->_('SemanticBoard')); ?></a>
+            <a href="semanticboard.php?small=1&theme=jour"><?php echo($translate->_('SemanticBoard')); ?></a>
         </li>
+<?php if (isset($config['knowtex_url'])) { ?>
         <li>
-            <a href="http://labs.knowtex.com/enmi2011/?mapOnly#carto"><?php echo($translate->_('SocialGraph')); ?></a>
+            <a href="<?php echo $config['knowtex_url'] ?>"><?php echo($translate->_('SocialGraph')); ?></a>
         </li>
+<?php } ?>
     </ul>
     <div class="ifwrap" id="vlWrap">
 	  <?php if ($config['islive']):?>
--- a/web/enmi2011/config.php	Mon Jan 09 12:51:19 2012 +0100
+++ b/web/enmi2011/config.php	Mon Jan 09 13:06:23 2012 +0100
@@ -106,6 +106,7 @@
 	'player_height' => 488,
 	
     // New Tweet live parameters
+    'knowtex_url' => "http://labs.knowtex.com/enmi2011/?mapOnly#carto",
     'use_tweetcast' => false,
     'js_config' => "
     var connect_type = 'gevent',
--- a/web/res/css/semanticboard.css	Mon Jan 09 12:51:19 2012 +0100
+++ b/web/res/css/semanticboard.css	Mon Jan 09 13:06:23 2012 +0100
@@ -28,9 +28,7 @@
 
 .small #container {
     width: 446px;
-    margin: 0 auto;
-    position: relative;
-    overflow: hidden;
+    height: 500px;
 }
 
 #tweetcont {
@@ -58,6 +56,10 @@
     float: left; width: 800px; margin-top: 12px;
 }
 
+.small #columncont {
+    width: 446px;
+}
+
 .column {
     float: left; width: 780px; height: 70px; margin: 5px 10px; position: relative;
 }
tweet_live