# HG changeset patch # User Raphael Velt # Date 1331036538 -3600 # Node ID 8276f3ff7a3f053fc388142038557ded1cfd0ea4 # Parent 0a2505c3b5470aef069beb048f462e714e6a4cc3 Added new player in player_embed diff -r 0a2505c3b547 -r 8276f3ff7a3f tweetcast/client/config.js --- a/tweetcast/client/config.js Mon Mar 05 18:41:11 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ -var tracking_keywords = [ "#rsln" ], - annotations = { - "default" : { - "colors" : { - "tweet" : "#ffffff", - "timeline" : "#585858", - "h" : 0, - "s" : 0 - } - }, - "positive" : { - "display_name" : "++", - "keywords" : [ /\+\+/ ], - "colors" : { - "tweet" : "#c5e7cd", - "timeline" : "#1D973D", - "h" : .3, - "s" : .65 - } - }, - "negative" : { - "display_name" : "--", - "keywords" : [ /\-\-/ ], - "colors" : { - "tweet" : "#f6ced0", - "timeline" : "#CE0A15", - "h" : 0, - "s" : .8 - } - }, - "reference" : { - "display_name" : "==", - "keywords" : [ /\=\=/ ], - "colors" : { - "tweet" : "#ecedc1", - "timeline" : "#C5A62D", - "h" : .16, - "s" : .8 - } - }, - "question" : { - "display_name" : "??", - "keywords" : [ /\?\?/ ], - "colors" : { - "tweet" : "#bfdbec", - "timeline" : "#036AAE", - "h" : .6, - "s" : .8 - } - } - } diff -r 0a2505c3b547 -r 8276f3ff7a3f tweetcast/client/css/style.css --- a/tweetcast/client/css/style.css Mon Mar 05 18:41:11 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,336 +0,0 @@ -/* Browser-reset CSS */ - -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, -figure, figcaption, footer, header, hgroup, -menu, nav, output, ruby, section, summary, -time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; -} - -body { - font-family: Helvetica, Arial, sans-serif; background-color: #F7F6F6; background-image: url("../img/bgd.jpg"); background-repeat: repeat-x; -} - -b { - font-weight: bold; -} - -.highlight { - background: #ffff00; -} - -#container { - width: 960px; margin: 0 auto; -} - -#colgauche { - float: left; width: 455px; margin-right: 13px; -} - -.barre { - float: left; width: 100%; -} - -.greyed { - color: #999; font-style: italic; -} - -.rechercheCourante { - background: #ffa0ff; font-weight: bold; color: #000080; -} - -/* Menu */ - -#headlogo { - float: left; margin-right: 10px; -} - -.menu { - border-left: 1px solid #C3C3C3; - float: left; - list-style: none; - font-size: 12px; - height: 62px; overflow: hidden; -} - -.menu li { - background: url("../img/menu_underline.gif") left bottom no-repeat; - padding: 3px 0 0 5px; - height: 18px; - min-width: 80px; -} - -.menu a { - color: #000000; text-decoration: none; -} - -.menu a:hover { - color: #0099FF; -} - -/* Formulaire */ - -#twwWrap { - float: left; width: 450px; background: #ffffff; padding: 1px; border-width: 1px; border-style: solid solid none solid; border-color: #ababab; margin-top: 6px; -} - -#tweetWriter { - width: 430px; padding: 10px; background: #efefef; -} - -/* Liste de Tweets */ - -#tweetviz { - float: left; width: 452px; border: 1px solid #999; -} - -/* Recherche */ - -#recherche { - position: relative; float: left; padding: 2px 0; width: 452px; border-bottom: 1px solid #999; -} - -#recherche input { - float: left; -} - -#inp_q { - width: 236px; border: none; padding: 1px; margin-left: 2px; height: 17px; font-size: 13px; -} - -#inp_submit, #inp_reset { - border: 0; padding: 0; width: 20px; height: 20px; overflow: hidden; text-indent: 800px; background: url(../img/searchcancel.png) -} - -#inp_submit:hover { - background-position: -20px 0; -} - -#inp_submit:active { - background-position: -40px 0; -} - -#inp_reset { - background-position: 0 -20px; -} - -#inp_reset:hover { - background-position: -20px -20px; -} - -#inp_reset:active { - background-position: -40px -20px; -} - -#time_legende { - float: left; margin-left: 30px; width: 30px; height: 20px; background: url(../img/scale.png) left; -} - -#time_scale { - float: left; font-size: 12px; margin: 3px 0 0; color: #666; width: 50px; text-align: center; -} - -#time_zoomout, #time_zoomin { - float: left; width: 12px; height: 20px; background: url(../img/scale.png); -} - -#time_zoomout { - background-position: -30px; -} - -#time_zoomout.inactive { - background-position: -54px; -} - -#time_zoomin { - background-position: -42px; -} - -#time_zoomin.inactive { - background-position: -66px; -} - -#recherche_annot { - position: absolute; top: 20px; z-index: 4; background: #ffffff; border: 1px solid #ccc; padding: 4px; font-size: 12px; - display: none; box-shadow: 2px 2px 2px rgba(0, 0, 0, .5) -} - -#recherche_annot a { - padding: 1px; line-height: 13px; margin: 1px; font-weight: bold; text-decoration: none; color: #000000; -} - -/* Liste des tweets */ - -#tweetlist { - float: left; width: 280px; height: 480px; list-style: none; border-right: 1px solid #999; color: #585858; cursor: pointer; cursor: hand; background: #ffffff; -} - -#tweetlist a { - text-decoration: none; color: #1985B5; -} - -#tweetlist a:hover { - text-decoration: underline; color: #105060; -} - -li.tweet, li.placeholder { - border-bottom : 1px dotted; overflow: hidden; float: left; border-color: #ccc; -} - -li.tweet { - position: relative; background: #fff; -} - -li.full { - width: 270px; height: 117px; border-right: 10px solid #ff0; -} - -li.half { - width: 280px; height: 46px; -} - -li.icons { - width: 20px; height: 20px; border: none; -} - -li.placeholder { - visibility: hidden; -} - -.tweet p { - overflow: hidden; -} - -.full p.tweet_text { - font-size: 12px; margin: 5px 0 5px 58px; height: 108px; width: 207px; color: #000000; -} - -.half p.tweet_text { - font-size: 11px; margin: 5px 0 5px 49px; height: 36px; line-height: 12px; width: 216px; -} - -div.around_img { - float: left; -} - -.full .profile_image { - margin: 5px 5px 0 5px; width: 48px; height: 48px; -} - -.half .profile_image { - margin: 5px; width: 36px; height: 36px; -} - -.icons .profile_image { - margin: 2px; width: 16px; height: 16px; -} - -p.created_at { - font-size: 12px; text-align: center; font-style: italic; color: #999999; width: 58px; overflow: hidden; -} - -.annotations { - position: absolute; margin: 0; padding: 0; top: 0; left: 0; width: 100%; height: 100%; -} - -.icons .annotations { - position: absolute; width: 20px; height: 6px; left: 0; top: 16px; z-index: 3; -} - -div.annotation { - float: left; height: 100%; -} - -div.twmain { - position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 2; overflow: hidden; -} - -div.tweet_actions { - position: absolute; bottom : 2px; right: 4px; font-size: 11px; -} - -/* timeline */ - -#timeline { - float: left; height: 480px; width: 150px; border-right: 1px solid #999; cursor: pointer; cursor: hand; -} - -#scrollcont { - float: left; width: 20px; height: 480px; overflow: auto; -} - -#scrollin { - width: 1px; height: 8000px; -} - -/* hovertweet */ - -#hovertweet { - position: absolute; display: none; margin: -20px 0 0 15px; z-index: 12; -} - -div.full { - position: absolute; background: #eeeeee; width: 270px; height: 84px; border: 1px solid #808080; border-radius: 3px; box-shadow: 5px 5px 5px rgba(0,0,0,.3); -} - -#hoverarrow { - position: absolute; width: 10px; height: 18px; left: -9px; top: 13px; background: url(../img/arrow.png); -} - -/* Colonne de droite */ - -#coldroite { - float: left; width: 492px; -} - -#vlWrap { - float: left; border: 5px solid #ffffff; background: #999999; padding: 1px; margin-top: 20px; -} - -#videoLivePlayer { - width: 480px; height: 320px; background: #000000; -} - -#out_fleche { - float: left; position: relative; width: 492px; height: 14px; background: url(../img/bgnoarrow.png); -} - -#in_fleche { - position: absolute; left: 10px; width: 27px; height: 15px; background: url(../img/arrowtop.png); -} - -#accordeon { - float: left; width: 492px; list-style: none; background: #777777; -} - -#accordeon li { - float: left; width: 480px; margin: 0 1px 1px 1px; padding: 4px; border: 1px solid #ffffff; background: #efefef; -} - -#accordeon li.deplie { - background: url(../img/bgdeplie.png) top repeat-x #efefef; -} - -/* Tag Cloud */ - -#motscles { - text-align: center; -} - -#motscles span { - padding: 2px; cursor: pointer; cursor: hand; -} diff -r 0a2505c3b547 -r 8276f3ff7a3f tweetcast/client/img/arrow.png Binary file tweetcast/client/img/arrow.png has changed diff -r 0a2505c3b547 -r 8276f3ff7a3f tweetcast/client/img/arrowtop.png Binary file tweetcast/client/img/arrowtop.png has changed diff -r 0a2505c3b547 -r 8276f3ff7a3f tweetcast/client/img/bgd.jpg Binary file tweetcast/client/img/bgd.jpg has changed diff -r 0a2505c3b547 -r 8276f3ff7a3f tweetcast/client/img/bgdeplie.png Binary file tweetcast/client/img/bgdeplie.png has changed diff -r 0a2505c3b547 -r 8276f3ff7a3f tweetcast/client/img/bgnoarrow.png Binary file tweetcast/client/img/bgnoarrow.png has changed diff -r 0a2505c3b547 -r 8276f3ff7a3f tweetcast/client/img/head_logo.gif Binary file tweetcast/client/img/head_logo.gif has changed diff -r 0a2505c3b547 -r 8276f3ff7a3f tweetcast/client/img/menu_underline.gif Binary file tweetcast/client/img/menu_underline.gif has changed diff -r 0a2505c3b547 -r 8276f3ff7a3f tweetcast/client/img/placeholder.png Binary file tweetcast/client/img/placeholder.png has changed diff -r 0a2505c3b547 -r 8276f3ff7a3f tweetcast/client/img/scale.png Binary file tweetcast/client/img/scale.png has changed diff -r 0a2505c3b547 -r 8276f3ff7a3f tweetcast/client/img/searchcancel.png Binary file tweetcast/client/img/searchcancel.png has changed diff -r 0a2505c3b547 -r 8276f3ff7a3f tweetcast/client/index.html --- a/tweetcast/client/index.html Mon Mar 05 18:41:11 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ - - - - - Polemic Tweet “TweetCast” - - - - - - - - - - - -
-
-
- - -
-
-
-

Annotations polémiques

-
-
-
-
-
- - - -
-
-
- - -
-
- Recherche par annotation :
-
-
-
-
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
      -
    • Nuage de mots-clés

    • -
    • -
    -
    -
    -
    -
    -
    -
    - - \ No newline at end of file diff -r 0a2505c3b547 -r 8276f3ff7a3f tweetcast/client/js/connect-gevent.js --- a/tweetcast/client/js/connect-gevent.js Mon Mar 05 18:41:11 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -function connectTweets() { - $.getJSON('http://' + document.location.hostname + ':8888/?callback=?', function(data) { - loadTweets(data.tweets) - } ); - - setInterval(function() { - if (!twCx.tweets) { - return; - } - $.getJSON('http://' + document.location.hostname + ':8888/?after_id=' + twCx.tweets[twCx.tweets.length - 1].id + '&callback=?', function(data) { - loadTweets(data.tweets, true); - }); - }, 1000) -} \ No newline at end of file diff -r 0a2505c3b547 -r 8276f3ff7a3f tweetcast/client/js/connect-nodejs.js --- a/tweetcast/client/js/connect-nodejs.js Mon Mar 05 18:41:11 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -document.write(' - - - - - - ' rel='stylesheet' type='text/css'> - ' rel='stylesheet' type='text/css'> - ' rel='stylesheet' type='text/css'> + Polemic Tweet Embedded Player + + + + + + + + + ' rel='stylesheet' type='text/css'/> + ' rel='stylesheet' type='text/css'/> + + + + - - - - - -
    -
    -
    -
    - -
    -
    -
    - - - -
    - - -
    -
    +
    + diff -r 0a2505c3b547 -r 8276f3ff7a3f web/polemicaltimeline.php --- a/web/polemicaltimeline.php Mon Mar 05 18:41:11 2012 +0100 +++ b/web/polemicaltimeline.php Tue Mar 06 13:22:18 2012 +0100 @@ -125,7 +125,8 @@ container: "AnnotationsListContainer"}, {type: "TagCloudWidget", container: "TagcloudContainer", - + + excludePattern: /^@/ } ] }, @@ -154,12 +155,12 @@ window.location.hash = "#metadata="+metadata_key; window.location.href = window.location.href; window.location.reload(true); - jQuery("#Embeded").attr('href','/embed_form.php?metadata='+metadata_key); + jQuery(".embedbutton").attr('href','/embed_form.php?metadata='+metadata_key); }); if(metadata_key !== "metadata") { - jQuery("#Embeded").attr('href','/embed_form.php?metadata='+metadata_key); + jQuery(".embedbutton").attr('href','/embed_form.php?metadata='+metadata_key); } - jQuery("#Embeded").fancybox({ + jQuery(".embedbutton").fancybox({ 'width' : 360, 'height' : 360, 'autoDimensions' : false, @@ -243,6 +244,18 @@ +
    + Intégrer + +
    + + + + +
    + + +
    diff -r 0a2505c3b547 -r 8276f3ff7a3f web/res/css/twcx-img/embedbutton.png Binary file web/res/css/twcx-img/embedbutton.png has changed diff -r 0a2505c3b547 -r 8276f3ff7a3f web/res/css/tweetcast.css --- a/web/res/css/tweetcast.css Mon Mar 05 18:41:11 2012 +0100 +++ b/web/res/css/tweetcast.css Tue Mar 06 13:22:18 2012 +0100 @@ -82,7 +82,7 @@ #mdpgauche { - float: left; width: 300px; margin-right: 10px; margin-top: 10px; + float: left; width: 300px; margin-right: 10px; } #mdpdroite { @@ -163,7 +163,25 @@ } #content_select_ul select { - width: 400px; + width: 350px; +} + +.embedbar { + float: right; width: 216px; height: 32px; margin-top: 15px; +} + +a.embedbutton { + display: block; float: left; background: url(twcx-img/embedbutton.png); text-decoration: none; font-size: 13px; + width: 64px; text-align: center; height: 19px; padding-top: 13px; + color: #333; margin-right: 4px; +} + +a.embedbutton:hover { + background-position: 0 -32px; +} + +.addthis_toolbox { + float: left; } /* Formulaire */ @@ -608,7 +626,7 @@ } #mdpgauche li.acctexte { - max-height: 400px; + max-height: 300px; } .acctexte ul { diff -r 0a2505c3b547 -r 8276f3ff7a3f web/res/js/LdtPlayer-release.js --- a/web/res/js/LdtPlayer-release.js Mon Mar 05 18:41:11 2012 +0100 +++ b/web/res/js/LdtPlayer-release.js Tue Mar 06 13:22:18 2012 +0100 @@ -4274,7 +4274,7 @@ if (typeof(view_type) === "undefined") { view_type = this._serializer.getNonTweetIds()[0]; } - this.positionMarker = this.selector.children(":first"); + this.positionMarker = this.selector.find(".Ldt-SegmentPositionMarker"); this._Popcorn.listen("timeupdate", IriSP.wrap(this, this.positionUpdater)); @@ -5163,6 +5163,7 @@ _words = {}, _showTitle = !this._config.excludeTitle, _showDescription = !this._config.excludeDescription, + _excludePattern = this._config.excludePattern || null, _tagCount = this._config.tagCount || 30; if (typeof this._config.excludeWords !== "undefined" && this._config.excludeWords.length) { IriSP._(this._config.excludeWords).each(function(_w) { @@ -5174,7 +5175,7 @@ if (_annotation.content && _annotation.content.description) { var _txt = (_showTitle ? _annotation.content.title : '') + ' ' + (_showDescription ? _annotation.content.description : '') IriSP._(_txt.toLowerCase().replace(_urlRegExp, '').match(_regexpword)).each(function(_mot) { - if (_stopWords.indexOf(_mot) == -1) { + if (_stopWords.indexOf(_mot) == -1 && (_excludePattern == null || !_excludePattern.test(_mot))) { _words[_mot] = 1 + (_words[_mot] || 0); } }) diff -r 0a2505c3b547 -r 8276f3ff7a3f web/traduction.php --- a/web/traduction.php Mon Mar 05 18:41:11 2012 +0100 +++ b/web/traduction.php Tue Mar 06 13:22:18 2012 +0100 @@ -126,7 +126,8 @@ // Embed ############# "EmbedTitle" =>"Embarquer cette vidéo", - "EmbedText" =>"Pour embarquer cette vidéo dans votre plateforme de publication de contenu copier colle le code suivant :", + "EmbedText" =>"Pour embarquer cette vidéo dans votre plateforme de publication de contenu, copiez et collez le code suivant :", + "EmbedButton" => "Intégrer", // Polemical Timeline ############# "ExplicationPT" => "l’Institut de recherche et d’innovation (Iri) vous a proposé une expérimentation et une démonstration d’un dispositif d’annotation polémique basé sur twitter. @@ -259,6 +260,7 @@ "EmbedTitle" =>"Embed this player", "EmbedText" =>"To embed this player in your blog or cms copy this embed code in html :", + "EmbedButton" => "Embed", // Polemicla Timeline ############# "ExplicationPT" => " @@ -407,6 +409,7 @@ "EmbedTitle" =>"動画を埋め込む", "EmbedText" =>"この動画をあなたのブログなどに埋め込むには、以下のコードをコピーして、htmlに貼り付けてください :", + "EmbedButton" => "Embed", // Polemicla Timeline ############# // Polemicla Timeline #############