From 6f313b66a7f445d411a78dad2b29889980cac01d Mon Sep 17 00:00:00 2001 From: yomguy Date: Tue, 3 Jul 2012 12:05:02 +0200 Subject: [PATCH] fix some button style, add passwd reinit button, trans, etc.. --- example/settings.py | 2 +- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 5039 -> 5039 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 203 ++++++++++-------- teleforma/models.py | 19 +- teleforma/static/teleforma/css/teleforma.css | 7 +- .../teleforma/inc/conference_list.html | 2 +- teleforma/templates/telemeta/base.html | 5 +- .../templates/telemeta/profile_detail.html | 5 + 8 files changed, 138 insertions(+), 105 deletions(-) diff --git a/example/settings.py b/example/settings.py index 15749e89..a9acee34 100644 --- a/example/settings.py +++ b/example/settings.py @@ -175,7 +175,7 @@ LOGIN_URL = '/login/' LOGIN_REDIRECT_URL = reverse_lazy('teleforma-desk') SESSION_EXPIRE_AT_BROWSER_CLOSE = False -EMAIL_HOST = 'localhost' +EMAIL_HOST = 'smtp.free.fr' DEFAULT_FROM_EMAIL = 'webmaster@parisson.com' POSTMAN_AUTO_MODERATE_AS=True diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 3c1e1cfae60d8258602193dbbcd0de404298c40d..ace123409e64301dbabb06a3b5fbe421d8ec6a8b 100644 GIT binary patch delta 21 ccmZ3lzFvKU2QP<_nSz0Zm8r?*0N!{u07nT0!T\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:300 models.py:396 models.py:412 +#: models.py:308 models.py:404 models.py:420 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:282 models.py:301 models.py:397 +#: models.py:166 models.py:220 models.py:290 models.py:309 models.py:405 msgid "description" msgstr "description" @@ -36,48 +36,48 @@ msgstr "organisation" msgid "department" msgstr "département" -#: models.py:107 models.py:413 models.py:458 +#: models.py:107 models.py:421 models.py:466 msgid "period" msgstr "période" -#: models.py:119 models.py:179 models.py:240 models.py:319 models.py:367 +#: models.py:119 models.py:179 models.py:239 models.py:327 models.py:375 msgid "course type" msgstr "type de matière" -#: models.py:124 models.py:281 +#: models.py:124 models.py:289 msgid "title" msgstr "titre" -#: models.py:126 models.py:286 models.py:411 +#: models.py:126 models.py:294 models.py:419 msgid "code" msgstr "cote" -#: models.py:127 models.py:285 +#: models.py:127 models.py:293 msgid "date modified" msgstr "date de modification" -#: models.py:128 models.py:302 +#: models.py:128 models.py:310 msgid "number" msgstr "" -#: models.py:129 models.py:416 +#: models.py:129 models.py:424 msgid "synthesis note" msgstr "note de synthèse" -#: models.py:130 models.py:419 +#: models.py:130 models.py:427 msgid "obligations" msgstr "obligations" -#: models.py:131 models.py:440 +#: models.py:131 models.py:448 #, fuzzy msgid "magistral" msgstr "Cours magistraux" -#: models.py:144 models.py:178 models.py:238 models.py:317 models.py:366 +#: models.py:144 models.py:178 models.py:237 models.py:325 models.py:374 msgid "course" msgstr "matière" -#: models.py:150 models.py:457 models.py:495 +#: models.py:150 models.py:465 models.py:503 msgid "user" msgstr "utilisateur" @@ -109,164 +109,169 @@ msgstr "date de début" msgid "end date" msgstr "date de fin" -#: models.py:189 models.py:372 -msgid "is live" -msgstr "en direct" - -#: models.py:190 models.py:326 models.py:373 +#: models.py:189 models.py:334 models.py:381 msgid "readers" msgstr "" -#: models.py:210 models.py:243 models.py:320 models.py:368 +#: models.py:209 models.py:242 models.py:328 models.py:376 msgid "conference" msgstr "conférence" -#: models.py:218 +#: models.py:217 msgid "host" msgstr "" -#: models.py:219 +#: models.py:218 msgid "port" msgstr "" -#: models.py:220 models.py:322 +#: models.py:219 models.py:330 msgid "type" msgstr "type" -#: models.py:222 +#: models.py:221 msgid "source password" msgstr "" -#: models.py:223 +#: models.py:222 msgid "admin password" msgstr "" -#: models.py:230 models.py:246 +#: models.py:229 models.py:245 msgid "streaming server" msgstr "serveur de diffusion" -#: models.py:247 +#: models.py:246 msgid "Streaming type" msgstr "Type de flux" -#: models.py:275 +#: models.py:248 +#, fuzzy +msgid "streaming" +msgstr "Diffusion" + +#: models.py:283 msgid "live stream" msgstr "stream en direct" -#: models.py:283 +#: models.py:291 msgid "credits" msgstr "crédits" -#: models.py:284 models.py:515 +#: models.py:292 models.py:523 msgid "date added" msgstr "date d'ajout" -#: models.py:287 +#: models.py:295 msgid "published" msgstr "publié" -#: models.py:309 +#: models.py:317 msgid "document type" msgstr "type de document" -#: models.py:324 +#: models.py:332 msgid "annal" msgstr "annale" -#: models.py:325 +#: models.py:333 msgid "file" msgstr "fichier" -#: models.py:404 models.py:405 templates/telemeta/profile_detail.html:63 +#: models.py:380 +msgid "is live" +msgstr "en direct" + +#: models.py:412 models.py:413 templates/telemeta/profile_detail.html:65 #: templates/telemeta/users.html:29 templates/telemeta/inc/user_list.html:21 msgid "IEJ" msgstr "IEJ" -#: models.py:422 models.py:465 +#: models.py:430 models.py:473 msgid "procedure" msgstr "procédure" -#: models.py:425 models.py:468 +#: models.py:433 models.py:476 msgid "written speciality" msgstr "spécialité écrit" -#: models.py:428 models.py:471 +#: models.py:436 models.py:479 msgid "oral speciality" msgstr "spécialité orale" -#: models.py:431 models.py:473 +#: models.py:439 models.py:481 msgid "oral 1" msgstr "" -#: models.py:434 models.py:475 +#: models.py:442 models.py:483 msgid "oral 2" msgstr "" -#: models.py:437 models.py:477 +#: models.py:445 models.py:485 msgid "options" msgstr "options" -#: models.py:442 +#: models.py:450 msgid "cost" msgstr "coût" -#: models.py:452 models.py:462 +#: models.py:460 models.py:470 msgid "training" msgstr "formation" -#: models.py:460 +#: models.py:468 msgid "iej" msgstr "iej" -#: models.py:463 +#: models.py:471 msgid "platform only" msgstr "plateforme seulement" -#: models.py:488 models.py:513 +#: models.py:496 models.py:521 msgid "student" msgstr "étudiant" -#: models.py:496 templates/telemeta/profile_detail.html:76 +#: models.py:504 templates/telemeta/profile_detail.html:78 msgid "Address" msgstr "" -#: models.py:497 +#: models.py:505 msgid "Postal code" msgstr "Code postal" -#: models.py:498 +#: models.py:506 msgid "City" msgstr "Ville" -#: models.py:499 +#: models.py:507 msgid "Country" msgstr "Pays" -#: models.py:500 templates/telemeta/profile_detail.html:85 +#: models.py:508 templates/telemeta/profile_detail.html:87 msgid "Language" msgstr "Langue" -#: models.py:501 templates/telemeta/profile_detail.html:77 +#: models.py:509 templates/telemeta/profile_detail.html:79 msgid "Telephone" msgstr "Téléphone" -#: models.py:502 +#: models.py:510 msgid "Expiration_date" msgstr "Date d'expiration" -#: models.py:503 +#: models.py:511 msgid "Password initialization" msgstr "" -#: models.py:507 +#: models.py:515 msgid "profile" msgstr "profil" -#: models.py:514 +#: models.py:522 msgid "amount" msgstr "montant" -#: models.py:523 +#: models.py:531 msgid "payment" msgstr "paiement" @@ -351,38 +356,42 @@ msgstr "" msgid "Date" msgstr "Date" -#: templates/postman/base_folder.html:50 +#: templates/postman/base_folder.html:53 msgid "g:i A,M j,n/j/y" msgstr "" -#: templates/postman/base_folder.html:58 templates/postman/view.html:39 +#: templates/postman/base_folder.html:61 templates/postman/view.html:39 #: templates/telemeta/lists.html:58 msgid "Delete" msgstr "" -#: templates/postman/base_folder.html:61 templates/postman/view.html:43 +#: templates/postman/base_folder.html:64 templates/postman/view.html:43 msgid "Archive" msgstr "" -#: templates/postman/base_folder.html:64 +#: templates/postman/base_folder.html:67 msgid "Undelete" msgstr "" -#: templates/postman/base_folder.html:70 +#: templates/postman/base_folder.html:73 #, fuzzy msgid "No messages." msgstr "Messages" #: templates/postman/base_write.html:23 +msgid "to an administrator" +msgstr "" + +#: templates/postman/base_write.html:31 #, fuzzy -msgid "Choose a professor" +msgid "to a professor" msgstr "professeur" -#: templates/postman/base_write.html:31 -msgid "Choose an administrator" +#: templates/postman/base_write.html:39 +msgid "to an IEJ" msgstr "" -#: templates/postman/base_write.html:48 +#: templates/postman/base_write.html:57 #: templates/teleforma/inc/chat_room.html:13 msgid "Send" msgstr "" @@ -533,6 +542,7 @@ 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:74 +#: templates/teleforma/inc/conference_list.html:22 #: templates/telemeta/lists.html:69 templates/telemeta/search_criteria.html:97 #: templates/telemeta/inc/module_revisions.html:17 msgid "Title" @@ -544,7 +554,7 @@ msgstr "Description" #: templates/teleforma/course.html:20 templates/teleforma/course.html.py:36 #: templates/teleforma/course.html:53 templates/teleforma/course_media.html:68 -#: templates/telemeta/profile_detail.html:80 +#: templates/telemeta/profile_detail.html:82 msgid "Date added" msgstr "Date d'ajout" @@ -558,17 +568,20 @@ msgstr "Conférences" #: templates/teleforma/course.html:51 #: templates/teleforma/course_conference.html:34 +#: templates/teleforma/inc/conference_list.html:23 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:24 #: templates/telemeta/inc/user_list.html:48 msgid "Professor" msgstr "Professeur" #: templates/teleforma/course_conference.html:36 +#: templates/teleforma/inc/conference_list.html:25 msgid "Begin" msgstr "Début" @@ -609,13 +622,14 @@ msgstr "Nouvelle note" msgid "Live conferences" msgstr "Conférences en direct" -#: templates/teleforma/inc/conference_list.html:13 +#: templates/teleforma/inc/conference_list.html:15 #: templates/teleforma/inc/document_list.html:17 #: templates/teleforma/inc/media_list.html:14 msgid "View" msgstr "" #: templates/teleforma/inc/document_list.html:24 +#: templates/teleforma/inc/media_list.html:17 msgid "Download" msgstr "Télécharger" @@ -680,7 +694,7 @@ msgstr "" msgid "Powered by" msgstr "" -#: templates/telemeta/base.html:167 +#: templates/telemeta/base.html:166 msgid "Legal notices" msgstr "" @@ -757,84 +771,88 @@ msgstr "Envoyer un message" msgid "User profile" msgstr "profil" -#: templates/telemeta/profile_detail.html:50 +#: templates/telemeta/profile_detail.html:51 msgid "Change password" msgstr "" -#: templates/telemeta/profile_detail.html:58 +#: templates/telemeta/profile_detail.html:60 #: templates/telemeta/inc/user_list.html:20 msgid "First Name" msgstr "" -#: templates/telemeta/profile_detail.html:59 +#: templates/telemeta/profile_detail.html:61 #: templates/telemeta/inc/user_list.html:19 msgid "Last Name" msgstr "" -#: templates/telemeta/profile_detail.html:60 +#: templates/telemeta/profile_detail.html:62 msgid "Username" msgstr "Nom d'utilisateur" -#: templates/telemeta/profile_detail.html:64 +#: templates/telemeta/profile_detail.html:66 #: templates/telemeta/inc/user_list.html:22 msgid "Training" msgstr "Formation" -#: templates/telemeta/profile_detail.html:65 +#: templates/telemeta/profile_detail.html:67 msgid "Platform only" msgstr "Plateforme seulement" -#: templates/telemeta/profile_detail.html:66 +#: templates/telemeta/profile_detail.html:68 #: templates/telemeta/inc/user_list.html:23 msgid "Procedure" msgstr "Procédure" -#: templates/telemeta/profile_detail.html:67 +#: templates/telemeta/profile_detail.html:69 #: templates/telemeta/inc/user_list.html:24 msgid "Oral spe" msgstr "Oral Spé" -#: templates/telemeta/profile_detail.html:68 +#: templates/telemeta/profile_detail.html:70 #: templates/telemeta/inc/user_list.html:25 msgid "Written spe" msgstr "Ecrit Spé" -#: templates/telemeta/profile_detail.html:69 +#: templates/telemeta/profile_detail.html:71 #: templates/telemeta/inc/user_list.html:26 msgid "Oral 1" msgstr "" -#: templates/telemeta/profile_detail.html:70 +#: templates/telemeta/profile_detail.html:72 #: templates/telemeta/inc/user_list.html:27 msgid "Oral 2" msgstr "" -#: templates/telemeta/profile_detail.html:71 +#: templates/telemeta/profile_detail.html:73 #, fuzzy msgid "Options" msgstr "options" -#: templates/telemeta/profile_detail.html:75 +#: templates/telemeta/profile_detail.html:77 msgid "Email" msgstr "" -#: templates/telemeta/profile_detail.html:81 +#: templates/telemeta/profile_detail.html:83 #, fuzzy msgid "Expiration date" msgstr "Date d'expiration" -#: templates/telemeta/profile_detail.html:82 +#: templates/telemeta/profile_detail.html:84 msgid "Last login" msgstr "" -#: templates/telemeta/profile_detail.html:93 +#: templates/telemeta/profile_detail.html:95 msgid "Apply" msgstr "" -#: templates/telemeta/profile_detail.html:103 +#: templates/telemeta/profile_detail.html:106 msgid "Login as" msgstr "Se connecter en tant que" +#: templates/telemeta/profile_detail.html:107 +msgid "Password reinitialization" +msgstr "" + #: templates/telemeta/search_criteria.html:5 #: templates/telemeta/search_criteria.html:76 msgid "Advanced Search" @@ -887,29 +905,26 @@ msgstr "" msgid "Unknown" msgstr "" -#: templatetags/teleforma_tags.py:27 +#: templatetags/teleforma_tags.py:60 msgid "General tweeter" msgstr "Tweeter général" -#: templatetags/teleforma_tags.py:28 +#: templatetags/teleforma_tags.py:61 msgid "Local tweeter" msgstr "Tweeter local" -#: templatetags/teleforma_tags.py:93 +#: templatetags/teleforma_tags.py:126 msgid "me" msgstr "moi" -#: templatetags/teleforma_tags.py:98 +#: templatetags/teleforma_tags.py:131 msgid "Yes" msgstr "" -#: templatetags/teleforma_tags.py:100 +#: templatetags/teleforma_tags.py:133 msgid "No" msgstr "" -#~ msgid "Streaming" -#~ msgstr "Diffusion" - #~ msgid "Annal" #~ msgstr "Annale" diff --git a/teleforma/models.py b/teleforma/models.py index 0538caf4..569bb22f 100755 --- a/teleforma/models.py +++ b/teleforma/models.py @@ -80,7 +80,8 @@ class Department(Model): name = CharField(_('name'), max_length=255) description = CharField(_('description'), max_length=255, blank=True) - organization = ForeignKey('Organization', related_name='department', verbose_name=_('organization')) + organization = ForeignKey('Organization', related_name='department', + verbose_name=_('organization')) def __unicode__(self): return self.name @@ -120,7 +121,8 @@ class CourseType(Model): class Course(Model): - department = ForeignKey('Department', related_name='course', verbose_name=_('department')) + department = ForeignKey('Department', related_name='course', + verbose_name=_('department')) title = CharField(_('title'), max_length=255) description = CharField(_('description'), max_length=255, blank=True) code = CharField(_('code'), max_length=255) @@ -175,6 +177,7 @@ class Room(Model): class Conference(Model): + public_id = CharField(_('public_id'), max_length=255, blank=True) course = ForeignKey('Course', related_name='conference', verbose_name=_('course')) course_type = ForeignKey('CourseType', related_name='conference', verbose_name=_('course type')) professor = ForeignKey('Professor', related_name='conference', verbose_name=_('professor'), @@ -204,6 +207,18 @@ class Conference(Model): super(Conference, self).save(**kwargs) self.course.save() + def to_dict(self): + dict = [{'id':'public_id','value': self.public_id, 'class':'', 'label':'public_id'}, + {'id':'organization','value': self.organization, 'class':'', 'label':'Organization'}, + {'id': 'department', 'value': self.department , 'class':'', 'label':'Department'}, + {'id' : 'conference', 'value': self.conference, 'class':'' , 'label': 'Conference'}, + {'id': 'professor', 'value': self.professor, 'class':'' , 'label': 'Professor'}, + {'id': 'session', 'value': self.session, 'class':'' , 'label': 'Session'}, + {'id': 'comment', 'value': self.comment, 'class':'' , 'label': 'Comment'}, + {'id': 'started', 'value': str(self.started), 'class':'' , 'label': 'Started'}, + ] + return dict + class Meta: db_table = app_label + '_' + 'conference' verbose_name = _('conference') diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css index 9edbd6f6..1a78b646 100644 --- a/teleforma/static/teleforma/css/teleforma.css +++ b/teleforma/static/teleforma/css/teleforma.css @@ -289,7 +289,7 @@ fieldset.iefix { background: transparent; border: none; padding: 0; margin: 0 } fieldset.iefix p { margin: 0 } legend { color: #999; padding: 0 .25em; font-size: 90%; font-weight: bold } label.disabled { color: #d7d7d7 } -.buttons { margin: .5em .5em .5em 0 } +.buttons { margin: 1em .5em .5em 0 } .buttons form, .buttons form div { display: inline } .buttons input { margin: 1em .5em .1em 0 } .inlinebuttons input { @@ -717,9 +717,8 @@ dl.dublincore dd.caption { /* infos item/collection */ .infos, .extraInfos { - - margin-bottom: 15px; - padding: 0.8em; + margin-bottom: 1em; + padding: 0.8em 0.8em 0em 0.8em; } .infos dl, .infos table { diff --git a/teleforma/templates/teleforma/inc/conference_list.html b/teleforma/templates/teleforma/inc/conference_list.html index e010c855..1093aa84 100644 --- a/teleforma/templates/teleforma/inc/conference_list.html +++ b/teleforma/templates/teleforma/inc/conference_list.html @@ -44,7 +44,7 @@ {% else %}
- {% trans "The conference is not started yet. Please wait..." %} +
{% endif %} diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html index a65826f5..b5986c74 100644 --- a/teleforma/templates/telemeta/base.html +++ b/teleforma/templates/telemeta/base.html @@ -158,7 +158,6 @@ alt="logo" />

-  

@@ -171,12 +170,12 @@ alt="logo" /> {% endblock %} - + {% endblock layout %} {% block analytics %} {% endblock analytics %} - + diff --git a/teleforma/templates/telemeta/profile_detail.html b/teleforma/templates/telemeta/profile_detail.html index 459df4b7..78d1d11f 100644 --- a/teleforma/templates/telemeta/profile_detail.html +++ b/teleforma/templates/telemeta/profile_detail.html @@ -47,7 +47,9 @@ {% if user.is_authenticated and user.username == usr.username or user.is_staff %}
{% trans "Edit" %} + {% if user.is_authenticated and user.username == usr.username %} + {% endif %}
{% endif %} @@ -99,9 +101,12 @@ +
{% if user.username != usr.username and user.is_staff %} + {% endif %} +
-- 2.39.5