From: yomguy Date: Sun, 17 Feb 2013 22:52:41 +0000 (+0100) Subject: fix audio buttons, update video-js button skin, locales X-Git-Tag: 0.9-probarreau~62 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=936ec623e68b4231d8ee08e56b59da8550425557;p=teleforma.git fix audio buttons, update video-js button skin, locales --- diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index f951cb14..0f3c0ea5 100644 Binary files a/teleforma/locale/fr/LC_MESSAGES/django.mo and b/teleforma/locale/fr/LC_MESSAGES/django.mo differ diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po index c9ec6543..ec926b95 100644 --- 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-02-15 15:30+0100\n" +"POT-Creation-Date: 2013-02-15 16:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@ -406,7 +406,7 @@ msgstr "documents corrigés" msgid "form" msgstr "formulaire" -#: models/pro.py:130 templates/teleforma/answer_form.html:102 +#: models/pro.py:130 templates/teleforma/answer_form.html:104 #: templates/teleforma/seminar_detail.html:158 #: templates/teleforma/testimonials.html:58 #: templates/teleforma/inc/answer_list.html:21 @@ -455,7 +455,7 @@ msgid "date validated" msgstr "date de validation" #: models/pro.py:185 templates/teleforma/answer_detail.html:43 -#: templates/teleforma/answer_form.html:105 +#: templates/teleforma/answer_form.html:107 msgid "Answer" msgstr "Réponse à la consultation" @@ -623,9 +623,11 @@ msgstr "" msgid "Hello" msgstr "Bonjour" -#: templates/postman/email_user.txt:3 templates/postman/email_visitor.txt:3 +#: templates/postman/email_user.txt:3 #, python-format -msgid "On %(date)s, you asked to send a message to the user '%(recipient)s'." +msgid "" +"On %(date)s, you asked to send a message to the user " +"'%(recipient.first_name)s %(recipient.last_name)s'." msgstr "" #: templates/postman/email_user.txt:5 templates/postman/email_visitor.txt:5 @@ -636,9 +638,11 @@ msgstr "" msgid ", for the following reason:" msgstr "" -#: templates/postman/email_user.txt:9 templates/postman/email_visitor.txt:10 +#: templates/postman/email_user.txt:9 #, python-format -msgid "On %(date)s, you sent a message to the user '%(sender)s'." +msgid "" +"On %(date)s, you sent a message to the user '%(sender.first_name)s " +"%(sender.last_name)s'." msgstr "" #: templates/postman/email_user.txt:10 @@ -647,12 +651,16 @@ msgstr "" #: templates/postman/email_user.txt:11 #, python-format -msgid "You have received a copy of a response from the user '%(sender)s'." +msgid "" +"You have received a copy of a response from the user '%(sender.first_name)s " +"%(sender.last_name)s'." msgstr "" #: templates/postman/email_user.txt:13 #, python-format -msgid "You have received a message from the user '%(sender)s'." +msgid "" +"You have received a message from the user '%(sender.first_name)s " +"%(sender.last_name)s'." msgstr "" #: templates/postman/email_user.txt:14 @@ -666,6 +674,8 @@ msgstr "" #: templates/postman/email_user.txt:19 templates/postman/email_visitor.txt:14 msgid "Thank you again for your interest in our services." msgstr "" +"L’équipe e-learning de Pro-Barreau vous remercie de votre confiance et reste " +"à votre disposition pour renseignement complémentaire" #: templates/postman/email_user.txt:20 #: templates/postman/email_user_init.txt:21 @@ -708,10 +718,20 @@ msgstr "%(organization)s : initialisation de votre compte e-learning" msgid "Dear visitor," msgstr "" +#: templates/postman/email_visitor.txt:3 +#, python-format +msgid "On %(date)s, you asked to send a message to the user '%(recipient)s'." +msgstr "" + #: templates/postman/email_visitor.txt:8 msgid "As a reminder, please find below the content of your message." msgstr "" +#: templates/postman/email_visitor.txt:10 +#, python-format +msgid "On %(date)s, you sent a message to the user '%(sender)s'." +msgstr "" + #: templates/postman/email_visitor.txt:11 msgid "Please find below the answer from your correspondent." msgstr "" @@ -783,17 +803,17 @@ msgstr "valider" msgid " reject" msgstr " rejeter" -#: templates/teleforma/answer_form.html:46 +#: templates/teleforma/answer_form.html:48 msgid "You have NOT save your work!" msgstr "Vous n'avez PAS enregistré votre consultation" -#: templates/teleforma/answer_form.html:61 +#: templates/teleforma/answer_form.html:63 #: templates/teleforma/evaluation_form.html:27 #: templates/teleforma/seminar_media_video.html:59 msgid "My steps" msgstr "Mes étapes" -#: templates/teleforma/answer_form.html:72 +#: templates/teleforma/answer_form.html:74 #: templates/teleforma/evaluation_form.html:10 #: templates/teleforma/seminar_detail.html:77 #: templates/teleforma/seminar_detail.html:86 @@ -809,35 +829,35 @@ msgstr "Mes étapes" msgid "Step" msgstr "Étape" -#: templates/teleforma/answer_form.html:72 +#: templates/teleforma/answer_form.html:74 #: templates/teleforma/seminar_detail.html:105 msgid "answer to this question" msgstr "réaliser cette consultation fictive" -#: templates/teleforma/answer_form.html:72 +#: templates/teleforma/answer_form.html:74 msgid "characters" msgstr "caractères" -#: templates/teleforma/answer_form.html:72 +#: templates/teleforma/answer_form.html:74 msgid "minimum" msgstr "minimum" -#: templates/teleforma/answer_form.html:86 +#: templates/teleforma/answer_form.html:88 msgid "Save" msgstr "" -#: templates/teleforma/answer_form.html:87 +#: templates/teleforma/answer_form.html:89 msgid "Submit it" msgstr "Soumettre" # #: templates/teleforma/seminar_detail.html:152 -#: templates/teleforma/answer_form.html:95 +#: templates/teleforma/answer_form.html:97 #: templates/teleforma/seminar_detail.html:152 #: templates/teleforma/seminars.html:141 msgid "Progressions" msgstr "Progressions" -#: templates/teleforma/answer_form.html:99 +#: templates/teleforma/answer_form.html:101 #: templates/teleforma/seminar_detail.html:155 #: templates/teleforma/seminars.html:144 msgid "General" @@ -861,7 +881,6 @@ msgstr " validé" #: templates/teleforma/seminar_media_video.html:81 #: templates/teleforma/inc/answer_list.html:41 #: templates/teleforma/inc/media_list.html:52 -#: templates/teleforma/inc/media_package_list.html:46 msgid " rejected" msgstr " rejeté" @@ -1026,20 +1045,19 @@ msgstr "Enregistrer et diffuser" #: templates/teleforma/seminar_media_video.html:21 #: templates/teleforma/seminar_media_video.html:81 #: templates/teleforma/inc/media_list.html:50 -#: templates/teleforma/inc/media_package_list.html:44 msgid " published" msgstr " publié" #: templates/teleforma/course_media.html:62 #: templates/teleforma/seminar_media_audio.html:10 #: templates/teleforma/seminar_media_audio.html:139 -#: templates/teleforma/seminar_media_video.html:181 +#: templates/teleforma/seminar_media_video.html:182 #: templates/teleforma/testimonials.html:60 #: templates/teleforma/testimonials.html:70 #: templates/teleforma/inc/document_list.html:22 #: templates/teleforma/inc/document_simple_list.html:9 #: templates/teleforma/inc/media_list.html:56 -#: templates/teleforma/inc/media_package_list.html:50 +#: templates/teleforma/inc/media_package_list.html:48 #: templates/teleforma/inc/testimonial_list.html:8 msgid "Download" msgstr "Télécharger" @@ -1138,7 +1156,12 @@ msgstr "Intervenants" msgid "Audio index" msgstr "Index audio" -#: templates/teleforma/seminar_media_video.html:144 +#: templates/teleforma/seminar_media_video.html:129 +#, fuzzy +msgid "Seminar ID" +msgstr "Séminaire" + +#: templates/teleforma/seminar_media_video.html:145 msgid "Video index" msgstr "Index vidéo" @@ -1243,6 +1266,13 @@ msgstr "Cliquez ici" msgid "No document" msgstr "Aucun document" +#: templates/teleforma/inc/document_simple_list.html:9 +#: templates/teleforma/inc/document_step.html:8 +#: templates/teleforma/inc/media_package_list.html:44 +#: templates/teleforma/inc/media_step.html:12 +msgid " viewed" +msgstr "" + #: templates/teleforma/inc/evaluation_form.html:9 msgid "Form" msgstr "Formulaire" diff --git a/teleforma/static/teleforma/video-js/video-js.css b/teleforma/static/teleforma/video-js/video-js.css index cd468eb0..f1045c2b 100644 --- a/teleforma/static/teleforma/video-js/video-js.css +++ b/teleforma/static/teleforma/video-js/video-js.css @@ -332,23 +332,16 @@ so you can upgrade to newer versions easier. You can remove all these styles by display: block; /* Start hidden */ z-index: 2; position: absolute; top: 50%; left: 50%; width: 8.0em; height: 8.0em; margin: -42px 0 0 -42px; text-align: center; vertical-align: center; cursor: pointer !important; border: 0.2em solid #fff; opacity: 0.95; - -webkit-border-radius: 25px; -moz-border-radius: 25px; border-radius: 25px; + -webkit-border-radius: 50px; -moz-border-radius: 50px; border-radius: 50px; - background: #454545; - background: -moz-linear-gradient(top, #454545 0%, #232323 50%, #161616 50%, #3f3f3f 100%); - background: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%,#454545), color-stop(50%,#232323), color-stop(50%,#161616), color-stop(100%,#3f3f3f)); - background: -webkit-linear-gradient(top, #454545 0%,#232323 50%,#161616 50%,#3f3f3f 100%); - background: -o-linear-gradient(top, #454545 0%,#232323 50%,#161616 50%,#3f3f3f 100%); - background: -ms-linear-gradient(top, #454545 0%,#232323 50%,#161616 50%,#3f3f3f 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#454545', endColorstr='#3f3f3f',GradientType=0 ); - background: linear-gradient(top, #454545 0%,#232323 50%,#161616 50%,#3f3f3f 100%); + background: transparent; /* CSS Shadows */ -webkit-box-shadow: 4px 4px 8px #000; -moz-box-shadow: 4px 4px 8px #000; box-shadow: 4px 4px 8px #000; } .vjs-default-skin div.vjs-big-play-button:hover { - -webkit-box-shadow: 0 0 80px #fff; -moz-box-shadow: 0 0 80px #fff; box-shadow: 0 0 80px #fff; + -webkit-box-shadow: 0 0 40px #fff; -moz-box-shadow: 0 0 40px #fff; box-shadow: 0 0 40px #fff; } .vjs-default-skin div.vjs-big-play-button span { diff --git a/teleforma/templates/postman/email_user.txt b/teleforma/templates/postman/email_user.txt index 944a32ff..c2c43b47 100644 --- a/teleforma/templates/postman/email_user.txt +++ b/teleforma/templates/postman/email_user.txt @@ -1,16 +1,16 @@ {% load i18n %}{% load telemeta_utils %}{% load teleforma_tags %}{% autoescape off %}{% trans "Hello" %} {{ usr.first_name }} {{ usr.last_name }}, {% if action == 'rejection' %} -{% blocktrans with object.sent_at|date:"DATETIME_FORMAT" as date and object.obfuscated_recipient as recipient %}On {{ date }}, you asked to send a message to the user '{{ recipient }}'.{% endblocktrans %} +{% blocktrans with object.sent_at|date:"DATETIME_FORMAT" as date and object.obfuscated_recipient as recipient %}On {{ date }}, you asked to send a message to the user '{{ recipient.first_name }} {{ recipient.last_name }}'.{% endblocktrans %} {% trans "Your message has been rejected by the moderator" %}{% if object.moderation_reason %}{% trans ", for the following reason:" %} {{ object.moderation_reason }}{% else %}.{% endif %} {% else %}{# 'acceptance' #} -{% if object.parent_id %}{% if object.parent.sender_id == object.recipient_id %}{% blocktrans with object.parent.sent_at|date:"DATETIME_FORMAT" as date and object.obfuscated_sender as sender %}On {{ date }}, you sent a message to the user '{{ sender }}'.{% endblocktrans %} +{% if object.parent_id %}{% if object.parent.sender_id == object.recipient_id %}{% blocktrans with object.parent.sent_at|date:"DATETIME_FORMAT" as date and object.obfuscated_sender as sender %}On {{ date }}, you sent a message to the user '{{ sender.first_name }} {{ sender.last_name }}'.{% endblocktrans %} {% trans "Your correspondent has given you an answer." %} -{% else %}{% blocktrans with object.obfuscated_sender as sender %}You have received a copy of a response from the user '{{ sender }}'.{% endblocktrans %} +{% else %}{% blocktrans with object.obfuscated_sender as sender %}You have received a copy of a response from the user '{{ sender.first_name }} {{ sender.last_name }}'.{% endblocktrans %} {% endif %} -{% else %}{% blocktrans with object.obfuscated_sender as sender %}You have received a message from the user '{{ sender }}'.{% endblocktrans %} +{% else %}{% blocktrans with object.obfuscated_sender as sender %}You have received a message from the user '{{ sender.first_name }} {{ sender.last_name }}'.{% endblocktrans %} {% endif %}{% endif %}{% trans "You can read and respond to this message from your e-learning desk following this link:" %} http://{{ site.name }}/messages/inbox/ diff --git a/teleforma/templates/teleforma/seminar_media_audio.html b/teleforma/templates/teleforma/seminar_media_audio.html index 474aa2ca..88509e6e 100644 --- a/teleforma/templates/teleforma/seminar_media_audio.html +++ b/teleforma/templates/teleforma/seminar_media_audio.html @@ -4,13 +4,9 @@ {% load i18n %} {% block module-action %} -{% for media in media.all %} - {% if media.item.file and media.is_published and media.item.file.path|in_download_formats %} -
-  {% trans "Download" %} -
- {% endif %} -{% endfor %} +
+  {% trans "Back" %} +
{% endblock module-action %} {% block course %} @@ -18,10 +14,6 @@
-
-  {% trans "Back" %} -
-
 {% trans "Video" %} @@ -30,7 +22,7 @@ {% endif %}
-
+