From 31f7cc08d139f4065b0701fb4dd4e36119f7c503 Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 17 Dec 2012 22:21:52 +0100 Subject: [PATCH] fix infos, seminar completed when answers are validated --- teleforma/admin.py | 1 - teleforma/forms.py | 2 +- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 10311 -> 10757 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 342 ++++++++++-------- teleforma/static/teleforma/css/teleforma.css | 8 +- .../static/teleforma/images/chronometer.png | Bin 0 -> 3608 bytes .../teleforma/inc/question_list.html | 6 +- .../templates/teleforma/seminar_detail.html | 21 +- teleforma/templates/teleforma/seminars.html | 6 + teleforma/templatetags/teleforma_tags.py | 13 + teleforma/urls.py | 2 + teleforma/views/pro.py | 2 +- 12 files changed, 244 insertions(+), 159 deletions(-) create mode 100644 teleforma/static/teleforma/images/chronometer.png diff --git a/teleforma/admin.py b/teleforma/admin.py index 12145d27..c1a88651 100644 --- a/teleforma/admin.py +++ b/teleforma/admin.py @@ -4,7 +4,6 @@ from django.contrib import admin from django.contrib.auth.models import User from django.contrib.auth.admin import UserAdmin - class ProfileInline(admin.StackedInline): model = Profile diff --git a/teleforma/forms.py b/teleforma/forms.py index 5db524d9..64ce4562 100644 --- a/teleforma/forms.py +++ b/teleforma/forms.py @@ -20,7 +20,7 @@ class AnswerForm(ModelForm): def __init__(self, *args, **kwargs): super(AnswerForm, self).__init__(*args, **kwargs) - self.fields['answer'].widget.attrs['cols'] = 95 + self.fields['answer'].widget.attrs['cols'] = 81 self.fields['answer'].widget.attrs['rows'] = 40 self.fields['status'].widget = HiddenInput() diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index bb0049f10b8eb5332eea40671e2d075ce6061aac..120f5d663615238a7589b90cce6a4bf53ac6c987 100644 GIT binary patch literal 10757 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 literal 10311 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\n" "Language-Team: LANGUAGE \n" @@ -17,8 +17,8 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1)\n" #: models/ae.py:46 models/core.py:177 models/crfpa.py:108 models/crfpa.py:146 -#: models/pro.py:166 models/pro.py:206 models/pro.py:221 models/pro.py:232 -#: models/pro.py:265 +#: models/pro.py:166 models/pro.py:207 models/pro.py:222 models/pro.py:234 +#: models/pro.py:267 msgid "user" msgstr "utilisateur" @@ -27,7 +27,7 @@ msgstr "utilisateur" msgid "period" msgstr "période" -#: models/ae.py:49 models/crfpa.py:114 models/pro.py:237 +#: models/ae.py:49 models/crfpa.py:114 models/pro.py:239 msgid "platform only" msgstr "plateforme seulement" @@ -63,11 +63,13 @@ msgstr "nom" #: models/core.py:89 models/core.py:101 models/core.py:121 models/core.py:133 #: models/core.py:148 models/core.py:197 models/core.py:307 models/core.py:373 -#: models/core.py:393 models/crfpa.py:48 models/pro.py:148 models/pro.py:190 +#: models/core.py:393 models/crfpa.py:48 models/pro.py:148 models/pro.py:191 +#: templates/teleforma/seminar_detail.html:60 +#: templates/teleforma/seminars.html:97 msgid "description" msgstr "description" -#: models/core.py:96 models/core.py:103 models/core.py:195 models/pro.py:189 +#: models/core.py:96 models/core.py:103 models/core.py:195 models/pro.py:190 msgid "organization" msgstr "organisation" @@ -91,12 +93,12 @@ msgstr "titre" msgid "code" msgstr "cote" -#: models/core.py:150 models/core.py:376 models/pro.py:120 models/pro.py:266 +#: models/core.py:150 models/core.py:376 models/pro.py:120 models/pro.py:268 msgid "date modified" msgstr "date de modification" #: models/core.py:151 models/core.py:420 models/core.py:478 models/pro.py:58 -#: models/pro.py:95 models/pro.py:150 models/pro.py:211 +#: models/pro.py:95 models/pro.py:150 models/pro.py:212 msgid "rank" msgstr "rang" @@ -198,7 +200,7 @@ msgstr "stream en direct" msgid "credits" msgstr "crédits" -#: models/core.py:375 models/pro.py:119 +#: models/core.py:375 models/pro.py:119 models/pro.py:172 msgid "date added" msgstr "date d'ajout" @@ -277,38 +279,38 @@ msgstr "iej" msgid "student" msgstr "étudiant" -#: models/crfpa.py:147 models/pro.py:239 +#: models/crfpa.py:147 models/pro.py:241 #: templates/telemeta/profile_detail.html:82 msgid "Address" msgstr "Adresse" -#: models/crfpa.py:148 models/pro.py:240 +#: models/crfpa.py:148 models/pro.py:242 msgid "Postal code" msgstr "Code postal" -#: models/crfpa.py:149 models/pro.py:241 +#: models/crfpa.py:149 models/pro.py:243 msgid "City" msgstr "Ville" -#: models/crfpa.py:150 models/pro.py:242 +#: models/crfpa.py:150 models/pro.py:244 msgid "Country" msgstr "Pays" -#: models/crfpa.py:151 models/pro.py:243 +#: models/crfpa.py:151 models/pro.py:245 #: templates/telemeta/profile_detail.html:91 msgid "Language" msgstr "Langue" -#: models/crfpa.py:152 models/pro.py:244 +#: models/crfpa.py:152 models/pro.py:246 #: templates/telemeta/profile_detail.html:83 msgid "Telephone" msgstr "Téléphone" -#: models/crfpa.py:153 models/pro.py:246 +#: models/crfpa.py:153 models/pro.py:248 msgid "Expiration_date" msgstr "Date d'expiration" -#: models/crfpa.py:154 models/pro.py:247 +#: models/crfpa.py:154 models/pro.py:249 msgid "Password initialized" msgstr "Mot de passe initialisé" @@ -332,11 +334,13 @@ msgstr "Type de séminaire" msgid "sub title" msgstr "sous-titre" -#: models/pro.py:92 +#: models/pro.py:92 templates/teleforma/seminar_detail.html:57 +#: templates/teleforma/seminars.html:94 msgid "public concerned" msgstr "public concerné" -#: models/pro.py:93 +#: models/pro.py:93 templates/teleforma/seminar_detail.html:56 +#: templates/teleforma/seminars.html:93 msgid "level" msgstr "niveau" @@ -372,12 +376,15 @@ msgstr "document 2" msgid "corrected document" msgstr "document corrigé" -#: models/pro.py:138 templates/teleforma/seminar_media_audio.html:56 -#: templates/teleforma/seminar_media_video.html:102 +#: models/pro.py:138 templates/teleforma/answer_form.html:77 +#: templates/teleforma/seminar_detail.html:154 +#: templates/teleforma/seminar_media_audio.html:56 +#: templates/teleforma/seminar_media_video.html:104 +#: templates/teleforma/inc/answer_list.html:21 msgid "Seminar" msgstr "Sémimaire" -#: models/pro.py:146 models/pro.py:205 models/pro.py:220 models/pro.py:264 +#: models/pro.py:146 models/pro.py:206 models/pro.py:221 models/pro.py:266 msgid "seminar" msgstr "séminaire" @@ -401,7 +408,7 @@ msgstr "Question" msgid "answer" msgstr "réponse" -#: models/pro.py:170 +#: models/pro.py:170 templates/teleforma/seminar_detail.html:40 msgid "validated" msgstr "validé" @@ -409,55 +416,56 @@ msgstr "validé" msgid "date submitted" msgstr "date de soumission" -#: models/pro.py:183 +#: models/pro.py:184 templates/teleforma/answer_detail.html:28 +#: templates/teleforma/answer_form.html:80 msgid "Answer" msgstr "Réponse" -#: models/pro.py:191 +#: models/pro.py:192 msgid "comments" msgstr "commentaires" -#: models/pro.py:193 models/pro.py:208 +#: models/pro.py:194 models/pro.py:209 msgid "template" msgstr "modèle" -#: models/pro.py:200 +#: models/pro.py:201 msgid "Testimonial template" msgstr "Modèle d'attestation" -#: models/pro.py:215 +#: models/pro.py:216 msgid "Testimonial" msgstr "Attestation" -#: models/pro.py:226 +#: models/pro.py:228 msgid "Evaluation" msgstr "Évaluation" -#: models/pro.py:234 +#: models/pro.py:236 msgid "seminars" msgstr "séminaires" -#: models/pro.py:238 +#: models/pro.py:240 msgid "Company" msgstr "" -#: models/pro.py:245 +#: models/pro.py:247 msgid "Fax" msgstr "" -#: models/pro.py:257 +#: models/pro.py:259 msgid "Auditor" msgstr "Auditeur" -#: models/pro.py:267 +#: models/pro.py:269 msgid "progress" msgstr "" -#: models/pro.py:271 +#: models/pro.py:273 msgid "Revision" msgstr "Révision" -#: models/pro.py:272 +#: models/pro.py:274 msgid "Revisions" msgstr "Révisions" @@ -469,7 +477,7 @@ msgstr "Page non trouvée" msgid "Server error" msgstr "Erreur du serveur" -#: templates/admin/base.html:21 templates/telemeta/base.html:102 +#: templates/admin/base.html:21 templates/telemeta/base.html:98 msgid "Home" msgstr "Accueil" @@ -497,7 +505,7 @@ msgstr "" msgid "Sent Messages" msgstr "Messages" -#: templates/postman/base.html:17 templates/telemeta/base.html:115 +#: templates/postman/base.html:17 msgid "Archives" msgstr "" @@ -715,14 +723,12 @@ msgid "Conversation" msgstr "" #: templates/postman/view.html:9 templates/telemeta/inc/user_list.html:72 -#, fuzzy msgid "Message" -msgstr "Messages" +msgstr "Message" #: templates/postman/view.html:25 -#, fuzzy msgid "Rejected" -msgstr "rejeté" +msgstr "Rejeté" #: templates/postman/view.html:25 msgid ":" @@ -736,6 +742,14 @@ msgstr "" msgid "Write" msgstr "" +#: templates/teleforma/answer_detail.html:38 +msgid " validate" +msgstr "valider" + +#: templates/teleforma/answer_detail.html:39 +msgid " reject" +msgstr " rejeter" + #: templates/teleforma/answer_form.html:46 msgid "Answer to the following question" msgstr "Réalisez la consultation fictive suivante" @@ -748,14 +762,56 @@ msgstr "en" msgid "words" msgstr "mots" -#: templates/teleforma/answer_form.html:60 +#: templates/teleforma/answer_form.html:61 msgid "Save" msgstr "" -#: templates/teleforma/answer_form.html:63 +#: templates/teleforma/answer_form.html:62 msgid "Submit it" msgstr "Soumettre" +#: templates/teleforma/answer_form.html:70 +#: templates/teleforma/seminar_detail.html:148 +#: templates/teleforma/seminars.html:112 +msgid "Progressions" +msgstr "Progressions" + +#: templates/teleforma/answer_form.html:74 +#: templates/teleforma/seminar_detail.html:151 +#: templates/teleforma/seminars.html:115 +msgid "General" +msgstr "Général" + +#: templates/teleforma/answers.html:6 templates/teleforma/answers.html:62 +#: templates/telemeta/base.html:111 +msgid "Answers" +msgstr "Consultations" + +#: templates/teleforma/answers.html:19 +#: templates/teleforma/inc/answer_list.html:41 +msgid " validated" +msgstr "validé" + +#: templates/teleforma/answers.html:25 +#: templates/teleforma/course_media.html:34 +#: templates/teleforma/course_media.html:79 +#: templates/teleforma/seminar_media_audio.html:25 +#: templates/teleforma/seminar_media_video.html:28 +#: templates/teleforma/seminar_media_video.html:73 +#: templates/teleforma/inc/answer_list.html:41 +#: templates/teleforma/inc/media_list.html:52 +#: templates/teleforma/inc/media_package_list.html:50 +msgid " rejected" +msgstr " rejeté" + +#: templates/teleforma/answers.html:40 templates/teleforma/seminars.html:35 +msgid "My seminars" +msgstr "Mes séminaires" + +#: templates/teleforma/answers.html:67 +msgid "No answer" +msgstr "Aucune réponse" + #: templates/teleforma/course.html:14 #: templates/teleforma/inc/document_list.html:7 msgid "Documents" @@ -773,8 +829,6 @@ msgid "Title" msgstr "Titre" #: templates/teleforma/course.html:18 templates/teleforma/course.html.py:34 -#: templates/teleforma/seminar_detail.html:34 -#: templates/teleforma/seminars.html:80 #: templates/teleforma/inc/media_package_list.html:40 msgid "Description" msgstr "Description" @@ -783,7 +837,7 @@ msgstr "Description" #: templates/teleforma/course.html:52 #: templates/teleforma/course_media.html:142 #: templates/teleforma/seminar_media_audio.html:64 -#: templates/teleforma/seminar_media_video.html:110 +#: templates/teleforma/seminar_media_video.html:112 #: templates/telemeta/profile_detail.html:86 msgid "Date added" msgstr "Date d'ajout" @@ -825,7 +879,7 @@ msgstr "S T O P" #: templates/teleforma/course_conference.html:37 #: templates/teleforma/course_media.html:73 -#: templates/teleforma/seminar_media_video.html:68 +#: templates/teleforma/seminar_media_video.html:70 msgid "Audio" msgstr "" @@ -888,7 +942,7 @@ msgid "End" msgstr "Fin" #: templates/teleforma/course_conference_record.html:23 -#: templates/teleforma/courses.html:41 templates/teleforma/seminars.html:41 +#: templates/teleforma/courses.html:41 templates/teleforma/seminars.html:51 msgid "New conference" msgstr "Nouvelle conférence" @@ -899,26 +953,16 @@ msgstr "Enregistrer et diffuser" #: templates/teleforma/course_media.html:27 #: templates/teleforma/course_media.html:79 #: templates/teleforma/seminar_media_audio.html:25 -#: templates/teleforma/seminar_media_video.html:20 -#: templates/teleforma/seminar_media_video.html:71 +#: templates/teleforma/seminar_media_video.html:21 +#: templates/teleforma/seminar_media_video.html:73 #: templates/teleforma/inc/media_list.html:50 #: templates/teleforma/inc/media_package_list.html:48 msgid " published" msgstr " publié" -#: templates/teleforma/course_media.html:34 -#: templates/teleforma/course_media.html:79 -#: templates/teleforma/seminar_media_audio.html:25 -#: templates/teleforma/seminar_media_video.html:27 -#: templates/teleforma/seminar_media_video.html:71 -#: templates/teleforma/inc/media_list.html:52 -#: templates/teleforma/inc/media_package_list.html:50 -msgid " rejected" -msgstr " rejeté" - #: templates/teleforma/course_media.html:62 #: templates/teleforma/seminar_media_audio.html:10 -#: templates/teleforma/seminar_media_video.html:56 +#: templates/teleforma/seminar_media_video.html:58 #: templates/teleforma/inc/document_list.html:22 #: templates/teleforma/inc/document_simple_list.html:15 #: templates/teleforma/inc/media_list.html:56 @@ -928,13 +972,13 @@ msgstr "Télécharger" #: templates/teleforma/course_media.html:141 #: templates/teleforma/seminar_media_audio.html:63 -#: templates/teleforma/seminar_media_video.html:109 +#: templates/teleforma/seminar_media_video.html:111 msgid "Mime type" msgstr "Type mime" #: templates/teleforma/course_media.html:143 #: templates/teleforma/seminar_media_audio.html:65 -#: templates/teleforma/seminar_media_video.html:111 +#: templates/teleforma/seminar_media_video.html:113 msgid "Date modified" msgstr "Date de modification" @@ -947,85 +991,110 @@ msgstr "ID Média" msgid "My courses" msgstr "Mes matières" -#: templates/teleforma/courses.html:48 templates/teleforma/seminars.html:48 +#: templates/teleforma/courses.html:48 templates/teleforma/seminars.html:58 msgid "My notes" msgstr "Mes notes" -#: templates/teleforma/courses.html:58 templates/teleforma/seminars.html:58 +#: templates/teleforma/courses.html:58 templates/teleforma/seminars.html:68 msgid "New note" msgstr "Nouvelle note" -#: templates/teleforma/courses.html:104 templates/teleforma/seminars.html:109 +#: templates/teleforma/courses.html:104 templates/teleforma/seminars.html:127 msgid "Status" msgstr "Status" -#: templates/teleforma/help.html:11 templates/telemeta/base.html:124 -#: templates/telemeta/base.html.py:137 +#: templates/teleforma/help.html:11 templates/telemeta/base.html:114 +#: templates/telemeta/base.html.py:127 msgid "Help" msgstr "Aide" -#: templates/teleforma/seminar_detail.html:21 -#: templates/teleforma/seminars.html:98 +#: templates/teleforma/seminar_detail.html:51 msgid "Informations" msgstr "Informations" -#: templates/teleforma/seminar_detail.html:44 -msgid "Step 1 : read the following documents" -msgstr "Étape 1 : lisez les documents suivants" +#: templates/teleforma/seminar_detail.html:55 +#: templates/teleforma/seminars.html:92 +msgid "keywords" +msgstr "mots clés" -#: templates/teleforma/seminar_detail.html:48 -msgid "Step 1 : read the following document" -msgstr "Étape 1 : lisez le document suivant" +#: templates/teleforma/seminar_detail.html:58 +#: templates/teleforma/seminars.html:95 +msgid "duration" +msgstr "durée" -#: templates/teleforma/seminar_detail.html:56 -msgid "Step 2 : view the following conferences" -msgstr "Étape 2 : visionnez les conférences suivantes" +#: templates/teleforma/seminar_detail.html:76 +msgid "Step 1 : read these documents" +msgstr "Étape 1 : lire ces documents" -#: templates/teleforma/seminar_detail.html:60 -msgid "Step 2 : view the following conference" -msgstr "Étape 2 : visionnez la conférence suivante" +#: templates/teleforma/seminar_detail.html:80 +msgid "Step 1 : read this document" +msgstr "Étape 1 : lire ce document" -#: templates/teleforma/seminar_detail.html:68 -msgid "Step 3 : read the following documents" -msgstr "Étape 3 : lisez les documents suivants" +#: templates/teleforma/seminar_detail.html:88 +msgid "Step 2 : attend these conferences" +msgstr "Étape 2 : assister à ces conférences" -#: templates/teleforma/seminar_detail.html:72 -msgid "Step 3 : read the following document" -msgstr "Étape 3 : lisez le document suivant" +#: templates/teleforma/seminar_detail.html:92 +msgid "Step 2 : attend this conference" +msgstr "Étape 2 : assister à cette conférence" -#: templates/teleforma/seminar_detail.html:80 -msgid "Step 4 : answer to the following questions" -msgstr "Étape 4 : réalisez les consultations fictives suivantes" +#: templates/teleforma/seminar_detail.html:100 +msgid "Step 3 : read these documents" +msgstr "Étape 3 : lire ces documents" -#: templates/teleforma/seminar_detail.html:84 -msgid "Step 4 : answer to the following question" -msgstr "Étape 4 : réalisez la consultation fictive suivante" +#: templates/teleforma/seminar_detail.html:104 +msgid "Step 3 : read this document" +msgstr "Étape 3 : lire ce document" -#: templates/teleforma/seminar_detail.html:93 -msgid "Step 5 : read the following corrected documents" -msgstr "Étape 5 : lisez les documents corrigés suivants" +#: templates/teleforma/seminar_detail.html:112 +msgid "Step 4 : answer to these questions" +msgstr "Étape 4 : réaliser ces consultations fictives" -#: templates/teleforma/seminar_detail.html:97 -msgid "Step 5 : read the following corrected document" -msgstr "Étape 5 : lisez le document corrigé suivant" +#: templates/teleforma/seminar_detail.html:118 +msgid "Step 4 : answer to this question" +msgstr "Étape 4 : réaliser cette consultation fictive" -#: templates/teleforma/seminar_detail.html:113 -msgid "Progression" -msgstr "Progression" +#: templates/teleforma/seminar_detail.html:127 +msgid "Step 5 : read these corrected documents" +msgstr "Étape 5 : lire ces documents corrigés" + +#: templates/teleforma/seminar_detail.html:131 +msgid "Step 5 : read this corrected document" +msgstr "Étape 5 : lire ce document corrigé" #: templates/teleforma/seminar_media_audio.html:58 -#: templates/teleforma/seminar_media_video.html:104 +#: templates/teleforma/seminar_media_video.html:106 msgid "Professors" msgstr "Professeurs" #: templates/teleforma/seminar_media_audio.html:66 -#: templates/teleforma/seminar_media_video.html:112 +#: templates/teleforma/seminar_media_video.html:114 msgid "Media package ID" msgstr "ID Media pakage" -#: templates/teleforma/seminars.html:25 -msgid "My seminars" -msgstr "Mes séminaires" +#: templates/teleforma/inc/answer_list.html:19 +#: templates/telemeta/profile_detail.html:60 +#: templates/telemeta/inc/user_list.html:19 +msgid "Last Name" +msgstr "" + +#: templates/teleforma/inc/answer_list.html:20 +#: templates/telemeta/profile_detail.html:59 +#: templates/telemeta/inc/user_list.html:20 +msgid "First Name" +msgstr "" + +#: templates/teleforma/inc/answer_list.html:22 +msgid "Date submitted" +msgstr "date de soumission" + +#: templates/teleforma/inc/answer_list.html:23 +msgid "Summary" +msgstr "" + +#: templates/teleforma/inc/answer_list.html:24 +msgid "Action / status" +msgstr "" #: templates/teleforma/inc/conference_list.html:8 msgid "Live conferences" @@ -1063,56 +1132,51 @@ msgid "Duration" msgstr "Durée" #: templates/teleforma/inc/question_list.html:15 -#, fuzzy +msgid "submitted on" +msgstr "soumise le" + +#: templates/teleforma/inc/question_list.html:15 +msgid "saved on" +msgstr "enregistrée le" + +#: templates/teleforma/inc/question_list.html:16 msgid "Submitted" -msgstr "Soumettre" +msgstr "Soumise" -#: templates/telemeta/base.html:99 +#: templates/telemeta/base.html:95 msgid "Desk" msgstr "Bureau" -#: templates/telemeta/base.html:107 +#: templates/telemeta/base.html:103 msgid "Messaging" msgstr "Messagerie" -#: templates/telemeta/base.html:110 templates/telemeta/users.html:6 +#: templates/telemeta/base.html:106 templates/telemeta/users.html:6 #: templates/telemeta/users.html.py:69 msgid "Users" msgstr "" -#: templates/telemeta/base.html:117 templates/telemeta/search_criteria.html:69 -msgid "Search" -msgstr "" - -#: templates/telemeta/base.html:118 -msgid "Collections" -msgstr "" - -#: templates/telemeta/base.html:119 -msgid "Items" -msgstr "" - -#: templates/telemeta/base.html:122 +#: templates/telemeta/base.html:112 msgid "Admin" msgstr "" -#: templates/telemeta/base.html:134 +#: templates/telemeta/base.html:124 msgid "Profile" msgstr "Profil" -#: templates/telemeta/base.html:136 +#: templates/telemeta/base.html:126 msgid "Lists" msgstr "" -#: templates/telemeta/base.html:139 +#: templates/telemeta/base.html:129 msgid "Sign out" msgstr "" -#: templates/telemeta/base.html:181 +#: templates/telemeta/base.html:171 msgid "Powered by" msgstr "" -#: templates/telemeta/base.html:191 +#: templates/telemeta/base.html:181 msgid "Legal notices" msgstr "" @@ -1197,16 +1261,6 @@ msgstr "" msgid "Login as" msgstr "Se connecter en tant que" -#: templates/telemeta/profile_detail.html:59 -#: templates/telemeta/inc/user_list.html:20 -msgid "First Name" -msgstr "" - -#: templates/telemeta/profile_detail.html:60 -#: templates/telemeta/inc/user_list.html:19 -msgid "Last Name" -msgstr "" - #: templates/telemeta/profile_detail.html:61 msgid "Username" msgstr "Nom d'utilisateur" @@ -1276,6 +1330,10 @@ msgstr "Réinitialisation du mot de passe" msgid "Advanced Search" msgstr "" +#: templates/telemeta/search_criteria.html:69 +msgid "Search" +msgstr "" + #: templates/telemeta/search_criteria.html:113 msgid "Year of recording" msgstr "" diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css index bb473a95..affe27ef 100644 --- a/teleforma/static/teleforma/css/teleforma.css +++ b/teleforma/static/teleforma/css/teleforma.css @@ -1682,7 +1682,7 @@ input,textarea{ } .messages { - padding: 0.5em 1em 1em 1em; + padding: 0em 1em 1em 1em; } .info { @@ -1766,3 +1766,9 @@ form .exceed{ border-radius: 8px 0px 8px 8px; } + +#id_answer { + font: 1em Verdana, sans-serif; + line-height: 1.3em; + color: #333; +} \ No newline at end of file diff --git a/teleforma/static/teleforma/images/chronometer.png b/teleforma/static/teleforma/images/chronometer.png new file mode 100644 index 0000000000000000000000000000000000000000..1c6cb4e523a84d3ae19d56adb847303905dd598e GIT binary patch literal 3608 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 eNY%?PN(TTo*alb-Q_5Tb0000 {% for question in questions.all %} - {{ question.title }} n°{{ question.rank }} - {% if question|submitted:user %}{% trans "submitted on" %} {{ question|submitted:user }}{% elif question|saved:user %}{% trans "saved on" %} {{ question|saved:user }}{% endif %} - {% if question|submitted:user %}{% endif %} + {{ question.title }} n°{{ question.rank }} + {% if question|submitted:user %}{% trans "submitted on" %} {{ question|submitted:user }}{% elif question|saved:user %}{% trans "saved on" %} {{ question|saved:user }}{% endif %} + {% if question|submitted:user and not question|validated:user %}{% elif question|submitted:user and question|validated:user %}{% endif %} {% endfor %} diff --git a/teleforma/templates/teleforma/seminar_detail.html b/teleforma/templates/teleforma/seminar_detail.html index 8f57d6b6..3caef4a1 100644 --- a/teleforma/templates/teleforma/seminar_detail.html +++ b/teleforma/templates/teleforma/seminar_detail.html @@ -52,6 +52,7 @@ $(function() {
+
{% trans "course" %}
{{ seminar.course }}
{% if seminar.keywords.all %}
{% trans "keywords" %}
{% for kw in seminar.keywords.all %}{{ kw }}, {% endfor %}
{% endif %}
{% trans "level" %}
{{ seminar.level }}
{% trans "public concerned" %}
{{ seminar.concerned }}
@@ -73,11 +74,11 @@ $(function() { {% with seminar.docs_1 as docs %} {% if docs.all.count > 1 %} - {% with _("Step 1 : read the following documents") as title %} + {% with _("Step 1 : read these documents") as title %} {% include "teleforma/inc/document_simple_list.html" %} {% endwith %} {% else %} - {% with _("Step 1 : read the following document") as title %} + {% with _("Step 1 : read this document") as title %} {% include "teleforma/inc/document_simple_list.html" %} {% endwith %} {% endif %} @@ -85,11 +86,11 @@ $(function() { {% with seminar.media as media_packages %} {% if media_packages.all.count > 1 %} - {% with _("Step 2 : view the following conferences") as title %} + {% with _("Step 2 : attend these conferences") as title %} {% include "teleforma/inc/media_package_list.html" %} {% endwith %} {% else %} - {% with _("Step 2 : view the following conference") as title %} + {% with _("Step 2 : attend this conference") as title %} {% include "teleforma/inc/media_package_list.html" %} {% endwith %} {% endif %} @@ -97,11 +98,11 @@ $(function() { {% with seminar.docs_2 as docs %} {% if docs.all.count > 1 %} - {% with _("Step 3 : read the following documents") as title %} + {% with _("Step 3 : read these documents") as title %} {% include "teleforma/inc/document_simple_list.html" %} {% endwith %} {% else %} - {% with _("Step 3 : read the following document") as title %} + {% with _("Step 3 : read this document") as title %} {% include "teleforma/inc/document_simple_list.html" %} {% endwith %} {% endif %} @@ -109,13 +110,13 @@ $(function() { {% with seminar.question as questions %} {% if questions.all.count > 1 %} - {% with _("Step 4 : answer to the following questions") as title %} + {% with _("Step 4 : answer to these questions") as title %} {% include "teleforma/inc/question_list.html" %} {% endwith %} {% else %} - {% with _("Step 4 : answer to the following question") as title %} + {% with _("Step 4 : answer to this question") as title %} {% include "teleforma/inc/question_list.html" %} {% endwith %} {% endif %} @@ -124,11 +125,11 @@ $(function() { {% if validated %} {% with seminar.docs_correct as docs %} {% if docs.all.count > 1 %} - {% with _("Step 5 : read the following corrected documents") as title %} + {% with _("Step 5 : read these corrected documents") as title %} {% include "teleforma/inc/document_simple_list.html" %} {% endwith %} {% else %} - {% with _("Step 5 : read the following corrected document") as title %} + {% with _("Step 5 : read this corrected document") as title %} {% include "teleforma/inc/document_simple_list.html" %} {% endwith %} {% endif %} diff --git a/teleforma/templates/teleforma/seminars.html b/teleforma/templates/teleforma/seminars.html index f8717681..b7195fa8 100644 --- a/teleforma/templates/teleforma/seminars.html +++ b/teleforma/templates/teleforma/seminars.html @@ -82,6 +82,12 @@ $(function() {
{{ seminar.title }} +
+ {% if seminar|progress:user == 100 %} + {% trans + {% endif %} +
+
diff --git a/teleforma/templatetags/teleforma_tags.py b/teleforma/templatetags/teleforma_tags.py index 7be93e37..cc7b85b6 100644 --- a/teleforma/templatetags/teleforma_tags.py +++ b/teleforma/templatetags/teleforma_tags.py @@ -53,6 +53,7 @@ import django.utils.timezone as timezone from timezones.utils import localtime_for_timezone from django.utils.translation import ugettext_lazy as _ from teleforma.views import get_courses +from teleforma.views.pro import seminar_progress from urlparse import urlparse register = template.Library() @@ -232,7 +233,19 @@ def saved(question, user): else: return '' +@register.filter +def validated(question, user): + answers = Answer.objects.filter(question=question, user=user, status=3) + if answers: + return answers[0].validated + else: + return False + @register.filter def summary(text, N): return text[:N] + '...' +@register.filter +def progress(seminar, user): + return seminar_progress(user, seminar) + diff --git a/teleforma/urls.py b/teleforma/urls.py index 2838817e..25bc5871 100644 --- a/teleforma/urls.py +++ b/teleforma/urls.py @@ -39,6 +39,7 @@ from django.views.generic.base import * from teleforma.models import * from teleforma.views import * from telemeta.views import * +import forms_builder.forms.urls from jsonrpc import jsonrpc_site htdocs_forma = os.path.dirname(__file__) + '/static/teleforma/' @@ -98,6 +99,7 @@ urlpatterns = patterns('', url(r'^desk/answers/$', AnswersView.as_view(), name="teleforma-answers"), url(r'^desk/answers/(?P.*)/$', AnswerDetailView.as_view(), name="teleforma-answer-detail"), + # Postman url(r'^messages/', include('postman.urls')), diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index 36a2d4e0..c23f81ed 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -78,7 +78,7 @@ def seminar_progress(user, seminar): questions = Question.objects.filter(seminar=seminar, status=3) for question in questions: total += question.weight - answer = Answer.objects.filter(question=question, status=3, user=user) + answer = Answer.objects.filter(question=question, status=3, user=user, validated=True) if answer: progress += question.weight -- 2.39.5