fix profile, add icons

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index 052c73228e40398bb82e5c2a45cccc354d8284b8..3c1e1cfae60d8258602193dbbcd0de404298c40d 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 f2afe8345e1dcb37d2167243a80d7cf99a35dc79..5b4391e9ec32b1c4bff54ce1ff0bd8bb89980efb 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-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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 (file)
index 0000000..069059d
Binary files /dev/null and b/teleforma/static/teleforma/images/application-msword.png differ

diff --git a/teleforma/static/teleforma/images/network-wireless.png b/teleforma/static/teleforma/images/network-wireless.png
new file mode 100644 (file)
index 0000000..d70f0f6
Binary files /dev/null and b/teleforma/static/teleforma/images/network-wireless.png differ

diff --git a/teleforma/static/teleforma/images/tool-animator.png b/teleforma/static/teleforma/images/tool-animator.png
new file mode 100644 (file)
index 0000000..61a5b2f
Binary files /dev/null and b/teleforma/static/teleforma/images/tool-animator.png differ

diff --git a/teleforma/templates/teleforma/inc/conference_list.html b/teleforma/templates/teleforma/inc/conference_list.html
index 89d247b9e1b60e233cb646335be87c211499c1d5..f6864fa761d89acb2a337767aa094994b3e61460 100644 (file)
--- a/teleforma/templates/teleforma/inc/conference_list.html
+++ b/teleforma/templates/teleforma/inc/conference_list.html
@@ -4,13 +4,13 @@
 {% if course.livestream.all|from_course_type:type %}
 <div class="course_content">
 <div class="course_subtitle">
-    <h3><img src="{% url telemeta-images "item_title.png" %}" width="10px" alt="" /> {% trans "Live conference"%}</h3>
+    <h3><img src="{% url telemeta-images "item_title.png" %}" width="10px" alt="" /> {% trans "Live conferences"%}</h3>
 </div>
     <table class="listing" width="100%">
     <tbody>
         {% for stream in course.livestream.all|from_course_type:type %}
             <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
-            <td><a href="{% url teleforma-conference-detail conference.id %}" title="{% trans "View" %}"><img src="{{ STATIC_URL }}/teleforma/images/network-wireless_r.png" style="vertical-align:middle" alt="" /> {{ stream.slug }}</a></td>
+            <td><a href="{% url teleforma-conference-detail conference.id %}" title="{% trans "View" %}"><img src="{{ STATIC_URL }}/teleforma/images/network-wireless.png" style="vertical-align:middle" alt="" /> {{ stream.slug }}</a></td>
             <td>{% if conference.professor.user %}<a href="{% url teleforma-profile-detail conference.professor.user.username %}" target="_blank">{{ conference.professor }}</a>{% endif %}</td>
             <td><a href="{% url teleforma-conference-detail conference.id %}">{{ conference.date_begin }}</a></td>
              <td align="center">

diff --git a/teleforma/templates/teleforma/inc/document_list.html b/teleforma/templates/teleforma/inc/document_list.html
index c10438eb6ef5dda25d991689d1fb3599e2d0dfd5..dd794cfa53bb5e6ab547010ba98de146a736d6ff 100644 (file)
--- a/teleforma/templates/teleforma/inc/document_list.html
+++ b/teleforma/templates/teleforma/inc/document_list.html
@@ -14,7 +14,7 @@
     <tbody>
         {% for document in course.document.all|from_course_type:type|from_doc_type:doc_type %}
         <tr>
-        <td>{% if document.file %}<a href="{% url teleforma-document-view document.id %}" target="_blank" title="{% trans "View" %}"><img src="{{ STATIC_URL }}/teleforma/images/icon_doc_16.png" style="vertical-align:middle" alt="" />{% endif %} {{ document.title }}{% if document.file %}</a>{% endif %}</td>
+        <td>{% if document.file %}<a href="{% url teleforma-document-view document.id %}" target="_blank" title="{% trans "View" %}"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" />{% endif %} {{ document.title }}{% if document.file %}</a>{% endif %}</td>
         <!--<td align="center">
         {% if document.is_annal %}
           <img src="images/ok.png" alt="yes" style="vertical-align:middle" />&nbsp;

diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html
index aa50533a958e404b9beda1c63c85d356dcdd44ea..660f4b1d3b4bc3dbd55f5a596ebf300e7a1cfd9a 100644 (file)
--- a/teleforma/templates/teleforma/inc/media_list.html
+++ b/teleforma/templates/teleforma/inc/media_list.html
@@ -11,7 +11,7 @@
         {% for media in course.media.all|from_course_type:type %}
          {% if media.published or user.is_staff %}
             <tr>
-            <td><a href="{% url teleforma-media-detail media.id %}" title="{% trans "View" %}"><img src="{{ STATIC_URL }}/teleforma/images/tool-animator_r.png" style="vertical-align:middle" alt="" /> {{ media.title }}</a></td>
+            <td><a href="{% url teleforma-media-detail media.id %}" title="{% trans "View" %}"><img src="{{ STATIC_URL }}/teleforma/images/tool-animator.png" style="vertical-align:middle" alt="" /> {{ media.title }}</a></td>
             <td><a href="{% url teleforma-media-detail media.id %}">{{ media.conference.session }}</a></td>
             <td>{% if media.conference.professor.user %}<a href="{% url teleforma-profile-detail media.conference.professor.user.username %}" target="_blank">{{ media.conference.professor }}</a>{% endif %}</td>
             <td>{% if media.conference.date_begin %}<a href="{% url teleforma-media-detail media.id %}">{{ media.conference.date_begin }}</a>{% endif %}</td>

diff --git a/teleforma/templatetags/teleforma_tags.py b/teleforma/templatetags/teleforma_tags.py
index b77488f83b08b2e47173450a1316240329421fea..981a4d5583ff74a1204877b0b097c831e111ab59 100644 (file)
--- a/teleforma/templatetags/teleforma_tags.py
+++ b/teleforma/templatetags/teleforma_tags.py
@@ -1,3 +1,36 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2011-2012 Parisson SARL
+
+# This software is a computer program whose purpose is to backup, analyse,
+# transcode and stream any audio content with its metadata over a web frontend.
+
+# This software is governed by the CeCILL  license under French law and
+# abiding by the rules of distribution of free software.  You can  use,
+# modify and/ or redistribute the software under the terms of the CeCILL
+# license as circulated by CEA, CNRS and INRIA at the following URL
+# "http://www.cecill.info".
+
+# As a counterpart to the access to the source code and  rights to copy,
+# modify and redistribute granted by the license, users are provided only
+# with a limited warranty  and the software's author,  the holder of the
+# economic rights,  and the successive licensors  have only  limited
+# liability.
+
+# In this respect, the user's attention is drawn to the risks associated
+# with loading,  using,  modifying and/or developing or reproducing the
+# software by the user in light of its specific status of free software,
+# that may mean  that it is complicated to manipulate,  and  that  also
+# therefore means  that it is reserved for developers  and  experienced
+# professionals having in-depth computer knowledge. Users are therefore
+# encouraged to load and test the software's suitability as regards their
+# requirements in conditions enabling the security of their systems and/or
+# data to be ensured and,  more generally, to use and operate it in the
+# same conditions as regards security.
+
+# The fact that you are presently reading this means that you have had
+# knowledge of the CeCILL license and that you accept its terms.
+#
+# Authors: Guillaume Pellerin <yomguy@parisson.com>
 
 from django import template
 from django.utils.http import urlquote
@@ -116,15 +149,15 @@ def get_admins():
     return User.objects.filter(is_staff=True)
 
 @register.assignment_tag
-def get_trainings():
+def get_all_trainings():
     return Training.objects.all()
 
 @register.assignment_tag
-def get_eijs():
+def get_all_iejs():
     return IEJ.objects.all()
 
 @register.assignment_tag
-def get_courses():
+def get_all_courses():
     return Course.objects.all()