fix youtube previews

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index 952f95d2ad26a8083adc8ca4a08d2614e842b422..e1d278d432f52e4f1afef22d8b4f0c199d9a2c5f 100644 (file)
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -97,9 +97,9 @@
  {% if user.is_authenticated %}
   <li><a href="#desk#" class="blue">{% trans "Desk" %}</a></span>
    <ul>
+    <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 --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py
index 9092a9b7c0498597ca56afdc883daa930a72d181..ff38074c1b3561addef874def104553f1c0fa139 100644 (file)
--- a/telemeta/templatetags/telemeta_utils.py
+++ b/telemeta/templatetags/telemeta_utils.py
@@ -362,7 +362,7 @@ def get_filename(object):
 @register.filter
 def get_youtube(link):
     link = link.split('&')
-    if "=" in link:
+    if "=" in link[0]:
         ref = link[0].split('=')[1]
     else:
         ref = link[0].split('/')[-1]

diff --git a/telemeta/views/base.py b/telemeta/views/base.py
index 68c1e0ca54287e1dc71ab612b0ce2d142f483964..251c1298eea6e69d076978c487e7b5e3e841bce5 100644 (file)
--- a/telemeta/views/base.py
+++ b/telemeta/views/base.py
@@ -189,7 +189,9 @@ def check_related_media(medias):
         if not media.mime_type:
             media.set_mime_type()
             media.save()
-        if not media.title and media.url and not 'https' in media.url:
+        if not media.title and media.url:
+            if 'https' in media.url:
+                media.url = media.url.replace('https', 'http')
             import lxml.etree
             parser = lxml.etree.HTMLParser()
             tree = lxml.etree.parse(media.url, parser)