summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2021-04-01 02:50:30 +0100
committerPhilip Sargent <philip.sargent@klebos.com>2021-04-01 02:50:30 +0100
commit51de825189d8e442a500090d6ed449a93806001e (patch)
tree1cdb482263fb25370088ec6332a1a89f436b2f76 /urls.py
parent4c0ad53b3a5e11be38a55564a0967029fbf4c4cc (diff)
downloadtroggle-51de825189d8e442a500090d6ed449a93806001e.tar.gz
troggle-51de825189d8e442a500090d6ed449a93806001e.tar.bz2
troggle-51de825189d8e442a500090d6ed449a93806001e.zip
making PHOTOS files served correctly by troggle
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/urls.py b/urls.py
index cd3bff7..62ea610 100644
--- a/urls.py
+++ b/urls.py
@@ -135,7 +135,7 @@ trogglepatterns = [
url(r'^photos/(?P<subpath>.*)$', mediapage, {'doc_root': settings.PHOTOS_ROOT}, name="mediapage"), # photo galleries
url(r'^site_media/(?P<subpath>.*)$', mediapage, {'doc_root': settings.MEDIA_ROOT}, name="mediapage"), # MEDIA_ROOT: CSS and JS
- url(r'^static/(?P<subpath>.*)$', mediapage, {'doc_root': settings.STATIC_ROOT}, name="mediapage"), # STATIC: CSS and JS
+ url(r'^static/(?P<subpath>.*)$', mediapage, {'doc_root': settings.MEDIA_ROOT}, name="mediapage"), # STATIC is in MEDIA now!
url(r'^(.*)_edit$', editexpopage, name="editexpopage"),
@@ -154,7 +154,7 @@ urlpatterns = [
# Alias /site-media/ /home/expo/troggle/media/
# Alias /robots.txt /home/expo/troggle/media/robots.txt
# Alias /favicon.ico /home/expo/troggle/media/favicon.ico # comes from /expoweb/* when running runserver
-# Alias /javascript /home/expo/troggle/media/javascript
+# Alias /javascript /home/expo/troggle/media/javascript # empty
# Copy of old standard apache configurations:
# Alias /expofiles /home/expo/expofiles