Changeset 3366

Timestamp:

03/14/08 18:00:41 (6 months ago)

Author:

coderanger

Message:

Working on trunk now.

Files:

• themeengineplugin/0.11/setup.py (modified) (2 diffs)
• themeengineplugin/0.11/themeengine/api.py (modified) (3 diffs)
• themeengineplugin/0.11/themeengine/web_ui.py (modified) (2 diffs)

themeengineplugin/0.11/setup.py

@@ -1 +1 @@
-#!/usr/bin/env python
-# -*- coding: iso-8859-1 -*-
-
-if __import__('os').getlogin() != 'coderanger':
-    print 'DO NOT USE THIS CODE YET.'
-    __import__('sys').exit(1)
-
-from setuptools import setup
@@ -24 +20 @@
-    ],
-    
-
+'Trac>=0.11dev-r6696,>=0.11'
-
-    entry_points = {

themeengineplugin/0.11/themeengine/api.py

@@ -1 +1 @@
-# Created by Noah Kantrowitz on 2007-07-16.
-# Copyright (c) 2007 Noah Kantrowitz. All rights reserved.
+import os.path
-import inspect
-
@@ -17 +18 @@
-         description::
-           A breif description of the theme.
-hem
-
+emplat
+template 
-         css::
-           The filename of the CSS file.
@@ -88 +89 @@
-        
-        info['description'] = inspect.getdoc(self.__class__)
-heme', self.get_theme_names().next()+'_theme.html'
+emplate', os.path.join('templates', self.get_theme_names().next().lower()+'_theme.html')
-        self._set_info(info, 'css', self.get_theme_names().next().lower()+'.css')
-        self._set_info(info, 'htdocs', 'htdocs')

themeengineplugin/0.11/themeengine/web_ui.py

@@ -1 +1 @@
-# Created by Noah Kantrowitz on 2007-07-15.
-# Copyright (c) 2007 Noah Kantrowitz. All rights reserved.
+import os.path
+
-from pkg_resources import resource_filename
-
@@ -16 +18 @@
-
-    def __init__(self):
-        # Force us to the front so we can override other templates
-        ComponentMeta._registry[ITemplateProvider].remove(ThemeEngineModule)
-        ComponentMeta._registry[ITemplateProvider].insert(0, ThemeEngineModule)
-        
-        self.system = ThemeEngineSystem(self.env)
-        self._last_theme = self.system.theme
-        
-    def theme(self):
-        cur_theme = self.system.theme
-        if cur_theme is not self._last_theme:
-            # We have changed themes, reset the template loader
-            self.log.debug('ThemeEngine: Changing theme from %s to %s', 
-                           (self._last_theme and self._last_theme['name'] or 'default'),
-                           (cur_theme and cur_theme['name'] or 'default'))
-            Chrome(self.env).templates = None
-            self._last_theme = cur_theme
-        return cur_theme
-    theme = property(theme)
-
-    # ITemplateProvider methods
-    def get_htdocs_dirs(self):
-
+system.
-        if theme and 'htdocs' in theme:
-            yield 'theme', resource_filename(theme['module'], theme['htdocs'])
-
+
-    def get_templates_dirs(self):
-
-s
-theme['templates']
-
+system.
+
+os.path.dirname(theme['template'])
+
-    # IRequestFilter methods
-    def pre_process_request(self, req, handler):
-        return handler
-
+
-    def post_process_request(self, req, template, data, content_type):
-
+system.
-        if theme and 'css' in theme:
-            add_stylesheet(req, 'theme/'+theme['css'])
+        if theme and 'template' in theme:
+            req.chrome['theme'] = os.path.basename(theme['template'])
-        return template, data, content_type