Changeset dd46083

Timestamp:

11/04/11 11:26:58 (19 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

7bb5f60

Parents:

f38625e

git-author:

yomguy <yomguy@…> (11/04/11 11:26:58)

git-committer:

yomguy <yomguy@…> (11/04/11 11:26:58)

Message:

add url related files, youtube detection, url img preview, prepare sound filtering in search criteria

Location:

telemeta

Files:

• htdocs/js/application.js (modified) (1 diff)
• models/media.py (modified) (3 diffs)
• templates/telemeta_default/mediaitem_detail.html (modified) (3 diffs)
• templates/telemeta_default/mediaitem_related_edit.html (modified) (1 diff)
• templates/telemeta_default/search_criteria.html (modified) (1 diff)
• templatetags/telemeta_utils.py (modified) (1 diff)

telemeta/htdocs/js/application.js

@@ -51 +51 @@
     var extra = $J('.extraInfos');
     extra.find('.folded dl, .folded table').css('display', 'none');
-    extra.find('a').click(function() {
+    extra.find('h4').click(function() {
         $J(this).parents('.extraInfos').children().toggleClass('folded').find('dl, table').toggle(100);
         //toggle toggles the visibility of elements

telemeta/models/media.py

@@ -50 +50 @@
 from telemeta.models.enum import *
 from django.forms import ModelForm
+from django.db.models.fields import URLField
 
 
@@ -343 +344 @@
     description     = TextField(_('description'))
     author          = ForeignKey(User, related_name="related", verbose_name=_('author'))
-    mime_type       = CharField(_('mime_type'), blank=True)
+    mime_type       = CharField(_('mime_type'))
+    url             = CharField(_('url'), max_length=500)
     file            = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename")
     
@@ -353 +355 @@
 
     def is_image(self):
-        return 'image' in self.mime_type
+        is_url_image = False
+        if self.url:
+            url_types = ['.png', '.jpg', '.gif', '.jpeg']
+            for type in url_types:
+                if type in self.url:
+                    is_url_image = True
+        return 'image' in self.mime_type or is_url_image
         
     def save(self, force_insert=False, force_update=False):

telemeta/templates/telemeta_default/mediaitem_detail.html

@@ -273 +273 @@
 </div> <!-- with-rightcol -->
 
-<div class="infos">
+<div class="extraInfos">
         {% block related_files %}
         <div>
@@ -279 +279 @@
             {% if related_files %}
             <div class="instruments">
-                <table class="instruments">
+                <table class="instruments" width="100%">
                     <thead>
                         <tr>
-                            <td>{% field_label "MediaItemRelatedFile" "file" %}</td>
                             <td>{% field_label "MediaItemRelatedFile" "title" %}</td>
                             <td>{% field_label "MediaItemRelatedFile" "mime type" %}</td>
+                            <td>{% field_label "MediaItemRelatedFile" "preview" %}</td>
                             <td>{% field_label "MediaItemRelatedFile" "author" %}</td>
-                            <td>{% field_label "MediaItemRelatedFile" "preview" %}</td>
                         </tr>
                     </thead>
@@ -292 +291 @@
                         {% for file in related_files %}
                         <tr>
-                            <td><a href="{% url telemeta-item-related-file item.public_id file.id %}">{% if file.file %}{{ file.file|get_filename }}{% endif %}</a></td>
-                            <td>{{ file.title }}</td>
+                            <td>
+                            {% if file.url %}
+                               <a href="{{ file.url }}">
+                                {% if file.title %}
+                                 {{ file.title }}
+                                {% else %} 
+                                 {{ file.url|get_filename }}
+                                {% endif %}
+                                </a>
+                            {% endif %}
+                            {% if file.file %}
+                              <a href="{% url telemeta-item-related-file item.public_id file.id %}">
+                                {% if file.title %}
+                                 {{ file.title }}
+                                {% else %} 
+                                 {{ file.file|get_filename }}
+                                {% endif %}
+                              </a>
+                            {% endif %}
+                            </td>
                             <td>{{ file.mime_type }}</td>
+                            <td>{% if file.is_image %}
+                                  {% if file.url %}
+                                   <a href="{{ file.url }}">
+                                   <img src="{{ file.url }}" style="width: 400px;" /></a>
+                                  {% else %}
+                                   <a href="{% url telemeta-item-related-file item.public_id file.id %}">
+                                   <img src="{% url telemeta-item-related-file item.public_id file.id %}" style="width: 400px;" /></a>
+                                   {% endif %}
+                                {% else %}
+                                {% if file.url %}
+                                 {% if "youtube" in file.url %}
+                                 <iframe width="420" height="315" src="{{ file.url|get_youtube }}" frameborder="0" allowfullscreen></iframe>
+                                 {% else %}
+                                 <a href="{{ file.url }}">link</a>
+                                 {% endif %}
+                                {% endif %}
+                                {% if file.file %}
+                                <a href="{% url telemeta-item-related-file item.public_id file.id %}">link</a>
+                                {% endif %}
+                                {% endif %}</td>
                             <td>{{ file.author }}</td>
-                            <td>{% if file.is_image %}<a href="{% url telemeta-item-related-file item.public_id file.id %}"><img src="{% url telemeta-item-related-file item.public_id file.id %}" style="width: 400px;" /></a>{% else %}<a href="{% url telemeta-item-related-file item.public_id file.id %}">link</a>{% endif %}</td>
                         </tr>
                         {% endfor %}
                     </tbody>
                 </table>
-                {% if user.is_authenticated and perms.telemeta.change_mediaitem %}
-                <a href="{% url telemeta-item-related_edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "related"%}</a>
-                {% endif %}
             </div>
+            {% endif %}
+            {% if user.is_authenticated and perms.telemeta.change_mediaitem %}
+                <br /><a href="{% url telemeta-item-related_edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "related"%}</a>
             {% endif %}
         </div>

telemeta/templates/telemeta_default/mediaitem_related_edit.html

@@ -23 +23 @@
         <tr><td><b>{% trans "File" %} :</b><td></td></tr>
         {% for field in form %}
+        <tr><td class="error">{{ field.errors }}</td></tr>
         <tr>
         {% if not "media_item" in field.html_name %}

telemeta/templates/telemeta_default/search_criteria.html

@@ -127 +127 @@
     </p>
     {% endif %}
-
+    <!--
+    <p><label for="sound">{% trans "Sound" %}</label>
+    <input type="checkbox" name="sound" value="True" align="left" />
+    </p>
+    -->
 </fieldset>
 

telemeta/templatetags/telemeta_utils.py

@@ -323 +323 @@
 
 @register.filter
-def get_filename(file):
-    return file.path.split(os.sep)[-1]
+def get_filename(object):
+    if isinstance(object, unicode):
+       return object.split('/')[-1]
+    else:
+        return object.path.split(os.sep)[-1]
+
+@register.filter
+def get_youtube(link):
+    link = link.split('&')
+    ref = link[0].split('=')[1]
+    return 'http://www.youtube.com/embed/'+ref