# HG changeset patch # User cavaliet # Date 1370962170 -7200 # Node ID 8bd913abffb5fb2191626bcf8cb173d194b6a4e5 # Parent b5f44489096e9799aaee0a6d5749c832b3bc818a add modif from integration and player diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/Futura-CondensedExtraBold.svg --- a/src/metadatacomposer/static/metadatacomposer/fonts/Futura-CondensedExtraBold.svg Tue Jun 11 16:17:48 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2842 +0,0 @@ - - - diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/Futura-CondensedExtraBold.ttf Binary file src/metadatacomposer/static/metadatacomposer/fonts/Futura-CondensedExtraBold.ttf has changed diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/Futura-CondensedExtraBold.woff Binary file src/metadatacomposer/static/metadatacomposer/fonts/Futura-CondensedExtraBold.woff has changed diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/Futura-Medium.svg --- a/src/metadatacomposer/static/metadatacomposer/fonts/Futura-Medium.svg Tue Jun 11 16:17:48 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3237 +0,0 @@ - - - diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/Futura-Medium.ttf Binary file src/metadatacomposer/static/metadatacomposer/fonts/Futura-Medium.ttf has changed diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/Futura-Medium.woff Binary file src/metadatacomposer/static/metadatacomposer/fonts/Futura-Medium.woff has changed diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-Bold.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-Bold.svg Tue Jun 11 16:49:30 2013 +0200 @@ -0,0 +1,21060 @@ + + + diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-Bold.ttf Binary file src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-Bold.ttf has changed diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-Bold.woff Binary file src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-Bold.woff has changed diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-CondBold.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-CondBold.svg Tue Jun 11 16:49:30 2013 +0200 @@ -0,0 +1,18209 @@ + + + diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-CondBold.ttf Binary file src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-CondBold.ttf has changed diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-CondBold.woff Binary file src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-CondBold.woff has changed diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-ExtraBold.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-ExtraBold.svg Tue Jun 11 16:49:30 2013 +0200 @@ -0,0 +1,21059 @@ + + + diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-ExtraBold.ttf Binary file src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-ExtraBold.ttf has changed diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-ExtraBold.woff Binary file src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-ExtraBold.woff has changed diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-Regular.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-Regular.svg Tue Jun 11 16:49:30 2013 +0200 @@ -0,0 +1,21062 @@ + + + diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-Regular.ttf Binary file src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-Regular.ttf has changed diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-Regular.woff Binary file src/metadatacomposer/static/metadatacomposer/fonts/OpenSans-Regular.woff has changed diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/img/logo-iri.png Binary file src/metadatacomposer/static/metadatacomposer/img/logo-iri.png has changed diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/img/sprites.png Binary file src/metadatacomposer/static/metadatacomposer/img/sprites.png has changed diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/static/metadatacomposer/js/player.js --- a/src/metadatacomposer/static/metadatacomposer/js/player.js Tue Jun 11 16:17:48 2013 +0200 +++ b/src/metadatacomposer/static/metadatacomposer/js/player.js Tue Jun 11 16:49:30 2013 +0200 @@ -20,10 +20,10 @@ url_transform: function(src) { return [{ type: "video/mp4", - src: src.replace(/\.[\d\w]+$/,'.mp4') + src: src.replace(/\.[\d\w]+$/,'.mp4').replace('rtmp://media.iri.centrepompidou.fr/ddc_player', 'http://media.iri.centrepompidou.fr') }, { type: "video/webm", - src: src.replace(/\.[\d\w]+$/,'.webm') + src: src.replace(/\.[\d\w]+$/,'.webm').replace('rtmp://media.iri.centrepompidou.fr/ddc_player', 'http://media.iri.centrepompidou.fr') }]; } } diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/templates/metadatacomposer/iri/composer_player_about.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/metadatacomposer/templates/metadatacomposer/iri/composer_player_about.html Tue Jun 11 16:49:30 2013 +0200 @@ -0,0 +1,9 @@ +{% load static %} +

À propos des Webdocs

Un lecteur créé par

+ +
Institut de Recherche et d’Innovation
+

\ No newline at end of file diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/templates/partial/metadatacomposer_partial_player.html --- a/src/metadatacomposer/templates/partial/metadatacomposer_partial_player.html Tue Jun 11 16:17:48 2013 +0200 +++ b/src/metadatacomposer/templates/partial/metadatacomposer_partial_player.html Tue Jun 11 16:49:30 2013 +0200 @@ -42,18 +42,7 @@

À propos des Webdocs

Une collaboration

- -
Festival d’Art Lyrique d’Aix-en-Provence
-
- -
Institut de Recherche et d’Innovation
-

+ {% include player_about %}

diff -r b5f44489096e -r 8bd913abffb5 src/metadatacomposer/views.py --- a/src/metadatacomposer/views.py Tue Jun 11 16:17:48 2013 +0200 +++ b/src/metadatacomposer/views.py Tue Jun 11 16:49:30 2013 +0200 @@ -33,6 +33,7 @@ context["top_header_css"] = "metadatacomposer/%s/composer_header_css.html" % self.branding context["top_header_partial"] = "metadatacomposer/%s/composer_header.html" % self.branding context["player_css"] = "metadatacomposer/%s/composer_player_css.html" % self.branding + context["player_about"] = "metadatacomposer/%s/composer_player_about.html" % self.branding return context