Parcourir la source

Allow the use of an url prefix

Uses URL_PREFIX setting (not documented yet)
Jocelyn Delande il y a 9 ans
Parent
commit
5a239288a1

+ 5 - 2
wifiwithme/core/urls.py

@@ -1,7 +1,10 @@
+from django.conf import settings
 from django.conf.urls import url, include
 from django.contrib import admin
 
+prefix = settings.URL_PREFIX
+
 urlpatterns = [
-    url(r'^admin/', admin.site.urls),
-    url(r'^map/', include('contribmap.urls')),
+    url(r'^{}admin/'.format(prefix), admin.site.urls),
+    url(r'^{}map/'.format(prefix), include('contribmap.urls')),
 ]

+ 3 - 3
wifiwithme/settings/base.py

@@ -119,12 +119,12 @@ USE_TZ = True
 
 ## URL Prefixing
 
-URL_PREFIX='/'
+URL_PREFIX=''
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.9/howto/static-files/
-
-STATIC_URL = URL_PREFIX + 'assets/'
+# STATIC_URL = '/{}assets/'.format(URL_PREFIX)
+# not defined here cause prefix overriding would not be taken into account
 
 STATICFILES_DIRS = [
     os.path.join(BASE_DIR, "static"),

+ 1 - 0
wifiwithme/settings/dev.py

@@ -11,3 +11,4 @@ except ImportError:
     pass
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+STATIC_URL = '/{}assets/'.format(URL_PREFIX)

+ 2 - 0
wifiwithme/settings/prod.py

@@ -9,3 +9,5 @@ try:
     from .local import *
 except ImportError:
     pass
+
+STATIC_URL = '/{}assets/'.format(URL_PREFIX)