number order for course module, change "Messaging" tab

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index aef29c6400e7353a0be1c06aa0398e9f0ed528c1..dc0d0dd77a82d6a2608ada2c3f66b1bddb69af3a 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 ad431bbf31964b8a015882186945f547a35e40b9..f3eb0bbb3868fded83f53eea91a412cf2ccbf666 100644 (file)
--- 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-06 12:37+0200\n"
+"POT-Creation-Date: 2012-06-12 12:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,17 +18,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: models.py:69 models.py:81 models.py:99 models.py:111 models.py:166
-#: models.py:292 models.py:384 models.py:400
+#: models.py:69 models.py:81 models.py:99 models.py:111 models.py:165
+#: models.py:291 models.py:387 models.py:403
 msgid "name"
 msgstr "nom"
 
 #: models.py:70 models.py:82 models.py:100 models.py:112 models.py:125
-#: models.py:167 models.py:222 models.py:274 models.py:293 models.py:385
+#: models.py:166 models.py:221 models.py:273 models.py:292 models.py:388
 msgid "description"
 msgstr "description"
 
-#: models.py:77 models.py:83 models.py:165
+#: models.py:77 models.py:83 models.py:164
 msgid "organization"
 msgstr "organisation"
 
@@ -36,131 +36,132 @@ msgstr "organisation"
 msgid "department"
 msgstr "département"
 
-#: models.py:107 models.py:401 models.py:446
+#: models.py:107 models.py:404 models.py:449
 msgid "period"
 msgstr "période"
 
-#: models.py:119 models.py:180 models.py:241 models.py:308 models.py:355
+#: models.py:119 models.py:179 models.py:240 models.py:310 models.py:358
 msgid "course type"
 msgstr "type de matière"
 
-#: models.py:124 models.py:273
+#: models.py:124 models.py:272
 msgid "title"
 msgstr "titre"
 
-#: models.py:126 models.py:278 models.py:399
+#: models.py:126 models.py:277 models.py:402
 msgid "code"
 msgstr "cote"
 
-#: models.py:127 models.py:277
+#: models.py:127 models.py:276
 msgid "date modified"
 msgstr "date de modification"
 
-#: models.py:128
+#: models.py:128 models.py:293
 msgid "number"
 msgstr ""
 
-#: models.py:129 models.py:404
+#: models.py:129 models.py:407
 msgid "synthesis note"
 msgstr "note de synthèse"
 
-#: models.py:130 models.py:407
+#: models.py:130 models.py:410
 msgid "obligations"
 msgstr "obligations"
 
-#: models.py:143 models.py:179 models.py:239 models.py:307 models.py:354
+#: models.py:131 models.py:431
+#, fuzzy
+msgid "magistral"
+msgstr "Cours magistraux"
+
+#: models.py:144 models.py:178 models.py:238 models.py:308 models.py:357
 msgid "course"
 msgstr "matière"
 
-#: models.py:149 models.py:445 models.py:483
+#: models.py:150 models.py:448 models.py:486
 msgid "user"
 msgstr "utilisateur"
 
-#: models.py:150 models.py:440 models.py:450
-msgid "training"
-msgstr "formation"
-
-#: models.py:152
+#: models.py:151
 msgid "courses"
 msgstr "matières"
 
-#: models.py:160 models.py:181
+#: models.py:159 models.py:180
 msgid "professor"
 msgstr "professeur"
 
-#: models.py:174 models.py:185
+#: models.py:173 models.py:184
 msgid "room"
 msgstr "salle"
 
-#: models.py:183
+#: models.py:182
 msgid "session"
 msgstr "session"
 
-#: models.py:187
+#: models.py:186
 msgid "comment"
 msgstr ""
 
-#: models.py:188
+#: models.py:187
 msgid "begin date"
 msgstr "date de début"
 
-#: models.py:189
+#: models.py:188
 msgid "end date"
 msgstr "date de fin"
 
-#: models.py:190 models.py:360
+#: models.py:189 models.py:363
 msgid "is live"
 msgstr "en direct"
 
-#: models.py:191 models.py:315 models.py:361
+#: models.py:190 models.py:317 models.py:364
 msgid "readers"
 msgstr ""
 
-#: models.py:211 models.py:243 models.py:309 models.py:356
+#: models.py:210 models.py:242 models.py:311 models.py:359
 msgid "conference"
 msgstr "conférence"
 
-#: models.py:219
+#: models.py:218
 msgid "host"
 msgstr ""
 
-#: models.py:220
+#: models.py:219
 msgid "port"
 msgstr ""
 
-#: models.py:221 models.py:311
+#: models.py:220 models.py:313
 msgid "type"
 msgstr "type"
 
-#: models.py:223
+#: models.py:222
 msgid "source password"
 msgstr ""
 
-#: models.py:224
+#: models.py:223
 msgid "admin password"
 msgstr ""
 
-#: models.py:231 models.py:246
+#: models.py:230 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:267
+#: models.py:266
 msgid "live stream"
 msgstr "stream en direct"
 
-#: models.py:275
+#: models.py:274
 msgid "credits"
 msgstr "crédits"
 
-#: models.py:276 models.py:503
+#: models.py:275 models.py:506
 msgid "date added"
 msgstr "date d'ajout"
 
-#: models.py:279
+#: models.py:278
 msgid "published"
 msgstr "publié"
 
@@ -168,104 +169,104 @@ msgstr "publié"
 msgid "document type"
 msgstr "type de document"
 
-#: models.py:313
+#: models.py:315
 msgid "annal"
 msgstr "annale"
 
-#: models.py:314
+#: models.py:316
 msgid "file"
 msgstr "fichier"
 
-#: models.py:392 models.py:393 templates/telemeta/profile_detail.html:63
+#: models.py:395 models.py:396 templates/telemeta/profile_detail.html:63
 #: templates/telemeta/users.html:29 templates/telemeta/inc/user_list.html:21
 msgid "IEJ"
 msgstr "IEJ"
 
-#: models.py:410 models.py:453
+#: models.py:413 models.py:456
 msgid "procedure"
 msgstr "procédure"
 
-#: models.py:413 models.py:459
+#: models.py:416 models.py:462
 msgid "written speciality"
 msgstr "spécialité écrit"
 
-#: models.py:416 models.py:456
+#: models.py:419 models.py:459
 msgid "oral speciality"
 msgstr "spécialité orale"
 
-#: models.py:419 models.py:422 models.py:461
+#: models.py:422 models.py:464
 msgid "oral 1"
 msgstr ""
 
-#: models.py:425 models.py:465
+#: models.py:425 models.py:466
+msgid "oral 2"
+msgstr ""
+
+#: models.py:428 models.py:468
 msgid "options"
 msgstr "options"
 
-#: models.py:428
-msgid "magitral courses"
-msgstr "Cours magistraux"
-
-#: models.py:430
+#: models.py:433
 msgid "cost"
 msgstr "coût"
 
-#: models.py:448
+#: models.py:443 models.py:453
+msgid "training"
+msgstr "formation"
+
+#: models.py:451
 msgid "iej"
 msgstr "iej"
 
-#: models.py:451
+#: models.py:454
 msgid "platform only"
 msgstr "plateforme seulement"
 
-#: models.py:463
-msgid "oral 2"
-msgstr ""
-
-#: models.py:476 models.py:501
+#: models.py:479 models.py:504
 msgid "student"
 msgstr "étudiant"
 
-#: models.py:484 templates/telemeta/profile_detail.html:76
+#: models.py:487 templates/telemeta/profile_detail.html:76
 msgid "Address"
 msgstr ""
 
-#: models.py:485
+#: models.py:488
 msgid "Postal code"
 msgstr "Code postal"
 
-#: models.py:486
+#: models.py:489
 msgid "City"
 msgstr "Ville"
 
-#: models.py:487
+#: models.py:490
 msgid "Country"
 msgstr "Pays"
 
-#: models.py:488 templates/telemeta/profile_detail.html:85
+#: models.py:491 templates/telemeta/profile_detail.html:85
 msgid "Language"
 msgstr "Langue"
 
-#: models.py:489 templates/telemeta/profile_detail.html:77
+#: models.py:492 templates/telemeta/profile_detail.html:77
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: models.py:490
+#: models.py:493
 msgid "Expiration_date"
 msgstr "Date d'expiration"
 
-#: models.py:491
+#: models.py:494
 msgid "Password initialization"
 msgstr ""
 
-#: models.py:495
+#: models.py:498
 msgid "profile"
 msgstr "profil"
 
-#: models.py:502
+#: models.py:505
 msgid "amount"
 msgstr "montant"
 
-#: models.py:511
+#: models.py:514
 msgid "payment"
 msgstr "paiement"
 
@@ -293,7 +294,7 @@ msgstr ""
 msgid "Sent Messages"
 msgstr "Messages"
 
-#: templates/postman/base.html:17 templates/telemeta/base.html:84
+#: templates/postman/base.html:17 templates/telemeta/base.html:86
 msgid "Archives"
 msgstr ""
 
@@ -512,8 +513,9 @@ 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:68
-#: templates/teleforma/inc/document_list.html:12
-#: templates/telemeta/lists.html:69 templates/telemeta/search_criteria.html:97
+#: 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/telemeta/inc/module_revisions.html:17
 msgid "Title"
 msgstr "Titre"
@@ -539,7 +541,7 @@ 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:12
+#: templates/teleforma/inc/media_list.html:13
 msgid "Session"
 msgstr "Session"
 
@@ -547,7 +549,7 @@ msgstr "Session"
 #: templates/teleforma/course_conference.html:35
 #: templates/teleforma/course_media.html:51
 #: templates/teleforma/inc/conference_list.html:13
-#: templates/teleforma/inc/media_list.html:13
+#: templates/teleforma/inc/media_list.html:14
 #: templates/telemeta/inc/user_list.html:48
 msgid "Professor"
 msgstr "Professeur"
@@ -566,7 +568,7 @@ msgstr "Direct"
 
 #: templates/teleforma/course_media.html:57
 #: templates/teleforma/inc/conference_list.html:14
-#: templates/teleforma/inc/media_list.html:14
+#: templates/teleforma/inc/media_list.html:15
 msgid "Begin date"
 msgstr "Date de début"
 
@@ -599,19 +601,19 @@ msgstr "Conférence en direct"
 msgid "Streaming"
 msgstr "Diffusion"
 
-#: templates/teleforma/inc/document_list.html:13
+#: templates/teleforma/inc/document_list.html:17
 msgid "Annal"
 msgstr "Annale"
 
-#: templates/teleforma/inc/document_list.html:14
+#: templates/teleforma/inc/document_list.html:18
 msgid "Date modified"
 msgstr "Date de modification"
 
-#: templates/teleforma/inc/document_list.html:15
+#: templates/teleforma/inc/document_list.html:19
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/teleforma/inc/document_list.html:37
+#: templates/teleforma/inc/document_list.html:43
 msgid "No document"
 msgstr "Aucun document"
 
@@ -619,68 +621,64 @@ msgstr "Aucun document"
 msgid "Passed conferences"
 msgstr "Conférences passées"
 
-#: templates/teleforma/inc/media_list.html:15
+#: templates/teleforma/inc/media_list.html:16
 msgid "Duration"
 msgstr "Durée"
 
-#: templates/telemeta/base.html:68
+#: templates/telemeta/base.html:71
 msgid "Desk"
 msgstr "Bureau"
 
-#: templates/telemeta/base.html:71
+#: templates/telemeta/base.html:74
 msgid "Home"
 msgstr "Accueil"
 
-#: templates/telemeta/base.html:72
-msgid "Sign in"
-msgstr ""
-
-#: templates/telemeta/base.html:77
-msgid "Messages"
-msgstr "Messages"
+#: templates/telemeta/base.html:79
+msgid "Messaging"
+msgstr "Messagerie"
 
-#: templates/telemeta/base.html:79 templates/telemeta/users.html:6
+#: templates/telemeta/base.html:81 templates/telemeta/users.html:6
 #: templates/telemeta/users.html.py:70
 msgid "Users"
 msgstr ""
 
-#: templates/telemeta/base.html:81 templates/telemeta/search_criteria.html:69
+#: templates/telemeta/base.html:83 templates/telemeta/search_criteria.html:69
 msgid "Search"
 msgstr ""
 
-#: templates/telemeta/base.html:86
+#: templates/telemeta/base.html:88
 msgid "Collections"
 msgstr ""
 
-#: templates/telemeta/base.html:87
+#: templates/telemeta/base.html:89
 msgid "Items"
 msgstr ""
 
-#: templates/telemeta/base.html:92 templates/telemeta/base.html.py:109
+#: templates/telemeta/base.html:94 templates/telemeta/base.html.py:112
 msgid "Help"
 msgstr ""
 
-#: templates/telemeta/base.html:97
+#: templates/telemeta/base.html:99
 msgid "Admin"
 msgstr ""
 
-#: templates/telemeta/base.html:106
+#: templates/telemeta/base.html:109
 msgid "Profile"
 msgstr "Profil"
 
-#: templates/telemeta/base.html:108
+#: templates/telemeta/base.html:111
 msgid "Lists"
 msgstr ""
 
-#: templates/telemeta/base.html:111
+#: templates/telemeta/base.html:114
 msgid "Sign out"
 msgstr ""
 
-#: templates/telemeta/base.html:153
+#: templates/telemeta/base.html:156
 msgid "Powered by"
 msgstr ""
 
-#: templates/telemeta/base.html:164
+#: templates/telemeta/base.html:167
 msgid "Legal notices"
 msgstr ""
 
@@ -727,6 +725,18 @@ msgstr "Sonore"
 msgid "deleted"
 msgstr ""
 
+#: templates/telemeta/login.html:9
+msgid "Your username and password didn't match. Please try again."
+msgstr ""
+
+#: templates/telemeta/login.html:18
+msgid "Password forgotten"
+msgstr ""
+
+#: templates/telemeta/login.html:19
+msgid "Sign in"
+msgstr ""
+
 #: templates/telemeta/profile_detail.html:6
 #, fuzzy
 msgid "User Profile"
@@ -760,11 +770,11 @@ msgid "Last Name"
 msgstr ""
 
 #: templates/telemeta/profile_detail.html:60
-#, fuzzy
 msgid "Username"
-msgstr "nom"
+msgstr "Nom d'utilisateur"
 
 #: templates/telemeta/profile_detail.html:64
+#: templates/telemeta/inc/user_list.html:22
 msgid "Training"
 msgstr "Formation"
 
@@ -773,32 +783,31 @@ msgid "Platform only"
 msgstr "Plateforme seulement"
 
 #: templates/telemeta/profile_detail.html:66
-#: templates/telemeta/inc/user_list.html:22
+#: templates/telemeta/inc/user_list.html:23
 msgid "Procedure"
 msgstr "Procédure"
 
 #: templates/telemeta/profile_detail.html:67
-#: templates/telemeta/inc/user_list.html:23
+#: templates/telemeta/inc/user_list.html:24
 msgid "Oral spe"
 msgstr "Oral Spé"
 
 #: templates/telemeta/profile_detail.html:68
-#: templates/telemeta/inc/user_list.html:24
+#: templates/telemeta/inc/user_list.html:25
 msgid "Written spe"
 msgstr "Ecrit Spé"
 
 #: templates/telemeta/profile_detail.html:69
-#: templates/telemeta/inc/user_list.html:25
+#: templates/telemeta/inc/user_list.html:26
 msgid "Oral 1"
 msgstr ""
 
 #: templates/telemeta/profile_detail.html:70
-#: templates/telemeta/inc/user_list.html:26
+#: templates/telemeta/inc/user_list.html:27
 msgid "Oral 2"
 msgstr ""
 
 #: templates/telemeta/profile_detail.html:71
-#: templates/telemeta/inc/user_list.html:27
 #, fuzzy
 msgid "Options"
 msgstr "options"
@@ -896,6 +905,9 @@ msgstr ""
 msgid "No"
 msgstr ""
 
+#~ msgid "Messages"
+#~ msgstr "Messages"
+
 #~ msgid "obligation"
 #~ msgstr "obligation"
 

diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html
index 7613076e4a2d94e4b982fe70ab567e4ccc0617b9..669a573809d5d179d6db0d1095fd45e1baa9b2a2 100644 (file)
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -23,7 +23,7 @@ $(document).ready(function(){
 <div style="background: white;">
 <ul>
 {% block courses %}
-{% for c in object_list %}
+{% for c in all_courses %}
   {% with c.course as course %}
    <li><a href="{% url teleforma-course-detail course.id %}">{{ course.title }}</a></li>
   {% endwith %}

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index 92b0f0d78a85f8acc5758dc91d40037993244581..a65826f58bf44e80dbf63cf8de80e043adb5493c 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -76,7 +76,7 @@ alt="logo" />
 
  {% if user.is_authenticated %}
 
- <li><a href="/messages" class="red">{% trans "Messages" %}{% if postman_unread_count %} ({{ postman_unread_count }}){% endif %}</a></li>
+ <li><a href="/messages" class="red">{% trans "Messaging" %}{% if postman_unread_count %} ({{ postman_unread_count }}){% endif %}</a></li>
 
  <li><a href="{% url teleforma-users %}" class="orange">{% trans "Users" %}</a></li>
 

diff --git a/teleforma/urls.py b/teleforma/urls.py
index b44865eef02a30b69329b1c7be1e6086872bc871..ef785f158d6082ffd96a6437b422128729d41d9c 100644 (file)
--- a/teleforma/urls.py
+++ b/teleforma/urls.py
@@ -46,6 +46,7 @@ user_export = UsersXLSExport()
 profile_view = ProfileView()
 
 urlpatterns = patterns('',
+#    url(r'^$', HomeView.as_view(), name='teleforma-home'),
     url(r'^$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html'},
         name="teleforma-login"),
 

diff --git a/teleforma/views.py b/teleforma/views.py
index 2d71b397999124bf482169ab1ccc9505326cb836..e0451081cbab37841e4d891e1f56cd5a8224c0d8 100755 (executable)
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -45,11 +45,11 @@ def format_courses(courses, course=None, queryset=None, types=None):
         for c in queryset:
             if c and c.code != 'X':
                 courses.append({'course': c, 'types': types.all(),
-                'date': c.date_modified})
+                'date': c.date_modified, 'number': c.number})
     elif course:
         if course.code != 'X':
             courses.append({'course': course, 'types': types.all(),
-            'date': course.date_modified})
+            'date': course.date_modified, 'number': course.number})
     return courses
 
 def get_courses(user):
@@ -157,7 +157,7 @@ class CourseView(DetailView):
             if c['course'] == course:
                 courses = format_courses(courses, course=course, types=c['types'])
         context['courses'] = courses
-        context['all_courses'] = all_courses
+        context['all_courses'] = sorted(all_courses, key=lambda k: k['number'])
         context['notes'] = course.notes.all().filter(author=self.request.user)
         content_type = ContentType.objects.get(app_label="teleforma", model="course")
         context['room'] = get_room(name=course.title, content_type=content_type,
@@ -183,6 +183,7 @@ class CoursesView(ListView):
         context['notes'] = Note.objects.filter(author=self.request.user)
         context['room'] = get_room(name='site')
         context['doc_types'] = DocumentType.objects.all()
+        context['all_courses'] = sorted(self.object_list, key=lambda k: k['number'])
         return context
 
     @method_decorator(login_required)