Skip to content

Commit b1b4f2a

Browse files
mhagandermhagander
committed
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.
1 parent 1bea866 commit b1b4f2a

35 files changed

+16
-37
lines changed

‎pgcommitfest/commitfest/static/commitfest/css/bootstrap-theme.min.css renamed to ‎media/commitfest/css/bootstrap-theme.min.css

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/bootstrap.css renamed to ‎media/commitfest/css/bootstrap.css

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/commitfest.css renamed to ‎media/commitfest/css/commitfest.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ div.form-group div.controls input.threadpick-input {
4444
*/
4545
#attachThreadListWrap.loading {
4646
display: block;
47-
background: url('/static/commitfest/spinner.gif') no-repeat center;
47+
background: url('/media/commitfest/spinner.gif') no-repeat center;
4848
width: 124px;
4949
height: 124px;
5050
margin: 0 auto;
@@ -57,7 +57,7 @@ div.form-group div.controls input.threadpick-input {
5757
* Annotate message dialog */
5858
#annotateMessageBody.loading {
5959
display: block;
60-
background: url('/static/commitfest/spinner.gif') no-repeat center;
60+
background: url('/media/commitfest/spinner.gif') no-repeat center;
6161
width: 124px;
6262
height: 124px;
6363
margin: 0 auto;

‎pgcommitfest/commitfest/static/commitfest/css/images/animated-overlay.gif renamed to ‎media/commitfest/css/images/animated-overlay.gif

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_flat_0_aaaaaa_40x100.png renamed to ‎media/commitfest/css/images/ui-bg_flat_0_aaaaaa_40x100.png

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_flat_75_ffffff_40x100.png renamed to ‎media/commitfest/css/images/ui-bg_flat_75_ffffff_40x100.png

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_55_fbf9ee_1x400.png renamed to ‎media/commitfest/css/images/ui-bg_glass_55_fbf9ee_1x400.png

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_65_ffffff_1x400.png renamed to ‎media/commitfest/css/images/ui-bg_glass_65_ffffff_1x400.png

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_75_dadada_1x400.png renamed to ‎media/commitfest/css/images/ui-bg_glass_75_dadada_1x400.png

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_75_e6e6e6_1x400.png renamed to ‎media/commitfest/css/images/ui-bg_glass_75_e6e6e6_1x400.png

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_glass_95_fef1ec_1x400.png renamed to ‎media/commitfest/css/images/ui-bg_glass_95_fef1ec_1x400.png

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png renamed to ‎media/commitfest/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_222222_256x240.png renamed to ‎media/commitfest/css/images/ui-icons_222222_256x240.png

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_2e83ff_256x240.png renamed to ‎media/commitfest/css/images/ui-icons_2e83ff_256x240.png

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_454545_256x240.png renamed to ‎media/commitfest/css/images/ui-icons_454545_256x240.png

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_888888_256x240.png renamed to ‎media/commitfest/css/images/ui-icons_888888_256x240.png

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/images/ui-icons_cd0a0a_256x240.png renamed to ‎media/commitfest/css/images/ui-icons_cd0a0a_256x240.png

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/jquery-ui.css renamed to ‎media/commitfest/css/jquery-ui.css

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/selectize.css renamed to ‎media/commitfest/css/selectize.css

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/css/selectize.default.css renamed to ‎media/commitfest/css/selectize.default.css

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/favicon.ico renamed to ‎media/commitfest/favicon.ico

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.eot renamed to ‎media/commitfest/fonts/glyphicons-halflings-regular.eot

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.svg renamed to ‎media/commitfest/fonts/glyphicons-halflings-regular.svg

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.ttf renamed to ‎media/commitfest/fonts/glyphicons-halflings-regular.ttf

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/fonts/glyphicons-halflings-regular.woff renamed to ‎media/commitfest/fonts/glyphicons-halflings-regular.woff

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/js/bootstrap.js renamed to ‎media/commitfest/js/bootstrap.js

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/js/commitfest.js renamed to ‎media/commitfest/js/commitfest.js

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/js/jquery-ui.js renamed to ‎media/commitfest/js/jquery-ui.js

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/js/jquery.js renamed to ‎media/commitfest/js/jquery.js

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/js/selectize.min.js renamed to ‎media/commitfest/js/selectize.min.js

File renamed without changes.

‎pgcommitfest/commitfest/static/commitfest/spinner.gif renamed to ‎media/commitfest/spinner.gif

File renamed without changes.

‎pgcommitfest/commitfest/templates/base.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<html>
44
<head>
55
<title>{{title}}</title>
6-
<link rel="stylesheet" href="/static/commitfest/css/jquery-ui.css" type="text/css">
7-
<link rel="stylesheet" href="/static/commitfest/css/bootstrap.css" />
8-
<link rel="stylesheet" href="/static/commitfest/css/bootstrap-theme.min.css" />
9-
<link rel="stylesheet" href="/static/commitfest/css/commitfest.css" />
10-
<link rel="shortcut icon" href="/static/commitfest/favicon.ico" />
6+
<link rel="stylesheet" href="/media/commitfest/css/jquery-ui.css" type="text/css">
7+
<link rel="stylesheet" href="/media/commitfest/css/bootstrap.css" />
8+
<link rel="stylesheet" href="/media/commitfest/css/bootstrap-theme.min.css" />
9+
<link rel="stylesheet" href="/media/commitfest/css/commitfest.css" />
10+
<link rel="shortcut icon" href="/media/commitfest/favicon.ico" />
1111
{%block extrahead%}{%endblock%}
1212
{%if rss_alternate%} <link rel="alternate" type="application/rss+xml" title="{{rss_alternate_title}}" href="{{rss_alternate}}" />{%endif%}
1313
</head>
@@ -40,9 +40,9 @@ <h1>{{title}}</h1>
4040
{%block contents%}
4141
{%endblock%}
4242
</div>
43-
<script src="/static/commitfest/js/jquery.js"></script>
44-
<script src="/static/commitfest/js/jquery-ui.js"></script>
45-
<script src="/static/commitfest/js/bootstrap.js"></script>
46-
<script src="/static/commitfest/js/commitfest.js"></script>
43+
<script src="/media/commitfest/js/jquery.js"></script>
44+
<script src="/media/commitfest/js/jquery-ui.js"></script>
45+
<script src="/media/commitfest/js/bootstrap.js"></script>
46+
<script src="/media/commitfest/js/commitfest.js"></script>
4747
{%block morescript%}{%endblock%}
4848
</html>

‎pgcommitfest/commitfest/templates/base_form.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ <h3>Search user</h3>
7171
{%endblock%}
7272

7373
{%block extrahead%}
74-
<link rel="stylesheet" href="/static/commitfest/css/selectize.css" />
75-
<link rel="stylesheet" href="/static/commitfest/css/selectize.default.css" />
74+
<link rel="stylesheet" href="/media/commitfest/css/selectize.css" />
75+
<link rel="stylesheet" href="/media/commitfest/css/selectize.default.css" />
7676
{%endblock%}
7777
{%block morescript%}
78-
<script src="/static/commitfest/js/selectize.min.js"></script>
78+
<script src="/media/commitfest/js/selectize.min.js"></script>
7979
<script>
8080
/* Set up selectize fields */
8181
{% for f, url in selectize_multiple_fields %}

‎pgcommitfest/settings.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@
6464

6565
# URL prefix for static files.
6666
# Example: "http://media.lawrence.com/static/"
67-
STATIC_URL = '/static/'
67+
STATIC_URL = '/media/'
6868

6969
# URL prefix for admin static files -- CSS, JavaScript and images.
7070
# Make sure to use a trailing slash.
7171
# Examples: "http://foo.com/static/admin/", "/static/admin/".
72-
ADMIN_MEDIA_PREFIX = '/static/admin/'
72+
ADMIN_MEDIA_PREFIX = '/media/admin/'
7373

7474
# Additional locations of static files
7575
STATICFILES_DIRS = (
@@ -81,8 +81,6 @@
8181
# List of finder classes that know how to find static files in
8282
# various locations.
8383
STATICFILES_FINDERS = (
84-
'django.contrib.staticfiles.finders.FileSystemFinder',
85-
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
8684
)
8785

8886
# Make this unique, and don't share it with anybody.
@@ -119,7 +117,6 @@
119117
'django.contrib.contenttypes',
120118
'django.contrib.sessions',
121119
'django.contrib.messages',
122-
'django.contrib.staticfiles',
123120
# Uncomment the next line to enable the admin:
124121
'django.contrib.admin',
125122
# Uncomment the next line to enable admin documentation:

‎update.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)