# HG changeset patch # User veltr # Date 1378302676 -7200 # Node ID ddbe31de8ad18cdd3cad4ecbec65286b164c0f84 # Parent 81243f1c7cff6ef8b563bcabbdc46f4288502ee6 Added Creator to the Annotation Widget diff -r 81243f1c7cff -r ddbe31de8ad1 src/widgets/Annotation.js --- a/src/widgets/Annotation.js Wed Sep 04 15:47:20 2013 +0200 +++ b/src/widgets/Annotation.js Wed Sep 04 15:51:16 2013 +0200 @@ -15,6 +15,7 @@ on_site: " sur ", tags_: "Mots-clés\u00a0:", description_: "Description\u00a0:", + creator_: "Créé par\u00a0:", excerpt_from: "Extrait de\u00a0:", untitled: "Segment sans titre" }, @@ -23,6 +24,7 @@ on_site: " on ", tags_: "Keywords:", description_: "Description:", + creator_: "Created by\u00a0:", excerpt_from: "Excerpt from:", untitled: "Untitled segment" } @@ -38,7 +40,9 @@ + '( - )' + '

{{l10n.excerpt_from}} ' + '( - )

' - + '
{{l10n.description_}}
' + + '
{{l10n.creator_}}
' + + '{{#show_creator}}

' + + '
{{l10n.description_}}
{{/show_creator}}' + '

' + '
' + '
{{l10n.tags_}}
' @@ -48,6 +52,7 @@ annotation_type : "chap", start_minimized: false, show_arrow : true, + show_creator: true, arrow_position: .5, site_name : "Lignes de Temps", search_on_tag_click: true, @@ -116,6 +121,9 @@ _this.$.find(".Ldt-Annotation-Tags-Block").addClass("Ldt-Annotation-EmptyBlock"); } highlightTitleAndDescription(); + if (_this.show_creator) { + _this.$.find(".Ldt-Annotation-Creator").text(_annotation.creator); + } if (_this.show_annotation_type) { _this.$.find(".Ldt-Annotation-Type").text(_annotation.getAnnotationType().title) } diff -r 81243f1c7cff -r ddbe31de8ad1 test/jwplayer.htm --- a/test/jwplayer.htm Wed Sep 04 15:47:20 2013 +0200 +++ b/test/jwplayer.htm Wed Sep 04 15:51:16 2013 +0200 @@ -19,8 +19,8 @@ IriSP.language = 'fr'; IriSP.widgetsDir = "metadataplayer"; var _metadata = { - url: 'json/ldt-jwplayer.json', -// url: 'http://capsicum/pf/ldtplatform/ldt/cljson/id/33e49eac-b3b0-11e1-b44d-00145ea4a2be?callback=?', +// url: 'json/ldt-jwplayer.json', + url: 'http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/cljson/id/e2f36e5c-8b26-11e2-a28d-00145ea4a2be', // url: 'http://capsicum/pf/ldtplatform/ldt/cljson/id/f1a17368-2bc8-11e1-b21a-00145ea49a02', // url: 'http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/cljson/id/fc0a654e-49ea-11e2-b4ad-00145ea4a2be', format: 'ldt' @@ -35,7 +35,10 @@ widgets: [ { type: "JwpPlayer", - autostart: true + autostart: true, + url_transform: function(url) { + return url.replace('/ddc_player/video/','/ddc_player/mp4:video/'); + } }, { type: "Slider" }, { type: "Controller" },