diff --git a/spa/views.py b/spa/views.py index 2d1b4c4..5c2a6cf 100644 --- a/spa/views.py +++ b/spa/views.py @@ -2,7 +2,9 @@ from django.shortcuts import render_to_response from django.template.context import RequestContext def app(request): - return render_to_response("inc/app.html", context_instance=RequestContext(request)) + return render_to_response( + "inc/app.html", + context_instance=RequestContext(request)) def upload(request): return render_to_response("inc/upload.html", context_instance=RequestContext(request)) diff --git a/static/js/app/views/header.js b/static/js/app/views/header.js index df73648..007b6ec 100644 --- a/static/js/app/views/header.js +++ b/static/js/app/views/header.js @@ -19,6 +19,7 @@ window.HeaderView = Backbone.View.extend({ trackPlaying:function (data) { $(this.el).find('#header-play-button-icon').removeClass('icon-play'); $(this.el).find('#header-play-button-icon').addClass('icon-pause'); + }, trackPaused:function (data) { $(this.el).find('#header-play-button-icon').removeClass('icon-pause'); diff --git a/static/js/app/views/mix.js b/static/js/app/views/mix.js index 079b3fd..e73b2aa 100644 --- a/static/js/app/views/mix.js +++ b/static/js/app/views/mix.js @@ -66,9 +66,10 @@ window.MixListItemView = Backbone.View.extend({ }, pauseMix:function () { com.podnoms.player.pause(); - _eventAggregator.trigger("track_playing"); + _eventAggregator.trigger("track_paused"); }, resume:function () { + _eventAggregator.trigger("track_playing"); com.podnoms.player.resume(); }, startMix:function () { @@ -86,9 +87,10 @@ window.MixListItemView = Backbone.View.extend({ url:data.stream_url, success:function () { _eventAggregator.trigger("track_playing"); + _eventAggregator.trigger("track_changed", data); }, error:function () { - + alert("Error playing mix. Do please try again."); } }); } diff --git a/templates/base.html b/templates/base.html index f4ff1b7..fa83003 100644 --- a/templates/base.html +++ b/templates/base.html @@ -71,8 +71,9 @@
+ Transmogrifying..... + {% block content %} - {% endblock %}