Change static->media and stop using collectstatic

This changes both the storage location of the files and the URL. This
aligns it up with how (almost) all our other django apps work, so good
for consistency.

35 files changed, 16 insertions, 37 deletions

diff --git a/pgcommitfest/commitfest/static/commitfest/css/bootstrap-theme.min.css b/media/commitfest/css/bootstrap-theme.min.css
index ba4bd28..ba4bd28 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/bootstrap-theme.min.css
+++ b/media/commitfest/css/bootstrap-theme.min.css
diff --git a/pgcommitfest/commitfest/static/commitfest/css/bootstrap.css b/media/commitfest/css/bootstrap.css
index 7f36651..7f36651 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/bootstrap.css
+++ b/media/commitfest/css/bootstrap.css
diff --git a/pgcommitfest/commitfest/static/commitfest/css/commitfest.css b/media/commitfest/css/commitfest.css
index 0ed8355..07bfa10 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/commitfest.css
+++ b/media/commitfest/css/commitfest.css
@@ -44,7 +44,7 @@ div.form-group div.controls input.threadpick-input {
  */
 #attachThreadListWrap.loading {
     display: block;
-    background: url('/https/git.postgresql.org/static/commitfest/spinner.gif') no-repeat center;
+    background: url('/https/git.postgresql.org/media/commitfest/spinner.gif') no-repeat center;
     width: 124px;
     height: 124px;
     margin: 0 auto;
@@ -57,7 +57,7 @@ div.form-group div.controls input.threadpick-input {
  * Annotate message dialog */
 #annotateMessageBody.loading {
     display: block;
-    background: url('/https/git.postgresql.org/static/commitfest/spinner.gif') no-repeat center;
+    background: url('/https/git.postgresql.org/media/commitfest/spinner.gif') no-repeat center;
     width: 124px;
     height: 124px;
     margin: 0 auto;
diff --git a/pgcommitfest/commitfest/static/commitfest/css/images/animated-overlay.gif b/media/commitfest/css/images/animated-overlay.gif
index d441f75..d441f75 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/images/animated-overlay.gif
+++ b/media/commitfest/css/images/animated-overlay.gif
diff --git a/pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/media/commitfest/css/images/ui-bg_flat_0_aaaaaa_40x100.png
index 5b5dab2..5b5dab2 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/media/commitfest/css/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_flat_75_ffffff_40x100.png b/media/commitfest/css/images/ui-bg_flat_75_ffffff_40x100.png
index ac8b229..ac8b229 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/media/commitfest/css/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/media/commitfest/css/images/ui-bg_glass_55_fbf9ee_1x400.png
index ad3d634..ad3d634 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_55_fbf9ee_1x400.png
+++ b/media/commitfest/css/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_65_ffffff_1x400.png b/media/commitfest/css/images/ui-bg_glass_65_ffffff_1x400.png
index 42ccba2..42ccba2 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/media/commitfest/css/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_75_dadada_1x400.png b/media/commitfest/css/images/ui-bg_glass_75_dadada_1x400.png
index 5a46b47..5a46b47 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_75_dadada_1x400.png
+++ b/media/commitfest/css/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/media/commitfest/css/images/ui-bg_glass_75_e6e6e6_1x400.png
index 86c2baa..86c2baa 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_75_e6e6e6_1x400.png
+++ b/media/commitfest/css/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_95_fef1ec_1x400.png b/media/commitfest/css/images/ui-bg_glass_95_fef1ec_1x400.png
index 4443fdc..4443fdc 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/media/commitfest/css/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/media/commitfest/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
index 7c9fa6c..7c9fa6c 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+++ b/media/commitfest/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_222222_256x240.png b/media/commitfest/css/images/ui-icons_222222_256x240.png
index ee039dc..ee039dc 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_222222_256x240.png
+++ b/media/commitfest/css/images/ui-icons_222222_256x240.png
diff --git a/pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_2e83ff_256x240.png b/media/commitfest/css/images/ui-icons_2e83ff_256x240.png
index 45e8928..45e8928 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_2e83ff_256x240.png
+++ b/media/commitfest/css/images/ui-icons_2e83ff_256x240.png
diff --git a/pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_454545_256x240.png b/media/commitfest/css/images/ui-icons_454545_256x240.png
index 7ec70d1..7ec70d1 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_454545_256x240.png
+++ b/media/commitfest/css/images/ui-icons_454545_256x240.png
diff --git a/pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_888888_256x240.png b/media/commitfest/css/images/ui-icons_888888_256x240.png
index 5ba708c..5ba708c 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_888888_256x240.png
+++ b/media/commitfest/css/images/ui-icons_888888_256x240.png
diff --git a/pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_cd0a0a_256x240.png b/media/commitfest/css/images/ui-icons_cd0a0a_256x240.png
index 7930a55..7930a55 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_cd0a0a_256x240.png
+++ b/media/commitfest/css/images/ui-icons_cd0a0a_256x240.png
diff --git a/pgcommitfest/commitfest/static/commitfest/css/jquery-ui.css b/media/commitfest/css/jquery-ui.css
index 55f91f4..55f91f4 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/jquery-ui.css
+++ b/media/commitfest/css/jquery-ui.css
diff --git a/pgcommitfest/commitfest/static/commitfest/css/selectize.css b/media/commitfest/css/selectize.css
index a763839..a763839 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/selectize.css
+++ b/media/commitfest/css/selectize.css
diff --git a/pgcommitfest/commitfest/static/commitfest/css/selectize.default.css b/media/commitfest/css/selectize.default.css
index 4e4a7a1..4e4a7a1 100644
--- a/pgcommitfest/commitfest/static/commitfest/css/selectize.default.css
+++ b/media/commitfest/css/selectize.default.css
diff --git a/pgcommitfest/commitfest/static/commitfest/favicon.ico b/media/commitfest/favicon.ico
index cc03766..cc03766 100644
--- a/pgcommitfest/commitfest/static/commitfest/favicon.ico
+++ b/media/commitfest/favicon.ico
diff --git a/pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.eot b/media/commitfest/fonts/glyphicons-halflings-regular.eot
index 4a4ca86..4a4ca86 100644
--- a/pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.eot
+++ b/media/commitfest/fonts/glyphicons-halflings-regular.eot
diff --git a/pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.svg b/media/commitfest/fonts/glyphicons-halflings-regular.svg
index e3e2dc7..e3e2dc7 100644
--- a/pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.svg
+++ b/media/commitfest/fonts/glyphicons-halflings-regular.svg
diff --git a/pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.ttf b/media/commitfest/fonts/glyphicons-halflings-regular.ttf
index 67fa00b..67fa00b 100644
--- a/pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.ttf
+++ b/media/commitfest/fonts/glyphicons-halflings-regular.ttf
diff --git a/pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.woff b/media/commitfest/fonts/glyphicons-halflings-regular.woff
index 8c54182..8c54182 100644
--- a/pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.woff
+++ b/media/commitfest/fonts/glyphicons-halflings-regular.woff
diff --git a/pgcommitfest/commitfest/static/commitfest/js/bootstrap.js b/media/commitfest/js/bootstrap.js
index 8ae571b..8ae571b 100644
--- a/pgcommitfest/commitfest/static/commitfest/js/bootstrap.js
+++ b/media/commitfest/js/bootstrap.js
diff --git a/pgcommitfest/commitfest/static/commitfest/js/commitfest.js b/media/commitfest/js/commitfest.js
index 2f1edda..2f1edda 100644
--- a/pgcommitfest/commitfest/static/commitfest/js/commitfest.js
+++ b/media/commitfest/js/commitfest.js
diff --git a/pgcommitfest/commitfest/static/commitfest/js/jquery-ui.js b/media/commitfest/js/jquery-ui.js
index 4610d2d..4610d2d 100644
--- a/pgcommitfest/commitfest/static/commitfest/js/jquery-ui.js
+++ b/media/commitfest/js/jquery-ui.js
diff --git a/pgcommitfest/commitfest/static/commitfest/js/jquery.js b/media/commitfest/js/jquery.js
index 006e953..006e953 100644
--- a/pgcommitfest/commitfest/static/commitfest/js/jquery.js
+++ b/media/commitfest/js/jquery.js
diff --git a/pgcommitfest/commitfest/static/commitfest/js/selectize.min.js b/media/commitfest/js/selectize.min.js
index 305d531..305d531 100644
--- a/pgcommitfest/commitfest/static/commitfest/js/selectize.min.js
+++ b/media/commitfest/js/selectize.min.js
diff --git a/pgcommitfest/commitfest/static/commitfest/spinner.gif b/media/commitfest/spinner.gif
index 0ca7ada..0ca7ada 100644
--- a/pgcommitfest/commitfest/static/commitfest/spinner.gif
+++ b/media/commitfest/spinner.gif
diff --git a/pgcommitfest/commitfest/templates/base.html b/pgcommitfest/commitfest/templates/base.html
index dc2f643..4a6ba99 100644
--- a/pgcommitfest/commitfest/templates/base.html
+++ b/pgcommitfest/commitfest/templates/base.html
@@ -3,11 +3,11 @@
 <html>
 <head>
   <title>{{title}}</title>
-  <link rel="stylesheet" href="/https/git.postgresql.org/static/commitfest/css/jquery-ui.css" type="text/css">
-  <link rel="stylesheet" href="/https/git.postgresql.org/static/commitfest/css/bootstrap.css" />
-  <link rel="stylesheet" href="/https/git.postgresql.org/static/commitfest/css/bootstrap-theme.min.css" />
-  <link rel="stylesheet" href="/https/git.postgresql.org/static/commitfest/css/commitfest.css" />
-  <link rel="shortcut icon" href="/https/git.postgresql.org/static/commitfest/favicon.ico" />
+  <link rel="stylesheet" href="/https/git.postgresql.org/media/commitfest/css/jquery-ui.css" type="text/css">
+  <link rel="stylesheet" href="/https/git.postgresql.org/media/commitfest/css/bootstrap.css" />
+  <link rel="stylesheet" href="/https/git.postgresql.org/media/commitfest/css/bootstrap-theme.min.css" />
+  <link rel="stylesheet" href="/https/git.postgresql.org/media/commitfest/css/commitfest.css" />
+  <link rel="shortcut icon" href="/https/git.postgresql.org/media/commitfest/favicon.ico" />
 {%block extrahead%}{%endblock%}
 {%if rss_alternate%}  <link rel="alternate" type="application/rss+xml" title="{{rss_alternate_title}}" href="{{rss_alternate}}" />{%endif%}
 </head>
@@ -40,9 +40,9 @@
 {%block contents%}
 {%endblock%}
 </div>
-<script src="/https/git.postgresql.org/static/commitfest/js/jquery.js"></script>
-<script src="/https/git.postgresql.org/static/commitfest/js/jquery-ui.js"></script>
-<script src="/https/git.postgresql.org/static/commitfest/js/bootstrap.js"></script>
-<script src="/https/git.postgresql.org/static/commitfest/js/commitfest.js"></script>
+<script src="/https/git.postgresql.org/media/commitfest/js/jquery.js"></script>
+<script src="/https/git.postgresql.org/media/commitfest/js/jquery-ui.js"></script>
+<script src="/https/git.postgresql.org/media/commitfest/js/bootstrap.js"></script>
+<script src="/https/git.postgresql.org/media/commitfest/js/commitfest.js"></script>
 {%block morescript%}{%endblock%}
 </html>
diff --git a/pgcommitfest/commitfest/templates/base_form.html b/pgcommitfest/commitfest/templates/base_form.html
index 7f2b2ad..91f2e91 100644
--- a/pgcommitfest/commitfest/templates/base_form.html
+++ b/pgcommitfest/commitfest/templates/base_form.html
@@ -71,11 +71,11 @@
 {%endblock%}
 
 {%block extrahead%}
-<link rel="stylesheet" href="/https/git.postgresql.org/static/commitfest/css/selectize.css" />
-<link rel="stylesheet" href="/https/git.postgresql.org/static/commitfest/css/selectize.default.css" />
+<link rel="stylesheet" href="/https/git.postgresql.org/media/commitfest/css/selectize.css" />
+<link rel="stylesheet" href="/https/git.postgresql.org/media/commitfest/css/selectize.default.css" />
 {%endblock%}
 {%block morescript%}
-<script src="/https/git.postgresql.org/static/commitfest/js/selectize.min.js"></script>
+<script src="/https/git.postgresql.org/media/commitfest/js/selectize.min.js"></script>
 <script>
 /* Set up selectize fields */
 {% for f, url in selectize_multiple_fields %}
diff --git a/pgcommitfest/settings.py b/pgcommitfest/settings.py
index d83d994..ffac58c 100644
--- a/pgcommitfest/settings.py
+++ b/pgcommitfest/settings.py
@@ -64,12 +64,12 @@ STATIC_ROOT = ''
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
-STATIC_URL = '/static/'
+STATIC_URL = '/media/'
 
 # URL prefix for admin static files -- CSS, JavaScript and images.
 # Make sure to use a trailing slash.
 # Examples: "http://foo.com/static/admin/", "/static/admin/".
-ADMIN_MEDIA_PREFIX = '/static/admin/'
+ADMIN_MEDIA_PREFIX = '/media/admin/'
 
 # Additional locations of static files
 STATICFILES_DIRS = (
@@ -81,8 +81,6 @@ STATICFILES_DIRS = (
 # List of finder classes that know how to find static files in
 # various locations.
 STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 )
 
 # Make this unique, and don't share it with anybody.
@@ -119,7 +117,6 @@ INSTALLED_APPS = (
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
-    'django.contrib.staticfiles',
     # Uncomment the next line to enable the admin:
     'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
diff --git a/update.sh b/update.sh
deleted file mode 100755
index 0eb138a..0000000
--- a/update.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-set -e
-
-# Trivial update script for pgcf
-if [ "$(id -u)" == "0" ]; then
-    echo Do not run as root!
-    exit 1
-fi
-
-cd $(dirname $0)
-
-git pull --rebase
-
-./python manage.py collectstatic --noinput
-
-./python manage.py migrate
-
-echo Done!