From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 28 Oct 2014 12:54:41 +0000 (+0100)
Subject: add RPC browser, prepare player block
X-Git-Tag: 1.5.0rc1~27^2~67
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7e93f360fe56bc70186be26d5a5b8a56d0bda93f;p=telemeta.git

add RPC browser, prepare player block
---

diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index e1ca2df4..ced9598a 100644
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -108,6 +108,8 @@ Item : <a href="{% url "telemeta-item-detail" item.public_id %}">{{ item }}</a>
 
     {% if item.file or item.url %}
 
+    {% block player %}
+
     {% if access == 'full' or perms.telemeta.can_play_all_items %}
     <div id="player_maximized" class="ts-skin-lab">
        <div id="player_header">
@@ -186,6 +188,9 @@ Item : <a href="{% url "telemeta-item-detail" item.public_id %}">{{ item }}</a>
     </div>
 
     {% endif %}
+
+    {% endblock player %}
+
     {% endif %}
 
     {% block infos %}
diff --git a/telemeta/urls.py b/telemeta/urls.py
index 9a10e863..60a52476 100644
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -224,8 +224,6 @@ urlpatterns = patterns('',
 
     # JSON RPC
     url(r'json/$', jsonrpc_site.dispatch, name='jsonrpc_mountpoint'),
-    # for the graphical browser/web console only, omissible
-    #url(r'json/browse/', 'jsonrpc.views.browse', name="jsonrpc_browser"),
 
     # Playlists
     url(r'^playlists/(?P<public_id>[a-zA-Z0-9]+)/(?P<resource_type>[a-zA-Z0-9]+)/csv/$', playlist_view.playlist_csv_export, name="telemeta-playlist-csv-export"),
@@ -245,4 +243,6 @@ if settings.DEBUG and 'debug_toolbar' in settings.INSTALLED_APPS:
     import debug_toolbar
     urlpatterns += patterns('',
     url(r'^__debug__/', include(debug_toolbar.urls)),)
+    # for the graphical browser/web console only, omissible
+    url(r'json/browse/', 'jsonrpc.views.browse', name="jsonrpc_browser"),