diff options
author | Magnus Hagander | 2023-04-12 11:42:58 +0000 |
---|---|---|
committer | Magnus Hagander | 2023-04-12 11:44:51 +0000 |
commit | b1b4f2af8d1b28ef8b808c85e75a7c0b5794be3c (patch) | |
tree | 5eea56e40751f21aae4532067df155a8dcc5c64a | |
parent | 1bea866b082c10de74373803f0cdf7236a0dc846 (diff) |
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.
-rw-r--r-- | media/commitfest/css/bootstrap-theme.min.css (renamed from pgcommitfest/commitfest/static/commitfest/css/bootstrap-theme.min.css) | 0 | ||||
-rw-r--r-- | media/commitfest/css/bootstrap.css (renamed from pgcommitfest/commitfest/static/commitfest/css/bootstrap.css) | 0 | ||||
-rw-r--r-- | media/commitfest/css/commitfest.css (renamed from pgcommitfest/commitfest/static/commitfest/css/commitfest.css) | 4 | ||||
-rw-r--r-- | media/commitfest/css/images/animated-overlay.gif (renamed from pgcommitfest/commitfest/static/commitfest/css/images/animated-overlay.gif) | bin | 1738 -> 1738 bytes | |||
-rw-r--r-- | media/commitfest/css/images/ui-bg_flat_0_aaaaaa_40x100.png (renamed from pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_flat_0_aaaaaa_40x100.png) | bin | 180 -> 180 bytes | |||
-rw-r--r-- | media/commitfest/css/images/ui-bg_flat_75_ffffff_40x100.png (renamed from pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_flat_75_ffffff_40x100.png) | bin | 178 -> 178 bytes | |||
-rw-r--r-- | media/commitfest/css/images/ui-bg_glass_55_fbf9ee_1x400.png (renamed from pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_55_fbf9ee_1x400.png) | bin | 120 -> 120 bytes | |||
-rw-r--r-- | media/commitfest/css/images/ui-bg_glass_65_ffffff_1x400.png (renamed from pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_65_ffffff_1x400.png) | bin | 105 -> 105 bytes | |||
-rw-r--r-- | media/commitfest/css/images/ui-bg_glass_75_dadada_1x400.png (renamed from pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_75_dadada_1x400.png) | bin | 111 -> 111 bytes | |||
-rw-r--r-- | media/commitfest/css/images/ui-bg_glass_75_e6e6e6_1x400.png (renamed from pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_75_e6e6e6_1x400.png) | bin | 110 -> 110 bytes | |||
-rw-r--r-- | media/commitfest/css/images/ui-bg_glass_95_fef1ec_1x400.png (renamed from pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_95_fef1ec_1x400.png) | bin | 119 -> 119 bytes | |||
-rw-r--r-- | media/commitfest/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png (renamed from pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png) | bin | 101 -> 101 bytes | |||
-rw-r--r-- | media/commitfest/css/images/ui-icons_222222_256x240.png (renamed from pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_222222_256x240.png) | bin | 4369 -> 4369 bytes | |||
-rw-r--r-- | media/commitfest/css/images/ui-icons_2e83ff_256x240.png (renamed from pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_2e83ff_256x240.png) | bin | 4369 -> 4369 bytes | |||
-rw-r--r-- | media/commitfest/css/images/ui-icons_454545_256x240.png (renamed from pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_454545_256x240.png) | bin | 4369 -> 4369 bytes | |||
-rw-r--r-- | media/commitfest/css/images/ui-icons_888888_256x240.png (renamed from pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_888888_256x240.png) | bin | 4369 -> 4369 bytes | |||
-rw-r--r-- | media/commitfest/css/images/ui-icons_cd0a0a_256x240.png (renamed from pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_cd0a0a_256x240.png) | bin | 4369 -> 4369 bytes | |||
-rw-r--r-- | media/commitfest/css/jquery-ui.css (renamed from pgcommitfest/commitfest/static/commitfest/css/jquery-ui.css) | 0 | ||||
-rw-r--r-- | media/commitfest/css/selectize.css (renamed from pgcommitfest/commitfest/static/commitfest/css/selectize.css) | 0 | ||||
-rw-r--r-- | media/commitfest/css/selectize.default.css (renamed from pgcommitfest/commitfest/static/commitfest/css/selectize.default.css) | 0 | ||||
-rw-r--r-- | media/commitfest/favicon.ico (renamed from pgcommitfest/commitfest/static/commitfest/favicon.ico) | bin | 4846 -> 4846 bytes | |||
-rw-r--r-- | media/commitfest/fonts/glyphicons-halflings-regular.eot (renamed from pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.eot) | bin | 20335 -> 20335 bytes | |||
-rw-r--r-- | media/commitfest/fonts/glyphicons-halflings-regular.svg (renamed from pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.svg) | 0 | ||||
-rw-r--r-- | media/commitfest/fonts/glyphicons-halflings-regular.ttf (renamed from pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.ttf) | bin | 41280 -> 41280 bytes | |||
-rw-r--r-- | media/commitfest/fonts/glyphicons-halflings-regular.woff (renamed from pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.woff) | bin | 23320 -> 23320 bytes | |||
-rw-r--r-- | media/commitfest/js/bootstrap.js (renamed from pgcommitfest/commitfest/static/commitfest/js/bootstrap.js) | 0 | ||||
-rw-r--r-- | media/commitfest/js/commitfest.js (renamed from pgcommitfest/commitfest/static/commitfest/js/commitfest.js) | 0 | ||||
-rw-r--r-- | media/commitfest/js/jquery-ui.js (renamed from pgcommitfest/commitfest/static/commitfest/js/jquery-ui.js) | 0 | ||||
-rw-r--r-- | media/commitfest/js/jquery.js (renamed from pgcommitfest/commitfest/static/commitfest/js/jquery.js) | 0 | ||||
-rw-r--r-- | media/commitfest/js/selectize.min.js (renamed from pgcommitfest/commitfest/static/commitfest/js/selectize.min.js) | 0 | ||||
-rw-r--r-- | media/commitfest/spinner.gif (renamed from pgcommitfest/commitfest/static/commitfest/spinner.gif) | bin | 6820 -> 6820 bytes | |||
-rw-r--r-- | pgcommitfest/commitfest/templates/base.html | 18 | ||||
-rw-r--r-- | pgcommitfest/commitfest/templates/base_form.html | 6 | ||||
-rw-r--r-- | pgcommitfest/settings.py | 7 | ||||
-rwxr-xr-x | update.sh | 18 |
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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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! |