Mercurial > public > madeira

diff mysite/templates/band/base.html @ 26:efb2da0b5d10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging the django1.3 branch into trunk.
author Brian Neal <bgneal@gmail.com>
date Wed, 30 Mar 2011 00:16:32 +0000
parents f3052378ab47
children ec7abd6ac50b
line wrap: on
line diff
--- a/mysite/templates/band/base.html	Sun Mar 20 19:53:35 2011 +0000
+++ b/mysite/templates/band/base.html	Wed Mar 30 00:16:32 2011 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+{% load url from future %}
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head><title>{% block title %}{% endblock %}</title>
 <meta http-equiv="Content-Type" content="text/html" />
@@ -10,37 +11,37 @@
 <meta name="copyright" content="&copy; 2007-2010 Brian Neal" />
 <meta name="keywords" lang="en-us" content="instrumental surf, surf, guitar, musician, instro, surf music, Dick Dale, Atlantics, Surf Coasters, Fender, Strat, Stratocaster, Destination Earth, Destination: Earth!,Space Cossacks, Troubadours, reverb" />
 <meta name="description" lang="en-us" content="Home page for the instrumental surf band The Madeira. The Madeira combine high energy performances reminiscent of The Atlantics and Dick Dale with exotic melodies and an unusually high level of musicianship. This page contains show dates, photos, videos, and news about the band." />
-<link rel="stylesheet" href="{{ MEDIA_URL }}css/blueprint/screen.css" type="text/css" media="screen, projection" />
-<link rel="stylesheet" href="{{ MEDIA_URL }}css/blueprint/print.css" type="text/css" media="print" /> 
+<link rel="stylesheet" href="{{ STATIC_URL }}css/blueprint/screen.css" type="text/css" media="screen, projection" />
+<link rel="stylesheet" href="{{ STATIC_URL }}css/blueprint/print.css" type="text/css" media="print" /> 
 <!--[if lt IE 8]>
-<link rel="stylesheet" href="{{ MEDIA_URL }}css/blueprint/ie.css" type="text/css" media="screen, projection" />
+<link rel="stylesheet" href="{{ STATIC_URL }}css/blueprint/ie.css" type="text/css" media="screen, projection" />
 <![endif]-->
-<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/theme.css" />
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/theme.css" />
 {% block custom_css %}{% endblock %}
 {% block custom_js %}{% endblock %}
-<link rel="shortcut icon" type="image/vnd.microsoft.com" href="{{ MEDIA_URL }}images/favicon.ico" />
+<link rel="shortcut icon" type="image/vnd.microsoft.com" href="{{ STATIC_URL }}images/favicon.ico" />
 </head>
 <body>
 <div class="container">
 
 <div id="header" class="span-24 last">
-   <img src="{{ MEDIA_URL }}images/header-logo.jpg" border="0" alt="Madeira Logo" />
+   <img src="{{ STATIC_URL }}images/header-logo.jpg" border="0" alt="Madeira Logo" />
 </div>
 
 <div id="navleft" class="span-4 append-1">
    <ul>
-      <li><a href="{% url mysite.band.views.index %}">Home</a></li>
-      <li><a href="{% url mysite.band.views.news %}">News</a></li>
-      <li><a href="{% url mysite.band.views.bio %}">Biography</a></li>
-      <li><a href="{% url mysite.band.views.gigs %}">Shows</a></li>
-      <li><a href="{% url mysite.band.views.press_index %}">Press</a></li>
-      <li><a href="{% url mysite.band.views.songs %}">Songs</a></li>
-      <li><a href="{% url mysite.band.views.photos_index %}">Photos</a></li>
-      <li><a href="{% url mysite.band.views.videos_index %}">Videos</a></li>
-      <li><a href="{% url mysite.band.views.flyers %}">Flyers</a></li>
-      <li><a href="{% url mysite.band.views.buy %}">Buy</a></li>
-      <li><a href="{% url mysite.band.views.contact %}">Contact</a></li>
-      <li><a href="{% url mysite.band.views.mail %}">Mailing List</a></li>
+      <li><a href="{% url 'mysite.band.views.index' %}">Home</a></li>
+      <li><a href="{% url 'mysite.band.views.news' %}">News</a></li>
+      <li><a href="{% url 'mysite.band.views.bio' %}">Biography</a></li>
+      <li><a href="{% url 'mysite.band.views.gigs' %}">Shows</a></li>
+      <li><a href="{% url 'mysite.band.views.press_index' %}">Press</a></li>
+      <li><a href="{% url 'mysite.band.views.songs' %}">Songs</a></li>
+      <li><a href="{% url 'mysite.band.views.photos_index' %}">Photos</a></li>
+      <li><a href="{% url 'mysite.band.views.videos_index' %}">Videos</a></li>
+      <li><a href="{% url 'mysite.band.views.flyers' %}">Flyers</a></li>
+      <li><a href="{% url 'mysite.band.views.buy' %}">Buy</a></li>
+      <li><a href="{% url 'mysite.band.views.contact' %}">Contact</a></li>
+      <li><a href="{% url 'mysite.band.views.mail' %}">Mailing List</a></li>
       <li><a href="http://myspace.com/themadeira">Myspace</a></li>
       <li><a href="http://facebook.com/themadeira">Facebook</a></li>
    </ul>