Changeset 8573

Timestamp:

27/09/12 12:41:13 (8 years ago)

Author:

mnagni

Message:

Incomplete - # 22554: "Remove the ""FollowSymLinks"""
 http://team.ceda.ac.uk/trac/ceda/ticket/22554

Fixes the localhost static files serving

Location:

mauRepo/MolesManager/trunk/cedaMoles/MolesManager

Files:

• settings.py (modified) (3 diffs)
• urls.py (modified) (2 diffs)

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/settings.py

@@ -19 +19 @@
 
 SITE_ROOT = os.path.dirname(os.path.abspath(__file__))
-MEDIA_ROOT = os.path.join(SITE_ROOT, 'static')
 
 PROJECT_DIRNAME = SITE_ROOT.split(os.sep)[-1]
@@ -75 +74 @@
 # Example: "/home/media/media.lawrence.com/static/"
 STATIC_ROOT = os.path.join(DJANGO_PROJECT, 'static')
+print STATIC_ROOT
 
 # URL prefix for static files.
@@ -83 +83 @@
 #STATIC_URL = 'http://127.0.0.1:8000/static/'
 #STATIC_ROOT = os.path.join(PROJECT_ROOT, STATIC_URL)
-STATIC_URL = '/static/'
+STATIC_URL = 'CUSTOM_STATIC_URL'
+if STATIC_URL == 'CUSTOM_STATIC_URL':
+    STATIC_URL = 'http://127.0.0.1:8000/static/'
+print STATIC_URL
 #STATIC_ROOT = os.path.join(PROJECT_ROOT, STATIC_URL)
 

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/urls.py

@@ -2 +2 @@
 from django.views.generic.simple import redirect_to
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from cedaMoles.MolesManager.settings import STATIC_ROOT, STATIC_URL
 
 # Uncomment the next two lines to enable the admin:
@@ -54 +55 @@
 )
 
-urlpatterns += staticfiles_urlpatterns()
+if STATIC_URL == 'http://127.0.0.1:8000/static/':
+    urlpatterns += patterns('',
+       url(r'css/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/css' , 'show_indexes': True}),
+    )
+
+    urlpatterns += patterns('',
+       url(r'css/960/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/css/960' , 'show_indexes': True}),
+    )
+
+    urlpatterns += patterns('',
+       url(r'img/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/img' , 'show_indexes': True}),
+    )
+
+    urlpatterns += patterns('',
+       url(r'js/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT+'/js' , 'show_indexes': True}),
+    )
+
+#urlpatterns += staticfiles_urlpatterns()
+