aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
diff options
context:
space:
mode:
authorJoar Wandborg <git@wandborg.com>2012-03-22 01:27:19 +0100
committerJoar Wandborg <git@wandborg.com>2012-03-22 01:27:19 +0100
commita9d84d4cb79252549d472f9f2059b45bbce4f4f1 (patch)
treee3b2301a34cacef2d40a2542a63f06f490faf32c /mediagoblin/templates
parent9743ce886ab3655662afaa0ef7b08791a65e37da (diff)
downloadmediagoblin-a9d84d4cb79252549d472f9f2059b45bbce4f4f1.tar.lz
mediagoblin-a9d84d4cb79252549d472f9f2059b45bbce4f4f1.tar.xz
mediagoblin-a9d84d4cb79252549d472f9f2059b45bbce4f4f1.zip
Faster sniffing
- Sniffing now goes through the old extension-based filter before doing it the bitsniffing way. - Refractored get_media_type_and_manager(filename). - Removed ogg extension from video accepted extensions, audio will take care of that. - Added custom audio player, still WIP,but working. - Added test for sniffing. This only tests for the mediagoblin.media_types.image type, as that is the only one enabled from start.
Diffstat (limited to 'mediagoblin/templates')
-rw-r--r--mediagoblin/templates/mediagoblin/media_displays/audio.html7
1 files changed, 7 insertions, 0 deletions
diff --git a/mediagoblin/templates/mediagoblin/media_displays/audio.html b/mediagoblin/templates/mediagoblin/media_displays/audio.html
index f130e323..36bd9d1d 100644
--- a/mediagoblin/templates/mediagoblin/media_displays/audio.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/audio.html
@@ -18,6 +18,13 @@
{% extends 'mediagoblin/user_pages/media.html' %}
+{% block mediagoblin_head %}
+ {{ super() }}
+ <link rel="stylesheet" type="text/css" href="{{ request.staticdirect('/css/audio.css') }}" />
+ <script type="text/javascript" src="{{ request.staticdirect(
+ '/js/audio.js') }}"></script>
+{% endblock %}
+
{% block mediagoblin_media %}
<div class="audio-media">
{% if 'spectrogram' in media.media_files %}