diff options
| author | Will Kahn-Greene <willg@bluesock.org> | 2012-06-10 11:50:14 -0400 |
|---|---|---|
| committer | Will Kahn-Greene <willg@bluesock.org> | 2012-07-16 09:26:28 -0400 |
| commit | 8545dd50f0cd588d505c217d367450198199a2b0 (patch) | |
| tree | 3ba262185cbbf7366f1ab9673efd49d1c6856fe0 /mediagoblin/app.py | |
| parent | 62157a898f60fab7c82eb76b2969354f9f02390d (diff) | |
| download | mediagoblin-8545dd50f0cd588d505c217d367450198199a2b0.tar.lz mediagoblin-8545dd50f0cd588d505c217d367450198199a2b0.tar.xz mediagoblin-8545dd50f0cd588d505c217d367450198199a2b0.zip | |
Flatpages first pass
This fixes the template loader so that it can load plugin templates.
This adds code for registering template paths so that plugins can add
their own templates.
This adds the base code for the flatpagesfile plugin. It doesn't serve
pages, yet, but it's pretty close.
Diffstat (limited to 'mediagoblin/app.py')
| -rw-r--r-- | mediagoblin/app.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py index dfc715b9..4870b89c 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -32,6 +32,7 @@ from mediagoblin.init.plugins import setup_plugins from mediagoblin.init import (get_jinja_loader, get_staticdirector, setup_global_and_app_config, setup_workbench, setup_database, setup_storage, setup_beaker_cache) +from mediagoblin.tools.pluginapi import PluginCache _log = logging.getLogger(__name__) @@ -80,7 +81,9 @@ class MediaGoblinApp(object): # Get the template environment self.template_loader = get_jinja_loader( app_config.get('local_templates'), - self.current_theme) + self.current_theme, + PluginCache().get_template_paths() + ) # Set up storage systems self.public_store, self.queue_store = setup_storage() |