config: Use the proxy theme to set site-specific themes.

diff --git a/conf/deadfoxjunction.py b/conf/deadfoxjunction.py
index 145db8eb752e941a15d74916ab208471d2caa6ba..e91d028fae67db0314bde6e18fe72172af1c5a99 100644 (file)
--- a/conf/deadfoxjunction.py
+++ b/conf/deadfoxjunction.py
@@ -24,7 +24,11 @@ class Config(FarmConfig):
     editor_force = True
     editor_default = 'text'  # internal default, just for completeness
 
-    theme_default = 'deadfoxjunction'
+    # Use a site-theme for /Site/ and a normal wiki theme for the rest.
+    proxy_theme_mapping = [
+        ('/Site/', 'deadfoxjunction'),
+        ('', 'modernized'),
+    ]
      
     # Set cookies on /, so they work on /wipi and /Site alike.
     cookie_path = '/'

diff --git a/conf/exodus.py b/conf/exodus.py
index 607d2797451401e52a32c155684eb93c9f2ee72a..5e144dbbd45a641db9641eaa76da64e4466f8284 100644 (file)
--- a/conf/exodus.py
+++ b/conf/exodus.py
@@ -23,7 +23,11 @@ class Config(FarmConfig):
     editor_force = True
     editor_default = 'text'  # internal default, just for completeness
 
-    theme_default = 'exodus'
+    # Use a site-theme for /Site/ and a normal wiki theme for the rest.
+    proxy_theme_mapping = [
+        ('/Site/', 'exodus'),
+        ('', 'modernized'),
+    ]
      
     # Set cookies on /, so they work on /wipi and /Site alike.
     cookie_path = '/'

diff --git a/conf/extinction.py b/conf/extinction.py
index 3af49983de69257631f47f84eee44e79a4315b8e..9046bcbff78c11e3301c53e6e3df6d7220105e1b 100644 (file)
--- a/conf/extinction.py
+++ b/conf/extinction.py
@@ -23,6 +23,10 @@ class Config(FarmConfig):
     editor_force = True
     editor_default = 'text'  # internal default, just for completeness
 
-    theme_default = 'modernized'
+    # Use a site-theme for /Site/ and a normal wiki theme for the rest.
+    proxy_theme_mapping = [
+        ('/Site/', 'extinction'),
+        ('', 'modernized'),
+    ]
 
 # vim: set ts=8 sts=4 sw=4 expandtab:

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index 194b49876c50bd32c7d32f603b005e83109fa8cf..7fdcbff255ef6f185b70c255ff0dc4c1cd8eb40b 100644 (file)
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -128,9 +128,10 @@ class FarmConfig(DefaultConfig):
         u'HelpContents',
     ]
 
-    # The default theme anonymous or new users get
-    theme_default = 'modern'
-
+    # Always use the proxy. Specific configs define a proxy_theme_mapping,
+    # which maps specific paths to a corresponding theme.
+    theme_default = 'proxy'
+    theme_force = True
 
     # Language options --------------------------------------------------