Permalink
Browse files

Merge remote branch 'iseppi/master' into upstream

  • Loading branch information...
2 parents 17729e7 + af8d3d2 commit 82809b786cd451b9531983fc6230ab01eb4aecf3 @johnf committed Apr 17, 2011
Showing 438 changed files with 6 additions and 5 deletions.
@@ -23,7 +23,7 @@ def load_environment(global_conf, app_conf):
root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
paths = dict(root=root,
controllers=os.path.join(root, 'controllers'),
- static_files=[file_paths['enabled_theme'] + '/' + file_paths['theme_public_folder'], file_paths['base_theme'] + '/' + file_paths['theme_public_folder'], file_paths['public_path']],
+ static_files=[file_paths['theme_public'], file_paths['public_path']],
templates=[os.path.join(root, 'templates')], # apparently pylons still wants this and as a list
default_theme=file_paths['base_theme'],
enabled_theme=file_paths['enabled_theme'])
@@ -6,10 +6,11 @@
# to them.
file_paths = {
'zk_root' : None,
- 'theme_root' : '$zk_root/zookeepr/templates',
- 'base_theme' : '$theme_root/default',
- 'enabled_theme': '$theme_root/default',
- 'theme_public_folder':'public',
+ 'theme_root' : '$zk_root/zookeepr/themes',
+ 'base_theme' : '$zk_root/zookeepr/templates',
+ 'enabled_theme': '$theme_root/zookeepr',
+ 'theme_templates': '$enabled_theme/templates',
+ 'theme_public': '$enabled_theme/public',
'public_path': '$zk_root/zookeepr/public',
'public_html': '',
'news_fileprefix': '$public_path/featured',
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.

0 comments on commit 82809b7

Please sign in to comment.