From 325bbbd635b93e27dcbfc54d1ff26ea6765483e9 Mon Sep 17 00:00:00 2001 From: yomguy Date: Tue, 19 Jun 2012 18:28:35 +0200 Subject: [PATCH] fix profile, add icons --- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 5229 -> 5039 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 160 +++++++++--------- .../teleforma/images/application-msword.png | Bin 0 -> 692 bytes .../teleforma/images/network-wireless.png | Bin 0 -> 830 bytes .../static/teleforma/images/tool-animator.png | Bin 0 -> 892 bytes .../teleforma/inc/conference_list.html | 4 +- .../teleforma/inc/document_list.html | 2 +- .../templates/teleforma/inc/media_list.html | 2 +- teleforma/templatetags/teleforma_tags.py | 39 ++++- 9 files changed, 119 insertions(+), 88 deletions(-) create mode 100644 teleforma/static/teleforma/images/application-msword.png create mode 100644 teleforma/static/teleforma/images/network-wireless.png create mode 100644 teleforma/static/teleforma/images/tool-animator.png diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 052c73228e40398bb82e5c2a45cccc354d8284b8..3c1e1cfae60d8258602193dbbcd0de404298c40d 100644 GIT binary patch delta 2298 zcmYk8eQ4EH7{{Nxt<8Bi@7;7dwdT}v(^+|aY3bCQFWItezGgMInY*Gm6dV>AaSb9h zA)P-IVfd1uv5Z!1SW;x6xCn6&s1Y*7KlG2X7c&sa;ph9ikKp0={e8~!{LXpKbDpzv z+0F8fvQ%$j)?T9}(W7W?rr8eIoXv~2yPw%W*a{zkM`3?>9A?22FbcngIk4N=v?uPsSg}G)ayF-V^GO$?NqEL1W#$Yj2;BvPoIA=ixtc6OX4r=}?sQF3vZ-8;^ z7MKq|@b7zIHtSm(9UeR4{2VId6HtMEgj(olw=cSV#qHl=A>VI9Es(?H8dwB1uL1JO z);l*tZ72oftZ&==!+tmb`-l(t3aaEM-G2%y(0TX&3YB25`)|1Y57feU;j1tkL#J5} z6)y?-Wb0u{rF+XA??TxhLQU8Sd2A0aWqi9b~og)U)`l8gIzGdfe{;&{gU=fsmnES^-O&AOHH<5rmR_*?UPzf)GN@yhvOYYnZ!;-tb z4Qid%JnF9x`*7%wRk+o2Ngf*SX|+vgyUU3C9- zNKSSeYJ4WU7z*>@Al?5mI*mA{L+#`M3>R>AK_z$!YT{Wq9A1Sg{r^yj#n`UK4S_0g z2~@lasM1$LB`^aj{(M-V`@h&7O|XFv8=(UBKn1)6wS!)$GrI}Hl0yaVgDQCz*^rCn zLoHMS8wK9!Lw*CdJd^&BB~VLfLb|d^U??_qpo)LCelys zgEoRry&HA#4Kx!?MZ=KVLcO&ASJa^`NF%&H6Y1+3KI1->TdgUL@Ep}u`In$&G9GFw z`_t$#r0c0R7EM62(I}*rTEuGxdP){;MH==bT#hCo{h~dAbhfXf8Z;8=|Ai_v29=^& zNbPY{fl5#V(sfmvj#i@aGSaQY7JE;3yUhFZoq55%e#OD?+&MvW?&x5D?%R=;&RG9> zkWX_ delta 2467 zcmYk8YiyHc6vv-VwsqZ|F+|zsHesDGrW;esWeC_hkkxS!bV`MeZmt=2NH;JAzytGPwQ(Wz;WxlJumu*wHdqKdjUjs< zhU&i+mcj_6f65J6hl7xxdzyzAzF>R>Qj>et{Bc;0|0dK#@0Q8Em!polr*+viFI!c0w(r4{F?yaUawj7=>|U{9RU}I;e3=%wGjn zKo`_e^+4s@2GuWO@dQk%!+s1UIso;V9f3;lJY+66235dms6yX0egIX_d8i%u()byyfq_b7A zxz>cCVpaIYToCFGF+5YS?%!P!-kDy!|z=)tQ(#o}% zKC}lthE}2_=tk6qZr1!Ev>d4|MRBAXtF{$sXVmUNwHYh>c--vU;2N|T-HCLBoyd)@^EVe|mfXRFqOwqz{6b7MPf zMe9*7(!V#4qGr^n{a=QmHi&kjd*xUQzzt^W+;tb!R-x{U<=kDc-s~LiHbbACS_|5S z`q3t|8r7lM(sjA?zn}T(G4F!>b%{iDZ~6^y&=(!)uYY1V79WVGr@ek}aCCokBtD!- z`-+~LI$9L+OnvM-mRHzO-xgTezG7-~X``ngGq^wfWLbBWM#pjq_GCw%En8kdnhWpr lr>~YBP7jw)c=ttU;G|3!OwUsCG{sa9|%^Cmz diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po index f2afe834..5b4391e9 100644 --- a/teleforma/locale/fr/LC_MESSAGES/django.po +++ b/teleforma/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-14 18:29+0200\n" +"POT-Creation-Date: 2012-06-19 17:51+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,12 +19,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1)\n" #: models.py:69 models.py:81 models.py:99 models.py:111 models.py:165 -#: models.py:293 models.py:389 models.py:405 +#: models.py:300 models.py:396 models.py:412 msgid "name" msgstr "nom" #: models.py:70 models.py:82 models.py:100 models.py:112 models.py:125 -#: models.py:166 models.py:221 models.py:275 models.py:294 models.py:390 +#: models.py:166 models.py:221 models.py:282 models.py:301 models.py:397 msgid "description" msgstr "description" @@ -36,48 +36,48 @@ msgstr "organisation" msgid "department" msgstr "département" -#: models.py:107 models.py:406 models.py:451 +#: models.py:107 models.py:413 models.py:458 msgid "period" msgstr "période" -#: models.py:119 models.py:179 models.py:240 models.py:312 models.py:360 +#: models.py:119 models.py:179 models.py:240 models.py:319 models.py:367 msgid "course type" msgstr "type de matière" -#: models.py:124 models.py:274 +#: models.py:124 models.py:281 msgid "title" msgstr "titre" -#: models.py:126 models.py:279 models.py:404 +#: models.py:126 models.py:286 models.py:411 msgid "code" msgstr "cote" -#: models.py:127 models.py:278 +#: models.py:127 models.py:285 msgid "date modified" msgstr "date de modification" -#: models.py:128 models.py:295 +#: models.py:128 models.py:302 msgid "number" msgstr "" -#: models.py:129 models.py:409 +#: models.py:129 models.py:416 msgid "synthesis note" msgstr "note de synthèse" -#: models.py:130 models.py:412 +#: models.py:130 models.py:419 msgid "obligations" msgstr "obligations" -#: models.py:131 models.py:433 +#: models.py:131 models.py:440 #, fuzzy msgid "magistral" msgstr "Cours magistraux" -#: models.py:144 models.py:178 models.py:238 models.py:310 models.py:359 +#: models.py:144 models.py:178 models.py:238 models.py:317 models.py:366 msgid "course" msgstr "matière" -#: models.py:150 models.py:450 models.py:488 +#: models.py:150 models.py:457 models.py:495 msgid "user" msgstr "utilisateur" @@ -109,15 +109,15 @@ msgstr "date de début" msgid "end date" msgstr "date de fin" -#: models.py:189 models.py:365 +#: models.py:189 models.py:372 msgid "is live" msgstr "en direct" -#: models.py:190 models.py:319 models.py:366 +#: models.py:190 models.py:326 models.py:373 msgid "readers" msgstr "" -#: models.py:210 models.py:243 models.py:313 models.py:361 +#: models.py:210 models.py:243 models.py:320 models.py:368 msgid "conference" msgstr "conférence" @@ -129,7 +129,7 @@ msgstr "" msgid "port" msgstr "" -#: models.py:220 models.py:315 +#: models.py:220 models.py:322 msgid "type" msgstr "type" @@ -149,132 +149,132 @@ msgstr "serveur de diffusion" msgid "Streaming type" msgstr "Type de flux" -#: models.py:268 +#: models.py:275 msgid "live stream" msgstr "stream en direct" -#: models.py:276 +#: models.py:283 msgid "credits" msgstr "crédits" -#: models.py:277 models.py:508 +#: models.py:284 models.py:515 msgid "date added" msgstr "date d'ajout" -#: models.py:280 +#: models.py:287 msgid "published" msgstr "publié" -#: models.py:302 +#: models.py:309 msgid "document type" msgstr "type de document" -#: models.py:317 +#: models.py:324 msgid "annal" msgstr "annale" -#: models.py:318 +#: models.py:325 msgid "file" msgstr "fichier" -#: models.py:397 models.py:398 templates/telemeta/profile_detail.html:63 +#: models.py:404 models.py:405 templates/telemeta/profile_detail.html:63 #: templates/telemeta/users.html:29 templates/telemeta/inc/user_list.html:21 msgid "IEJ" msgstr "IEJ" -#: models.py:415 models.py:458 +#: models.py:422 models.py:465 msgid "procedure" msgstr "procédure" -#: models.py:418 models.py:461 +#: models.py:425 models.py:468 msgid "written speciality" msgstr "spécialité écrit" -#: models.py:421 models.py:464 +#: models.py:428 models.py:471 msgid "oral speciality" msgstr "spécialité orale" -#: models.py:424 models.py:466 +#: models.py:431 models.py:473 msgid "oral 1" msgstr "" -#: models.py:427 models.py:468 +#: models.py:434 models.py:475 msgid "oral 2" msgstr "" -#: models.py:430 models.py:470 +#: models.py:437 models.py:477 msgid "options" msgstr "options" -#: models.py:435 +#: models.py:442 msgid "cost" msgstr "coût" -#: models.py:445 models.py:455 +#: models.py:452 models.py:462 msgid "training" msgstr "formation" -#: models.py:453 +#: models.py:460 msgid "iej" msgstr "iej" -#: models.py:456 +#: models.py:463 msgid "platform only" msgstr "plateforme seulement" -#: models.py:481 models.py:506 +#: models.py:488 models.py:513 msgid "student" msgstr "étudiant" -#: models.py:489 templates/telemeta/profile_detail.html:76 +#: models.py:496 templates/telemeta/profile_detail.html:76 msgid "Address" msgstr "" -#: models.py:490 +#: models.py:497 msgid "Postal code" msgstr "Code postal" -#: models.py:491 +#: models.py:498 msgid "City" msgstr "Ville" -#: models.py:492 +#: models.py:499 msgid "Country" msgstr "Pays" -#: models.py:493 templates/telemeta/profile_detail.html:85 +#: models.py:500 templates/telemeta/profile_detail.html:85 msgid "Language" msgstr "Langue" -#: models.py:494 templates/telemeta/profile_detail.html:77 +#: models.py:501 templates/telemeta/profile_detail.html:77 msgid "Telephone" msgstr "Téléphone" -#: models.py:495 +#: models.py:502 msgid "Expiration_date" msgstr "Date d'expiration" -#: models.py:496 +#: models.py:503 msgid "Password initialization" msgstr "" -#: models.py:500 +#: models.py:507 msgid "profile" msgstr "profil" -#: models.py:507 +#: models.py:514 msgid "amount" msgstr "montant" -#: models.py:516 +#: models.py:523 msgid "payment" msgstr "paiement" -#: views.py:141 +#: views.py:146 msgid "Access not allowed." msgstr "Accès non autorisé." -#: views.py:142 +#: views.py:147 msgid "" "Please login or contact the website administator to get a private access." msgstr "" @@ -373,12 +373,16 @@ msgstr "" msgid "No messages." msgstr "Messages" -#: templates/postman/base_write.html:17 +#: templates/postman/base_write.html:23 #, fuzzy msgid "Choose a professor" msgstr "professeur" -#: templates/postman/base_write.html:29 +#: templates/postman/base_write.html:31 +msgid "Choose an administrator" +msgstr "" + +#: templates/postman/base_write.html:48 #: templates/teleforma/inc/chat_room.html:13 msgid "Send" msgstr "" @@ -528,10 +532,8 @@ msgstr "Supports écrits" #: templates/teleforma/course.html:18 templates/teleforma/course.html.py:34 #: templates/teleforma/course_conference.html:33 -#: templates/teleforma/course_document.html:75 -#: templates/teleforma/inc/document_list.html:16 -#: templates/teleforma/inc/media_list.html:12 templates/telemeta/lists.html:69 -#: templates/telemeta/search_criteria.html:97 +#: templates/teleforma/course_document.html:74 +#: templates/telemeta/lists.html:69 templates/telemeta/search_criteria.html:97 #: templates/telemeta/inc/module_revisions.html:17 msgid "Title" msgstr "Titre" @@ -556,16 +558,12 @@ msgstr "Conférences" #: templates/teleforma/course.html:51 #: templates/teleforma/course_conference.html:34 -#: templates/teleforma/inc/conference_list.html:12 -#: templates/teleforma/inc/media_list.html:13 msgid "Session" msgstr "Session" #: templates/teleforma/course.html:52 #: templates/teleforma/course_conference.html:35 #: templates/teleforma/course_media.html:57 -#: templates/teleforma/inc/conference_list.html:13 -#: templates/teleforma/inc/media_list.html:14 #: templates/telemeta/inc/user_list.html:48 msgid "Professor" msgstr "Professeur" @@ -583,8 +581,6 @@ msgid "Live" msgstr "Direct" #: templates/teleforma/course_media.html:63 -#: templates/teleforma/inc/conference_list.html:14 -#: templates/teleforma/inc/media_list.html:15 msgid "Begin date" msgstr "Date de début" @@ -610,36 +606,26 @@ msgid "New note" msgstr "Nouvelle note" #: templates/teleforma/inc/conference_list.html:7 -msgid "Live conference" -msgstr "Conférence en direct" - -#: templates/teleforma/inc/conference_list.html:15 -msgid "Streaming" -msgstr "Diffusion" +msgid "Live conferences" +msgstr "Conférences en direct" +#: templates/teleforma/inc/conference_list.html:13 #: templates/teleforma/inc/document_list.html:17 -msgid "Annal" -msgstr "Annale" - -#: templates/teleforma/inc/document_list.html:18 -msgid "Date modified" -msgstr "Date de modification" +#: templates/teleforma/inc/media_list.html:14 +msgid "View" +msgstr "" -#: templates/teleforma/inc/document_list.html:19 +#: templates/teleforma/inc/document_list.html:24 msgid "Download" msgstr "Télécharger" -#: templates/teleforma/inc/document_list.html:43 +#: templates/teleforma/inc/document_list.html:35 msgid "No document" msgstr "Aucun document" #: templates/teleforma/inc/media_list.html:7 msgid "Passed conferences" -msgstr "Conférences passées" - -#: templates/teleforma/inc/media_list.html:16 -msgid "Duration" -msgstr "Durée" +msgstr "Conférences en différé" #: templates/telemeta/base.html:71 msgid "Desk" @@ -921,6 +907,18 @@ msgstr "" msgid "No" msgstr "" +#~ msgid "Streaming" +#~ msgstr "Diffusion" + +#~ msgid "Annal" +#~ msgstr "Annale" + +#~ msgid "Date modified" +#~ msgstr "Date de modification" + +#~ msgid "Duration" +#~ msgstr "Durée" + #~ msgid "Messages" #~ msgstr "Messages" diff --git a/teleforma/static/teleforma/images/application-msword.png b/teleforma/static/teleforma/images/application-msword.png new file mode 100644 index 0000000000000000000000000000000000000000..069059db9556f185ffb3b99b037800af128396e6 GIT binary patch literal 692 zcmV;l0!#ggP)sb*bz>1kp{@k2i;zUnMMEl86hTEa^Squr=?p_Ec!qDz zeVp$*kIST#VCDH1WH<+9jK2Sw1d-U9+sbU$gXfcy$bj<< z7#F)<2NyatA+WY`{X2lMfW{cp%^6&~Z~~^OL#KcntDECsA}TN;qCF?E4A&5wh!?uG z4=d{*;D#D*UOa}ZwVyH(nMi_jaE*~CC@&ad(-Hw9Tsdz?#BaYsWOFmHObb&+2DvQ9 zlu0ngm^M^i$x;=BzxCWK?rnUb77RSt_>5^HQDRkYl$DROCuflGKo-41sZ=`K>-C=h z8I8axLen%gm&mi-HA{icr4ZsYabG4gP#2$ec2Fo3aR1r6h}fDt3KEX)(s8zJ?;RrO z;vkV#*2_dBub_fsfwY&2KwA0Z_BKl8GWz{~Qto7SW%YU;dj$x^VlnEsR;#I5Oo}9) zdjEF|!{HE>N(J3+HzDQ^+i1REkYBfuH#}H6N83gSz@4l>y+%BwMBt~-aEQIdfms)~ zn#bWd4wjY{9|3rs7LWuC1_M;9RdhO?q}*yHkK&tUG>)8tGiso{*nWKH_VOiaBS`w8 z-p_cxFJ0G_p65xQ)>1s>9-&_wCt}fgKkWri%Ec!840HDB9z{K7syrOs) aDfP)K~#9!rIUL|Q&Akpe|HbN+nh>dIi}`H)TEdBk4oepJ^ZI3 zRM4OKNQan0fA*I`|MdX%`d}G>&_a4)QV51ksBJhOn=>CQak$Mb^KP=;x$eBX_jIq} z(z3ria5(4p{r%3D59fCdh7f}N49Q+%U8h462d)$_I4j~1hcJHpU=3@8XwYvx! zyXTUl9P_Y9ld3DoRAO0&WFVwHWE5uIVf58Q5mIUVp1!^~`j3IGZBivqm6>mzSLdWD zlECT=3I`dU0y~oFFsxYhVadjs)v^a~ofe9YL+vF^9*$Tdfh`bJcTC-Q@!5wamcpotu)pTTEi&|H zh1OOis_C-5x4S6RXY`_K!d@ZhzX>o*D-CL(zhBm&`0B9I6|XPD1;0K!vL>KgF6NphH%H-(&BCgGCAqWK^dvn338!*RYv z-tyV*Mc{zQnXG)xkOY z3qgPL)!dEj4E*rUHgDB5oMZ1+=6XLl)_lur8*h4>P6u}Vg=bAggFx7VD}ku8zCz=M zJ;uu~E1r1|wZYeVc0QzCv!-)Ow!Jr*ObkH~Az}Z&x$p1%3#G4>BVCt-PXGV_07*qo IM6N<$f?XSWF#rGn literal 0 HcmV?d00001 diff --git a/teleforma/static/teleforma/images/tool-animator.png b/teleforma/static/teleforma/images/tool-animator.png new file mode 100644 index 0000000000000000000000000000000000000000..61a5b2f6ed1b98cbb6ccf53aae2b87a4d621f135 GIT binary patch literal 892 zcmV-?1B3jDP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L05@F#05@F$8GuGz00007bV*G`2iOS@ z2pTNwEP+J;00R6;L_t(|+J#b0NK|1IJ>Q%6)Mzx#nVe~qGLRCppQ$9G!m&cKm6SyP zt7%ctrbQ4Kf`U*{w1~iJQHvIdq*x1$%7sRxNMJ$EFn=~R(Q8baX`DCn=H2c*&~g!- zkGpyAJLjHz?q|V&V6|E?G&Edx|Ngy}s>(GNl8N*!r=uzujfQ>yBvn^e7aE4q_~lEi ztD#}n+daEI`qb11ipS%0{@g`sIoNh{;jZbRwzgKNs#@RC(Qz^yj$DaGzuwlgjJK(& zac@~^scT~5Jx0ggeA4ywNHFB@8GQQWk*;UsSbz}1+tt-Yc|@b1Y5)F1j8zvQ169aQ#{*zNv9BF+PR5IyXG~JQyB+DYP`ucH}r*Rh8)N9T2v17j)eq zEX?Cty#_=EIUP<&78w>G0}({RpG;D~@5l7VX`DK76cwvhVkQy<W@XQBe`rZ`gp6lHz=rOC3D!>lIF?69-$GvCO(0+jnf^Ky79wD@seD z&d#Fe?gR7>JcIiE2kZ_9##O@N8jl@6gV&>Dq$rBHMp@=na(4(WB6AbGzI
-

{% trans "Live conference"%}

+

{% trans "Live conferences"%}

{% for stream in course.livestream.all|from_course_type:type %} - + {% for document in course.document.all|from_course_type:type|from_doc_type:doc_type %} - +
{{ stream.slug }} {{ stream.slug }} {% if conference.professor.user %}{{ conference.professor }}{% endif %} {{ conference.date_begin }} diff --git a/teleforma/templates/teleforma/inc/document_list.html b/teleforma/templates/teleforma/inc/document_list.html index c10438eb..dd794cfa 100644 --- a/teleforma/templates/teleforma/inc/document_list.html +++ b/teleforma/templates/teleforma/inc/document_list.html @@ -14,7 +14,7 @@
{% if document.file %}{% endif %} {{ document.title }}{% if document.file %}{% endif %}{% if document.file %}{% endif %} {{ document.title }}{% if document.file %}{% endif %}