--- a/web/client_new.php Fri Dec 16 19:17:47 2011 +0100
+++ b/web/client_new.php Fri Dec 16 20:10:31 2011 +0100
@@ -1,3 +1,8 @@
+<?php
+ $embed = (isset($_REQUEST['embed']) && $_REQUEST['embed']);
+ $videoWidth = ( $embed ? 442 : 480 );
+ $videoHeight = ( $embed ? 250 : 320 );
+?>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
@@ -144,10 +149,86 @@
</script>
</head>
- <body>
+ <body<?php if ($embed) { echo ' class="embed"'; } ?>>
<div id="sendUsFeedBack"><a href="<?php echo($C_feedback_form_url); ?>" target="_blank"><img src="<?php echo(URL_ROOT); ?>images/sendusfeedback.png"></a></div>
<div id="container">
+
+ <div id="coldroite">
+ <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="<?php echo $videoWidth; ?>" height="<?php echo $videoHeight; ?>">
+ <param name="movie" value="<?php echo(URL_ROOT); ?>res/mediaplayer/player.swf" />
+ <param name="allowfullscreen" value="true" />
+ <param name="allowscriptaccess" value="always" />
+ <param name="wmode" value="transparent" />
+ <param name="flashvars" value="autostart=true&live=true&image=<?php echo($big_visual_url); ?>&provider=rtmp&streamer=rtmp://media.iri.centrepompidou.fr/ddc_player/&file=livestream&controlbar=none&autostart=true" />
+ <embed
+ type="application/x-shockwave-flash"
+ id="player2"
+ name="player2"
+ src="<?php echo(URL_ROOT); ?>res/mediaplayer/player.swf"
+ width="<?php echo $videoWidth; ?>"
+ height="<?php echo $videoHeight; ?>"
+ allowscriptaccess="always"
+ allowfullscreen="true"
+ wmode="transparent"
+ flashvars="autostart=true&live=true&provider=rtmp&streamer=rtmp://media.iri.centrepompidou.fr/ddc_player/&file=livestream&image=<?php echo($big_visual_url); ?>&controlbar=none&autostart=true"
+ />
+ </object>
+ <?php elseif(isset($config['islive_embed']) && count($config['islive_embed'])>0):?>
+ <?php echo($config['islive_embed']); ?>
+ <?php else: ?>
+ <img src="<?php echo($big_visual_url); ?>" width="<?php echo $videoWidth; ?>" height="<?php echo $videoHeight; ?>" />
+ <?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>
+ <ul id="accordeon">
+ <li class="acctitre">
+ <h3><?php echo($translate->_('config__title')); ?></h3>
+ </li>
+ <li class="acctexte">
+ <p><?php echo($translate->_('config__description')); ?></p>
+ </li>
+ <li class="acctitre">
+ <h3><?php echo($translate->_('keywords')); ?></h3>
+ </li>
+ <li class="acctexte hidden">
+ <div class="accsubtitle">
+ <div class="aroundsubtitle">
+ <h4><?php echo($translate->_('suggested')); ?></h4>
+ </div>
+ </div>
+ <div class="tagcloud" id="suggkw"></div>
+ </li>
+ <li class="acctexte hidden">
+ <div class="accsubtitle">
+ <div class="aroundsubtitle">
+ <h4><?php echo($translate->_('contextual')); ?></h4>
+ </div>
+ </div>
+ <div class="tagcloud" id="motscles"></div>
+ </li>
+ </ul>
+ </div>
<div id="colgauche">
<div class="barre">
<img id="headlogo" src="<?php echo($head_logo); ?>" width="171" height="63" />
@@ -244,81 +325,6 @@
</div>
</div>
</div>
- <div id="coldroite">
- <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">
- <param name="movie" value="<?php echo(URL_ROOT); ?>res/mediaplayer/player.swf" />
- <param name="allowfullscreen" value="true" />
- <param name="allowscriptaccess" value="always" />
- <param name="wmode" value="transparent" />
- <param name="flashvars" value="autostart=true&live=true&image=<?php echo($big_visual_url); ?>&provider=rtmp&streamer=rtmp://media.iri.centrepompidou.fr/ddc_player/&file=livestream&controlbar=none&autostart=true" />
- <embed
- type="application/x-shockwave-flash"
- id="player2"
- name="player2"
- src="<?php echo(URL_ROOT); ?>res/mediaplayer/player.swf"
- width="480"
- height="320"
- allowscriptaccess="always"
- allowfullscreen="true"
- wmode="transparent"
- flashvars="autostart=true&live=true&provider=rtmp&streamer=rtmp://media.iri.centrepompidou.fr/ddc_player/&file=livestream&image=<?php echo($big_visual_url); ?>&controlbar=none&autostart=true"
- />
- </object>
- <?php elseif(isset($config['islive_embed']) && count($config['islive_embed'])>0):?>
- <?php echo($config['islive_embed']); ?>
- <?php else: ?>
- <img src="<?php echo($big_visual_url); ?>" width="480" height="320" />
- <?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>
- <ul id="accordeon">
- <li class="acctitre">
- <h3><?php echo($translate->_('config__title')); ?></h3>
- </li>
- <li class="acctexte">
- <p><?php echo($translate->_('config__description')); ?></p>
- </li>
- <li class="acctitre">
- <h3><?php echo($translate->_('keywords')); ?></h3>
- </li>
- <li class="acctexte hidden">
- <div class="accsubtitle">
- <div class="aroundsubtitle">
- <h4><?php echo($translate->_('suggested')); ?></h4>
- </div>
- </div>
- <div class="tagcloud" id="suggkw"></div>
- </li>
- <li class="acctexte hidden">
- <div class="accsubtitle">
- <div class="aroundsubtitle">
- <h4><?php echo($translate->_('contextual')); ?></h4>
- </div>
- </div>
- <div class="tagcloud" id="motscles"></div>
- </li>
- </ul>
- </div>
<div class="footer">
<hr />
<?php
--- a/web/enmi2011/config.php Fri Dec 16 19:17:47 2011 +0100
+++ b/web/enmi2011/config.php Fri Dec 16 20:10:31 2011 +0100
@@ -74,7 +74,7 @@
'use_tweetcast' => true,
'js_config' => "
var connect_type = 'gevent',
- source_address = 'http://polemictweet.com:8888/',
+ source_address = 'http://polemictweet.com:8080/',
tracking_keywords = [ \"#enmi\" ],
suggested_keywords = [
\"confiance\",
--- a/web/res/css/tweetcast.css Fri Dec 16 19:17:47 2011 +0100
+++ b/web/res/css/tweetcast.css Fri Dec 16 20:10:31 2011 +0100
@@ -26,7 +26,12 @@
}
body {
- font-family: 'PT Sans', Helvetica, Arial, sans-serif; background-color: #F7F6F6; background-image: url("twcx-img/bgd.jpg"); background-repeat: repeat-x;
+ font-family: 'PT Sans', Helvetica, Arial, sans-serif; background-color: #F7F6F6;
+ background-image: url("twcx-img/bgd.jpg"); background-repeat: repeat-x;
+}
+
+body.embed {
+ background-position: 0 -63px;
}
h2, h3, h4 {
@@ -59,18 +64,31 @@
position: absolute; right: 0; top: 0; width: 100px; z-index: 999999;
}
+.embed #sendUsFeedBack {
+ display: none;
+}
+
#container {
position: relative; width: 960px; margin: 0 auto;
}
+.embed #container {
+ width: 455px; padding-bottom: 70px;
+}
+
#colgauche {
- float: left; width: 455px; margin-right: 13px;
+ float: right; width: 455px; margin-right: 13px;
+}
+
+.embed #colgauche {
+ margin: 0;
}
.barre {
float: left; width: 100%;
}
+
.greyed {
color: #999; font-style: italic;
}
@@ -86,12 +104,20 @@
float: left; margin-right: 10px;
}
+.embed #headlogo {
+ display: none;
+}
+
#minilogo {
background: url("../../images/pol_color.gif") left top no-repeat;
width: 46px; height: 5px; left: 99px; top: 55px;
position: absolute; z-index: 9;
}
+.embed #minilogo {
+ display: none;
+}
+
.menu {
border-left: 1px solid #C3C3C3;
float: left;
@@ -100,6 +126,10 @@
height: 62px; overflow: hidden;
}
+.embed .menu {
+ display: none;
+}
+
.menu li {
background: url("twcx-img/menu_underline.gif") left bottom no-repeat;
padding: 3px 0 0 5px;
@@ -384,6 +414,10 @@
border-left: 1px solid #999;
}
+.embed #onglets {
+ display: none;
+}
+
#onglets li {
float: left; text-transform: uppercase; background: url(twcx-img/bg_onglet.png) repeat-x;
line-height: 12px; font-size: 12px; height: 12px; padding: 6px 10px; font-weight: bold;
@@ -407,7 +441,11 @@
}
#coldroite {
- float: left; width: 492px;
+ float: right; width: 492px;
+}
+
+.embed #coldroite {
+ width: 455px;
}
div.ifwrap {
@@ -418,10 +456,23 @@
width: 480px; height: 320px; background: #000000; border: none; padding: 0; margin: 0;
}
+
+.embed div.ifwrap, .embed #videoLivePlayer {
+ width: 442px; height: 250px;
+}
+
+.embed div.ifwrap {
+ margin: 5px 0 0;
+}
+
#out_fleche {
float: left; position: relative; width: 492px; height: 14px; background: url(twcx-img/bgnoarrow.png);
}
+.embed #out_fleche {
+ display: none;
+}
+
#in_fleche {
position: absolute; left: 10px; width: 27px; height: 15px; background: url(twcx-img/arrowtop.png);
}
@@ -430,6 +481,10 @@
float: left; width: 492px; list-style: none; background: #999999;
}
+.embed #accordeon {
+ display: none;
+}
+
#accordeon h3 {
font-size: 16px; font-weight: bold; color: #555555;
}
@@ -500,6 +555,10 @@
float: left; width: 100%; margin: 40px 0 10px; text-align: center;
}
+.embed .footer {
+ display: none;
+}
+
hr {
background: #cccccc; border: none; height: 1px; margin: 0 0 10px; width: 100%;
}
--- a/web/res/js-tweetcast/live-polemic.js Fri Dec 16 19:17:47 2011 +0100
+++ b/web/res/js-tweetcast/live-polemic.js Fri Dec 16 20:10:31 2011 +0100
@@ -1062,7 +1062,7 @@
break;
case "gevent" :
- $.getJSON( source_address + '/?callback=?', function(data) {
+ $.getJSON( source_address + '?callback=?', function(data) {
loadTweets(data.tweets)
} );