# HG changeset patch # User hamidouk # Date 1328193319 -3600 # Node ID cebc62a9356383df61c7653732573069a8711cd2 # Parent 10ec59f061981e71e3118c21e0f9f4455b12288c new player version. new css. diff -r 10ec59f06198 -r cebc62a93563 src/ldt/ldt/static/ldt/css/LdtPlayer.css --- a/src/ldt/ldt/static/ldt/css/LdtPlayer.css Thu Feb 02 11:07:20 2012 +0100 +++ b/src/ldt/ldt/static/ldt/css/LdtPlayer.css Thu Feb 02 15:35:19 2012 +0100 @@ -75,6 +75,30 @@ } +.Ldt-fbShare { + display: block; + float: left; + width: 24px; + height: 24px; + background:url('imgs/facebook.png'); +} + +.Ldt-TwShare { + display: block; + float: left; + width: 24px; + height: 24px; + background:url('imgs/twitter.png'); +} + +.Ldt-GplusShare { + display: block; + float: left; + width: 24px; + height: 24px; + background:url('imgs/google.png'); +} + .Ldt-SaTitle{ padding-top:2px; padding-bottom:3px; @@ -399,6 +423,8 @@ height: 48px; margin-left: 5px; margin-right: 5px; + background:url('imgs/profile_arrow.png'); + background-position: 7 10px; } .Ldt-tweet_userHandle { @@ -424,6 +450,7 @@ height: 17px; width: 17px; margin-right: 1px; + background:url('imgs/minimize.png'); } .Ldt-tweetWidgetMinimize { @@ -432,6 +459,7 @@ height: 17px; width: 17px; right: 9px; + background:url('imgs/minimize.png'); } .Ldt-tweetWidget * a:link { @@ -618,6 +646,7 @@ display: block; border: 1px solid #babcbc; } + .Ldt-createAnnotation-profileArrow { display: table-cell; vertical-align: top; @@ -625,11 +654,9 @@ width: 15px; padding-right: 5px; padding-left: 3px; -} - -.Ldt-createAnnotation-profileArrow img { - display: block; - margin-left: 4px; + background:url('imgs/profile_arrow.png'); + background-repeat: no-repeat; + background-position: center; } .Ldt-createAnnotation-Description { @@ -671,6 +698,8 @@ background-repeat: no-repeat; height: 48px; width: 48px; + position: relative; + margin-top: 3px; } .Ldt-createAnnotation-endScreen { @@ -695,6 +724,7 @@ height: 17px; width: 17px; right: 0px; + background:url('imgs/minimize.png'); } /* polemic tweet annotation buttons */ @@ -801,10 +831,22 @@ /* Tagcloud */ +.Ldt-TagCloud { + font-family: "PT Sans", Arial, Helvetica, sans-serif; +} + .Ldt-TagCloud ul { list-style: none; padding: 0; margin: 5px; text-align: center; } .Ldt-TagCloud li { - display: inline-block; margin: 2px; + display: inline-block; margin: 2px; cursor:pointer; cursor:hand; } + +.Ldt-TagCloud li:hover { + color: #0099ff; +} + +.Ldt-TagCloud-actif { + color: #c000c0; +} diff -r 10ec59f06198 -r cebc62a93563 src/ldt/ldt/static/ldt/js/LdtPlayer-release.js --- a/src/ldt/ldt/static/ldt/js/LdtPlayer-release.js Thu Feb 02 11:07:20 2012 +0100 +++ b/src/ldt/ldt/static/ldt/js/LdtPlayer-release.js Thu Feb 02 15:35:19 2012 +0100 @@ -1088,11 +1088,11 @@ }; IriSP.SparklineWidget_template = "

Loading

"; IriSP.annotation_template = "{{! template for an annotation displayed in a segmentWidget }}

"; -IriSP.annotationWidget_template = "{{! template for the annotation widget }}

share on facebook

share on twitter

share on google+

"; +IriSP.annotationWidget_template = "{{! template for the annotation widget }}

"; IriSP.annotation_loading_template = "{{! template shown while the annotation widget is loading }}

Chargement...

"; IriSP.annotationsListWidget_template = "{{! template for the annotation list widget }}

{{! if the url is not present, it means that the annotation exists in the current project }} {{^url}} {{/url}} {{! otherwise link to url }} {{#url}} {{/url}}

{{begin}} - {{end}}

{{title}}

{{desc}}

"; IriSP.arrowWidget_template = "

"; -IriSP.createAnnotationWidget_template = "{{! template for the annotation creation widget }}

{{^cinecast_version}} Cancel

Cancel

{{/cinecast_version}}

Submit

Add keywords :

{{#polemic_mode}}

Add polemic keywords

{{/polemic_mode}}

"; +IriSP.createAnnotationWidget_template = "{{! template for the annotation creation widget }}

{{^cinecast_version}}

{{/cinecast_version}}

{{^user_avatar}}

{{/user_avatar}} {{#user_avatar}}

{{/user_avatar}}

Submit

Add keywords :

{{#polemic_mode}}

Add polemic keywords

{{/polemic_mode}}

"; IriSP.createAnnotationWidget_festivalCinecast_template = "{{! template for the annotation creation widget specific for the cinecast festival}}

Add keywords :

Submit

"; IriSP.createAnnotation_errorMessage_template = "

You must enter text to submit an annotation

"; IriSP.overlay_marker_template = "{{! the template for the small bars which is z-indexed over our segment widget }}

"; @@ -1103,7 +1103,7 @@ IriSP.sliderWidget_template = "{{! template for the slider widget - it's composed of two divs we one overlayed on top of the other }}

"; IriSP.tooltip_template = "{{! template used by the jquery ui tooltip }}"; IriSP.tooltipWidget_template = "{{! template for the tooltip widget }}

"; -IriSP.tweetWidget_template = "{{! template for the tweet widget }}

dont minimize automatically

minimize window

";/* utils.js - various utils that don't belong anywhere else */ +IriSP.tweetWidget_template = "{{! template for the tweet widget }}

";/* utils.js - various utils that don't belong anywhere else */ /* trace function, for debugging */ @@ -1729,6 +1729,11 @@ "imgs": "/mdp/src/css/imgs" }; +IriSP.user = { + "name" : "loic", + "avatar" : "http://a1.twimg.com/profile_images/39270812/loicempuria_normal.jpg" +}; + IriSP.defaults.default_templates_vars = function() { return { "img_dir" : IriSP.paths.imgs @@ -2841,10 +2846,14 @@ IriSP.createAnnotationWidget.prototype.draw = function() { var _this = this; - + var template_params = {cinecast_version: this.cinecast_version, + polemic_mode: this.polemic_mode}; + + if (!IriSP.null_or_undefined(IriSP.user) && !IriSP.null_or_undefined(IriSP.user.avatar)) + template_params["user_avatar"] = IriSP.user.avatar; + var annotationMarkup = IriSP.templToHTML(IriSP.createAnnotationWidget_template, - {cinecast_version: this.cinecast_version, - polemic_mode: this.polemic_mode}); + template_params); this.selector.append(annotationMarkup);