Merge branch 'dj1.6' into crem2

diff --cc telemeta/locale/de/LC_MESSAGES/django.po
index 11e8e2e201b2dea6551fb73fa7e28b4743e23611,3567ce79ad6322276410c2f576bc5e7b0bbc8288..43f615220d7b3a159fe254a477797031caf32935
--- 1/telemeta/locale/de/LC_MESSAGES/django.po
--- 2/telemeta/locale/de/LC_MESSAGES/django.po
+++ b/telemeta/locale/de/LC_MESSAGES/django.po
@@@ -592,12 -634,11 +635,11 @@@ msgstr "Datum der Digitalisierung
  msgid "publishing date"
  msgstr "Datum der Publikation"
  
- #: models/media.py:393
- #, fuzzy
+ #: models/media.py:410
  msgid "creator reference"
 -msgstr "Referenz von ErzeugerIn"
 +msgstr "Referenz"
  
- #: models/media.py:394
+ #: models/media.py:411
  msgid "published references"
  msgstr "publizierte Referenzen"
  
@@@ -1021,12 -1113,13 +1114,13 @@@ msgid "Administration
  msgstr "Verwaltung"
  
  #: templates/telemeta/admin.html:14 templates/telemeta/admin_general.html:5
- #: templates/telemeta/base.html:121
+ #: templates/telemeta/base.html:130 templates/telemeta/collection_edit.html:20
+ #: templates/telemeta/mediaitem_edit.html:21
  msgid "General"
 -msgstr "allgemein"
 +msgstr "Allgemein"
  
  #: templates/telemeta/admin_enumerations.html:6
- #: templates/telemeta/base.html:122 templates/telemeta/enumeration_edit.html:7
+ #: templates/telemeta/base.html:131 templates/telemeta/enumeration_edit.html:7
  msgid "Enumerations"
  msgstr "Aufzählung"
  

diff --cc telemeta/locale/fr/LC_MESSAGES/django.po
Simple merge

diff --cc telemeta/templates/telemeta/base.html
index d079e65638a6c4b30e547c4c025f95065ef1f2e5,e8bb9628a68a4a5052f8355f19373f87e9ff9f98..02b89a0c2f92cf88d0f51951a0692311fb41f238
--- 1/telemeta/templates/telemeta/base.html
--- 2/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@@ -51,26 -58,22 +58,26 @@@
  
  <div id="auth_info">
  {% if user.is_authenticated %}
 -<img src="{{ STATIC_URL }}telemeta/images/user.png" alt="user" style="vertical-align:middle" />
 -{% trans "Welcome" %},
 +
 +  <img src="{{ STATIC_URL }}telemeta/images/user.png" alt="user" style="vertical-align:middle" />
 +  {% trans "Welcome" %},
  {% if user.first_name or user.last_name %}
 -{{ user.first_name }} {{ user.last_name }} |
 +  {{ user.first_name }} {{ user.last_name }}
  {% else %}
 -{{ user.username }} |
 +  {{ user.username }}
 +{% endif %}
 +{% if perms.telemeta.can_view_users_and_profiles %}
 + | <a href="{% url telemeta-profile-detail user.username %}">{% trans "Profile" %}</a>
  {% endif %}
-  | <a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a>
- {% if perms.telemeta.can_view_users_and_profiles %}
-  | <a href="{% url telemeta-logout %}">{% trans "Sign out" %}
-   <img src="{{ STATIC_URL }}telemeta/images/logout.png" alt="logout" style="vertical-align:middle" /></a>
+ {% if not perms.telemeta.can_not_view_users_and_profiles %}
+ <a href="{% url "telemeta-profile-detail" user.username %}">{% trans "Profile" %}</a> |
  {% endif %}
- 
+ <a href="{% url "telemeta-flatpage" "help" %}">{% trans "Help" %}</a> |
+ <a href="{% url "telemeta-logout" %}">{% trans "Sign out" %}
+ <img src="{{ STATIC_URL }}telemeta/images/logout.png" alt="logout" style="vertical-align:middle" /></a>
  {% else %}
-   <a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a>
-   <a href="{% url telemeta-login %}">{% trans "Sign in" %}</a>
+ <a href="{% url "telemeta-flatpage" "help" %}">{% trans "Help" %}</a> |
+ <a href="{% url "telemeta-login" %}">{% trans "Sign in" %}</a>
  {% endif %}
  </div>
  
@@@ -88,12 -97,12 +101,12 @@@
  {# spaces between li and a elements breaks layout #}
  
  <ul id="nav">
 - {% if user.is_authenticated %}
 + {% if user.is_authenticated and perms.telemeta.can_view_users_and_profiles %}
    <li><a href="#desk#" class="blue">{% trans "Desk" %}</a>
     <ul>
-     <li><a href="{% url telemeta-desk-lists %}">{% trans "Lists" %}</a></li>
-     <li><a href="{% url telemeta-desk-profile user.username %}">{% trans "Profile" %}</a></li>
-     <li><a href="{% url telemeta-desk-home %}">{% trans "Home" %}</a></li>
+     <li><a href="{% url "telemeta-desk-lists" %}">{% trans "Lists" %}</a></li>
+     <li><a href="{% url "telemeta-desk-profile" user.username %}">{% trans "Profile" %}</a></li>
+     <li><a href="{% url "telemeta-desk-home" %}">{% trans "Home" %}</a></li>
     </ul>
    </li>
   {% else %}

diff --cc telemeta/views/core.py
Simple merge

diff --cc telemeta/views/item.py
index f2f0cbe6c308fe7eafbd2f4982737e9da5d1129f,6a67ef23cd9d6d3d38a381136abe0deba9b1b74f..a5acc696c760dd7de865191ede133e0febebf625
--- 1/telemeta/views/item.py
--- 2/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@@ -115,23 -136,15 +136,14 @@@ class ItemView(ItemBaseMixin)
              messages.error(request, title)
              return render(request, 'telemeta/messages.html', {'description' : description})
  
-         graphers = []
-         for grapher in self.graphers:
-             graphers.append({'name':grapher.name(), 'id': grapher.id()})
-             
-         if request.REQUEST.has_key('grapher_id'):
-             grapher_id = request.REQUEST['grapher_id']
-         else:
-             grapher_id = getattr(settings, 'TELEMETA_DEFAULT_GRAPHER_ID', 'waveform')
- 
          previous, next = self.item_previous_next(item)
  
 -        mime_type = self.item_analyze(item)
 -
 -        #FIXME: use mimetypes.guess_type
 -        if 'quicktime' in mime_type:
 -            mime_type = 'video/mp4'
 +        mime_type = item.mime_type
 +        if mime_type and mime_type != 'none' :
 +            if 'quicktime' in mime_type:
 +                mime_type = 'video/mp4'
  
-         playlists = get_playlists(request)
+         playlists = get_playlists_names(request)
          related_media = MediaItemRelated.objects.filter(item=item)
          check_related_media(related_media)
          revisions = Revision.objects.filter(element_type='item', element_id=item.id).order_by('-time')
@@@ -376,10 -386,27 +387,27 @@@
                      analyzers_sub.append(subpipe)
                      pipe = pipe | subpipe
  
+                 default_grapher = self.get_grapher(self.default_grapher_id)
+                 for size in self.default_grapher_sizes:
+                     width = size.split('x')[0]
+                     height = size.split('x')[1]
+                     image_file = '.'.join([item.public_id, self.default_grapher_id, size.replace('x', '_'), 'png'])
+                     path = self.cache_data.dir + os.sep + image_file
+                     graph = default_grapher(width = int(width), height = int(height))
+                     graphers_sub.append({'graph' : graph, 'path': path})
+                     pipe = pipe | graph
+ 
                  pipe.run()
  
+                 for grapher in graphers_sub:
+                     grapher['graph'].watermark('timeside', opacity=.6, margin=(5,5))
+                     f = open(grapher['path'], 'w')
+                     grapher['graph'].render(grapher['path'])
+                     f.close()
+ 
+                 mime_type = mimetypes.guess_type(source)[0]
                  analysis = MediaItemAnalysis(item=item, name='MIME type',
 -                                             analyzer_id='mime_type', unit='', value=mime_type)
 +                                             analyzer_id='mime_type', unit='', value=item.mime_type)
                  analysis.save()
                  analysis = MediaItemAnalysis(item=item, name='Channels',
                                               analyzer_id='channels',