From 34acce824e92b32bd77e05a0a55c405cadc49475 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 12 Jun 2013 21:36:58 +0200 Subject: [PATCH] fix some testimonial styles --- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 19251 -> 19310 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 11 +++++++---- .../static/teleforma/css/teleforma_pdf.css | 1 + .../teleforma/seminar_testimonial.html | 2 +- .../seminar_testimonial_knowledge.html | 4 ++-- .../seminar_testimonial_payback.html | 2 +- .../templates/teleforma/testimonials.html | 6 +++--- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 9e09ca2dc48fc13f62563f53096520d204ed7b9e..691fe74ad7258ba25736061b63ad6a10f429db80 100644 GIT binary patch delta 6019 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 VF{y*ovNtte7!n#NHEVh+@_#oNaZ>;Q delta 5969 zcmY+|2bfM*9>?)B)f8ix!C<1!L>+@*mC^esA-YMFAbMR9j@quvPBQ44GDXzj0{Cfply z<4_F6@z(C4#>oumIX8!b23&yZa22Y9je!fC+l`vQ0c3OBQB;Q~P}lu{y8j~P!8@pa zLW}#?>o`V{13wk=SgF-SM#1eQNHIY~M$F%mFuj&1GUBbQ0>Q2*PTV)J$D&3z%|tQ zyQl>Qm-O$8MO|ME)3HoRk2jpcNE$T54R*mc)IeWi9DalO@q)EKM7^|;rTmE(MeRf> zt5-%1P#rZ957qxn)C9B4#X6xCXWIoEP&3|!ftL<7i(!jt_Iaj1dI;0ss{)p38+M24bPHU>4(OjL)9P+Pwq zHKE-YiU&~l9Y#&yTjafVXHfk<#c0NNVbA+F+lQ zZ&h~>`IdG0%K0lShnn~csArmPcEnKXJ%q6S`L z=hve;*lF%V-G2o22u`A&`A_B@J0Du!?>`m`a6S=reU=rE2&SNkw&-hI*TupgPPzt++SN!jZ_2ANMQ9V3C^s4wS`c z>Zus``(K-aR?ryLK}*z%yP>wMAL@o7<~Y<2OhsM45Ow_;t8Yd<(*3B39x{(x`zh4* z=g`v@-k_kZ3$5i3lz^I066zV3N39?Y^+?j~d7lzrQHd&J;oI zbZKi(LtWp>qoA2~vlHD>&vd9c5%p+hqIT*-Y>Dg4N2rN5<2SY@{vztSu2>icp%yq5 z`OV@MV>#T7+F|c91RyZ290~4)%8tM^b+4-eb&qhsXBWj0s zU;^$#P3ROR;yvU#&&BgMvkDD~sFk)sz4g6N9rZ&!nqjC3Oh#?p3{;2nu?Vh5-G3N0 z@iVCVuUh+U)Xs$Sr&jHSFr4vSi9mrL9%d?PWz|tz+6dKgYgETQ&B3V8|5()ZZ{u`a zfLcIO1ONVVs1;X5J&LyG0LxefRUUPitY-TcP>$`0Up>g}5N zAGhjFoqLsf25O=^Fa`IbCVC4s(fgQ;Va@DgikfKKX6(OSz6=`l)(=PRz+?==Ow$w|W4oX; zYC?Tb&u%!X!|B%kfw>ZM(Y_wF(ybVdr&0G`z~}H5=E6KJ{2eIhQP9jvqGnzJbz>FO zv#V+Cb*#M+Y69t~oykDm-xGEHK-2(3t$noBHI61Q4RzfL)HvQM3Yy_s494x|F04g; z530jQs2vL7h0!A@h!L2C+QAgmgc_R7P|vs(s{hWY0ehnsFc2g4`5#X~158DAI1AO$ zT-1OI%ui4^er_H^?btcg_roRBfcH@YhP3qijYSQdfRR`XHQ};>I?ul@g(w=Do9$5_ zzwW4s4Mz<$7S+Kd)C8wl`z+MX%|Q)37qyUOR$qe^sDFm~qB@8AK6rv*`urDe<-fhf zF^Ia3g+A_W^9gphau#YQbd(}Lk-n;M@b}04ljw6^jeJe?xOC{tY6!VZ9+D^q3)BDi zc`Yj_uDJInnii8iMDx^ff#k6{@iWHtA#v3IfxkamQ2Cfl|6Su3R=$Nz$$v?1?tKZ* zlTXRBgZ;@`5*Ie`1P!anDH3DjuBH4fd5h><>aS!HDNg1PJ)`49$B!i3?h7>7Ki6=W zl`G@@teE)X-bPB*Nolf%Y#~F*=S0VDA9ol-t=AdWwjYO++2lL&I$1TU|<5cq4>MKmqle8x3WGvB<aW22qzU;qnMriywOtrY`EHXS3%7qXq`_!n8K0!IhZkZe$eV+1)$;>lBTjLaoE`jL1B z8-)7u-bwP2cZiPk=lSO<=|XmpOXNCPLMD({Ztjda_L5nFk{+CYY=!}3W!A_7@!on$ z<49XFndta{#E@u`Lii2hdXZnrJ~D>nVwC*2jN~ENq$qiIj$zfq1N)5vHtg>)k4$g|_16<)z_o;Bh{5=YvR zH?%1)QfN$0lQu-hE+2OTPg+@gMz)d#s@M_Cq;e?NB7Y=*CLPJ&Nq)|Kk2*?{QGpWw zor!OfW?lKGJy}Jfxws7KsN@s)t*GJ=tEXZkl1L)CUPlk|D(OwWB6rB6oNfs>B6Hf7 n+!CA\n" "Language-Team: LANGUAGE \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 9d1acfc5..43939aac 100644 --- 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 52851777..03eb5ecb 100644 --- a/teleforma/templates/teleforma/seminar_testimonial.html +++ b/teleforma/templates/teleforma/seminar_testimonial.html @@ -34,7 +34,7 @@ {% trans "Last name" %} : {{ testimonial.user.last_name|upper }} {% trans "First name" %} : {{ testimonial.user.first_name|upper }} {% trans "Address" %} : {{ testimonial.user.auditor.all.0.address }} {{ testimonial.user.auditor.all.0.postal_code }} {{ testimonial.user.auditor.all.0.city }} - {% trans "Subject" %} : {{ seminar.title }} + {% trans "Object" %} : {{ seminar.title }} {% trans "Course" %} : {{ seminar.course }} {% trans "Training type" %} : E-learning {% trans "Duration" %} : {{ seminar.duration|hours }} {% trans "hours" %} diff --git a/teleforma/templates/teleforma/seminar_testimonial_knowledge.html b/teleforma/templates/teleforma/seminar_testimonial_knowledge.html index a823df6c..a3a4d479 100644 --- a/teleforma/templates/teleforma/seminar_testimonial_knowledge.html +++ b/teleforma/templates/teleforma/seminar_testimonial_knowledge.html @@ -34,14 +34,14 @@ {% trans "Last name" %} : {{ testimonial.user.last_name|upper }} {% trans "First name" %} : {{ testimonial.user.first_name|upper }} {% trans "Address" %} : {{ testimonial.user.auditor.all.0.address }} {{ testimonial.user.auditor.all.0.postal_code }} {{ testimonial.user.auditor.all.0.city }} - {% trans "Subject" %} : {{ seminar.title }} + {% trans "Object" %} : {{ seminar.title }} {% trans "Course" %} : {{ seminar.course }} {% trans "Duration" %} : {{ seminar.duration|hours }} {% trans "hours" %} {% trans "Validation mode of the training" %} : {% trans "Reply to questions" %} {% trans "Training begin date" %} : {{ first_revision.date|date:'j F Y' }} {% trans "Knowledge validation dates and terms" %} : {% for answer in answers %} - {% trans "Answer" %} n°{{ answer.question.rank }} : {{ answer.date_validated|date:'j F Y' }} + {% trans "Answer" %} n°{{ answer.question.rank }} : {{ answer.date_validated|date:'j F Y' }} {% trans "Required characters" %} : {{ answer.question.min_nchar }} {% trans "Submitted characters" %} : {{ answer.answer|length }} {% endfor %} diff --git a/teleforma/templates/teleforma/seminar_testimonial_payback.html b/teleforma/templates/teleforma/seminar_testimonial_payback.html index 3b9e8c9f..a884ef07 100644 --- a/teleforma/templates/teleforma/seminar_testimonial_payback.html +++ b/teleforma/templates/teleforma/seminar_testimonial_payback.html @@ -81,7 +81,7 @@ -
+
{{ seminar.title }}
diff --git a/teleforma/templates/teleforma/testimonials.html b/teleforma/templates/teleforma/testimonials.html index 2d191253..3e9e7327 100644 --- a/teleforma/templates/teleforma/testimonials.html +++ b/teleforma/templates/teleforma/testimonials.html @@ -61,19 +61,19 @@ {% trans "Training testimonial" %} - {% trans "validated on" %} {{ testimonial.date_added }} + {% trans "validated on" %} {{ testimonial.date_added|date:'j F Y' }} {% trans "Knowledge validation testimonial" %} ({% trans "only to have support of the training costs" %}) - {% trans "validated on" %} {{ testimonial.date_added }} + {% trans "validated on" %} {{ testimonial.date_added|date:'j F Y' }} {% trans "Payback testimonial" %} ({% trans "only to have support of the training costs" %}) - {% trans "validated on" %} {{ testimonial.date_added }} + {% trans "validated on" %} {{ testimonial.date_added|date:'j F Y' }} -- 2.39.5