From 984a06888045a78ba3eae20e38ed14e33cfaa63c Mon Sep 17 00:00:00 2001 From: Jim Driessen Date: Tue, 5 Sep 2017 14:02:27 +0200 Subject: [PATCH] Add mute button. --- marietje/api/urls.py | 1 + marietje/api/views.py | 10 ++++++++++ marietje/marietje/static/js/queue.js | 5 +++++ marietje/queues/templates/queues/queue.html | 5 ++++- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/marietje/api/urls.py b/marietje/api/urls.py index 2e58268..294de81 100644 --- a/marietje/api/urls.py +++ b/marietje/api/urls.py @@ -18,4 +18,5 @@ urlpatterns = [ url(r'^upload', views.upload), url(r'^volumedown', views.volume_down), url(r'^volumeup', views.volume_up), + url(r'^mute', views.mute), ] diff --git a/marietje/api/views.py b/marietje/api/views.py index 3318006..8b63d53 100644 --- a/marietje/api/views.py +++ b/marietje/api/views.py @@ -267,3 +267,13 @@ def volume_up(request): command = QueueCommand(queue=request.user.queue, command='volume_up') command.save() return JsonResponse({}) + + +@require_http_methods(["POST"]) +@api_auth_required +def mute(request): + if not request.user.has_perm('queues.can_control_volume'): + return HttpResponseForbidden() + command = QueueCommand(queue=request.user.queue, command='mute') + command.save() + return JsonResponse({}) diff --git a/marietje/marietje/static/js/queue.js b/marietje/marietje/static/js/queue.js index 337dbf4..88db7ce 100644 --- a/marietje/marietje/static/js/queue.js +++ b/marietje/marietje/static/js/queue.js @@ -97,6 +97,11 @@ $(function () { $.post('/api/volumeup', {csrfmiddlewaretoken: csrf_token}); }); + $('#mute').click(function(e){ + e.preventDefault(); + $.post('/api/mute', {csrfmiddlewaretoken: csrf_token}); + }); + $(document).on('touchstart', '.artist, .title', function(){ noRemove = true; setTimeout(function(){ noRemove = false; }, 500); diff --git a/marietje/queues/templates/queues/queue.html b/marietje/queues/templates/queues/queue.html index 13c8f50..f9ba994 100644 --- a/marietje/queues/templates/queues/queue.html +++ b/marietje/queues/templates/queues/queue.html @@ -45,7 +45,10 @@
-

Now Playing

+

+ Now Playing{% if perms.queues.can_control_volume %} + {% endif %} +