tweet_live: comparison web/client.php

equal deleted inserted replaced

-:e652022fd1f7
+:03d2aa7b4967
 $videoHeight = ( $embed ? 280 : 320 );
 if ($embed && !isset($_SESSION['TWITTER_ACCESS_TOKEN']) && (isset($_REQUEST['auth_redirect']) || isset($_SERVER['HTTP_REFERER']))) {
 $_SESSION['TWITTER_REDIRECT_URL'] = isset($_REQUEST['auth_redirect']) ? $_REQUEST['auth_redirect'] : $_SERVER['HTTP_REFERER'];
 };
+$annotations = get_default_annotations_config($config, $translate);
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
 "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="<?php echo($actual); ?>">
 <meta http-equiv="X-UA-Compatible" content="IE=9" />
 <!-- FONT -->
 <link href='<?php echo(registry_url('PT-Sans_Narrow','font'))?>' rel='stylesheet' type='text/css'>
 <link href='<?php echo(registry_url('PT-Sans','font'))?>' rel='stylesheet' type='text/css'>
 <!-- CSS -->
 <link rel="stylesheet" href="<?php echo(registry_url('fancybox','css'));?>" type="text/css" media="screen">
 <link rel="stylesheet" href="<?php echo(registry_url('tweetcast','css'));?>?v=210512" type="text/css" media="screen, projection"/>
 <!-- JAVASCRIPT -->
 <script type="text/javascript" src="<?php echo(registry_url('jquery-mousewheel','js'))?>"></script>
 <script type="text/javascript" src="<?php echo(registry_url('jquery-scrollto','js'))?>"></script>
 <script type="text/javascript" src="<?php echo(registry_url('underscore','js'))?>"></script>
 <script type="text/javascript" src="<?php echo(registry_url('raphael','js'))?>"></script>
 <script type="text/javascript" src="<?php echo(registry_url('fancybox','js'))?>"></script>
 <script type="text/javascript">
 <?php
 if (isset($config['tracking_keywords']) && count($config['tracking_keywords'])) {
 echo "var tracking_keywords = ".json_encode($config['tracking_keywords']).';';
 } elseif (isset($config['hashtag'])) {
 echo "var tracking_keywords = ".json_encode(array($config['hashtag'])).";";
 }
 ?>
 <?php if (isset($config['suggested_keywords'])) echo "var suggested_keywords = ".json_encode($config['suggested_keywords']).";"; ?>
-<?php if (isset($config['js_config'])) echo $config['js_config']; ?>
+<?php if (isset($config['js_config'])) echo "\n".$config['js_config']."\n"; ?>
 l10n = { "rechercher" : "<?php echo $translate->_('Rechercher'); ?>" }
-var annotations = {
+if (typeof annotations == "undefined" || !annotations) {
-"default" : {
+var annotations = JSON.parse("<?php echo addslashes(json_encode($annotations)); ?>");
-"colors" : {
+for(var annot_cat in annotations) {
-"h" : 0,
+if("keywords" in annotations[annot_cat]) {
-"s" : 0
+annotations[annot_cat]['keywords'] = [ new RegExp(annotations[annot_cat]['keywords']), ];
-}
-},
-"positive" : {
-"display_name" : "++ | <?php echo $translate->_('Agree'); ?>",
-"keywords" : [ /\+\+/ ],
-"colors" : {
-"h" : .3,
-"s" : .65
-}
-},
-"negative" : {
-"display_name" : "-- | <?php echo $translate->_('Disagree'); ?>",
-"keywords" : [ /\-\-/ ],
-"colors" : {
-"h" : 0,
-"s" : .8
-}
-},
-"reference" : {
-"display_name" : "== | <?php echo $translate->_('Reference'); ?>",
-"keywords" : [ /\=\=/ ],
-"colors" : {
-"h" : .16,
-"s" : .8
-}
-},
-"question" : {
-"display_name" : "?? | <?php echo $translate->_('Question'); ?>",
-"keywords" : [ /\?\?/ ],
-"colors" : {
-"h" : .6,
-"s" : .8
 }
 }
 }
+console.log(annotations);
 </script>
 <?php if (isset($_SESSION['TWITTER_ACCESS_TOKEN'])) { ?>
 <script type="text/javascript" src="<?php echo(registry_url('twcx-main','js'))?>"></script>
 <?php } ?>
 <script type="text/javascript">
 function add_grammar(value) {
 var _st = $('#status'),
 _val = _st.val();
 _st.val( _val + ( _val[_val.length - 1] == " " ? "" : " " ) + value ).change();
 }
 $(document).ready(function() {
 function updateCounter() {
 var _v = $("#status").val();
 if (_v.length > 140) {
 _v = _v.substr(0,140);
 $("#status").val(_v);
 } else {
 $(_e).removeClass('selected');
 }
 });
 }
 // BUTTONS
 $(".tweetButton").click(function() {
 add_grammar($(this).find('span.twbSyntax').text());
 updateCounter();
 })
 // SEND TWEETS
 $("#sendTweet").click(function(){
 var MyStatus = $('#status').val();
 $.post('tweet_ajax.php', {status:MyStatus}
 ,function(data) {
 if(data=="true"){
 $("#messageSuccess").show('fast');
 $("#messageSuccess").delay(800).hide('slow');
 $('#status').val("<?php echo($config['hashtag']); ?>");
 $('#status').change();
 }else{
 $("#error").text(data);
 $("#messageFailed").show('fast');
 $("#messageFailed").delay(800).hide('slow');
 }
 });
 });
 $("#status").bind("change keyup paste blur focus",updateCounter);
 $("#Program").fancybox({
 'width'             : '75%',
 'height'            : '75%',
 'autoScale'         : false,
 'transitionIn'      : 'none',
 'autoDimensions'    : false,
 'transitionIn'      : 'none',
 'transitionOut'     : 'none',
 'type'              : 'iframe'
 });
 $("#onglets a").click(function() {
 $("div.ifwrap").hide();
 $("#onglets li").removeClass("selected");
 $(this).parent().addClass("selected");
 var hr = $(this).attr("href");
 $("#iframeWrap").show();
 $("#graphFrame").attr("src", hr);
 }
 return false;
 });
 });
 // hightlight
 <?php
 <?php } ?>
 //<!-- LIMIT TEXTAREA:
 // End -->
 </script>
 <script type="text/javascript">
 var _gaq = _gaq || [];
 _gaq.push(['_setAccount', 'UA-23581291-1']);
 _gaq.push(['_trackPageview']);
 _gaq.push(['_setAllowAnchor', true]);
 (function() {
 var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
 ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
 var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
 })();
 </script>
 </head>
 <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">
 <div class="embedbar">
 <a class="embedbutton" href="<?php echo(URL_ROOT.$rep)?>/live_embed_form.php">Intégrer</a>
 <!-- AddThis Button BEGIN -->
 <div class="addthis_toolbox addthis_default_style addthis_32x32_style">
 <a class="addthis_button_facebook"></a>
 jwplayer('videoLivePlayer').setup(<?php echo json_encode($jwpconfig); ?>);
 </script>
 <?php
 }
 ?>
 </div>
 <div class="ifwrap hidden" id="iframeWrap">
 <iframe id="graphFrame"></iframe>
 </div>
 <ul class="accordeon">
 <?php print $translate->_("Erreur1"); ?><div id="error">&nbsp;</div><br/><br/>
 </div>
 <a href="#"  id="sendTweet" >
 <span><?php print $translate->_("Envoyer"); ?></span>
 </a>
-<a id="positive" title="++ | <?php echo $translate->_('Agree'); ?>" class="tweetButton twbGreen">
+<?php foreach ($annotations as $annot_cat => $annot_def) {
-<span class="twbSyntax">++</span>
+if($annot_cat == "default") {
-<span class="twbSeparator">|</span>
+continue;
-<span class="twbLabel"><?php echo $translate->_('Agree'); ?></span>
+}
-</a>
+$display_parts = explode(" | ", $annot_def['display_name']);
-<a id="negative" title="-- | <?php echo $translate->_('Disagree'); ?>" class="tweetButton twbRed">
+?>
-<span class="twbSyntax">--</span>
+<a id="<?php echo $annot_cat; ?>" title="<?php echo $annot_def['display_name']; ?>" class="tweetButton <?php echo $annot_def['colors_class']; ?>">
-<span class="twbSeparator">|</span>
+<span class="twbSyntax"><?php echo $display_parts[0]; ?></span>
-<span class="twbLabel"><?php echo $translate->_('Disagree'); ?></span>
+<span class="twbSeparator">|</span>
-</a>
+<span class="twbLabel"><?php echo $display_parts[1]; ?></span>
-<a id="reference" title="== | <?php echo $translate->_('Reference'); ?>" class="tweetButton twbYellow">
+</a>
-<span class="twbSyntax">==</span>
+<?php } ?>
-<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>
 </div>
 </div>
 <?php if (isset($_SESSION['TWITTER_ACCESS_TOKEN'])) { ?>
 <div id="tweetviz">
 <div class="barre">
 <form id="recherche">
 <input autocomplete="off" class="greyed" id="inp_q" value="<?php echo $translate->_('Rechercher'); ?>" />
 <input id="inp_submit" type="submit" />
 <div id="timeline"></div>
 <div id="scrollcont">
 <div id="scrollin"></div>
 </div>
 </div>
 <?php } else {?>
 <p class="connect-message"><a href="<?php echo URL_ROOT.$rep; ?>/client.php?CONNECT=true"><?php echo $translate->_('You must be connected with your Twitter account to read the conversation'); ?></a></p>
 <?php } ?>
 </div>
 <?php $pad_url = $translate->_('config__pad_url');?>
 <?php if ($pad_url !== "config__pad_url"):?>
 <ul class="accordeon">
 <li class="acctitre">
 <?php endif;?>
 <div class="footer">
 <hr />
 <?php
 echo("<span id=\"event-partenaires\">".$translate->_('config__partenaires')."</span>");
 if (isset($_SESSION['TWITTER_ACCESS_TOKEN'])){
 echo("| <a href='clear.php' class='footerLink'>".$translate->_("D&eacute;connexion")."</a>");
 }
 ?>
 </div>

changeset 1295	03d2aa7b4967
parent 989	e4e219f7b12c
child 1366	2cebaaf18c54