From c07c0e0b63561f6bdd990d0da623ee6ccc6e1ea8 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 5 Dec 2020 13:32:34 +0100 Subject: [PATCH] [staticfiles] phase in proper support --- ipv6ula/settings.py | 3 ++- {static => ipv6ula/static}/bootstrap | 0 .../bootstrap-4.4.1-dist/css/bootstrap-grid.css | 0 .../bootstrap-4.4.1-dist/css/bootstrap-grid.css.map | 0 .../bootstrap-4.4.1-dist/css/bootstrap-grid.min.css | 0 .../css/bootstrap-grid.min.css.map | 0 .../bootstrap-4.4.1-dist/css/bootstrap-reboot.css | 0 .../bootstrap-4.4.1-dist/css/bootstrap-reboot.css.map | 0 .../bootstrap-4.4.1-dist/css/bootstrap-reboot.min.css | 0 .../css/bootstrap-reboot.min.css.map | 0 .../static}/bootstrap-4.4.1-dist/css/bootstrap.css | 0 .../static}/bootstrap-4.4.1-dist/css/bootstrap.css.map | 0 .../static}/bootstrap-4.4.1-dist/css/bootstrap.min.css | 0 .../bootstrap-4.4.1-dist/css/bootstrap.min.css.map | 0 .../bootstrap-4.4.1-dist/js/bootstrap.bundle.js | 0 .../bootstrap-4.4.1-dist/js/bootstrap.bundle.js.map | 0 .../bootstrap-4.4.1-dist/js/bootstrap.bundle.min.js | 0 .../js/bootstrap.bundle.min.js.map | 0 .../static}/bootstrap-4.4.1-dist/js/bootstrap.js | 0 .../static}/bootstrap-4.4.1-dist/js/bootstrap.js.map | 0 .../static}/bootstrap-4.4.1-dist/js/bootstrap.min.js | 0 .../bootstrap-4.4.1-dist/js/bootstrap.min.js.map | 0 .../static}/css/sticky-footer-navbar.css | 0 {static => ipv6ula/static}/js/jquery.min.js | 0 {static => ipv6ula/static}/js/popper.min.js | 0 ipv6ula/templates/ipv6ula/base.html | 10 +++++----- ipv6ula/urls.py | 4 +++- 27 files changed, 10 insertions(+), 7 deletions(-) rename {static => ipv6ula/static}/bootstrap (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/css/bootstrap-grid.css (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/css/bootstrap-grid.css.map (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/css/bootstrap-grid.min.css (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/css/bootstrap-grid.min.css.map (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/css/bootstrap-reboot.css (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/css/bootstrap-reboot.css.map (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/css/bootstrap-reboot.min.css (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/css/bootstrap-reboot.min.css.map (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/css/bootstrap.css (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/css/bootstrap.css.map (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/css/bootstrap.min.css (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/css/bootstrap.min.css.map (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/js/bootstrap.bundle.js (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/js/bootstrap.bundle.js.map (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/js/bootstrap.bundle.min.js (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/js/bootstrap.bundle.min.js.map (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/js/bootstrap.js (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/js/bootstrap.js.map (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/js/bootstrap.min.js (100%) rename {static => ipv6ula/static}/bootstrap-4.4.1-dist/js/bootstrap.min.js.map (100%) rename {static => ipv6ula/static}/css/sticky-footer-navbar.css (100%) rename {static => ipv6ula/static}/js/jquery.min.js (100%) rename {static => ipv6ula/static}/js/popper.min.js (100%) diff --git a/ipv6ula/settings.py b/ipv6ula/settings.py index 2f67072..ab27519 100644 --- a/ipv6ula/settings.py +++ b/ipv6ula/settings.py @@ -139,7 +139,8 @@ USE_TZ = True # https://docs.djangoproject.com/en/3.0/howto/static-files/ STATIC_URL = '/static/' -STATICFILES_DIRS = [ os.path.join(BASE_DIR, "static") ] +STATICFILES_DIRS = [ ] +STATIC_ROOT = "/home/app/app/static" AUTHENTICATION_BACKENDS = [ diff --git a/static/bootstrap b/ipv6ula/static/bootstrap similarity index 100% rename from static/bootstrap rename to ipv6ula/static/bootstrap diff --git a/static/bootstrap-4.4.1-dist/css/bootstrap-grid.css b/ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap-grid.css similarity index 100% rename from static/bootstrap-4.4.1-dist/css/bootstrap-grid.css rename to ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap-grid.css diff --git a/static/bootstrap-4.4.1-dist/css/bootstrap-grid.css.map b/ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap-grid.css.map similarity index 100% rename from static/bootstrap-4.4.1-dist/css/bootstrap-grid.css.map rename to ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap-grid.css.map diff --git a/static/bootstrap-4.4.1-dist/css/bootstrap-grid.min.css b/ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap-grid.min.css similarity index 100% rename from static/bootstrap-4.4.1-dist/css/bootstrap-grid.min.css rename to ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap-grid.min.css diff --git a/static/bootstrap-4.4.1-dist/css/bootstrap-grid.min.css.map b/ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap-grid.min.css.map similarity index 100% rename from static/bootstrap-4.4.1-dist/css/bootstrap-grid.min.css.map rename to ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap-grid.min.css.map diff --git a/static/bootstrap-4.4.1-dist/css/bootstrap-reboot.css b/ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap-reboot.css similarity index 100% rename from static/bootstrap-4.4.1-dist/css/bootstrap-reboot.css rename to ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap-reboot.css diff --git a/static/bootstrap-4.4.1-dist/css/bootstrap-reboot.css.map b/ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap-reboot.css.map similarity index 100% rename from static/bootstrap-4.4.1-dist/css/bootstrap-reboot.css.map rename to ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap-reboot.css.map diff --git a/static/bootstrap-4.4.1-dist/css/bootstrap-reboot.min.css b/ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap-reboot.min.css similarity index 100% rename from static/bootstrap-4.4.1-dist/css/bootstrap-reboot.min.css rename to ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap-reboot.min.css diff --git a/static/bootstrap-4.4.1-dist/css/bootstrap-reboot.min.css.map b/ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap-reboot.min.css.map similarity index 100% rename from static/bootstrap-4.4.1-dist/css/bootstrap-reboot.min.css.map rename to ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap-reboot.min.css.map diff --git a/static/bootstrap-4.4.1-dist/css/bootstrap.css b/ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap.css similarity index 100% rename from static/bootstrap-4.4.1-dist/css/bootstrap.css rename to ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap.css diff --git a/static/bootstrap-4.4.1-dist/css/bootstrap.css.map b/ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap.css.map similarity index 100% rename from static/bootstrap-4.4.1-dist/css/bootstrap.css.map rename to ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap.css.map diff --git a/static/bootstrap-4.4.1-dist/css/bootstrap.min.css b/ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap.min.css similarity index 100% rename from static/bootstrap-4.4.1-dist/css/bootstrap.min.css rename to ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap.min.css diff --git a/static/bootstrap-4.4.1-dist/css/bootstrap.min.css.map b/ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap.min.css.map similarity index 100% rename from static/bootstrap-4.4.1-dist/css/bootstrap.min.css.map rename to ipv6ula/static/bootstrap-4.4.1-dist/css/bootstrap.min.css.map diff --git a/static/bootstrap-4.4.1-dist/js/bootstrap.bundle.js b/ipv6ula/static/bootstrap-4.4.1-dist/js/bootstrap.bundle.js similarity index 100% rename from static/bootstrap-4.4.1-dist/js/bootstrap.bundle.js rename to ipv6ula/static/bootstrap-4.4.1-dist/js/bootstrap.bundle.js diff --git a/static/bootstrap-4.4.1-dist/js/bootstrap.bundle.js.map b/ipv6ula/static/bootstrap-4.4.1-dist/js/bootstrap.bundle.js.map similarity index 100% rename from static/bootstrap-4.4.1-dist/js/bootstrap.bundle.js.map rename to ipv6ula/static/bootstrap-4.4.1-dist/js/bootstrap.bundle.js.map diff --git a/static/bootstrap-4.4.1-dist/js/bootstrap.bundle.min.js b/ipv6ula/static/bootstrap-4.4.1-dist/js/bootstrap.bundle.min.js similarity index 100% rename from static/bootstrap-4.4.1-dist/js/bootstrap.bundle.min.js rename to ipv6ula/static/bootstrap-4.4.1-dist/js/bootstrap.bundle.min.js diff --git a/static/bootstrap-4.4.1-dist/js/bootstrap.bundle.min.js.map b/ipv6ula/static/bootstrap-4.4.1-dist/js/bootstrap.bundle.min.js.map similarity index 100% rename from static/bootstrap-4.4.1-dist/js/bootstrap.bundle.min.js.map rename to ipv6ula/static/bootstrap-4.4.1-dist/js/bootstrap.bundle.min.js.map diff --git a/static/bootstrap-4.4.1-dist/js/bootstrap.js b/ipv6ula/static/bootstrap-4.4.1-dist/js/bootstrap.js similarity index 100% rename from static/bootstrap-4.4.1-dist/js/bootstrap.js rename to ipv6ula/static/bootstrap-4.4.1-dist/js/bootstrap.js diff --git a/static/bootstrap-4.4.1-dist/js/bootstrap.js.map b/ipv6ula/static/bootstrap-4.4.1-dist/js/bootstrap.js.map similarity index 100% rename from static/bootstrap-4.4.1-dist/js/bootstrap.js.map rename to ipv6ula/static/bootstrap-4.4.1-dist/js/bootstrap.js.map diff --git a/static/bootstrap-4.4.1-dist/js/bootstrap.min.js b/ipv6ula/static/bootstrap-4.4.1-dist/js/bootstrap.min.js similarity index 100% rename from static/bootstrap-4.4.1-dist/js/bootstrap.min.js rename to ipv6ula/static/bootstrap-4.4.1-dist/js/bootstrap.min.js diff --git a/static/bootstrap-4.4.1-dist/js/bootstrap.min.js.map b/ipv6ula/static/bootstrap-4.4.1-dist/js/bootstrap.min.js.map similarity index 100% rename from static/bootstrap-4.4.1-dist/js/bootstrap.min.js.map rename to ipv6ula/static/bootstrap-4.4.1-dist/js/bootstrap.min.js.map diff --git a/static/css/sticky-footer-navbar.css b/ipv6ula/static/css/sticky-footer-navbar.css similarity index 100% rename from static/css/sticky-footer-navbar.css rename to ipv6ula/static/css/sticky-footer-navbar.css diff --git a/static/js/jquery.min.js b/ipv6ula/static/js/jquery.min.js similarity index 100% rename from static/js/jquery.min.js rename to ipv6ula/static/js/jquery.min.js diff --git a/static/js/popper.min.js b/ipv6ula/static/js/popper.min.js similarity index 100% rename from static/js/popper.min.js rename to ipv6ula/static/js/popper.min.js diff --git a/ipv6ula/templates/ipv6ula/base.html b/ipv6ula/templates/ipv6ula/base.html index 838124b..d8870d4 100644 --- a/ipv6ula/templates/ipv6ula/base.html +++ b/ipv6ula/templates/ipv6ula/base.html @@ -7,8 +7,8 @@ - - + + The IPv6 ULA registry by ungleich.ch @@ -45,9 +45,9 @@ - - - + + + diff --git a/ipv6ula/urls.py b/ipv6ula/urls.py index 6238506..a3e2b56 100644 --- a/ipv6ula/urls.py +++ b/ipv6ula/urls.py @@ -15,6 +15,8 @@ Including another URLconf """ from django.contrib import admin from django.urls import path +rom django.conf import settings +from django.conf.urls.static import static from ipv6ula import views @@ -24,4 +26,4 @@ urlpatterns = [ path('login/', views.LoginView.as_view(), name='login'), path('logout/', views.logout_view, name='logout'), path('admin/', admin.site.urls), -] +] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)