Convert to and enable staticfiles contrib application

This moves our site static files into the sitestatic directory if they
are shared resources, and also moves a handful of things (such as the
artwork logos) into application-specific static/ directories. This
allows the staticfiles contrib app to work after a few settings tweaks,
a run of collectstatic, and massaging the hardcoded '/media/' prefix out
of our templates.

Django 1.4 is going to make this a lot easier to move things to a CDN
and provides better template tags; for now this is setting the stage
before we can move to that.

Signed-off-by: Dan McGee <dan@archlinux.org>

93 files changed, 66 insertions, 51 deletions

diff --git a/.gitignore b/.gitignore
index fea51cc3..e6378211 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 local_settings.py
 archweb.db
 archweb.db-*
+collected_static/
 testing/
diff --git a/main/templatetags/cdn.py b/main/templatetags/cdn.py
index 5cb12fcf..b91553ed 100644
--- a/main/templatetags/cdn.py
+++ b/main/templatetags/cdn.py
@@ -11,7 +11,8 @@ def jquery():
         link = 'https://ajax.googleapis.com/ajax/libs/jquery/' \
                 '%s/jquery.min.js' % version
     else:
-        link = '/media/jquery-%s.min.js' % version
+        static_url = getattr(settings, 'STATIC_URL', '/static/')
+        link = '%sjquery-%s.min.js' % (static_url, version)
     return '<script type="text/javascript" src="%s"></script>' % link
 
 @register.tag
diff --git a/media/logos/archlinux-logo-black-1200dpi.png b/public/static/logos/archlinux-logo-black-1200dpi.png
index a3082c39..a3082c39 100644
--- a/media/logos/archlinux-logo-black-1200dpi.png
+++ b/public/static/logos/archlinux-logo-black-1200dpi.png
diff --git a/media/logos/archlinux-logo-black-90dpi.png b/public/static/logos/archlinux-logo-black-90dpi.png
index 6948b795..6948b795 100644
--- a/media/logos/archlinux-logo-black-90dpi.png
+++ b/public/static/logos/archlinux-logo-black-90dpi.png
diff --git a/media/logos/archlinux-logo-black-scalable.svg b/public/static/logos/archlinux-logo-black-scalable.svg
index 10d6c4af..10d6c4af 100644
--- a/media/logos/archlinux-logo-black-scalable.svg
+++ b/public/static/logos/archlinux-logo-black-scalable.svg
diff --git a/media/logos/archlinux-logo-dark-1200dpi.png b/public/static/logos/archlinux-logo-dark-1200dpi.png
index 24a5cefa..24a5cefa 100644
--- a/media/logos/archlinux-logo-dark-1200dpi.png
+++ b/public/static/logos/archlinux-logo-dark-1200dpi.png
diff --git a/media/logos/archlinux-logo-dark-90dpi.png b/public/static/logos/archlinux-logo-dark-90dpi.png
index f3757c61..f3757c61 100644
--- a/media/logos/archlinux-logo-dark-90dpi.png
+++ b/public/static/logos/archlinux-logo-dark-90dpi.png
diff --git a/media/logos/archlinux-logo-dark-scalable.svg b/public/static/logos/archlinux-logo-dark-scalable.svg
index 5a80cc4d..5a80cc4d 100644
--- a/media/logos/archlinux-logo-dark-scalable.svg
+++ b/public/static/logos/archlinux-logo-dark-scalable.svg
diff --git a/media/logos/archlinux-logo-light-1200dpi.png b/public/static/logos/archlinux-logo-light-1200dpi.png
index 79e0a0f1..79e0a0f1 100644
--- a/media/logos/archlinux-logo-light-1200dpi.png
+++ b/public/static/logos/archlinux-logo-light-1200dpi.png
diff --git a/media/logos/archlinux-logo-light-90dpi.png b/public/static/logos/archlinux-logo-light-90dpi.png
index 95803309..95803309 100644
--- a/media/logos/archlinux-logo-light-90dpi.png
+++ b/public/static/logos/archlinux-logo-light-90dpi.png
diff --git a/media/logos/archlinux-logo-light-scalable.svg b/public/static/logos/archlinux-logo-light-scalable.svg
index 5fd0716f..5fd0716f 100644
--- a/media/logos/archlinux-logo-light-scalable.svg
+++ b/public/static/logos/archlinux-logo-light-scalable.svg
diff --git a/media/logos/archlinux-logo-only.svg b/public/static/logos/archlinux-logo-only.svg
index 09be94a7..09be94a7 100644
--- a/media/logos/archlinux-logo-only.svg
+++ b/public/static/logos/archlinux-logo-only.svg
diff --git a/media/logos/archlinux-logo-white-1200dpi.png b/public/static/logos/archlinux-logo-white-1200dpi.png
index 50e700cf..50e700cf 100644
--- a/media/logos/archlinux-logo-white-1200dpi.png
+++ b/public/static/logos/archlinux-logo-white-1200dpi.png
diff --git a/media/logos/archlinux-logo-white-90dpi.png b/public/static/logos/archlinux-logo-white-90dpi.png
index 86679601..86679601 100644
--- a/media/logos/archlinux-logo-white-90dpi.png
+++ b/public/static/logos/archlinux-logo-white-90dpi.png
diff --git a/media/logos/archlinux-logo-white-scalable.svg b/public/static/logos/archlinux-logo-white-scalable.svg
index 70eb2dfe..70eb2dfe 100644
--- a/media/logos/archlinux-logo-white-scalable.svg
+++ b/public/static/logos/archlinux-logo-white-scalable.svg
diff --git a/media/logos/legacy/arch-legacy-aqua-blue.png b/public/static/logos/legacy/arch-legacy-aqua-blue.png
index 9637ce72..9637ce72 100644
--- a/media/logos/legacy/arch-legacy-aqua-blue.png
+++ b/public/static/logos/legacy/arch-legacy-aqua-blue.png
diff --git a/media/logos/legacy/arch-legacy-aqua-blue.svg b/public/static/logos/legacy/arch-legacy-aqua-blue.svg
index f4c80109..f4c80109 100644
--- a/media/logos/legacy/arch-legacy-aqua-blue.svg
+++ b/public/static/logos/legacy/arch-legacy-aqua-blue.svg
diff --git a/media/logos/legacy/arch-legacy-aqua-white.png b/public/static/logos/legacy/arch-legacy-aqua-white.png
index 25fe9001..25fe9001 100644
--- a/media/logos/legacy/arch-legacy-aqua-white.png
+++ b/public/static/logos/legacy/arch-legacy-aqua-white.png
diff --git a/media/logos/legacy/arch-legacy-aqua-white.svg b/public/static/logos/legacy/arch-legacy-aqua-white.svg
index 60b554fa..60b554fa 100644
--- a/media/logos/legacy/arch-legacy-aqua-white.svg
+++ b/public/static/logos/legacy/arch-legacy-aqua-white.svg
diff --git a/media/logos/legacy/arch-legacy-aqua.png b/public/static/logos/legacy/arch-legacy-aqua.png
index 881e1709..881e1709 100644
--- a/media/logos/legacy/arch-legacy-aqua.png
+++ b/public/static/logos/legacy/arch-legacy-aqua.png
diff --git a/media/logos/legacy/arch-legacy-aqua.svg b/public/static/logos/legacy/arch-legacy-aqua.svg
index 30860912..30860912 100644
--- a/media/logos/legacy/arch-legacy-aqua.svg
+++ b/public/static/logos/legacy/arch-legacy-aqua.svg
diff --git a/media/logos/legacy/arch-legacy-blue1.png b/public/static/logos/legacy/arch-legacy-blue1.png
index 3ed6c248..3ed6c248 100644
--- a/media/logos/legacy/arch-legacy-blue1.png
+++ b/public/static/logos/legacy/arch-legacy-blue1.png
diff --git a/media/logos/legacy/arch-legacy-blue1.svg b/public/static/logos/legacy/arch-legacy-blue1.svg
index 5a6f2c71..5a6f2c71 100644
--- a/media/logos/legacy/arch-legacy-blue1.svg
+++ b/public/static/logos/legacy/arch-legacy-blue1.svg
diff --git a/media/logos/legacy/arch-legacy-blue2.png b/public/static/logos/legacy/arch-legacy-blue2.png
index 8b5b791e..8b5b791e 100644
--- a/media/logos/legacy/arch-legacy-blue2.png
+++ b/public/static/logos/legacy/arch-legacy-blue2.png
diff --git a/media/logos/legacy/arch-legacy-blue2.svg b/public/static/logos/legacy/arch-legacy-blue2.svg
index 48b28338..48b28338 100644
--- a/media/logos/legacy/arch-legacy-blue2.svg
+++ b/public/static/logos/legacy/arch-legacy-blue2.svg
diff --git a/media/logos/legacy/arch-legacy-noodle-blue.png b/public/static/logos/legacy/arch-legacy-noodle-blue.png
index b24d34cf..b24d34cf 100644
--- a/media/logos/legacy/arch-legacy-noodle-blue.png
+++ b/public/static/logos/legacy/arch-legacy-noodle-blue.png
diff --git a/media/logos/legacy/arch-legacy-noodle-blue.svg b/public/static/logos/legacy/arch-legacy-noodle-blue.svg
index 7b6485b8..7b6485b8 100644
--- a/media/logos/legacy/arch-legacy-noodle-blue.svg
+++ b/public/static/logos/legacy/arch-legacy-noodle-blue.svg
diff --git a/media/logos/legacy/arch-legacy-noodle-box.png b/public/static/logos/legacy/arch-legacy-noodle-box.png
index 1162ed64..1162ed64 100644
--- a/media/logos/legacy/arch-legacy-noodle-box.png
+++ b/public/static/logos/legacy/arch-legacy-noodle-box.png
diff --git a/media/logos/legacy/arch-legacy-noodle-box.svg b/public/static/logos/legacy/arch-legacy-noodle-box.svg
index 8f17f00a..8f17f00a 100644
--- a/media/logos/legacy/arch-legacy-noodle-box.svg
+++ b/public/static/logos/legacy/arch-legacy-noodle-box.svg
diff --git a/media/logos/legacy/arch-legacy-noodle-cup.png b/public/static/logos/legacy/arch-legacy-noodle-cup.png
index b4f93078..b4f93078 100644
--- a/media/logos/legacy/arch-legacy-noodle-cup.png
+++ b/public/static/logos/legacy/arch-legacy-noodle-cup.png
diff --git a/media/logos/legacy/arch-legacy-noodle-cup.svg b/public/static/logos/legacy/arch-legacy-noodle-cup.svg
index 8d6a0442..8d6a0442 100644
--- a/media/logos/legacy/arch-legacy-noodle-cup.svg
+++ b/public/static/logos/legacy/arch-legacy-noodle-cup.svg
diff --git a/media/logos/legacy/arch-legacy-noodle-white.png b/public/static/logos/legacy/arch-legacy-noodle-white.png
index a12ee21c..a12ee21c 100644
--- a/media/logos/legacy/arch-legacy-noodle-white.png
+++ b/public/static/logos/legacy/arch-legacy-noodle-white.png
diff --git a/media/logos/legacy/arch-legacy-noodle-white.svg b/public/static/logos/legacy/arch-legacy-noodle-white.svg
index 03e1b15a..03e1b15a 100644
--- a/media/logos/legacy/arch-legacy-noodle-white.svg
+++ b/public/static/logos/legacy/arch-legacy-noodle-white.svg
diff --git a/media/logos/legacy/arch-legacy-ribbon1.png b/public/static/logos/legacy/arch-legacy-ribbon1.png
index fb8e7720..fb8e7720 100644
--- a/media/logos/legacy/arch-legacy-ribbon1.png
+++ b/public/static/logos/legacy/arch-legacy-ribbon1.png
diff --git a/media/logos/legacy/arch-legacy-ribbon2.png b/public/static/logos/legacy/arch-legacy-ribbon2.png
index 66635999..66635999 100644
--- a/media/logos/legacy/arch-legacy-ribbon2.png
+++ b/public/static/logos/legacy/arch-legacy-ribbon2.png
diff --git a/media/logos/legacy/arch-legacy-ribbon3.png b/public/static/logos/legacy/arch-legacy-ribbon3.png
index c3c00b85..c3c00b85 100644
--- a/media/logos/legacy/arch-legacy-ribbon3.png
+++ b/public/static/logos/legacy/arch-legacy-ribbon3.png
diff --git a/media/logos/legacy/arch-legacy-ribbon4.png b/public/static/logos/legacy/arch-legacy-ribbon4.png
index 33a78edf..33a78edf 100644
--- a/media/logos/legacy/arch-legacy-ribbon4.png
+++ b/public/static/logos/legacy/arch-legacy-ribbon4.png
diff --git a/media/logos/legacy/arch-legacy-ribbon5.png b/public/static/logos/legacy/arch-legacy-ribbon5.png
index abf7cce4..abf7cce4 100644
--- a/media/logos/legacy/arch-legacy-ribbon5.png
+++ b/public/static/logos/legacy/arch-legacy-ribbon5.png
diff --git a/media/logos/legacy/arch-legacy-ribbon6.png b/public/static/logos/legacy/arch-legacy-ribbon6.png
index 9f275f22..9f275f22 100644
--- a/media/logos/legacy/arch-legacy-ribbon6.png
+++ b/public/static/logos/legacy/arch-legacy-ribbon6.png
diff --git a/media/logos/legacy/arch-legacy-wombat-lg.png b/public/static/logos/legacy/arch-legacy-wombat-lg.png
index 0661b6f5..0661b6f5 100644
--- a/media/logos/legacy/arch-legacy-wombat-lg.png
+++ b/public/static/logos/legacy/arch-legacy-wombat-lg.png
diff --git a/media/logos/legacy/arch-legacy-wombat.png b/public/static/logos/legacy/arch-legacy-wombat.png
index 67e1afac..67e1afac 100644
--- a/media/logos/legacy/arch-legacy-wombat.png
+++ b/public/static/logos/legacy/arch-legacy-wombat.png
diff --git a/settings.py b/settings.py
index b22b4293..a898381a 100644
--- a/settings.py
+++ b/settings.py
@@ -34,11 +34,6 @@ SITE_ID = 1
 DATE_FORMAT = 'Y-m-d'
 DATETIME_FORMAT = 'Y-m-d H:i'
 
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/admin_media/'
-
 # Login URL configuration
 LOGIN_URL = '/login/'
 LOGIN_REDIRECT_URL = '/'
@@ -52,6 +47,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.debug',
     'django.core.context_processors.i18n',
     'django.core.context_processors.media',
+    'django.core.context_processors.static',
     'django.contrib.messages.context_processors.messages',
     'main.context_processors.secure',
 )
@@ -84,6 +80,17 @@ MIDDLEWARE_CLASSES = (
 
 ROOT_URLCONF = 'urls'
 
+# URL to serve static files
+STATIC_URL = '/static/'
+
+# Location to collect static files
+STATIC_ROOT = os.path.join(DEPLOY_PATH, 'collected_static')
+
+# Look for more static files in these locations
+STATICFILES_DIRS = (
+    os.path.join(DEPLOY_PATH, 'sitestatic'),
+)
+
 # Configure where messages should reside
 MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'
 
@@ -100,14 +107,16 @@ INSTALLED_APPS = (
     'django.contrib.sitemaps',
     'django.contrib.admin',
     'django.contrib.markup',
-    'main', # contains shared models and libs
+    'django.contrib.staticfiles',
+    'south',
+
+    'main',
     'mirrors',
     'news',
     'packages',
     'todolists',
     'devel',
     'public',
-    'south', # database migration support
     'releng',
     'visualize',
 )
diff --git a/media/CP_EN_BK_S_001.gif b/sitestatic/CP_EN_BK_S_001.gif
index 41cf0885..41cf0885 100644
--- a/media/CP_EN_BK_S_001.gif
+++ b/sitestatic/CP_EN_BK_S_001.gif
diff --git a/media/airvm_button.png b/sitestatic/airvm_button.png
index 0acadc9c..0acadc9c 100644
--- a/media/airvm_button.png
+++ b/sitestatic/airvm_button.png
diff --git a/media/archnavbar/archlogo.gif b/sitestatic/archnavbar/archlogo.gif
index e1852a06..e1852a06 100644
--- a/media/archnavbar/archlogo.gif
+++ b/sitestatic/archnavbar/archlogo.gif
diff --git a/media/archnavbar/archlogo.png b/sitestatic/archnavbar/archlogo.png
index e873e94b..e873e94b 100644
--- a/media/archnavbar/archlogo.png
+++ b/sitestatic/archnavbar/archlogo.png
diff --git a/media/archnavbar/archnavbar.css b/sitestatic/archnavbar/archnavbar.css
index d95832bc..d95832bc 100644
--- a/media/archnavbar/archnavbar.css
+++ b/sitestatic/archnavbar/archnavbar.css
diff --git a/media/archweb-print.css b/sitestatic/archweb-print.css
index 2946de54..2946de54 100644
--- a/media/archweb-print.css
+++ b/sitestatic/archweb-print.css
diff --git a/media/archweb.css b/sitestatic/archweb.css
index a354cb96..a354cb96 100644
--- a/media/archweb.css
+++ b/sitestatic/archweb.css
diff --git a/media/archweb.js b/sitestatic/archweb.js
index 151d0f81..151d0f81 100644
--- a/media/archweb.js
+++ b/sitestatic/archweb.js
diff --git a/media/asc.gif b/sitestatic/asc.gif
index 74157867..74157867 100644
--- a/media/asc.gif
+++ b/sitestatic/asc.gif
diff --git a/media/desc.gif b/sitestatic/desc.gif
index 3b30b3c5..3b30b3c5 100644
--- a/media/desc.gif
+++ b/sitestatic/desc.gif
diff --git a/media/favicon.ico b/sitestatic/favicon.ico
index 55497b85..55497b85 100644
--- a/media/favicon.ico
+++ b/sitestatic/favicon.ico
diff --git a/media/jquery-1.4.4.min.js b/sitestatic/jquery-1.4.4.min.js
index 8f3ca2e2..8f3ca2e2 100644
--- a/media/jquery-1.4.4.min.js
+++ b/sitestatic/jquery-1.4.4.min.js
diff --git a/media/jquery.tablesorter.js b/sitestatic/jquery.tablesorter.js
index 331b7617..331b7617 100644
--- a/media/jquery.tablesorter.js
+++ b/sitestatic/jquery.tablesorter.js
diff --git a/media/jquery.tablesorter.min.js b/sitestatic/jquery.tablesorter.min.js
index ffe991f7..ffe991f7 100644
--- a/media/jquery.tablesorter.min.js
+++ b/sitestatic/jquery.tablesorter.min.js
diff --git a/media/logos/apple-touch-icon-114x114.png b/sitestatic/logos/apple-touch-icon-114x114.png
index e6365ee2..e6365ee2 100644
--- a/media/logos/apple-touch-icon-114x114.png
+++ b/sitestatic/logos/apple-touch-icon-114x114.png
diff --git a/media/logos/apple-touch-icon-57x57.png b/sitestatic/logos/apple-touch-icon-57x57.png
index d2d78262..d2d78262 100644
--- a/media/logos/apple-touch-icon-57x57.png
+++ b/sitestatic/logos/apple-touch-icon-57x57.png
diff --git a/media/logos/apple-touch-icon-72x72.png b/sitestatic/logos/apple-touch-icon-72x72.png
index 170656e0..170656e0 100644
--- a/media/logos/apple-touch-icon-72x72.png
+++ b/sitestatic/logos/apple-touch-icon-72x72.png
diff --git a/media/new.png b/sitestatic/new.png
index 6a9bf037..6a9bf037 100644
--- a/media/new.png
+++ b/sitestatic/new.png
diff --git a/media/nosort.gif b/sitestatic/nosort.gif
index fac668fc..fac668fc 100644
--- a/media/nosort.gif
+++ b/sitestatic/nosort.gif
diff --git a/media/rss.png b/sitestatic/rss.png
index c9164592..c9164592 100644
--- a/media/rss.png
+++ b/sitestatic/rss.png
diff --git a/media/sevenl_button.png b/sitestatic/sevenl_button.png
index 93adcdf0..93adcdf0 100644
--- a/media/sevenl_button.png
+++ b/sitestatic/sevenl_button.png
diff --git a/media/silhouette.png b/sitestatic/silhouette.png
index afa87cd1..afa87cd1 100644
--- a/media/silhouette.png
+++ b/sitestatic/silhouette.png
diff --git a/media/vnet_button.png b/sitestatic/vnet_button.png
index 22cfa9e4..22cfa9e4 100644
--- a/media/vnet_button.png
+++ b/sitestatic/vnet_button.png
diff --git a/templates/base.html b/templates/base.html
index a120c537..0da77cf3 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -3,13 +3,13 @@
 <head>
     <title>{% block title %}Arch Linux{% endblock %}</title>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <link rel="stylesheet" type="text/css" href="/media/archweb.css" media="screen, projection" />
-    <link rel="stylesheet" type="text/css" href="/media/archweb-print.css" media="print" />
-    <link rel="icon" type="image/x-icon" href="/media/favicon.ico" />
-    <link rel="shortcut icon" type="image/x-icon" href="/media/favicon.ico" />
-    <link rel="apple-touch-icon" href="/media/logos/apple-touch-icon-57x57.png" />
-    <link rel="apple-touch-icon" sizes="72x72" href="/media/logos/apple-touch-icon-72x72.png" />
-    <link rel="apple-touch-icon" sizes="114x114" href="/media/logos/apple-touch-icon-114x114.png" />
+    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}archweb.css" media="screen, projection" />
+    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}archweb-print.css" media="print" />
+    <link rel="icon" type="image/x-icon" href="{{ STATIC_URL }}favicon.ico" />
+    <link rel="shortcut icon" type="image/x-icon" href="{{ STATIC_URL }}favicon.ico" />
+    <link rel="apple-touch-icon" href="{{ STATIC_URL }}logos/apple-touch-icon-57x57.png" />
+    <link rel="apple-touch-icon" sizes="72x72" href="{{ STATIC_URL }}logos/apple-touch-icon-72x72.png" />
+    <link rel="apple-touch-icon" sizes="114x114" href="{{ STATIC_URL }}logos/apple-touch-icon-114x114.png" />
     <link rel="search" type="application/opensearchdescription+xml" href="{% url opensearch-packages as osp %}{{ osp }}" title="Arch Linux Packages" />
     {% block head %}{% endblock %}
 </head>
diff --git a/templates/devel/clock.html b/templates/devel/clock.html
index d2eb0a8d..72a57d0f 100644
--- a/templates/devel/clock.html
+++ b/templates/devel/clock.html
@@ -40,8 +40,8 @@
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="/media/archweb.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $("#clocks-table:has(tbody tr)").tablesorter(
diff --git a/templates/devel/index.html b/templates/devel/index.html
index 0f0ded38..530986ae 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -288,8 +288,8 @@
 {% endcache %}
 
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="/media/archweb.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $("#dash-myflagged:not(:has(tbody tr.empty))").tablesorter(
diff --git a/templates/devel/packages.html b/templates/devel/packages.html
index 9f01167c..ed4123b6 100644
--- a/templates/devel/packages.html
+++ b/templates/devel/packages.html
@@ -52,8 +52,8 @@
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="/media/archweb.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $(".results").tablesorter({widgets: ['zebra']});
diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 3daf1a2d..02aa5aeb 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -105,8 +105,8 @@
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="/media/archweb.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $("#available_urls:has(tbody tr)").tablesorter(
diff --git a/templates/mirrors/mirrors.html b/templates/mirrors/mirrors.html
index bf356080..1207e811 100644
--- a/templates/mirrors/mirrors.html
+++ b/templates/mirrors/mirrors.html
@@ -41,7 +41,8 @@
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0], [2,0]]});
diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html
index 046c4196..54c59413 100644
--- a/templates/mirrors/status.html
+++ b/templates/mirrors/status.html
@@ -102,8 +102,8 @@
 
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="/media/archweb.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     var headers = { 5: { sorter: 'duration' }, 6: { sorter: 'mostlydigit' }, 7: { sorter: 'mostlydigit' }, 8: { sorter: 'mostlydigit' } };
diff --git a/templates/news/add.html b/templates/news/add.html
index bb866dc4..dca8fe85 100644
--- a/templates/news/add.html
+++ b/templates/news/add.html
@@ -33,7 +33,7 @@
     <div id="news-preview-data" class="article-content"></div>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/archweb.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(enablePreview);
 </script>
diff --git a/templates/packages/details.html b/templates/packages/details.html
index ef6ee982..1e3a2944 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -233,7 +233,7 @@
 </div><!-- #pkgdetails -->
 
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/archweb.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(ajaxifyFiles);
 </script>
diff --git a/templates/packages/differences.html b/templates/packages/differences.html
index 6c06ae25..33455d26 100644
--- a/templates/packages/differences.html
+++ b/templates/packages/differences.html
@@ -58,8 +58,8 @@
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="/media/archweb.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $('.results').tablesorter({widgets: ['zebra'], sortList: [[1,0], [0,0]]});
diff --git a/templates/packages/groups.html b/templates/packages/groups.html
index 87316a34..dad8665d 100644
--- a/templates/packages/groups.html
+++ b/templates/packages/groups.html
@@ -28,7 +28,8 @@
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0], [0,0]]});
diff --git a/templates/packages/opensearch.xml b/templates/packages/opensearch.xml
index 711b36a2..216be3e9 100644
--- a/templates/packages/opensearch.xml
+++ b/templates/packages/opensearch.xml
@@ -3,7 +3,7 @@
 	<ShortName>Arch Linux Packages</ShortName>
 	<Description>Search the Arch Linux package repositories.</Description>
 	<Tags>linux archlinux package software</Tags>
-	<Image height="16" width="16" type="image/x-icon">{{domain}}/media/favicon.ico</Image>
+	<Image height="16" width="16" type="image/x-icon">{{domain}}/static/favicon.ico</Image>
 	<Language>en-us</Language>
 	<InputEncoding>UTF-8</InputEncoding>
 	<OutputEncoding>UTF-8</OutputEncoding>
diff --git a/templates/packages/packages_list.html b/templates/packages/packages_list.html
index 942e1073..599ddcb9 100644
--- a/templates/packages/packages_list.html
+++ b/templates/packages/packages_list.html
@@ -40,7 +40,8 @@
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $(".results").tablesorter({widgets: ['zebra'], sortList: [[2,0]]});
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index b032e656..26fd88dd 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -79,8 +79,8 @@
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="/media/archweb.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $('a.signoff-link').click(signoff_package);
diff --git a/templates/packages/stale_relations.html b/templates/packages/stale_relations.html
index d51f7e44..0186d08e 100644
--- a/templates/packages/stale_relations.html
+++ b/templates/packages/stale_relations.html
@@ -106,8 +106,8 @@
 
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="/media/archweb.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $('#inactive-user:not(:has(tbody tr.empty))').tablesorter({widgets: ['zebra'], headers: { 0: { sorter: false } }, sortList: [[3,0]]});
diff --git a/templates/releng/iso_overview.html b/templates/releng/iso_overview.html
index 8280f100..5a4445b7 100644
--- a/templates/releng/iso_overview.html
+++ b/templates/releng/iso_overview.html
@@ -30,8 +30,8 @@
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="/media/archweb.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $(".results:not(:has(tbody tr.empty))").tablesorter({widgets: ['zebra']});
diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html
index 845d330d..512e1bf3 100644
--- a/templates/releng/result_list.html
+++ b/templates/releng/result_list.html
@@ -33,8 +33,8 @@
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="/media/archweb.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $(".results:not(:has(tbody tr.empty))").tablesorter({widgets: ['zebra']});
diff --git a/templates/todolists/list.html b/templates/todolists/list.html
index 7d229271..b829a12b 100644
--- a/templates/todolists/list.html
+++ b/templates/todolists/list.html
@@ -43,7 +43,8 @@
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     // I'm not sure why it didn't autodetect digit, but it has to be explicit
diff --git a/templates/todolists/public_list.html b/templates/todolists/public_list.html
index c3054863..b1d0453b 100644
--- a/templates/todolists/public_list.html
+++ b/templates/todolists/public_list.html
@@ -65,11 +65,11 @@
 </div>
 {% endif %}
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $(".results").tablesorter({widgets: ['zebra'], sortList: [[0,0], [1,0]]});
 });
-
 </script>
 {% endblock %}
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index c9ea919a..6516f73e 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -59,8 +59,8 @@
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="/media/archweb.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $('a.status-link').click(todolist_flag);
diff --git a/templates/visualize/index.html b/templates/visualize/index.html
index b9459318..160ff92e 100644
--- a/templates/visualize/index.html
+++ b/templates/visualize/index.html
@@ -30,11 +30,11 @@
 </div>
 {% endcomment %}
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/d3.min.js"></script>
-<script type="text/javascript" src="/media/d3.geom.min.js"></script>
-<script type="text/javascript" src="/media/d3.layout.min.js"></script>
-<script type="text/javascript" src="/media/archweb.js"></script>
-<script type="text/javascript" src="/media/visualize.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}d3.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}d3.geom.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}d3.layout.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}visualize.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     var orderings = {
diff --git a/media/d3.geom.js b/visualize/static/d3.geom.js
index d860c2bf..d860c2bf 100644
--- a/media/d3.geom.js
+++ b/visualize/static/d3.geom.js
diff --git a/media/d3.geom.min.js b/visualize/static/d3.geom.min.js
index 2dc6395d..2dc6395d 100644
--- a/media/d3.geom.min.js
+++ b/visualize/static/d3.geom.min.js
diff --git a/media/d3.js b/visualize/static/d3.js
index d71f57d5..d71f57d5 100644
--- a/media/d3.js
+++ b/visualize/static/d3.js
diff --git a/media/d3.layout.js b/visualize/static/d3.layout.js
index 30ba7918..30ba7918 100644
--- a/media/d3.layout.js
+++ b/visualize/static/d3.layout.js
diff --git a/media/d3.layout.min.js b/visualize/static/d3.layout.min.js
index a6a893e7..a6a893e7 100644
--- a/media/d3.layout.min.js
+++ b/visualize/static/d3.layout.min.js
diff --git a/media/d3.min.js b/visualize/static/d3.min.js
index b37f5c9c..b37f5c9c 100644
--- a/media/d3.min.js
+++ b/visualize/static/d3.min.js
diff --git a/media/visualize.js b/visualize/static/visualize.js
index e73171ea..e73171ea 100644
--- a/media/visualize.js
+++ b/visualize/static/visualize.js