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.

diff --git a/pgcommitfest/commitfest/static/commitfest/css/bootstrap-theme.min.css b/media/commitfest/css/bootstrap-theme.min.css
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/bootstrap-theme.min.css
rename to media/commitfest/css/bootstrap-theme.min.css

diff --git a/pgcommitfest/commitfest/static/commitfest/css/bootstrap.css b/media/commitfest/css/bootstrap.css
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/bootstrap.css
rename to media/commitfest/css/bootstrap.css

diff --git a/pgcommitfest/commitfest/static/commitfest/css/commitfest.css b/media/commitfest/css/commitfest.css
similarity index 88%
rename from pgcommitfest/commitfest/static/commitfest/css/commitfest.css
rename to media/commitfest/css/commitfest.css
index 0ed83555212bc3fdd597824e93aa2bedbeede044..07bfa102c962556f864e35aba7df1b9d3cf94e97 100644 (file)
--- 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('/static/commitfest/spinner.gif') no-repeat center;
+    background: url('/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('/static/commitfest/spinner.gif') no-repeat center;
+    background: url('/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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/images/animated-overlay.gif
rename to 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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to 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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_flat_75_ffffff_40x100.png
rename to 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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_55_fbf9ee_1x400.png
rename to 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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_65_ffffff_1x400.png
rename to 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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_75_dadada_1x400.png
rename to 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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to 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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_95_fef1ec_1x400.png
rename to 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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename to 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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_222222_256x240.png
rename to 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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_2e83ff_256x240.png
rename to 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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_454545_256x240.png
rename to 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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_888888_256x240.png
rename to 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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_cd0a0a_256x240.png
rename to 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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/jquery-ui.css
rename to media/commitfest/css/jquery-ui.css

diff --git a/pgcommitfest/commitfest/static/commitfest/css/selectize.css b/media/commitfest/css/selectize.css
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/selectize.css
rename to media/commitfest/css/selectize.css

diff --git a/pgcommitfest/commitfest/static/commitfest/css/selectize.default.css b/media/commitfest/css/selectize.default.css
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/css/selectize.default.css
rename to media/commitfest/css/selectize.default.css

diff --git a/pgcommitfest/commitfest/static/commitfest/favicon.ico b/media/commitfest/favicon.ico
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/favicon.ico
rename to media/commitfest/favicon.ico

diff --git a/pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.eot b/media/commitfest/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.eot
rename to 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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.svg
rename to 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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.ttf
rename to 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
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.woff
rename to media/commitfest/fonts/glyphicons-halflings-regular.woff

diff --git a/pgcommitfest/commitfest/static/commitfest/js/bootstrap.js b/media/commitfest/js/bootstrap.js
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/js/bootstrap.js
rename to media/commitfest/js/bootstrap.js

diff --git a/pgcommitfest/commitfest/static/commitfest/js/commitfest.js b/media/commitfest/js/commitfest.js
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/js/commitfest.js
rename to media/commitfest/js/commitfest.js

diff --git a/pgcommitfest/commitfest/static/commitfest/js/jquery-ui.js b/media/commitfest/js/jquery-ui.js
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/js/jquery-ui.js
rename to media/commitfest/js/jquery-ui.js

diff --git a/pgcommitfest/commitfest/static/commitfest/js/jquery.js b/media/commitfest/js/jquery.js
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/js/jquery.js
rename to media/commitfest/js/jquery.js

diff --git a/pgcommitfest/commitfest/static/commitfest/js/selectize.min.js b/media/commitfest/js/selectize.min.js
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/js/selectize.min.js
rename to media/commitfest/js/selectize.min.js

diff --git a/pgcommitfest/commitfest/static/commitfest/spinner.gif b/media/commitfest/spinner.gif
similarity index 100%
rename from pgcommitfest/commitfest/static/commitfest/spinner.gif
rename to media/commitfest/spinner.gif

diff --git a/pgcommitfest/commitfest/templates/base.html b/pgcommitfest/commitfest/templates/base.html
index dc2f643eae986942ed40273f8516cb3e4f884597..4a6ba990e1bfa2185c0a969b35ce253144888fd1 100644 (file)
--- 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="/static/commitfest/css/jquery-ui.css" type="text/css">
-  <link rel="stylesheet" href="/static/commitfest/css/bootstrap.css" />
-  <link rel="stylesheet" href="/static/commitfest/css/bootstrap-theme.min.css" />
-  <link rel="stylesheet" href="/static/commitfest/css/commitfest.css" />
-  <link rel="shortcut icon" href="/static/commitfest/favicon.ico" />
+  <link rel="stylesheet" href="/media/commitfest/css/jquery-ui.css" type="text/css">
+  <link rel="stylesheet" href="/media/commitfest/css/bootstrap.css" />
+  <link rel="stylesheet" href="/media/commitfest/css/bootstrap-theme.min.css" />
+  <link rel="stylesheet" href="/media/commitfest/css/commitfest.css" />
+  <link rel="shortcut icon" href="/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="/static/commitfest/js/jquery.js"></script>
-<script src="/static/commitfest/js/jquery-ui.js"></script>
-<script src="/static/commitfest/js/bootstrap.js"></script>
-<script src="/static/commitfest/js/commitfest.js"></script>
+<script src="/media/commitfest/js/jquery.js"></script>
+<script src="/media/commitfest/js/jquery-ui.js"></script>
+<script src="/media/commitfest/js/bootstrap.js"></script>
+<script src="/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 7f2b2adfbfeecaaa3adfd807168abf71f598d957..91f2e91e6bb22af2359df9b143420ddf783464a5 100644 (file)
--- 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="/static/commitfest/css/selectize.css" />
-<link rel="stylesheet" href="/static/commitfest/css/selectize.default.css" />
+<link rel="stylesheet" href="/media/commitfest/css/selectize.css" />
+<link rel="stylesheet" href="/media/commitfest/css/selectize.default.css" />
 {%endblock%}
 {%block morescript%}
-<script src="/static/commitfest/js/selectize.min.js"></script>
+<script src="/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 d83d994b3271f59dc058453d8a36b7cde611021c..ffac58cce05c61c15f2a5e86de8808a5eae89b94 100644 (file)
--- 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 (executable)
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!