# HG changeset patch # User Brian Neal # Date 1362938940 18000 # Node ID d63c8ccc29a7a18b1ab6ee5852d7fce7eb96b65d # Parent 081a88b3bfc8895a779b21ebbddaf78ae1670bee Get home page slideshow images from MEDIA, not STATIC. diff -r 081a88b3bfc8 -r d63c8ccc29a7 .hgignore --- a/.hgignore Sun Mar 10 12:47:21 2013 -0500 +++ b/.hgignore Sun Mar 10 13:09:00 2013 -0500 @@ -12,6 +12,7 @@ media/downloads media/podcast media/potd +media/slideshow media/smiley celerybeat-schedule sg101/xapian_index diff -r 081a88b3bfc8 -r d63c8ccc29a7 core/templatetags/core_tags.py --- a/core/templatetags/core_tags.py Sun Mar 10 12:47:21 2013 -0500 +++ b/core/templatetags/core_tags.py Sun Mar 10 13:09:00 2013 -0500 @@ -229,11 +229,11 @@ def slideshow_images(): """Randomly choose images from a pool for a slideshow.""" - slides_dir = os.path.join(settings.STATIC_ROOT, 'slideshow', '*') + slides_dir = os.path.join(settings.MEDIA_ROOT, 'slideshow', '*') slides = [os.path.basename(s) for s in glob.glob(slides_dir)] if len(slides) >= 5: slides = random.sample(slides, 5) - slides = ['%sslideshow/%s' % (settings.STATIC_URL, s) for s in slides] + slides = ['%sslideshow/%s' % (settings.MEDIA_URL, s) for s in slides] return { 'slides': slides, diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/425.JPG Binary file static/slideshow/425.JPG has changed diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/casino66.jpg Binary file static/slideshow/casino66.jpg has changed diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/chum.jpg Binary file static/slideshow/chum.jpg has changed diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/friasivan.jpg Binary file static/slideshow/friasivan.jpg has changed diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/image-1.jpg Binary file static/slideshow/image-1.jpg has changed diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/image-2.jpg Binary file static/slideshow/image-2.jpg has changed diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/image-3.jpg Binary file static/slideshow/image-3.jpg has changed diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/image-4.jpg Binary file static/slideshow/image-4.jpg has changed diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/image-5.jpg Binary file static/slideshow/image-5.jpg has changed diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/insect.jpg Binary file static/slideshow/insect.jpg has changed diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/jeffdavepaul.jpg Binary file static/slideshow/jeffdavepaul.jpg has changed diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/lehos_zps7d7f75a5.jpg Binary file static/slideshow/lehos_zps7d7f75a5.jpg has changed diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/lorenzo.jpg Binary file static/slideshow/lorenzo.jpg has changed diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/slack3.jpg Binary file static/slideshow/slack3.jpg has changed diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/spco.jpg Binary file static/slideshow/spco.jpg has changed diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/spra001.jpg Binary file static/slideshow/spra001.jpg has changed diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/ssiv.jpg Binary file static/slideshow/ssiv.jpg has changed diff -r 081a88b3bfc8 -r d63c8ccc29a7 static/slideshow/wronski.jpg Binary file static/slideshow/wronski.jpg has changed