Mercurial > public > madeira
diff mysite/templates/band/photos.html @ 26:efb2da0b5d10
Merging the django1.3 branch into trunk.
author | Brian Neal <bgneal@gmail.com> |
---|---|
date | Wed, 30 Mar 2011 00:16:32 +0000 |
parents | 1b6b3e38e918 |
children | 25e00d1b99bf |
line wrap: on
line diff
--- a/mysite/templates/band/photos.html Sun Mar 20 19:53:35 2011 +0000 +++ b/mysite/templates/band/photos.html Wed Mar 30 00:16:32 2011 +0000 @@ -1,11 +1,12 @@ {% extends 'band/base.html' %} +{% load url from future %} {% block title %}The Madeira | Photo Galleries{% endblock %} {% block custom_css %} -<link rel="stylesheet" href="{{ MEDIA_URL }}js/fancybox/jquery.fancybox-1.3.1.css" type="text/css" media="screen" /> +<link rel="stylesheet" href="{{ STATIC_URL }}js/fancybox/jquery.fancybox-1.3.1.css" type="text/css" media="screen" /> {% endblock %} {% block custom_js %} <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script> -<script type="text/javascript" src="{{ MEDIA_URL }}js/fancybox/jquery.fancybox-1.3.1.pack.js"></script> +<script type="text/javascript" src="{{ STATIC_URL }}js/fancybox/jquery.fancybox-1.3.1.pack.js"></script> <script type="text/javascript"> $(function() { $('a.fancybox').fancybox(); @@ -17,7 +18,7 @@ {% if galleries %} <ul> {% for gallery in galleries %} - <li><a href="{% url mysite.band.views.photo_detail gallery.id %}">{{ gallery.title }}</a></li> + <li><a href="{% url 'mysite.band.views.photo_detail' gallery.id %}">{{ gallery.title }}</a></li> {% endfor %} </ul> {% else %}