Changeset 1320

Timestamp:

12/04/07 08:06:16 (9 months ago)

Author:

JensDiemer

Message:

New settings ('SERVE_STATIC_FILES' and 'REDIRECT_OLD_PYLUCID_URL') for set up the urls.py

Location:

trunk/pylucid/PyLucid

Files:

• settings_example.py (modified) (3 diffs)
• urls.py (modified) (3 diffs)

trunk/pylucid/PyLucid/settings_example.py

@@ -154 +154 @@
 # STATIC FILES
 # http://www.djangoproject.com/documentation/static_files/
-#
+
+# Serve static files for the development server?
+# Using this method is inefficient and insecure.
+# Do not use this in a production setting. Use this only for development.
+SERVE_STATIC_FILES = False
+
 # Note: Every URL/path...
 # ...must be a absolute path.
@@ -370 +375 @@
 # Should be only enabled for tests. It is a big security hole!
 INSTALL_EVILEVAL = False
+
+# Permit sending mails with the EMailSystem Plugin:
+ALLOW_SEND_MAILS = True
+
+# Every Plugin output gets a html SPAN tag around.
+# Here you can defined witch CSS class name the tag should used:
+CSS_PLUGIN_CLASS_NAME = "PyLucidPlugins"
+
+
 
 # The table prefix from a old PyLucid installation, if exist.
@@ -386 +400 @@
 # Use "low level admin/User administration" to set a new password for the user.
 
-# Permit sending mails with the EMailSystem Plugin:
-ALLOW_SEND_MAILS = True
-
-# Every Plugin output gets a html SPAN tag around.
-# Here you can defined witch CSS class name the tag should used:
-CSS_PLUGIN_CLASS_NAME = "PyLucidPlugins"
+# If you used a old PyLucid installation then you can recirect the old
+# urls with "indey.py" to the new URLs without the "index.py" part.
+# Default: False
+REDIRECT_OLD_PYLUCID_URL = False

trunk/pylucid/PyLucid/urls.py

@@ -21 +21 @@
 handler404 = 'django.views.defaults.page_not_found'
 handler500 = 'django.views.defaults.server_error'
+
+#______________________________________________________________________________
+# The install section:
 
 # We insert the _install URLs only, if the _install section is activated.
@@ -52 +55 @@
     # _install section is deactivated -> start with a empty urls
     urls = ()
+
 
 #______________________________________________________________________________
@@ -90 +94 @@
     (r'^([\w/-]*?)/?$', 'PyLucid.index.index'),
 
-    #_____________________________________
-    # REDIRECT
-    # Redirect old PyLucid (with "index.py") to the new URLs.
-    # Only usefull, if you have a old PyLucid page used.
-    #(r'^index.py(.*?)$', 'PyLucid.index.redirect'),
-
-    #_____________________________________
-    # STATIC FILES
-    # Using this method is inefficient and insecure.
-    # Do not use this in a production setting. Use this only for development.
-    # http://www.djangoproject.com/documentation/static_files/
-    #
-    # uncomment the lines, if you use the dajngo development server:
-    #--------------------------------------------------------------------------
-#    (
-#        '^%s(?P<path>.*)$' % settings.MEDIA_URL.lstrip("/"),
-#        'django.views.static.serve',
-#        {'document_root': './%s' % settings.MEDIA_URL}
-#    ),
     #--------------------------------------------------------------------------
 )
+
+
+if getattr(settings, "REDIRECT_OLD_PYLUCID_URL", False) == True:
+    # Redirect old PyLucid (with "index.py") to the new URLs.
+    # Only usefull, if you have a old PyLucid page used in the past ;)
+    urls += (
+        r'^index.py(.*?)$', 'PyLucid.index.redirect'
+    ),
+
+
+# serve static files
+if getattr(settings, "SERVE_STATIC_FILES", False) == True:
+    # Should only enabled, if the django development server used.
+    urls += (
+        '^%s(?P<path>.*)$' % settings.MEDIA_URL.lstrip("/"),
+        'django.views.static.serve',
+        {'document_root': './%s' % settings.MEDIA_URL},
+    ),
+
+
 urlpatterns = patterns('', *urls)