Enable playlist listing, fix various javascript errors

master
Bradlee Speice 2013-02-05 15:06:31 -05:00
parent 75b678d56c
commit 5c538d395e
4 changed files with 19 additions and 5 deletions

View File

@ -6,8 +6,10 @@ from django.template import RequestContext
from django.shortcuts import render_to_response, redirect
#Melodia-specific utilities
from web_utils import json_response as json
import web_utils
@login_required
def main(request):
return render_to_response("index", context_instance = RequestContext(request))
return render_to_response("index", context_instance = RequestContext(request,
web_utils.template_resources()
))

View File

@ -74,7 +74,6 @@ List of block elements in this page:
{% endblock %}
</div>
</div>
</body>
{# General scripts #}
{% block scripts %}
@ -94,4 +93,6 @@ List of block elements in this page:
{% endblock %}
</script>
{% endblock %}{# endblock scripts #}
</body>
</html>

View File

@ -3,7 +3,7 @@
<ul class="nav nav-list">
<li class="nav-header">Playlists</li>
{% for playlist in Playlist.objects.all %}
<li>{{ playlist.name }}</li>
{% for playlist in playlist_list %}
<li><a href="#" data-playlist-name="{{ playlist.name }}">{{ playlist.name }}</a></li>
{% endfor %}
</ul>

View File

@ -2,6 +2,8 @@
from django.utils import simplejson
from django.http import HttpResponse
from archiver.playlist import Playlist
def json_response(**kwargs):
#This is used to make sure that we have a standard json response
response = {}
@ -13,3 +15,12 @@ def json_response(**kwargs):
response["success"] = True
return HttpResponse(simplejson.dumps(response))
def template_resources():
"Return a dictionary of resources templates will need"
#For example, giving templates a reference to all playlists.
resource_dict = {}
resource_dict.update({"playlist_list": Playlist.objects.all()})
return resource_dict