fix some testimonial styles

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index 9e09ca2dc48fc13f62563f53096520d204ed7b9e..691fe74ad7258ba25736061b63ad6a10f429db80 100644 (file)
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 aca90664a97d453d5bcf6d1345137cd865478a82..49c36940077179526cc8460e304eec61a4fe8f2f 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-06-12 17:47+0200\n"
+"POT-Creation-Date: 2013-06-12 21:35+0200\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"
@@ -591,10 +591,8 @@ msgid "Recipient"
 msgstr ""
 
 #: templates/postman/base_folder.html:42
-#: templates/teleforma/seminar_testimonial.html:37
-#: templates/teleforma/seminar_testimonial_knowledge.html:37
 msgid "Subject"
-msgstr ""
+msgstr "Sujet"
 
 #: templates/postman/base_folder.html:43
 #: templates/telemeta/inc/module_revisions.html:16
@@ -1184,6 +1182,11 @@ msgstr "Nom"
 msgid "First name"
 msgstr "Prénom"
 
+#: templates/teleforma/seminar_testimonial.html:37
+#: templates/teleforma/seminar_testimonial_knowledge.html:37
+msgid "Object"
+msgstr "Sujet"
+
 #: templates/teleforma/seminar_testimonial.html:39
 msgid "Training type"
 msgstr "Type de formation"

diff --git a/teleforma/static/teleforma/css/teleforma_pdf.css b/teleforma/static/teleforma/css/teleforma_pdf.css
index 9d1acfc572e83cf2abd5f7ae33a1763a2460059c..43939aac90bc683ea442ad765a46b38fa47c50b1 100644 (file)
--- a/teleforma/static/teleforma/css/teleforma_pdf.css
+++ b/teleforma/static/teleforma/css/teleforma_pdf.css
@@ -45,4 +45,5 @@
 
 .bold {
     font-weight: bold;
+       vertical-align: top;
 }

diff --git a/teleforma/templates/teleforma/seminar_testimonial.html b/teleforma/templates/teleforma/seminar_testimonial.html
index 52851777c685f452b04094891a99e92b4804ca5d..03eb5ecbc29b6e603f5b382aec2801a3d7f25f69 100644 (file)
--- a/teleforma/templates/teleforma/seminar_testimonial.html
+++ b/teleforma/templates/teleforma/seminar_testimonial.html
@@ -34,7 +34,7 @@
       <tr><td class="bold">{% trans "Last name" %} : </td><td>{{ testimonial.user.last_name|upper }}</td></tr>
       <tr><td class="bold">{% trans "First name" %} : </td><td>{{ testimonial.user.first_name|upper }}</td></tr>
       <tr><td class="bold">{% trans "Address" %} : </td><td>{{ testimonial.user.auditor.all.0.address }} {{ testimonial.user.auditor.all.0.postal_code }} {{ testimonial.user.auditor.all.0.city }}</td></tr>
-      <tr><td class="bold">{% trans "Subject" %} : </td><td>{{ seminar.title }}</td></tr>
+      <tr><td class="bold">{% trans "Object" %} : </td><td>{{ seminar.title }}</td></tr>
       <tr><td class="bold">{% trans "Course" %} : </td><td>{{ seminar.course }}</td></tr>
       <tr><td class="bold">{% trans "Training type" %} : </td><td>E-learning</td></tr>
       <tr><td class="bold">{% trans "Duration" %} : </td><td>{{ seminar.duration|hours }} {% trans "hours" %}</td></tr>

diff --git a/teleforma/templates/teleforma/seminar_testimonial_knowledge.html b/teleforma/templates/teleforma/seminar_testimonial_knowledge.html
index a823df6c653d88de59d55b22b408e6f40c35f72e..a3a4d47990530fe79bd3c80ee6125157a292b260 100644 (file)
--- a/teleforma/templates/teleforma/seminar_testimonial_knowledge.html
+++ b/teleforma/templates/teleforma/seminar_testimonial_knowledge.html
@@ -34,14 +34,14 @@
       <tr><td class="bold">{% trans "Last name" %} : </td><td>{{ testimonial.user.last_name|upper }}</td></tr>
       <tr><td class="bold">{% trans "First name" %} : </td><td>{{ testimonial.user.first_name|upper }}</td></tr>
       <tr><td class="bold">{% trans "Address" %} : </td><td>{{ testimonial.user.auditor.all.0.address }} {{ testimonial.user.auditor.all.0.postal_code }} {{ testimonial.user.auditor.all.0.city }}</td></tr>
-      <tr><td class="bold">{% trans "Subject" %} : </td><td>{{ seminar.title }}</td></tr>
+      <tr><td class="bold">{% trans "Object" %} : </td><td>{{ seminar.title }}</td></tr>
       <tr><td class="bold">{% trans "Course" %} : </td><td>{{ seminar.course }}</td></tr>
       <tr><td class="bold">{% trans "Duration" %} : </td><td>{{ seminar.duration|hours }} {% trans "hours" %}</td></tr>
       <tr><td class="bold">{% trans "Validation mode of the training" %} : </td><td>{% trans "Reply to questions" %}</td></tr>
       <tr><td class="bold">{% trans "Training begin date" %} : </td><td>{{ first_revision.date|date:'j F Y' }}</td></tr>
       <tr><td class="bold">{% trans "Knowledge validation dates and terms" %} : </td><td></td></tr>
       {% for answer in answers %}
-        <tr style="padding-top: -2px;"><td style="padding-left:10px;">{% trans "Answer" %} n°{{ answer.question.rank }} : </td><td>{{ answer.date_validated|date:'j F Y' }}</td></tr>
+        <tr><td style="padding-left:10px;">{% trans "Answer" %} n°{{ answer.question.rank }} : </td><td>{{ answer.date_validated|date:'j F Y' }}</td></tr>
         <tr style="padding-top: -2px;"><td style="padding-left:20px;">{% trans "Required characters" %} : </td><td>{{ answer.question.min_nchar }}</td></tr>
         <tr style="padding-top: -2px;"><td style="padding-left:20px;">{% trans "Submitted characters" %} : </td><td>{{ answer.answer|length }}</td></tr>
       {% endfor %}

diff --git a/teleforma/templates/teleforma/seminar_testimonial_payback.html b/teleforma/templates/teleforma/seminar_testimonial_payback.html
index 3b9e8c9f9fab145dfa5746939c28e0d2e2fdfa97..a884ef07d522e62504b4a3723a3bed7fa9f23327 100644 (file)
--- a/teleforma/templates/teleforma/seminar_testimonial_payback.html
+++ b/teleforma/templates/teleforma/seminar_testimonial_payback.html
@@ -81,7 +81,7 @@
 </div>
 
 
-<div id="seminar" style="position: absolute; left: 200px; top: 50px; z-index=2;">
+<div id="seminar">
   {{ seminar.title }}
 </div>
 

diff --git a/teleforma/templates/teleforma/testimonials.html b/teleforma/templates/teleforma/testimonials.html
index 2d19125342f80116e7a0ede653628b5465c8660b..3e9e73278d449a30de365e57ad5ce86cace1a09c 100644 (file)
--- a/teleforma/templates/teleforma/testimonials.html
+++ b/teleforma/templates/teleforma/testimonials.html
@@ -61,19 +61,19 @@
 
     <tr>
      <td><a href="{% url teleforma-seminar-testimonial testimonial.seminar.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" /> {% trans "Training testimonial" %}</a></td>
-     <td>{% trans "validated on" %} {{ testimonial.date_added }}</td>
+     <td>{% trans "validated on" %} {{ testimonial.date_added|date:'j F Y'  }}</td>
      <td><a href="{% url teleforma-seminar-testimonial-download testimonial.seminar.id %}?format=pdf"><img src="{{ STATIC_URL }}teleforma/images/download.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" /></a></td>
     </tr>
 
     <tr>
      <td><a href="{% url teleforma-seminar-testimonial-knowledge testimonial.seminar.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" /> {% trans "Knowledge validation testimonial" %} ({% trans "only to have support of the training costs" %})</a></td>
-     <td>{% trans "validated on" %} {{ testimonial.date_added }}</td>
+     <td>{% trans "validated on" %} {{ testimonial.date_added|date:'j F Y'  }}</td>
      <td><a href="{% url teleforma-seminar-testimonial-knowledge testimonial.seminar.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}teleforma/images/download.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" /></a></td>
     </tr>
 
     <tr>
      <td><a href="{% url teleforma-seminar-testimonial-payback testimonial.seminar.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" /> {% trans "Payback testimonial" %} ({% trans "only to have support of the training costs" %})</td>
-     <td>{% trans "validated on" %} {{ testimonial.date_added }}</td>
+     <td>{% trans "validated on" %} {{ testimonial.date_added|date:'j F Y'  }}</td>
      <td><a href="{% url teleforma-seminar-testimonial-payback testimonial.seminar.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}teleforma/images/download.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" /></a></td>
     </tr>