diff --git a/idre/settings.py b/idre/settings.py index dd38e5a..40e08b3 100644 --- a/idre/settings.py +++ b/idre/settings.py @@ -76,7 +76,7 @@ MEDIA_URL = '/media/' STATIC_ROOT = os.path.join(BASE_DIR, 'static') STATIC_URL = '/static/' -STATICFILES_DIRS = (STATIC_ROOT,) +STATICFILES_DIRS = (os.path.join(BASE_DIR, 'idre', 'static'),) TEMPLATES = [{ 'APP_DIRS': True, diff --git a/static/admin/css/base.css b/idre/static/admin/css/base.css similarity index 100% rename from static/admin/css/base.css rename to idre/static/admin/css/base.css diff --git a/static/admin/css/changelists.css b/idre/static/admin/css/changelists.css similarity index 100% rename from static/admin/css/changelists.css rename to idre/static/admin/css/changelists.css diff --git a/static/admin/css/dashboard.css b/idre/static/admin/css/dashboard.css similarity index 100% rename from static/admin/css/dashboard.css rename to idre/static/admin/css/dashboard.css diff --git a/static/admin/css/fonts.css b/idre/static/admin/css/fonts.css similarity index 100% rename from static/admin/css/fonts.css rename to idre/static/admin/css/fonts.css diff --git a/static/admin/css/forms.css b/idre/static/admin/css/forms.css similarity index 100% rename from static/admin/css/forms.css rename to idre/static/admin/css/forms.css diff --git a/static/admin/css/login.css b/idre/static/admin/css/login.css similarity index 100% rename from static/admin/css/login.css rename to idre/static/admin/css/login.css diff --git a/static/admin/css/rtl.css b/idre/static/admin/css/rtl.css similarity index 100% rename from static/admin/css/rtl.css rename to idre/static/admin/css/rtl.css diff --git a/static/admin/css/widgets.css b/idre/static/admin/css/widgets.css similarity index 100% rename from static/admin/css/widgets.css rename to idre/static/admin/css/widgets.css diff --git a/static/admin/fonts/LICENSE.txt b/idre/static/admin/fonts/LICENSE.txt similarity index 100% rename from static/admin/fonts/LICENSE.txt rename to idre/static/admin/fonts/LICENSE.txt diff --git a/static/admin/fonts/README.txt b/idre/static/admin/fonts/README.txt similarity index 100% rename from static/admin/fonts/README.txt rename to idre/static/admin/fonts/README.txt diff --git a/static/admin/fonts/Roboto-Bold-webfont.woff b/idre/static/admin/fonts/Roboto-Bold-webfont.woff similarity index 100% rename from static/admin/fonts/Roboto-Bold-webfont.woff rename to idre/static/admin/fonts/Roboto-Bold-webfont.woff diff --git a/static/admin/fonts/Roboto-Light-webfont.woff b/idre/static/admin/fonts/Roboto-Light-webfont.woff similarity index 100% rename from static/admin/fonts/Roboto-Light-webfont.woff rename to idre/static/admin/fonts/Roboto-Light-webfont.woff diff --git a/static/admin/fonts/Roboto-Regular-webfont.woff b/idre/static/admin/fonts/Roboto-Regular-webfont.woff similarity index 100% rename from static/admin/fonts/Roboto-Regular-webfont.woff rename to idre/static/admin/fonts/Roboto-Regular-webfont.woff diff --git a/static/admin/img/LICENSE b/idre/static/admin/img/LICENSE similarity index 100% rename from static/admin/img/LICENSE rename to idre/static/admin/img/LICENSE diff --git a/static/admin/img/README.txt b/idre/static/admin/img/README.txt similarity index 100% rename from static/admin/img/README.txt rename to idre/static/admin/img/README.txt diff --git a/static/admin/img/calendar-icons.svg b/idre/static/admin/img/calendar-icons.svg similarity index 100% rename from static/admin/img/calendar-icons.svg rename to idre/static/admin/img/calendar-icons.svg diff --git a/static/admin/img/gis/move_vertex_off.svg b/idre/static/admin/img/gis/move_vertex_off.svg similarity index 100% rename from static/admin/img/gis/move_vertex_off.svg rename to idre/static/admin/img/gis/move_vertex_off.svg diff --git a/static/admin/img/gis/move_vertex_on.svg b/idre/static/admin/img/gis/move_vertex_on.svg similarity index 100% rename from static/admin/img/gis/move_vertex_on.svg rename to idre/static/admin/img/gis/move_vertex_on.svg diff --git a/static/admin/img/icon-addlink.svg b/idre/static/admin/img/icon-addlink.svg similarity index 100% rename from static/admin/img/icon-addlink.svg rename to idre/static/admin/img/icon-addlink.svg diff --git a/static/admin/img/icon-alert.svg b/idre/static/admin/img/icon-alert.svg similarity index 100% rename from static/admin/img/icon-alert.svg rename to idre/static/admin/img/icon-alert.svg diff --git a/static/admin/img/icon-calendar.svg b/idre/static/admin/img/icon-calendar.svg similarity index 100% rename from static/admin/img/icon-calendar.svg rename to idre/static/admin/img/icon-calendar.svg diff --git a/static/admin/img/icon-changelink.svg b/idre/static/admin/img/icon-changelink.svg similarity index 100% rename from static/admin/img/icon-changelink.svg rename to idre/static/admin/img/icon-changelink.svg diff --git a/static/admin/img/icon-clock.svg b/idre/static/admin/img/icon-clock.svg similarity index 100% rename from static/admin/img/icon-clock.svg rename to idre/static/admin/img/icon-clock.svg diff --git a/static/admin/img/icon-deletelink.svg b/idre/static/admin/img/icon-deletelink.svg similarity index 100% rename from static/admin/img/icon-deletelink.svg rename to idre/static/admin/img/icon-deletelink.svg diff --git a/static/admin/img/icon-no.svg b/idre/static/admin/img/icon-no.svg similarity index 100% rename from static/admin/img/icon-no.svg rename to idre/static/admin/img/icon-no.svg diff --git a/static/admin/img/icon-unknown-alt.svg b/idre/static/admin/img/icon-unknown-alt.svg similarity index 100% rename from static/admin/img/icon-unknown-alt.svg rename to idre/static/admin/img/icon-unknown-alt.svg diff --git a/static/admin/img/icon-unknown.svg b/idre/static/admin/img/icon-unknown.svg similarity index 100% rename from static/admin/img/icon-unknown.svg rename to idre/static/admin/img/icon-unknown.svg diff --git a/static/admin/img/icon-yes.svg b/idre/static/admin/img/icon-yes.svg similarity index 100% rename from static/admin/img/icon-yes.svg rename to idre/static/admin/img/icon-yes.svg diff --git a/static/admin/img/inline-delete.svg b/idre/static/admin/img/inline-delete.svg similarity index 100% rename from static/admin/img/inline-delete.svg rename to idre/static/admin/img/inline-delete.svg diff --git a/static/admin/img/search.svg b/idre/static/admin/img/search.svg similarity index 100% rename from static/admin/img/search.svg rename to idre/static/admin/img/search.svg diff --git a/static/admin/img/selector-icons.svg b/idre/static/admin/img/selector-icons.svg similarity index 100% rename from static/admin/img/selector-icons.svg rename to idre/static/admin/img/selector-icons.svg diff --git a/static/admin/img/sorting-icons.svg b/idre/static/admin/img/sorting-icons.svg similarity index 100% rename from static/admin/img/sorting-icons.svg rename to idre/static/admin/img/sorting-icons.svg diff --git a/static/admin/img/tooltag-add.svg b/idre/static/admin/img/tooltag-add.svg similarity index 100% rename from static/admin/img/tooltag-add.svg rename to idre/static/admin/img/tooltag-add.svg diff --git a/static/admin/img/tooltag-arrowright.svg b/idre/static/admin/img/tooltag-arrowright.svg similarity index 100% rename from static/admin/img/tooltag-arrowright.svg rename to idre/static/admin/img/tooltag-arrowright.svg diff --git a/static/admin/js/SelectBox.js b/idre/static/admin/js/SelectBox.js similarity index 100% rename from static/admin/js/SelectBox.js rename to idre/static/admin/js/SelectBox.js diff --git a/static/admin/js/SelectFilter2.js b/idre/static/admin/js/SelectFilter2.js similarity index 100% rename from static/admin/js/SelectFilter2.js rename to idre/static/admin/js/SelectFilter2.js diff --git a/static/admin/js/actions.js b/idre/static/admin/js/actions.js similarity index 100% rename from static/admin/js/actions.js rename to idre/static/admin/js/actions.js diff --git a/static/admin/js/actions.min.js b/idre/static/admin/js/actions.min.js similarity index 100% rename from static/admin/js/actions.min.js rename to idre/static/admin/js/actions.min.js diff --git a/static/admin/js/admin/DateTimeShortcuts.js b/idre/static/admin/js/admin/DateTimeShortcuts.js similarity index 100% rename from static/admin/js/admin/DateTimeShortcuts.js rename to idre/static/admin/js/admin/DateTimeShortcuts.js diff --git a/static/admin/js/admin/RelatedObjectLookups.js b/idre/static/admin/js/admin/RelatedObjectLookups.js similarity index 100% rename from static/admin/js/admin/RelatedObjectLookups.js rename to idre/static/admin/js/admin/RelatedObjectLookups.js diff --git a/static/admin/js/calendar.js b/idre/static/admin/js/calendar.js similarity index 100% rename from static/admin/js/calendar.js rename to idre/static/admin/js/calendar.js diff --git a/static/admin/js/cancel.js b/idre/static/admin/js/cancel.js similarity index 100% rename from static/admin/js/cancel.js rename to idre/static/admin/js/cancel.js diff --git a/static/admin/js/change_form.js b/idre/static/admin/js/change_form.js similarity index 100% rename from static/admin/js/change_form.js rename to idre/static/admin/js/change_form.js diff --git a/static/admin/js/collapse.js b/idre/static/admin/js/collapse.js similarity index 100% rename from static/admin/js/collapse.js rename to idre/static/admin/js/collapse.js diff --git a/static/admin/js/collapse.min.js b/idre/static/admin/js/collapse.min.js similarity index 100% rename from static/admin/js/collapse.min.js rename to idre/static/admin/js/collapse.min.js diff --git a/static/admin/js/core.js b/idre/static/admin/js/core.js similarity index 100% rename from static/admin/js/core.js rename to idre/static/admin/js/core.js diff --git a/static/admin/js/inlines.js b/idre/static/admin/js/inlines.js similarity index 100% rename from static/admin/js/inlines.js rename to idre/static/admin/js/inlines.js diff --git a/static/admin/js/inlines.min.js b/idre/static/admin/js/inlines.min.js similarity index 100% rename from static/admin/js/inlines.min.js rename to idre/static/admin/js/inlines.min.js diff --git a/static/admin/js/jquery.init.js b/idre/static/admin/js/jquery.init.js similarity index 100% rename from static/admin/js/jquery.init.js rename to idre/static/admin/js/jquery.init.js diff --git a/static/admin/js/popup_response.js b/idre/static/admin/js/popup_response.js similarity index 100% rename from static/admin/js/popup_response.js rename to idre/static/admin/js/popup_response.js diff --git a/static/admin/js/prepopulate.js b/idre/static/admin/js/prepopulate.js similarity index 100% rename from static/admin/js/prepopulate.js rename to idre/static/admin/js/prepopulate.js diff --git a/static/admin/js/prepopulate.min.js b/idre/static/admin/js/prepopulate.min.js similarity index 100% rename from static/admin/js/prepopulate.min.js rename to idre/static/admin/js/prepopulate.min.js diff --git a/static/admin/js/prepopulate_init.js b/idre/static/admin/js/prepopulate_init.js similarity index 100% rename from static/admin/js/prepopulate_init.js rename to idre/static/admin/js/prepopulate_init.js diff --git a/static/admin/js/timeparse.js b/idre/static/admin/js/timeparse.js similarity index 100% rename from static/admin/js/timeparse.js rename to idre/static/admin/js/timeparse.js diff --git a/static/admin/js/urlify.js b/idre/static/admin/js/urlify.js similarity index 100% rename from static/admin/js/urlify.js rename to idre/static/admin/js/urlify.js diff --git a/static/admin/js/vendor/jquery/LICENSE-JQUERY.txt b/idre/static/admin/js/vendor/jquery/LICENSE-JQUERY.txt similarity index 100% rename from static/admin/js/vendor/jquery/LICENSE-JQUERY.txt rename to idre/static/admin/js/vendor/jquery/LICENSE-JQUERY.txt diff --git a/static/admin/js/vendor/jquery/jquery.js b/idre/static/admin/js/vendor/jquery/jquery.js similarity index 100% rename from static/admin/js/vendor/jquery/jquery.js rename to idre/static/admin/js/vendor/jquery/jquery.js diff --git a/static/admin/js/vendor/jquery/jquery.min.js b/idre/static/admin/js/vendor/jquery/jquery.min.js similarity index 100% rename from static/admin/js/vendor/jquery/jquery.min.js rename to idre/static/admin/js/vendor/jquery/jquery.min.js diff --git a/static/admin/js/vendor/xregexp/LICENSE-XREGEXP.txt b/idre/static/admin/js/vendor/xregexp/LICENSE-XREGEXP.txt similarity index 100% rename from static/admin/js/vendor/xregexp/LICENSE-XREGEXP.txt rename to idre/static/admin/js/vendor/xregexp/LICENSE-XREGEXP.txt diff --git a/static/admin/js/vendor/xregexp/xregexp.js b/idre/static/admin/js/vendor/xregexp/xregexp.js similarity index 100% rename from static/admin/js/vendor/xregexp/xregexp.js rename to idre/static/admin/js/vendor/xregexp/xregexp.js diff --git a/static/admin/js/vendor/xregexp/xregexp.min.js b/idre/static/admin/js/vendor/xregexp/xregexp.min.js similarity index 100% rename from static/admin/js/vendor/xregexp/xregexp.min.js rename to idre/static/admin/js/vendor/xregexp/xregexp.min.js diff --git a/static/css/base.css b/idre/static/css/base.css similarity index 100% rename from static/css/base.css rename to idre/static/css/base.css diff --git a/static/img/bandcamp_logo.png b/idre/static/img/bandcamp_logo.png similarity index 100% rename from static/img/bandcamp_logo.png rename to idre/static/img/bandcamp_logo.png diff --git a/static/img/bg.png b/idre/static/img/bg.png similarity index 100% rename from static/img/bg.png rename to idre/static/img/bg.png diff --git a/static/img/favicon.ico b/idre/static/img/favicon.ico similarity index 100% rename from static/img/favicon.ico rename to idre/static/img/favicon.ico diff --git a/static/img/favicon.png b/idre/static/img/favicon.png similarity index 100% rename from static/img/favicon.png rename to idre/static/img/favicon.png diff --git a/static/img/header.png b/idre/static/img/header.png similarity index 100% rename from static/img/header.png rename to idre/static/img/header.png diff --git a/static/img/logo.png b/idre/static/img/logo.png similarity index 100% rename from static/img/logo.png rename to idre/static/img/logo.png diff --git a/static/img/soundcloud_logo.png b/idre/static/img/soundcloud_logo.png similarity index 100% rename from static/img/soundcloud_logo.png rename to idre/static/img/soundcloud_logo.png diff --git a/idre/urls.py b/idre/urls.py index 0a211ca..6f1764e 100644 --- a/idre/urls.py +++ b/idre/urls.py @@ -7,6 +7,7 @@ import idre.views import label.urls import news.urls + admin.autodiscover() @@ -17,5 +18,13 @@ urlpatterns = ( [ url(r"^admin/", include(admin.site.urls)) ] ) + if settings.DEBUG: - urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + urlpatterns += static( + settings.STATIC_URL, + document_root=settings.STATIC_ROOT + ) + urlpatterns += static( + settings.MEDIA_URL, + document_root=settings.MEDIA_ROOT + )