# HG changeset patch
# User veltr
# Date 1339422457 -7200
# Node ID af969d762e03c3536087829481db94853fb208ef
# Parent  f2befea2c2d17a6a9979dee6902d9ee3abf11f6c
corrections

diff -r f2befea2c2d1 -r af969d762e03 crea/integration/metadataplayer/MusitagAnnotations.js
--- a/crea/integration/metadataplayer/MusitagAnnotations.js	Mon Jun 11 15:10:18 2012 +0200
+++ b/crea/integration/metadataplayer/MusitagAnnotations.js	Mon Jun 11 15:47:37 2012 +0200
@@ -8,14 +8,23 @@
     '<div class="Musitag-Annotations-Main"></div><div id="Musitag-Annotations-Audioplayer"></div>';
     
 IriSP.Widgets.MusitagAnnotations.prototype.annotation_template =
-    '<div class="Musitag-Annotations-tag" begin-time="{{begin.milliseconds}}" title="{{color.name}}, {{emoticon.name}} à {{begin}}">'
+    '<div class="Musitag-Annotations-tag" begin-time="{{annotation.begin.milliseconds}}" title="{{annotation.color.name}}, {{annotation.emoticon.name}} {{l10n.at_timecode}} {{annotation.begin}}">'
     + '<div class="Musitag-container-50">'
     + '<div class="Musitag-shadow"></div>'
-    + '<div class="Musitag-color Musitag-{{color.tag}}"></div>'
-    + '<div class="Musitag-emoticon Musitag-{{emoticon.tag}}"></div>'
-    + '</div>{{#audio}}<div class="Musitag-Annotations-Balloon" audio-url="{{audio.href}}"></div>{{/audio}}'
+    + '<div class="Musitag-color Musitag-{{annotation.color.tag}}"></div>'
+    + '<div class="Musitag-emoticon Musitag-{{annotation.emoticon.tag}}"></div>'
+    + '</div>{{#annotation.audio}}<div class="Musitag-Annotations-Balloon" audio-url="{{annotation.audio.href}}"></div>{{/annotation.audio}}'
     + '</div>';
 
+IriSP.Widgets.MusitagAnnotations.prototype.messages = {
+    fr: {
+        at_timecode: "à"
+    },
+    en: {
+        at_timecode: "at"
+    }
+}
+
 IriSP.Widgets.MusitagAnnotations.prototype.defaults = {
     annotation_type: false,
     columns: 15,
@@ -23,7 +32,7 @@
     emoticons: [
         { tag: "happy", name: "content"},
         { tag: "unhappy", name: "mécontent"},
-        { tag: "laughing", name: "rigolard"},
+        { tag: "laughing", name: "rieur"},
         { tag: "surprised", name: "étonné"}
     ],
     colors: [
@@ -108,7 +117,7 @@
         }
         _html += '<div class="Musitag-Annotations-column">';
         _html += _column.map(function(_annotation) {
-            return Mustache.to_html(_this.annotation_template, _annotation);
+            return Mustache.to_html(_this.annotation_template, { annotation: _annotation, l10n: _this.l10n });
         }).join('');
         _html += '</div>';
     }
diff -r f2befea2c2d1 -r af969d762e03 web/tralalere/static/tralalere/metadataplayer/MusitagAnnotations.js
--- a/web/tralalere/static/tralalere/metadataplayer/MusitagAnnotations.js	Mon Jun 11 15:10:18 2012 +0200
+++ b/web/tralalere/static/tralalere/metadataplayer/MusitagAnnotations.js	Mon Jun 11 15:47:37 2012 +0200
@@ -8,14 +8,23 @@
     '<div class="Musitag-Annotations-Main"></div><div id="Musitag-Annotations-Audioplayer"></div>';
     
 IriSP.Widgets.MusitagAnnotations.prototype.annotation_template =
-    '<div class="Musitag-Annotations-tag" begin-time="{{begin.milliseconds}}" title="{{color.name}}, {{emoticon.name}} à {{begin}}">'
+    '<div class="Musitag-Annotations-tag" begin-time="{{annotation.begin.milliseconds}}" title="{{annotation.color.name}}, {{annotation.emoticon.name}} {{l10n.at_timecode}} {{annotation.begin}}">'
     + '<div class="Musitag-container-50">'
     + '<div class="Musitag-shadow"></div>'
-    + '<div class="Musitag-color Musitag-{{color.tag}}"></div>'
-    + '<div class="Musitag-emoticon Musitag-{{emoticon.tag}}"></div>'
-    + '</div>{{#audio}}<div class="Musitag-Annotations-Balloon" audio-url="{{audio.href}}"></div>{{/audio}}'
+    + '<div class="Musitag-color Musitag-{{annotation.color.tag}}"></div>'
+    + '<div class="Musitag-emoticon Musitag-{{annotation.emoticon.tag}}"></div>'
+    + '</div>{{#annotation.audio}}<div class="Musitag-Annotations-Balloon" audio-url="{{annotation.audio.href}}"></div>{{/annotation.audio}}'
     + '</div>';
 
+IriSP.Widgets.MusitagAnnotations.prototype.messages = {
+    fr: {
+        at_timecode: "à"
+    },
+    en: {
+        at_timecode: "at"
+    }
+}
+
 IriSP.Widgets.MusitagAnnotations.prototype.defaults = {
     annotation_type: false,
     columns: 15,
@@ -23,7 +32,7 @@
     emoticons: [
         { tag: "happy", name: "content"},
         { tag: "unhappy", name: "mécontent"},
-        { tag: "laughing", name: "rigolard"},
+        { tag: "laughing", name: "rieur"},
         { tag: "surprised", name: "étonné"}
     ],
     colors: [
@@ -108,7 +117,7 @@
         }
         _html += '<div class="Musitag-Annotations-column">';
         _html += _column.map(function(_annotation) {
-            return Mustache.to_html(_this.annotation_template, _annotation);
+            return Mustache.to_html(_this.annotation_template, { annotation: _annotation, l10n: _this.l10n });
         }).join('');
         _html += '</div>';
     }
diff -r f2befea2c2d1 -r af969d762e03 web/tralalere/templates/base.html
--- a/web/tralalere/templates/base.html	Mon Jun 11 15:10:18 2012 +0200
+++ b/web/tralalere/templates/base.html	Mon Jun 11 15:47:37 2012 +0200
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="fr">
+<html lang="{{ LANGUAGE_CODE }}">
     <head>
         <meta charset="utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
@@ -14,6 +14,23 @@
         <div class="big-container">
 {% block main_content %}
 {% endblock %}
+            <div class="footer">
+                <div class="footer-idf">
+                    <p class="footer-soutenu">Soutenu par le<br />Conseil Régional</p>
+                    <a href="http://www.iledefrance.fr/" title="Région Île-de-France" target="_blank">
+                        <img src="{{STATIC_URL}}tralalere/img/logo-idf.png" alt="Région Île-de-France" />
+                    </a>
+                </div>
+                <a href="http://www.futur-en-seine.fr/" title="Festival Futur En Seine 2012" target="_blank">
+                    <img src="{{STATIC_URL}}tralalere/img/logo-fens.png" class="footer-logo" alt="Festival Futur En Seine 2012" />
+                </a>
+                <a href="http://www.tralalere.com/" title="Tralalere" target="_blank">
+                    <img src="{{STATIC_URL}}tralalere/img/logo-tralalere.png" class="footer-logo" alt="Tralalere" />
+                </a>
+                <a href="http://www.iri.centrepompidou.fr/" title="Institut de Recherche et d'Innovation" target="_blank">
+                    <img src="{{STATIC_URL}}tralalere/img/logo-iri.png" class="footer-logo" alt="Institut de Recherche et d'Innovation" />
+                </a>
+            </div>
         </div>
 {% block end_body %}
 {% endblock %}
diff -r f2befea2c2d1 -r af969d762e03 web/tralalere/templates/home.html
--- a/web/tralalere/templates/home.html	Mon Jun 11 15:10:18 2012 +0200
+++ b/web/tralalere/templates/home.html	Mon Jun 11 15:47:37 2012 +0200
@@ -22,7 +22,7 @@
                 {% if content.tags_stats.colors %}
                 <ul class="home-dataviz home-dataviz-colors">
                 {% for tag in content.tags_stats.colors %}
-                    <li style="width: {{tag.width}}px" alt="{% trans tag.tag %}">
+                    <li style="width: {{tag.width}}px" title="{% trans tag.tag %}">
                     {% if tag.scale == 1 %}
                         <div class="tag-container-50" >
                     {% else %}
@@ -38,7 +38,7 @@
                 {% if content.tags_stats.emoticons %}
                 <ul class="home-dataviz home-dataviz-emoticon">
                 {% for tag in content.tags_stats.emoticons %}
-                    <li style="width: {{tag.width}}px">
+                    <li style="width: {{tag.width}}px" title="{% trans tag.tag %}">
                     {% if tag.scale == 1 %}
                         <div class="tag-container-50">
                     {% else %}
diff -r f2befea2c2d1 -r af969d762e03 web/tralalere/templates/player.html
--- a/web/tralalere/templates/player.html	Mon Jun 11 15:10:18 2012 +0200
+++ b/web/tralalere/templates/player.html	Mon Jun 11 15:47:37 2012 +0200
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load thumbnail %}
+{% load i18n %}
 {% block js_import %} 
         <script type="text/javascript" src="{{STATIC_URL}}tralalere/metadataplayer/LdtPlayer-core.js"></script>
 {% endblock %}
@@ -34,6 +35,7 @@
 
 {% block end_body %}
     <script type="text/javascript">
+    IriSP.language = "{{ LANGUAGE_CODE }}";
     IriSP.libFiles.defaultDir = "{{STATIC_URL}}tralalere/js";
     IriSP.libFiles.locations.jwPlayerSWF = "{{STATIC_URL}}tralalere/swf/player.swf";
     IriSP.widgetsDir = "{{STATIC_URL}}tralalere/metadataplayer";
@@ -47,7 +49,13 @@
             height : 1,
             container : 'player-elements',
             default_options: {
-                metadata: _metadata
+                metadata: _metadata,
+                colors: [{% for color in colors %}
+                    { tag: "{{color}}", name: "{% trans color %}"}{% if not forloop.last %}, {% endif %}{% endfor %}
+                ],
+                emoticons: [{% for emoticon in emoticons %}
+                    { tag: "{{emoticon}}", name: "{% trans emoticon %}"}{% if not forloop.last %}, {% endif %}{% endfor %}
+                ]
             },
             css : '{{STATIC_URL}}tralalere/metadataplayer/LdtPlayer-core.css',
             widgets: [
diff -r f2befea2c2d1 -r af969d762e03 web/tralalere/views.py
--- a/web/tralalere/views.py	Mon Jun 11 15:10:18 2012 +0200
+++ b/web/tralalere/views.py	Mon Jun 11 15:47:37 2012 +0200
@@ -98,4 +98,4 @@
     
     content = Content.objects.get_by_natural_key(contentid)
     
-    return render_to_response('player.html', {'content': content}, context_instance=RequestContext(request))
\ No newline at end of file
+    return render_to_response('player.html', {'content': content, 'colors': COLORS, 'emoticons': EMOTICONS}, context_instance=RequestContext(request))
\ No newline at end of file