From 1606cf69d773e4584b1be9d487b0dee7db300bb0 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Tue, 19 Apr 2011 20:11:29 +0200
Subject: [PATCH] now using MEDIA_URL for static files.

---
 oliver_screen/main/urls.py                      |  1 -
 oliver_screen/main/views.py                     |  3 ++-
 oliver_screen/templates/public/index.html       | 12 ++++++------
 oliver_screen/templates/public/now_playing.html |  4 ++--
 oliver_screen/tracks/admin.py                   |  2 +-
 oliver_screen/tracks/models.py                  |  2 --
 oliver_screen/tracks/views.py                   |  4 +++-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/oliver_screen/main/urls.py b/oliver_screen/main/urls.py
index de06094..6edcc26 100644
--- a/oliver_screen/main/urls.py
+++ b/oliver_screen/main/urls.py
@@ -1,6 +1,5 @@
 from django.conf.urls.defaults import *
 urlpatterns = patterns('oliver_screen.main.views',
-    (r'^tracks', 'tracks'),
     (r'^$', 'index'),
     )
 
diff --git a/oliver_screen/main/views.py b/oliver_screen/main/views.py
index 022ac2e..4e22491 100644
--- a/oliver_screen/main/views.py
+++ b/oliver_screen/main/views.py
@@ -1,6 +1,7 @@
 from django.http import HttpResponse
 from django.shortcuts import render_to_response, get_object_or_404
+from django.template import RequestContext
 
 # My views
 def index(request):
-    return render_to_response('public/index.html')
+    return render_to_response('public/index.html', context_instance=RequestContext(request))
diff --git a/oliver_screen/templates/public/index.html b/oliver_screen/templates/public/index.html
index 96444cf..45cb973 100644
--- a/oliver_screen/templates/public/index.html
+++ b/oliver_screen/templates/public/index.html
@@ -3,18 +3,18 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
     <head>
     <title>Current track</title>
-        <link rel="stylesheet"  type="text/css" href="/oliver/static/screen.css" />
-        <script type="text/javascript" src="/oliver/static/jquery-1.5.2.min.js"></script>
-        <script type="text/javascript" src="/oliver/static/jquery.timers-1.2.js"></script>
+        <link rel="stylesheet"  type="text/css" href="{{ MEDIA_URL }}screen.css" />
+        <script type="text/javascript" src="{{ MEDIA_URL }}jquery-1.5.2.min.js"></script>
+        <script type="text/javascript" src="{{ MEDIA_URL }}jquery.timers-1.2.js"></script>
         <script type="text/javascript">
             /* Function that updates the capacities */
             var get_last_track = function() {
                 $( '#last_track' ).load(
-                    '/oliver/tracks/last');
+                    '{% url tracks.views.get_last_track %}');
             };
             var get_now_playing = function() {
                 $( '#now_playing' ).load(
-                    '/oliver/tracks/now_playing/');
+                    '{% url tracks.views.get_now_playing %}');
             };
             /* Initial update */
             $( document ).ready( get_last_track );
@@ -45,7 +45,7 @@
 	</head>
 
 	<body>
-    <div id="spinner"><img src="/oliver/static/spinner.gif"/></div>
+            <div id="spinner"><img src="{{ MEDIA_URL }}spinner.gif"/></div>
 	<div id="container">
         <div id="content">
             <div id="now_playing"></div>
diff --git a/oliver_screen/templates/public/now_playing.html b/oliver_screen/templates/public/now_playing.html
index e473e3f..71c07b6 100644
--- a/oliver_screen/templates/public/now_playing.html
+++ b/oliver_screen/templates/public/now_playing.html
@@ -1,7 +1,7 @@
 {% if now_playing %}
     <img src="{{ now_playing.image}}" class="now_playing" /><br />
-    <img src="/oliver/static/eq.gif" /> {{ now_playing.artist}} - {{ now_playing.title }} ♪♫<br />
+    <img src="{{ MEDIA_URL}}eq.gif" /> {{ now_playing.artist}} - {{ now_playing.title }} ♪♫<br />
 {% else %}
-    <img src="/oliver/static/no_music_makes_me_sick_by_sakgaa.jpg" /><br />
+    <img src="{{ MEDIA_URL}}no_music_makes_me_sick_by_sakgaa.jpg" /><br />
     :[
 {% endif %}
diff --git a/oliver_screen/tracks/admin.py b/oliver_screen/tracks/admin.py
index b37e484..31e5075 100644
--- a/oliver_screen/tracks/admin.py
+++ b/oliver_screen/tracks/admin.py
@@ -3,7 +3,7 @@ from django.contrib import admin
 
 class LastFMAdmin(admin.ModelAdmin):
 	fieldsets = [
-		(None, {'fields': ['apikey','apisecret','user']})
+		(None, {'fields': ['user']})
 	]
 
 admin.site.register(LastFMSettings, LastFMAdmin)
diff --git a/oliver_screen/tracks/models.py b/oliver_screen/tracks/models.py
index a038dba..2ba2eaf 100644
--- a/oliver_screen/tracks/models.py
+++ b/oliver_screen/tracks/models.py
@@ -3,8 +3,6 @@ from django.db import models
 # Create your models here.
 #
 class LastFMSettings(models.Model):
-    apikey = models.CharField(max_length=200)
-    apisecret = models.CharField(max_length=200)
     user = models.CharField(max_length=200)
 
     def __unicode__(self):
diff --git a/oliver_screen/tracks/views.py b/oliver_screen/tracks/views.py
index 41f2a1a..f3ddea3 100644
--- a/oliver_screen/tracks/views.py
+++ b/oliver_screen/tracks/views.py
@@ -1,5 +1,7 @@
 from django.http import HttpResponse
 from django.shortcuts import render_to_response, get_object_or_404
+from django.template import RequestContext
+
 import pylast
 from datetime import datetime
 from oliver_screen import settings
@@ -25,7 +27,7 @@ def get_now_playing(request):
     if not track is None:
         artist = track.get_artist()
         now_playing = { 'artist': artist.get_name(), 'title': track.get_title(), 'image': artist.get_images(limit=1)[0].sizes.original}
-    return render_to_response("public/now_playing.html", {'now_playing':now_playing});
+    return render_to_response("public/now_playing.html", {'now_playing':now_playing}, context_instance=RequestContext(request));
 
 # Mock views
 def dummy_get_last_track(request):