# HG changeset patch
# User Chris Ridgway <ckridgway@gmail.com>
# Date 1322341844 21600
# Node ID 54f616fbd3c593566d71dd5961d348e807835c4b
# Parent  e60af48feb005a869a5883dfdedc30c46ce4ed55# Parent  fb778f9503df6985803e33754a171383ca8a57c0
Merging with default.

diff -r e60af48feb00 -r 54f616fbd3c5 bns_website/settings/production.py
--- a/bns_website/settings/production.py	Sat Nov 26 15:08:25 2011 -0600
+++ b/bns_website/settings/production.py	Sat Nov 26 15:10:44 2011 -0600
@@ -14,6 +14,22 @@
     },
 }
 
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'LOCATION': '127.0.0.1:11211',
+        'TIMEOUT': 600,
+    },
+}
+
+CACHE_MIDDLEWARE_ALIAS = 'default'
+CACHE_MIDDLEWARE_SECONDS = 600
+CACHE_MIDDLEWARE_KEY_PREFIX = 'BNS'
+CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True
+
+MIDDLEWARE_CLASSES.insert(0, 'django.middleware.cache.UpdateCacheMiddleware')
+MIDDLEWARE_CLASSES.append('django.middleware.cache.FetchFromCacheMiddleware')
+
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': True,
diff -r e60af48feb00 -r 54f616fbd3c5 bns_website/static/images/favicon.ico
Binary file bns_website/static/images/favicon.ico has changed
diff -r e60af48feb00 -r 54f616fbd3c5 bns_website/templates/home.html
--- a/bns_website/templates/home.html	Sat Nov 26 15:08:25 2011 -0600
+++ b/bns_website/templates/home.html	Sat Nov 26 15:10:44 2011 -0600
@@ -57,7 +57,7 @@
          <div class="row">
             <div class="span4">
                <ol id="column1">
-                  <li>El Supernaut: Wonderman from Initiö</li>
+                  <li>El Supernaut: Wonderman from Intiö</li>
                   <li>Los Twang! Marvels: Sea of Glory</li>
                   <li>El Ray: Cherry Cheeks</li>
                   <li>The Coffin Daggers: Borgo Pass</li>
@@ -94,7 +94,7 @@
       <p>
 Welcome to Brave New Surf, a showcase for the amazing new sounds of surf music. Here is undeniable evidence that the surf genre is not only still alive but thriving. Surf music’s legendary first wave came to an untimely end at the hands of the British Invasion bands, but the genre was resurrected in 1980 by the great Jon &amp; the Nightriders. In the three decades since, surf music has ebbed and swelled (mostly as an underground phenomenon), growing stronger with each new wave. The past four years have been extraordinarily fruitful in both the number and the quality of new releases. The best of these new tracks – many compiled for you here – can stand toe to toe with the very best of the 1960s.
 </p><p>
-      The songs on this CD testify to a love affair between the musicians and their music. Surf musicians are not in this for the money – almost all have to keep their day jobs – but, rather, because of a deep passion for the music. For them, life is much more satisfying if some part of it is spent playing in a surf band. This passion is shared by an increasingly international community, reaching almost every corner of the world. The bands on this compilation come not only from North America, but also South America and Europe, these two continents emerging in the past decade as real hotbeds of surf music activity.
+      The songs on this CD testify to a love affair between the musicians and their music. Surf musicians are not in this for the money – almost all have to keep their day jobs – but, rather, because of a deep passion for the music. For them, life is much more satisfying if some part of it is spent playing in a surf band. This passion is shared by an increasingly international community, reaching almost every corner of the world. The bands on this compilation come not only from North America, but also South America and Europe, those two continents emerging in the past decade as real hotbeds of surf music activity.
 </p><p>
       Surf bands universally start off by playing the 1960s classics. As a result, the surf genre is steeped in the tradition. But while some stay largely within the boundaries of that tradition, others more fully explore the possibilities
 only hinted at by the first wave bands, and still others move beyond the boundaries, in some cases obliterating them, pushing surf music into new directions.
 </p><p>
diff -r e60af48feb00 -r 54f616fbd3c5 bns_website/templates/music.html
--- a/bns_website/templates/music.html	Sat Nov 26 15:08:25 2011 -0600
+++ b/bns_website/templates/music.html	Sat Nov 26 15:10:44 2011 -0600
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% load core_tags %}
 
 {% block title %}Listen{% endblock %}
@@ -20,7 +21,7 @@
             [
                 {
                     artist:"El Supernaut",
-                    title:"Wonderman from Initiö",
+                    title:"Wonderman from Intiö",
                     mp3:"{{ STATIC_URL }}music/1.mp3"
                 },
                 {
@@ -136,6 +137,10 @@
 {% block content %}
 {% navbar 'music' %}
 <h1>Listen</h1>
+
+<div class="row">
+<div class="span8">
+
 <div id="jquery_jplayer_1" class="jp-jplayer"></div>
 
 <div id="jp_container_1" class="jp-audio">
@@ -181,4 +186,13 @@
         </div>
     </div>
 </div>
+
+</div>
+<div class="span7 offset1">
+   <div class="alert-message block-message info">
+      <h2>Like what you hear?</h2>
+      <a href="{% url 'buy' %}" class="btn large primary bns">Buy Now! »</a>
+   </div>
+</div>
+</div>
 {% endblock %}