readd download buttons, fix trans

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po
index 366199b746a3a24e9c9784694f9a47049d07184c..7df8ac66970467c5e21f3a9f68bfa184e34859d9 100644 (file)
--- a/teleforma/locale/fr/LC_MESSAGES/django.po
+++ b/teleforma/locale/fr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-17 15:45+0100\n"
+"POT-Creation-Date: 2013-01-17 15:41+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n"
 "Language-Team: LANGUAGE <lists@parisson.com>\n"
@@ -1273,7 +1273,8 @@ msgstr ""
 "Nous sommes désolés!\n"
 "\n"
 "Votre consultation n'a pas été validée.\n"
-"Vous pouvez la re-travailler et la soumettre en suivant ce lien :\n"
+"Vous pouvez la re-travailler et la soumettre en suivant ce "
+"lien :\n"
 
 #: templates/teleforma/messages/answer_validated.txt:2
 msgid ""
@@ -1298,7 +1299,8 @@ msgstr ""
 "Félicitations!\n"
 "\n"
 "Votre séminaire a été validé.\n"
-"Vous pouvez télecharger votre attestation en cliquant sur ce lien :\n"
+"Vous pouvez télecharger votre attestation en cliquant sur ce "
+"lien :\n"
 
 #: templates/telemeta/base.html:96
 msgid "Desk"
@@ -1571,7 +1573,7 @@ msgid ""
 "testimonial below."
 msgstr ""
 "Toutes vos consultations fictives ont été validées ! Vous pouvez désormais "
-"télécharger l'attestion de formation ci-dessous."
+"télécharger l'attestation de formation ci-dessous."
 
 #: views/pro.py:160
 msgid "You have successfully saved your answer"

diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index 9257771615103283b0e993c61883165c7c2e28a9..cdb5643ee49a5cd41b1cca85d58835c6e57b3be3 100644 (file)
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -1633,7 +1633,7 @@ input,textarea{
 
 .module_action {
     text-align: center;
-    margin: 0em 0em 3em 0em;
+    margin: 2em 0em 3em 0em;
     padding: 1em;
 }
 

diff --git a/teleforma/templates/teleforma/seminar_media_audio.html b/teleforma/templates/teleforma/seminar_media_audio.html
index 9399c0cb3ed7d9617e6411ed341384f2abfb6279..f52e69d5708beef44884b53345c53475a8d093de 100644 (file)
--- a/teleforma/templates/teleforma/seminar_media_audio.html
+++ b/teleforma/templates/teleforma/seminar_media_audio.html
@@ -18,7 +18,8 @@
 
 <div class="course_title">
     <div style="float: right; font-size: 0.9em;">
-        
+        <a href="{% url teleforma-seminar-detail seminar.id %}" class="component_icon button icon_previous">&nbsp;{% trans "Back" %}</a>
+                
         <a href="{% url teleforma-media-video seminar.id media.id %}" class="component_icon button icon_speaker">&nbsp;{% trans "Video" %}</a>
         
         {% if user.is_staff %}
@@ -122,3 +123,11 @@ function jumpToTimeoffset(time) {
 </script>
 
 {% endblock index %}
+
+{% block module-action-right %}
+{% if media.item.file and media.is_published and media.item.file.path|in_download_formats %}
+ <div class="module_action"> 
+   <a href="{{ MEDIA_URL }}{{ media.item.transcoded.all.0.file }}" class="component_icon button" id="action_red"><img src="{{STATIC_URL}}teleforma/images/download_media.png" alt="" style="vertical-align:middle" />&nbsp;{% trans "Download" %}</a>
+ </div>
+{% endif %}
+{% endblock module-action-right %}

diff --git a/teleforma/templates/teleforma/seminar_media_video.html b/teleforma/templates/teleforma/seminar_media_video.html
index 676c78f5b32bb96ef76bfa64ce2c68b02fbb8094..b9d817de4684d7ea326460c2cf0a4c4fd1e49389 100644 (file)
--- a/teleforma/templates/teleforma/seminar_media_video.html
+++ b/teleforma/templates/teleforma/seminar_media_video.html
@@ -64,13 +64,6 @@ $(window).ready(function(){
 {% endblock submodules %}
 
 {% block module-action %}
-{% for media in medias.all %}
-    {% if media.item.file and media.is_published and media.item.file.path|in_download_formats %}
-     <div class="module_action"> 
-     <a href="{{ MEDIA_URL }}{{ media.item.file }}" class="component_icon button" id="action_red"><img src="{{STATIC_URL}}teleforma/images/download_media.png" alt="" style="vertical-align:middle" />&nbsp;{% trans "Download" %}</a>
-     </div>
-    {% endif %}
-{% endfor %}
 {% endblock module-action %}
 
 {% block course %}
@@ -78,6 +71,7 @@ $(window).ready(function(){
 
 <div class="course_title">
     <div style="float: right; font-size: 0.9em;">
+        <a href="{% url teleforma-seminar-detail seminar.id %}" class="component_icon button icon_previous">&nbsp;{% trans "Back" %}</a>
         
         <a href="{% url teleforma-media-audio seminar.id media.id %}" class="component_icon button icon_speaker">&nbsp;{% trans "Audio" %}</a>
         
@@ -170,3 +164,11 @@ function jumpToTimeoffset(time) {
 </script>
 
 {% endblock index %}
+
+{% block module-action-right %}
+{% if media.item.file and media.is_published and media.item.file.path|in_download_formats %}
+ <div class="module_action"> 
+   <a href="{{ MEDIA_URL }}{{ media.item.file }}" class="component_icon button" id="action_red"><img src="{{STATIC_URL}}teleforma/images/download_media.png" alt="" style="vertical-align:middle" />&nbsp;{% trans "Download" %}</a>
+ </div>
+{% endif %}
+{% endblock module-action-right %}

diff --git a/teleforma/templates/teleforma/seminars.html b/teleforma/templates/teleforma/seminars.html
index e05a33df81ebee77934901e0a23f91b88a1f06fe..8b80d4dd03d0b4688046f073d617841801facd1a 100644 (file)
--- a/teleforma/templates/teleforma/seminars.html
+++ b/teleforma/templates/teleforma/seminars.html
@@ -158,6 +158,9 @@ server_status_callback();
 {% block index %}
 {% endblock index %}
 
+{% block module-action-right %}
+{% endblock module-action-right %}
+
 </div>
 
 {% endblock content %}